From 891e044e4ae63524456165a52efc7db5c2407cd5 Mon Sep 17 00:00:00 2001 From: Ulisses Lima Date: Sun, 10 Apr 2022 17:39:01 -0300 Subject: [PATCH 001/100] BAEL-5157 - Exception Handling with Jersey First draft: https://drafts.baeldung.com/wp-admin/post.php?post=131880&action=edit --- .../ExceptionHandlingConfig.java | 19 ++++ .../jersey/exceptionhandling/data/Stock.java | 33 +++++++ .../jersey/exceptionhandling/data/Wallet.java | 51 ++++++++++ .../jersey/exceptionhandling/repo/Db.java | 32 ++++++ .../exceptionhandling/repo/Identifiable.java | 17 ++++ .../rest/StocksResource.java | 42 ++++++++ .../rest/WalletsResource.java | 98 ++++++++++++++++++ .../IllegalArgumentExceptionMapper.java | 23 +++++ .../exceptions/InvalidTradeException.java | 17 ++++ .../rest/exceptions/RestErrorResponse.java | 34 +++++++ .../exceptions/ServerExceptionMapper.java | 35 +++++++ .../exceptionhandling/service/Repository.java | 10 ++ .../rest/StocksResourceIntegrationTest.java | 99 +++++++++++++++++++ 13 files changed, 510 insertions(+) create mode 100644 jersey/src/main/java/com/baeldung/jersey/exceptionhandling/ExceptionHandlingConfig.java create mode 100644 jersey/src/main/java/com/baeldung/jersey/exceptionhandling/data/Stock.java create mode 100644 jersey/src/main/java/com/baeldung/jersey/exceptionhandling/data/Wallet.java create mode 100644 jersey/src/main/java/com/baeldung/jersey/exceptionhandling/repo/Db.java create mode 100644 jersey/src/main/java/com/baeldung/jersey/exceptionhandling/repo/Identifiable.java create mode 100644 jersey/src/main/java/com/baeldung/jersey/exceptionhandling/rest/StocksResource.java create mode 100644 jersey/src/main/java/com/baeldung/jersey/exceptionhandling/rest/WalletsResource.java create mode 100644 jersey/src/main/java/com/baeldung/jersey/exceptionhandling/rest/exceptions/IllegalArgumentExceptionMapper.java create mode 100644 jersey/src/main/java/com/baeldung/jersey/exceptionhandling/rest/exceptions/InvalidTradeException.java create mode 100644 jersey/src/main/java/com/baeldung/jersey/exceptionhandling/rest/exceptions/RestErrorResponse.java create mode 100644 jersey/src/main/java/com/baeldung/jersey/exceptionhandling/rest/exceptions/ServerExceptionMapper.java create mode 100644 jersey/src/main/java/com/baeldung/jersey/exceptionhandling/service/Repository.java create mode 100644 jersey/src/test/java/com/baeldung/jersey/exceptionhandling/rest/StocksResourceIntegrationTest.java diff --git a/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/ExceptionHandlingConfig.java b/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/ExceptionHandlingConfig.java new file mode 100644 index 0000000000..d4cc1a81a1 --- /dev/null +++ b/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/ExceptionHandlingConfig.java @@ -0,0 +1,19 @@ +package com.baeldung.jersey.exceptionhandling; + +import javax.ws.rs.ApplicationPath; + +import org.glassfish.jersey.server.ResourceConfig; + +import com.baeldung.jersey.exceptionhandling.rest.exceptions.IllegalArgumentExceptionMapper; +import com.baeldung.jersey.exceptionhandling.rest.exceptions.ServerExceptionMapper; + +@ApplicationPath("/exception-handling/*") +public class ExceptionHandlingConfig extends ResourceConfig { + + public ExceptionHandlingConfig() { + packages("com.baeldung.jersey.exceptionhandling.rest"); + register(IllegalArgumentExceptionMapper.class); + register(ServerExceptionMapper.class); + } + +} diff --git a/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/data/Stock.java b/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/data/Stock.java new file mode 100644 index 0000000000..9a3f321651 --- /dev/null +++ b/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/data/Stock.java @@ -0,0 +1,33 @@ +package com.baeldung.jersey.exceptionhandling.data; + +import com.baeldung.jersey.exceptionhandling.repo.Identifiable; + +public class Stock implements Identifiable { + private static final long serialVersionUID = 1L; + private String id; + private Double price; + + public Stock() { + } + + public Stock(String id, Double price) { + this.id = id; + this.price = price; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public Double getPrice() { + return price; + } + + public void setPrice(Double price) { + this.price = price; + } +} diff --git a/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/data/Wallet.java b/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/data/Wallet.java new file mode 100644 index 0000000000..8ef47b4c99 --- /dev/null +++ b/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/data/Wallet.java @@ -0,0 +1,51 @@ +package com.baeldung.jersey.exceptionhandling.data; + +import com.baeldung.jersey.exceptionhandling.repo.Identifiable; + +public class Wallet implements Identifiable { + private static final long serialVersionUID = 1L; + + public static final Double MIN_CHARGE = 50.0; + public static final String MIN_CHARGE_MSG = "minimum charge is: " + MIN_CHARGE; + + private String id; + private Double balance = 0.0; + + public Wallet() { + } + + public Wallet(String id) { + this.id = id; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public Double getBalance() { + return balance; + } + + public void setBalance(Double balance) { + this.balance = balance; + } + + public Double addBalance(Double amount) { + if (balance == null) + balance = 0.0; + + return balance += amount; + } + + public boolean hasFunds(Double amount) { + if (balance == null || amount == null) { + return false; + } + + return (balance - amount) >= 0; + } +} diff --git a/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/repo/Db.java b/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/repo/Db.java new file mode 100644 index 0000000000..c91085f25b --- /dev/null +++ b/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/repo/Db.java @@ -0,0 +1,32 @@ +package com.baeldung.jersey.exceptionhandling.repo; + +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; +import java.util.UUID; + +public class Db { + private Map db = new HashMap<>(); + + public Optional findById(String id) { + return Optional.ofNullable(db.get(id)); + } + + public String save(T t) { + String id = t.getId(); + if (id == null) { + id = UUID.randomUUID() + .toString(); + t.setId(id); + } + db.put(id, t); + return id; + } + + public void remove(T t) { + db.entrySet() + .removeIf(entry -> entry.getValue() + .getId() + .equals(t.getId())); + } +} diff --git a/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/repo/Identifiable.java b/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/repo/Identifiable.java new file mode 100644 index 0000000000..11af44bcc5 --- /dev/null +++ b/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/repo/Identifiable.java @@ -0,0 +1,17 @@ +package com.baeldung.jersey.exceptionhandling.repo; + +import java.io.Serializable; + +public interface Identifiable extends Serializable { + void setId(String id); + + String getId(); + + public static void assertValid(Identifiable i) { + if (i == null) + throw new IllegalArgumentException("object cannot be null"); + + if (i.getId() == null) + throw new IllegalArgumentException("object id cannot be null"); + } +} diff --git a/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/rest/StocksResource.java b/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/rest/StocksResource.java new file mode 100644 index 0000000000..94ce329ad0 --- /dev/null +++ b/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/rest/StocksResource.java @@ -0,0 +1,42 @@ +package com.baeldung.jersey.exceptionhandling.rest; + +import java.util.Optional; + +import javax.ws.rs.Consumes; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; + +import com.baeldung.jersey.exceptionhandling.data.Stock; +import com.baeldung.jersey.exceptionhandling.repo.Db; +import com.baeldung.jersey.exceptionhandling.service.Repository; + +@Path("/stocks") +public class StocksResource { + private static final Db stocks = Repository.STOCKS_DB; + + @POST + @Consumes(MediaType.APPLICATION_JSON) + @Produces(MediaType.APPLICATION_JSON) + public Response post(Stock stock) { + stocks.save(stock); + + return Response.ok(stock) + .build(); + } + + @GET + @Path("/{ticker}") + @Produces(MediaType.APPLICATION_JSON) + public Response get(@PathParam("ticker") String id) { + Optional stock = stocks.findById(id); + stock.orElseThrow(IllegalArgumentException::new); + + return Response.ok(stock.get()) + .build(); + } +} diff --git a/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/rest/WalletsResource.java b/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/rest/WalletsResource.java new file mode 100644 index 0000000000..e5f8ddec06 --- /dev/null +++ b/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/rest/WalletsResource.java @@ -0,0 +1,98 @@ +package com.baeldung.jersey.exceptionhandling.rest; + +import java.util.Optional; + +import javax.ws.rs.Consumes; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.PUT; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.WebApplicationException; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.Response.Status; + +import com.baeldung.jersey.exceptionhandling.data.Stock; +import com.baeldung.jersey.exceptionhandling.data.Wallet; +import com.baeldung.jersey.exceptionhandling.repo.Db; +import com.baeldung.jersey.exceptionhandling.rest.exceptions.InvalidTradeException; +import com.baeldung.jersey.exceptionhandling.rest.exceptions.RestErrorResponse; +import com.baeldung.jersey.exceptionhandling.service.Repository; + +@Path("/wallets") +public class WalletsResource { + private static final Db stocks = Repository.STOCKS_DB; + private static final Db wallets = Repository.WALLETS_DB; + + @POST + @Consumes(MediaType.APPLICATION_JSON) + @Produces(MediaType.APPLICATION_JSON) + public Response post(Wallet wallet) { + wallets.save(wallet); + + return Response.ok(wallet) + .build(); + } + + @GET + @Path("/{id}") + @Produces(MediaType.APPLICATION_JSON) + public Response get(@PathParam("id") String id) { + Optional wallet = wallets.findById(id); + wallet.orElseThrow(IllegalArgumentException::new); + + return Response.ok(wallet.get()) + .build(); + } + + @PUT + @Path("/{id}/{amount}") + @Produces(MediaType.APPLICATION_JSON) + public Response putAmount(@PathParam("id") String id, @PathParam("amount") Double amount) { + Optional wallet = wallets.findById(id); + wallet.orElseThrow(IllegalArgumentException::new); + + if (amount < Wallet.MIN_CHARGE) { + throw new InvalidTradeException(Wallet.MIN_CHARGE_MSG); + } + + wallet.get() + .addBalance(amount); + wallets.save(wallet.get()); + + return Response.ok(wallet) + .build(); + } + + @POST + @Path("/{wallet}/buy/{ticker}") + @Produces(MediaType.APPLICATION_JSON) + public Response postBuyStock(@PathParam("wallet") String walletId, @PathParam("ticker") String id) { + Optional stock = stocks.findById(id); + stock.orElseThrow(InvalidTradeException::new); + + Optional w = wallets.findById(walletId); + w.orElseThrow(InvalidTradeException::new); + + Wallet wallet = w.get(); + Double price = stock.get() + .getPrice(); + + if (!wallet.hasFunds(price)) { + RestErrorResponse response = new RestErrorResponse(); + response.setSubject(wallet); + response.setMessage("insufficient balance"); + throw new WebApplicationException(Response.status(Status.NOT_ACCEPTABLE) + .entity(response) + .build()); + } + + wallet.addBalance(-price); + wallets.save(wallet); + + return Response.ok(wallet) + .build(); + } +} diff --git a/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/rest/exceptions/IllegalArgumentExceptionMapper.java b/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/rest/exceptions/IllegalArgumentExceptionMapper.java new file mode 100644 index 0000000000..b577121027 --- /dev/null +++ b/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/rest/exceptions/IllegalArgumentExceptionMapper.java @@ -0,0 +1,23 @@ +package com.baeldung.jersey.exceptionhandling.rest.exceptions; + +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; +import javax.ws.rs.ext.ExceptionMapper; + +public class IllegalArgumentExceptionMapper implements ExceptionMapper { + public static final String DEFAULT_MESSAGE = "an illegal argument was provided"; + + @Override + public Response toResponse(final IllegalArgumentException exception) { + return Response.status(Response.Status.EXPECTATION_FAILED) + .entity(build(exception.getMessage())) + .type(MediaType.APPLICATION_JSON) + .build(); + } + + private RestErrorResponse build(String message) { + RestErrorResponse response = new RestErrorResponse(); + response.setMessage(DEFAULT_MESSAGE + ": " + message); + return response; + } +} diff --git a/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/rest/exceptions/InvalidTradeException.java b/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/rest/exceptions/InvalidTradeException.java new file mode 100644 index 0000000000..11277c048a --- /dev/null +++ b/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/rest/exceptions/InvalidTradeException.java @@ -0,0 +1,17 @@ +package com.baeldung.jersey.exceptionhandling.rest.exceptions; + +import javax.ws.rs.WebApplicationException; +import javax.ws.rs.core.Response; + +public class InvalidTradeException extends WebApplicationException { + private static final long serialVersionUID = 1L; + private static final String MESSAGE = "invalid trade operation"; + + public InvalidTradeException() { + super(MESSAGE, Response.Status.NOT_ACCEPTABLE); + } + + public InvalidTradeException(String detail) { + super(MESSAGE + ": " + detail, Response.Status.NOT_ACCEPTABLE); + } +} diff --git a/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/rest/exceptions/RestErrorResponse.java b/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/rest/exceptions/RestErrorResponse.java new file mode 100644 index 0000000000..dd193ab059 --- /dev/null +++ b/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/rest/exceptions/RestErrorResponse.java @@ -0,0 +1,34 @@ +package com.baeldung.jersey.exceptionhandling.rest.exceptions; + +public class RestErrorResponse { + private Object subject; + private String message; + + public RestErrorResponse() { + } + + public RestErrorResponse(String message) { + this.message = message; + } + + public RestErrorResponse(Object subject, String message) { + this.subject = subject; + this.message = message; + } + + public Object getSubject() { + return subject; + } + + public void setSubject(Object subject) { + this.subject = subject; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } +} diff --git a/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/rest/exceptions/ServerExceptionMapper.java b/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/rest/exceptions/ServerExceptionMapper.java new file mode 100644 index 0000000000..a6e9cc7f39 --- /dev/null +++ b/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/rest/exceptions/ServerExceptionMapper.java @@ -0,0 +1,35 @@ +package com.baeldung.jersey.exceptionhandling.rest.exceptions; + +import javax.ws.rs.WebApplicationException; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.Response.Status; +import javax.ws.rs.ext.ExceptionMapper; + +public class ServerExceptionMapper implements ExceptionMapper { + public static final String HTTP_405_MESSAGE = "METHOD_NOT_ALLOWED"; + + @Override + public Response toResponse(final WebApplicationException exception) { + String message = exception.getMessage(); + Response response = exception.getResponse(); + Status status = response.getStatusInfo() + .toEnum(); + + switch (status) { + case METHOD_NOT_ALLOWED: + message = HTTP_405_MESSAGE; + break; + case INTERNAL_SERVER_ERROR: + message = "internal validation - " + exception; + break; + default: + message = "[unhandled response code] " + exception; + } + + return Response.status(status) + .entity(status + ": " + message) + .type(MediaType.TEXT_PLAIN) + .build(); + } +} diff --git a/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/service/Repository.java b/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/service/Repository.java new file mode 100644 index 0000000000..459b062068 --- /dev/null +++ b/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/service/Repository.java @@ -0,0 +1,10 @@ +package com.baeldung.jersey.exceptionhandling.service; + +import com.baeldung.jersey.exceptionhandling.data.Stock; +import com.baeldung.jersey.exceptionhandling.data.Wallet; +import com.baeldung.jersey.exceptionhandling.repo.Db; + +public class Repository { + public static Db STOCKS_DB = new Db<>(); + public static Db WALLETS_DB = new Db<>(); +} diff --git a/jersey/src/test/java/com/baeldung/jersey/exceptionhandling/rest/StocksResourceIntegrationTest.java b/jersey/src/test/java/com/baeldung/jersey/exceptionhandling/rest/StocksResourceIntegrationTest.java new file mode 100644 index 0000000000..1648116918 --- /dev/null +++ b/jersey/src/test/java/com/baeldung/jersey/exceptionhandling/rest/StocksResourceIntegrationTest.java @@ -0,0 +1,99 @@ +package com.baeldung.jersey.exceptionhandling.rest; + +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.startsWith; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; + +import java.util.HashMap; + +import javax.ws.rs.client.Entity; +import javax.ws.rs.client.Invocation; +import javax.ws.rs.core.Application; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.Response.Status; + +import org.glassfish.jersey.test.JerseyTest; +import org.junit.Test; + +import com.baeldung.jersey.exceptionhandling.ExceptionHandlingConfig; +import com.baeldung.jersey.exceptionhandling.data.Stock; +import com.baeldung.jersey.exceptionhandling.data.Wallet; +import com.baeldung.jersey.exceptionhandling.rest.exceptions.IllegalArgumentExceptionMapper; +import com.baeldung.jersey.exceptionhandling.rest.exceptions.RestErrorResponse; +import com.baeldung.jersey.exceptionhandling.rest.exceptions.ServerExceptionMapper; + +public class StocksResourceIntegrationTest extends JerseyTest { + private static final Entity EMPTY_BODY = Entity.json(""); + private static final Stock STOCK = new Stock("BAEL", 51.57); + private static final String MY_WALLET = "MY-WALLET"; + private static final Wallet WALLET = new Wallet(MY_WALLET); + private static final int INSUFFICIENT_AMOUNT = (int) (Wallet.MIN_CHARGE - 1); + + @Override + protected Application configure() { + return new ExceptionHandlingConfig(); + } + + private Invocation.Builder stocks(String path) { + return target("/stocks" + path).request(); + } + + private Invocation.Builder wallets(String path, Object... args) { + return target("/wallets" + String.format(path, args)).request(); + } + + private Entity entity(Object object) { + return Entity.entity(object, MediaType.APPLICATION_JSON_TYPE); + } + + @Test + public void whenMethodNotAllowed_thenCustomMessage() { + Response response = stocks("").get(); + + assertEquals(Status.METHOD_NOT_ALLOWED.getStatusCode(), response.getStatus()); + + String content = response.readEntity(String.class); + assertThat(content, containsString(ServerExceptionMapper.HTTP_405_MESSAGE)); + } + + @Test + public void whenTickerNotExists_thenRestErrorResponse() { + Response response = stocks("/UNDEFINED").get(); + + assertEquals(Status.EXPECTATION_FAILED.getStatusCode(), response.getStatus()); + + RestErrorResponse content = response.readEntity(RestErrorResponse.class); + assertThat(content.getMessage(), startsWith(IllegalArgumentExceptionMapper.DEFAULT_MESSAGE)); + } + + @Test + public void givenAmountLessThanMinimum_whenAddingToWallet_thenInvalidTradeException() { + wallets("").post(entity(WALLET)); + Response response = wallets("/%s/%d", MY_WALLET, INSUFFICIENT_AMOUNT).put(EMPTY_BODY); + + assertEquals(Status.NOT_ACCEPTABLE.getStatusCode(), response.getStatus()); + + String content = response.readEntity(String.class); + assertThat(content, containsString(Wallet.MIN_CHARGE_MSG)); + } + + @Test + public void givenInsifficientFunds_whenBuyingStock_thenWebApplicationException() { + stocks("").post(entity(STOCK)); + wallets("").post(entity(WALLET)); + + Response response = wallets("/%s/buy/%s", MY_WALLET, STOCK.getId()).post(EMPTY_BODY); + assertEquals(Status.NOT_ACCEPTABLE.getStatusCode(), response.getStatus()); + + RestErrorResponse content = response.readEntity(RestErrorResponse.class); + assertNotNull(content.getSubject()); + + HashMap subject = (HashMap) content.getSubject(); + assertEquals(subject.get("id"), WALLET.getId()); + assertTrue(WALLET.getBalance() < Wallet.MIN_CHARGE); + } +} From 3b92f0b83477e29e41bf4c399d2fdf31c8351183 Mon Sep 17 00:00:00 2001 From: Ulisses Lima Date: Mon, 18 Apr 2022 10:46:13 -0300 Subject: [PATCH 002/100] BAEL-5157 * more meaningful exception messages --- .../jersey/exceptionhandling/rest/StocksResource.java | 2 +- .../rest/exceptions/ServerExceptionMapper.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/rest/StocksResource.java b/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/rest/StocksResource.java index 94ce329ad0..64b645a1c6 100644 --- a/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/rest/StocksResource.java +++ b/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/rest/StocksResource.java @@ -34,7 +34,7 @@ public class StocksResource { @Produces(MediaType.APPLICATION_JSON) public Response get(@PathParam("ticker") String id) { Optional stock = stocks.findById(id); - stock.orElseThrow(IllegalArgumentException::new); + stock.orElseThrow(() -> new IllegalArgumentException("ticker")); return Response.ok(stock.get()) .build(); diff --git a/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/rest/exceptions/ServerExceptionMapper.java b/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/rest/exceptions/ServerExceptionMapper.java index a6e9cc7f39..adfac000e8 100644 --- a/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/rest/exceptions/ServerExceptionMapper.java +++ b/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/rest/exceptions/ServerExceptionMapper.java @@ -7,7 +7,7 @@ import javax.ws.rs.core.Response.Status; import javax.ws.rs.ext.ExceptionMapper; public class ServerExceptionMapper implements ExceptionMapper { - public static final String HTTP_405_MESSAGE = "METHOD_NOT_ALLOWED"; + public static final String HTTP_405_MESSAGE = "use one of"; @Override public Response toResponse(final WebApplicationException exception) { @@ -18,7 +18,7 @@ public class ServerExceptionMapper implements ExceptionMapper Date: Tue, 19 Apr 2022 13:09:20 +0500 Subject: [PATCH 003/100] Removed unused import "EnableAutoConfiguration" --- .../kafka/embedded/KafkaProducerConsumerApplication.java | 1 - 1 file changed, 1 deletion(-) diff --git a/spring-kafka/src/main/java/com/baeldung/kafka/embedded/KafkaProducerConsumerApplication.java b/spring-kafka/src/main/java/com/baeldung/kafka/embedded/KafkaProducerConsumerApplication.java index b4a03a12b0..0b6b7cce8b 100644 --- a/spring-kafka/src/main/java/com/baeldung/kafka/embedded/KafkaProducerConsumerApplication.java +++ b/spring-kafka/src/main/java/com/baeldung/kafka/embedded/KafkaProducerConsumerApplication.java @@ -1,7 +1,6 @@ package com.baeldung.kafka.embedded; import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication From c53a7035879636fbac23c5378b6dd2964f53d70a Mon Sep 17 00:00:00 2001 From: waqasakramef <103989631+waqasakramef@users.noreply.github.com> Date: Tue, 19 Apr 2022 13:22:22 +0500 Subject: [PATCH 004/100] Add placeholder The placeholder is mentioned in the kafkaConsumer.java but didn't defined in the applications.prop. So we need to defined that. Current exception is as follow. org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'kafkaConsumer' defined in file [/Users/mac/Library/Mobile Documents/com~apple~CloudDocs/development/kafka-poc/producer/target/classes/com/ef/kafka/embedded/KafkaConsumer.class]: Initialization of bean failed; nested exception is java.lang.IllegalArgumentException: Could not resolve placeholder 'test.topic' in value "${test.topic}" --- spring-kafka/src/main/resources/application.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-kafka/src/main/resources/application.properties b/spring-kafka/src/main/resources/application.properties index e1a983339b..9a614cbafd 100644 --- a/spring-kafka/src/main/resources/application.properties +++ b/spring-kafka/src/main/resources/application.properties @@ -13,4 +13,5 @@ monitor.topic.name=baeldung # monitoring - simulation monitor.producer.simulate=true monitor.consumer.simulate=true -monitor.kafka.consumer.groupid.simulate=baeldungGrpSimulate \ No newline at end of file +monitor.kafka.consumer.groupid.simulate=baeldungGrpSimulate +test.topic=testtopic1 From 79bc953888c6a9386fda9e1ddd5e6d78022031cb Mon Sep 17 00:00:00 2001 From: Ulisses Lima Date: Tue, 19 Apr 2022 12:27:00 -0300 Subject: [PATCH 005/100] BAEL-5157 * midified integration test to use the first available port --- .../exceptionhandling/rest/StocksResourceIntegrationTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jersey/src/test/java/com/baeldung/jersey/exceptionhandling/rest/StocksResourceIntegrationTest.java b/jersey/src/test/java/com/baeldung/jersey/exceptionhandling/rest/StocksResourceIntegrationTest.java index 1648116918..ceb59adc1f 100644 --- a/jersey/src/test/java/com/baeldung/jersey/exceptionhandling/rest/StocksResourceIntegrationTest.java +++ b/jersey/src/test/java/com/baeldung/jersey/exceptionhandling/rest/StocksResourceIntegrationTest.java @@ -17,6 +17,7 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; import org.glassfish.jersey.test.JerseyTest; +import org.glassfish.jersey.test.TestProperties; import org.junit.Test; import com.baeldung.jersey.exceptionhandling.ExceptionHandlingConfig; @@ -35,6 +36,7 @@ public class StocksResourceIntegrationTest extends JerseyTest { @Override protected Application configure() { + forceSet(TestProperties.CONTAINER_PORT, "0"); return new ExceptionHandlingConfig(); } From 73e2047689b2d4ad14e87ea60fda6680e8269b78 Mon Sep 17 00:00:00 2001 From: Alex Golub Date: Wed, 20 Apr 2022 13:50:30 +0300 Subject: [PATCH 006/100] Use the default package visibility and optimize imports --- .../com/baeldung/JUnit5NewFeaturesUnitTest.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/testing-modules/junit-5-basics/src/test/java/com/baeldung/JUnit5NewFeaturesUnitTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/JUnit5NewFeaturesUnitTest.java index 311c62f425..9b67426dfa 100644 --- a/testing-modules/junit-5-basics/src/test/java/com/baeldung/JUnit5NewFeaturesUnitTest.java +++ b/testing-modules/junit-5-basics/src/test/java/com/baeldung/JUnit5NewFeaturesUnitTest.java @@ -1,17 +1,11 @@ package com.baeldung; +import org.junit.jupiter.api.*; + import java.util.logging.Logger; -import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - //@RunWith(JUnitPlatform.class) -public class JUnit5NewFeaturesUnitTest { +class JUnit5NewFeaturesUnitTest { private static final Logger log = Logger.getLogger(JUnit5NewFeaturesUnitTest.class.getName()); @@ -29,7 +23,6 @@ public class JUnit5NewFeaturesUnitTest { @Test void testSingleSuccessTest() { log.info("Success"); - } @Test From d722c0d1d17eaa780333d3a53ec0036396719acc Mon Sep 17 00:00:00 2001 From: Alex Golub Date: Wed, 20 Apr 2022 13:57:15 +0300 Subject: [PATCH 007/100] Reformat Put each assertion on separate line to improve readability Explain why test is marked @Disabled --- .../test/java/com/baeldung/FirstUnitTest.java | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/testing-modules/junit-5-basics/src/test/java/com/baeldung/FirstUnitTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/FirstUnitTest.java index c47a70e52f..a5304d3402 100644 --- a/testing-modules/junit-5-basics/src/test/java/com/baeldung/FirstUnitTest.java +++ b/testing-modules/junit-5-basics/src/test/java/com/baeldung/FirstUnitTest.java @@ -1,12 +1,12 @@ package com.baeldung; -import static org.junit.jupiter.api.Assertions.*; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; class FirstUnitTest { @@ -14,20 +14,24 @@ class FirstUnitTest { void lambdaExpressions() { List numbers = Arrays.asList(1, 2, 3); assertTrue(numbers.stream() - .mapToInt(i -> i) - .sum() > 5, "Sum should be greater than 5"); + .mapToInt(Integer::intValue) + .sum() > 5, "Sum should be greater than 5"); } @Disabled("test to show MultipleFailuresError") @Test void groupAssertions() { - int[] numbers = { 0, 1, 2, 3, 4 }; - assertAll("numbers", () -> assertEquals(numbers[0], 1), () -> assertEquals(numbers[3], 3), () -> assertEquals(numbers[4], 1)); + int[] numbers = {0, 1, 2, 3, 4}; + assertAll("numbers", + () -> assertEquals(numbers[0], 1), + () -> assertEquals(numbers[3], 3), + () -> assertEquals(numbers[4], 1) + ); } @Test - @Disabled + @Disabled("Disabled test example") void disabledTest() { - assertTrue(false); + fail(); } } From efaf789e71e2083bfdb9b0467536569da425ac86 Mon Sep 17 00:00:00 2001 From: Alex Golub Date: Wed, 20 Apr 2022 13:58:33 +0300 Subject: [PATCH 008/100] JUnit5 test classes and methods should have default package visibility --- .../java/com/baeldung/ExceptionUnitTest.java | 12 ++++++------ .../src/test/java/com/baeldung/LiveTest.java | 18 +++++++++--------- .../migration/junit5/AssumptionUnitTest.java | 16 +++++++--------- 3 files changed, 22 insertions(+), 24 deletions(-) diff --git a/testing-modules/junit-5-basics/src/test/java/com/baeldung/ExceptionUnitTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/ExceptionUnitTest.java index 440c3e40ab..7b7c11ccad 100644 --- a/testing-modules/junit-5-basics/src/test/java/com/baeldung/ExceptionUnitTest.java +++ b/testing-modules/junit-5-basics/src/test/java/com/baeldung/ExceptionUnitTest.java @@ -1,16 +1,16 @@ package com.baeldung; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.function.Executable; import java.util.ConcurrentModificationException; import java.util.HashMap; import java.util.Map; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.function.Executable; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; -public class ExceptionUnitTest { +class ExceptionUnitTest { @Test void shouldThrowException() { @@ -29,7 +29,7 @@ public class ExceptionUnitTest { } @Test - public void whenModifyMapDuringIteration_thenThrowExecption() { + void whenModifyMapDuringIteration_thenThrowExecption() { Map hashmap = new HashMap<>(); hashmap.put(1, "One"); hashmap.put(2, "Two"); diff --git a/testing-modules/junit-5-basics/src/test/java/com/baeldung/LiveTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/LiveTest.java index c23eeb5afa..524ea58328 100644 --- a/testing-modules/junit-5-basics/src/test/java/com/baeldung/LiveTest.java +++ b/testing-modules/junit-5-basics/src/test/java/com/baeldung/LiveTest.java @@ -1,28 +1,28 @@ package com.baeldung; -import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.DynamicTest; +import org.junit.jupiter.api.TestFactory; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.stream.Stream; -import org.junit.jupiter.api.DynamicTest; -import org.junit.jupiter.api.TestFactory; +import static org.junit.jupiter.api.Assertions.assertEquals; -public class LiveTest { +class LiveTest { private List in = new ArrayList<>(Arrays.asList("Hello", "Yes", "No")); private List out = new ArrayList<>(Arrays.asList("Cześć", "Tak", "Nie")); @TestFactory - public Stream translateDynamicTestsFromStream() { + Stream translateDynamicTestsFromStream() { return in.stream() - .map(word -> DynamicTest.dynamicTest("Test translate " + word, () -> { - int id = in.indexOf(word); - assertEquals(out.get(id), translate(word)); - })); + .map(word -> DynamicTest.dynamicTest("Test translate " + word, () -> { + int id = in.indexOf(word); + assertEquals(out.get(id), translate(word)); + })); } private String translate(String word) { diff --git a/testing-modules/junit-5-basics/src/test/java/com/baeldung/migration/junit5/AssumptionUnitTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/migration/junit5/AssumptionUnitTest.java index 80201a3f44..c1eba0d557 100644 --- a/testing-modules/junit-5-basics/src/test/java/com/baeldung/migration/junit5/AssumptionUnitTest.java +++ b/testing-modules/junit-5-basics/src/test/java/com/baeldung/migration/junit5/AssumptionUnitTest.java @@ -1,28 +1,26 @@ package com.baeldung.migration.junit5; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assumptions.assumeFalse; -import static org.junit.jupiter.api.Assumptions.assumeTrue; -import static org.junit.jupiter.api.Assumptions.assumingThat; - import org.junit.jupiter.api.Test; -public class AssumptionUnitTest { +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assumptions.*; + +class AssumptionUnitTest { @Test - public void trueAssumption() { + void trueAssumption() { assumeTrue(5 > 1, () -> "5 is greater the 1"); assertEquals(5 + 2, 7); } @Test - public void falseAssumption() { + void falseAssumption() { assumeFalse(5 < 1, () -> "5 is less then 1"); assertEquals(5 + 2, 7); } @Test - public void assumptionThat() { + void assumptionThat() { String someString = "Just a string"; assumingThat(someString.equals("Just a string"), () -> assertEquals(2 + 2, 4)); } From 2327a11eca27437e0be662034e9f3634803a6295 Mon Sep 17 00:00:00 2001 From: Alex Golub Date: Wed, 20 Apr 2022 14:01:07 +0300 Subject: [PATCH 009/100] Assertion arguments should be passed in the correct order --- .../src/test/java/com/baeldung/ExceptionUnitTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testing-modules/junit-5-basics/src/test/java/com/baeldung/ExceptionUnitTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/ExceptionUnitTest.java index 7b7c11ccad..a191d941a9 100644 --- a/testing-modules/junit-5-basics/src/test/java/com/baeldung/ExceptionUnitTest.java +++ b/testing-modules/junit-5-basics/src/test/java/com/baeldung/ExceptionUnitTest.java @@ -17,7 +17,8 @@ class ExceptionUnitTest { Throwable exception = assertThrows(UnsupportedOperationException.class, () -> { throw new UnsupportedOperationException("Not supported"); }); - assertEquals(exception.getMessage(), "Not supported"); + + assertEquals("Not supported", exception.getMessage()); } @Test From 37b5df83c5ca1fc8e340b8de5f64a83de255de81 Mon Sep 17 00:00:00 2001 From: Alex Golub Date: Wed, 20 Apr 2022 14:03:48 +0300 Subject: [PATCH 010/100] Statement lambda can be replaced with expression lambda --- .../src/test/java/com/baeldung/ExceptionUnitTest.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/testing-modules/junit-5-basics/src/test/java/com/baeldung/ExceptionUnitTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/ExceptionUnitTest.java index a191d941a9..5bbd75d4d9 100644 --- a/testing-modules/junit-5-basics/src/test/java/com/baeldung/ExceptionUnitTest.java +++ b/testing-modules/junit-5-basics/src/test/java/com/baeldung/ExceptionUnitTest.java @@ -24,9 +24,7 @@ class ExceptionUnitTest { @Test void assertThrowsException() { String str = null; - assertThrows(IllegalArgumentException.class, () -> { - Integer.valueOf(str); - }); + assertThrows(IllegalArgumentException.class, () -> Integer.valueOf(str)); } @Test From 7ef7265dceb6d1418932c6b79de47e836c3b3096 Mon Sep 17 00:00:00 2001 From: Alex Golub Date: Wed, 20 Apr 2022 14:06:43 +0300 Subject: [PATCH 011/100] Method name typo --- .../src/test/java/com/baeldung/ExceptionUnitTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing-modules/junit-5-basics/src/test/java/com/baeldung/ExceptionUnitTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/ExceptionUnitTest.java index 5bbd75d4d9..b22707f10a 100644 --- a/testing-modules/junit-5-basics/src/test/java/com/baeldung/ExceptionUnitTest.java +++ b/testing-modules/junit-5-basics/src/test/java/com/baeldung/ExceptionUnitTest.java @@ -28,7 +28,7 @@ class ExceptionUnitTest { } @Test - void whenModifyMapDuringIteration_thenThrowExecption() { + void whenModifyMapDuringIteration_thenThrowException() { Map hashmap = new HashMap<>(); hashmap.put(1, "One"); hashmap.put(2, "Two"); From f1801bbd6f7c824e069b81847594808cf15499cd Mon Sep 17 00:00:00 2001 From: Alex Golub Date: Thu, 21 Apr 2022 10:29:26 +0300 Subject: [PATCH 012/100] JUnit5 test classes and methods should have default package visibility --- .../assertexception/ExceptionAssertionUnitTest.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/testing-modules/junit-5-basics/src/test/java/com/baeldung/assertexception/ExceptionAssertionUnitTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/assertexception/ExceptionAssertionUnitTest.java index ee2f696408..32e0e4a1cb 100644 --- a/testing-modules/junit-5-basics/src/test/java/com/baeldung/assertexception/ExceptionAssertionUnitTest.java +++ b/testing-modules/junit-5-basics/src/test/java/com/baeldung/assertexception/ExceptionAssertionUnitTest.java @@ -1,13 +1,14 @@ package com.baeldung.assertexception; +import org.junit.jupiter.api.Test; + import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.jupiter.api.Test; +class ExceptionAssertionUnitTest { -public class ExceptionAssertionUnitTest { @Test - public void whenExceptionThrown_thenAssertionSucceeds() { + void whenExceptionThrown_thenAssertionSucceeds() { Exception exception = assertThrows(NumberFormatException.class, () -> { Integer.parseInt("1a"); }); @@ -19,7 +20,7 @@ public class ExceptionAssertionUnitTest { } @Test - public void whenDerivedExceptionThrown_thenAssertionSucceds() { + void whenDerivedExceptionThrown_thenAssertionSucceds() { Exception exception = assertThrows(RuntimeException.class, () -> { Integer.parseInt("1a"); }); @@ -29,4 +30,5 @@ public class ExceptionAssertionUnitTest { assertTrue(actualMessage.contains(expectedMessage)); } -} \ No newline at end of file + +} From 0af6112abf7cd85fda1bda273df2e22e60a3baa1 Mon Sep 17 00:00:00 2001 From: Alex Golub Date: Thu, 21 Apr 2022 10:30:28 +0300 Subject: [PATCH 013/100] Delete redundant curly braces when using single lambda statement --- .../assertexception/ExceptionAssertionUnitTest.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/testing-modules/junit-5-basics/src/test/java/com/baeldung/assertexception/ExceptionAssertionUnitTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/assertexception/ExceptionAssertionUnitTest.java index 32e0e4a1cb..4a9e7e7f84 100644 --- a/testing-modules/junit-5-basics/src/test/java/com/baeldung/assertexception/ExceptionAssertionUnitTest.java +++ b/testing-modules/junit-5-basics/src/test/java/com/baeldung/assertexception/ExceptionAssertionUnitTest.java @@ -9,9 +9,7 @@ class ExceptionAssertionUnitTest { @Test void whenExceptionThrown_thenAssertionSucceeds() { - Exception exception = assertThrows(NumberFormatException.class, () -> { - Integer.parseInt("1a"); - }); + Exception exception = assertThrows(NumberFormatException.class, () -> Integer.parseInt("1a")); String expectedMessage = "For input string"; String actualMessage = exception.getMessage(); @@ -21,9 +19,7 @@ class ExceptionAssertionUnitTest { @Test void whenDerivedExceptionThrown_thenAssertionSucceds() { - Exception exception = assertThrows(RuntimeException.class, () -> { - Integer.parseInt("1a"); - }); + Exception exception = assertThrows(RuntimeException.class, () -> Integer.parseInt("1a")); String expectedMessage = "For input string"; String actualMessage = exception.getMessage(); From 95aff67d58d1e0eefd916839f33ed007777dc654 Mon Sep 17 00:00:00 2001 From: Alex Golub Date: Thu, 21 Apr 2022 10:30:44 +0300 Subject: [PATCH 014/100] Method name typo --- .../baeldung/assertexception/ExceptionAssertionUnitTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing-modules/junit-5-basics/src/test/java/com/baeldung/assertexception/ExceptionAssertionUnitTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/assertexception/ExceptionAssertionUnitTest.java index 4a9e7e7f84..5203a3f202 100644 --- a/testing-modules/junit-5-basics/src/test/java/com/baeldung/assertexception/ExceptionAssertionUnitTest.java +++ b/testing-modules/junit-5-basics/src/test/java/com/baeldung/assertexception/ExceptionAssertionUnitTest.java @@ -18,7 +18,7 @@ class ExceptionAssertionUnitTest { } @Test - void whenDerivedExceptionThrown_thenAssertionSucceds() { + void whenDerivedExceptionThrown_thenAssertionSucceeds() { Exception exception = assertThrows(RuntimeException.class, () -> Integer.parseInt("1a")); String expectedMessage = "For input string"; From 7d343f7674b2ed6ebc435ab533b0dddc8990a36d Mon Sep 17 00:00:00 2001 From: Alex Golub Date: Thu, 21 Apr 2022 11:05:26 +0300 Subject: [PATCH 015/100] assertThat(T, Matcher) Deprecated. Use org.hamcrest.MatcherAssert.assertThat() --- .../junit5vsjunit4assertions/Junit4AssertionsUnitTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5vsjunit4assertions/Junit4AssertionsUnitTest.java b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5vsjunit4assertions/Junit4AssertionsUnitTest.java index 7e74c2dace..236a43036b 100644 --- a/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5vsjunit4assertions/Junit4AssertionsUnitTest.java +++ b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5vsjunit4assertions/Junit4AssertionsUnitTest.java @@ -1,5 +1,6 @@ package com.baeldung.junit5vsjunit4assertions; +import org.hamcrest.MatcherAssert; import org.junit.Test; import java.util.Arrays; @@ -30,7 +31,7 @@ public class Junit4AssertionsUnitTest { @Test public void whenAssertingArraysEquality_thenEqual() { - char[] expected = { 'J', 'u', 'n', 'i', 't' }; + char[] expected = {'J', 'u', 'n', 'i', 't'}; char[] actual = "Junit".toCharArray(); assertArrayEquals(expected, actual); @@ -95,7 +96,7 @@ public class Junit4AssertionsUnitTest { @Test public void testAssertThatHasItems() { - assertThat(Arrays.asList("Java", "Kotlin", "Scala"), hasItems("Java", "Kotlin")); + MatcherAssert.assertThat(Arrays.asList("Java", "Kotlin", "Scala"), hasItems("Java", "Kotlin")); } } From 06c16d1eb0cd257b9922b6cc45f1cc22272ccbe5 Mon Sep 17 00:00:00 2001 From: Alex Golub Date: Thu, 21 Apr 2022 11:06:23 +0300 Subject: [PATCH 016/100] JUnit5 test classes and methods should have default package visibility --- .../Junit5AssertionsUnitTest.java | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5vsjunit4assertions/Junit5AssertionsUnitTest.java b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5vsjunit4assertions/Junit5AssertionsUnitTest.java index 40b9143a71..ced87dea8d 100644 --- a/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5vsjunit4assertions/Junit5AssertionsUnitTest.java +++ b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5vsjunit4assertions/Junit5AssertionsUnitTest.java @@ -32,11 +32,11 @@ import org.junit.jupiter.api.Test; * Unit test that demonstrate the different assertions available within JUnit 4 */ @DisplayName("Test case for assertions") -public class Junit5AssertionsUnitTest { +class Junit5AssertionsUnitTest { @Test @DisplayName("Arrays should be equals") - public void whenAssertingArraysEquality_thenEqual() { + void whenAssertingArraysEquality_thenEqual() { char[] expected = {'J', 'u', 'p', 'i', 't', 'e', 'r'}; char[] actual = "Jupiter".toCharArray(); @@ -45,7 +45,7 @@ public class Junit5AssertionsUnitTest { @Test @DisplayName("The area of two polygons should be equal") - public void whenAssertingEquality_thenEqual() { + void whenAssertingEquality_thenEqual() { float square = 2 * 2; float rectangle = 2 * 2; @@ -53,7 +53,7 @@ public class Junit5AssertionsUnitTest { } @Test - public void whenAssertingEqualityWithDelta_thenEqual() { + void whenAssertingEqualityWithDelta_thenEqual() { float square = 2 * 2; float rectangle = 3 * 2; float delta = 2; @@ -62,27 +62,27 @@ public class Junit5AssertionsUnitTest { } @Test - public void whenAssertingConditions_thenVerified() { + void whenAssertingConditions_thenVerified() { assertTrue(5 > 4, "5 is greater the 4"); assertTrue(null == null, "null is equal to null"); } @Test - public void whenAssertingNull_thenTrue() { + void whenAssertingNull_thenTrue() { Object cat = null; assertNull(cat, () -> "The cat should be null"); } @Test - public void whenAssertingNotNull_thenTrue() { + void whenAssertingNotNull_thenTrue() { Object dog = new Object(); assertNotNull(dog, () -> "The dog should not be null"); } @Test - public void whenAssertingSameObject_thenSuccessfull() { + void whenAssertingSameObject_thenSuccessfull() { String language = "Java"; Optional optional = Optional.of(language); @@ -90,7 +90,7 @@ public class Junit5AssertionsUnitTest { } @Test - public void givenBooleanSupplier_whenAssertingCondition_thenVerified() { + void givenBooleanSupplier_whenAssertingCondition_thenVerified() { BooleanSupplier condition = () -> 5 > 6; assertFalse(condition, "5 is not greater then 6"); @@ -98,13 +98,13 @@ public class Junit5AssertionsUnitTest { @Test @Disabled - public void whenFailingATest_thenFailed() { + void whenFailingATest_thenFailed() { // Test not completed fail("FAIL - test not completed"); } @Test - public void givenMultipleAssertion_whenAssertingAll_thenOK() { + void givenMultipleAssertion_whenAssertingAll_thenOK() { Object obj = null; assertAll( "heading", @@ -115,7 +115,7 @@ public class Junit5AssertionsUnitTest { } @Test - public void givenTwoLists_whenAssertingIterables_thenEquals() { + void givenTwoLists_whenAssertingIterables_thenEquals() { Iterable al = new ArrayList<>(asList("Java", "Junit", "Test")); Iterable ll = new LinkedList<>(asList("Java", "Junit", "Test")); @@ -123,7 +123,7 @@ public class Junit5AssertionsUnitTest { } @Test - public void whenAssertingTimeout_thenNotExceeded() { + void whenAssertingTimeout_thenNotExceeded() { assertTimeout( ofSeconds(2), () -> { @@ -134,7 +134,7 @@ public class Junit5AssertionsUnitTest { } @Test - public void whenAssertingTimeoutPreemptively_thenNotExceeded() { + void whenAssertingTimeoutPreemptively_thenNotExceeded() { assertTimeoutPreemptively( ofSeconds(2), () -> { @@ -145,14 +145,14 @@ public class Junit5AssertionsUnitTest { } @Test - public void whenAssertingEquality_thenNotEqual() { + void whenAssertingEquality_thenNotEqual() { Integer value = 5; // result of an algorithm assertNotEquals(0, value, "The result cannot be 0"); } @Test - public void whenAssertingEqualityListOfStrings_thenEqual() { + void whenAssertingEqualityListOfStrings_thenEqual() { List expected = asList("Java", "\\d+", "JUnit"); List actual = asList("Java", "11", "JUnit"); @@ -171,7 +171,7 @@ public class Junit5AssertionsUnitTest { } @Test - public void testConvertToDoubleThrowException() { + void testConvertToDoubleThrowException() { String age = "eighteen"; assertThrows(NumberFormatException.class, () -> { convertToInt(age); From 618c69690d454dc945f0d01055d958f08d7b5db4 Mon Sep 17 00:00:00 2001 From: Alex Golub Date: Thu, 21 Apr 2022 11:07:21 +0300 Subject: [PATCH 017/100] Code reformat --- .../Junit5AssertionsUnitTest.java | 62 +++++++------------ 1 file changed, 24 insertions(+), 38 deletions(-) diff --git a/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5vsjunit4assertions/Junit5AssertionsUnitTest.java b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5vsjunit4assertions/Junit5AssertionsUnitTest.java index ced87dea8d..fec24ac6d3 100644 --- a/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5vsjunit4assertions/Junit5AssertionsUnitTest.java +++ b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5vsjunit4assertions/Junit5AssertionsUnitTest.java @@ -1,22 +1,8 @@ package com.baeldung.junit5vsjunit4assertions; -import static java.time.Duration.ofSeconds; -import static java.util.Arrays.asList; -import static org.junit.jupiter.api.Assertions.assertAll; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertIterableEquals; -import static org.junit.jupiter.api.Assertions.assertLinesMatch; -import static org.junit.jupiter.api.Assertions.assertNotEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertSame; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTimeout; -import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptively; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.LinkedList; @@ -24,9 +10,9 @@ import java.util.List; import java.util.Optional; import java.util.function.BooleanSupplier; -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; +import static java.time.Duration.ofSeconds; +import static java.util.Arrays.asList; +import static org.junit.jupiter.api.Assertions.*; /** * Unit test that demonstrate the different assertions available within JUnit 4 @@ -107,10 +93,10 @@ class Junit5AssertionsUnitTest { void givenMultipleAssertion_whenAssertingAll_thenOK() { Object obj = null; assertAll( - "heading", - () -> assertEquals(4, 2 * 2, "4 is 2 times 2"), - () -> assertEquals("java", "JAVA".toLowerCase()), - () -> assertEquals(obj, null, "null is equal to null") + "heading", + () -> assertEquals(4, 2 * 2, "4 is 2 times 2"), + () -> assertEquals("java", "JAVA".toLowerCase()), + () -> assertEquals(obj, null, "null is equal to null") ); } @@ -125,22 +111,22 @@ class Junit5AssertionsUnitTest { @Test void whenAssertingTimeout_thenNotExceeded() { assertTimeout( - ofSeconds(2), - () -> { - // code that requires less then 2 minutes to execute - Thread.sleep(1000); - } + ofSeconds(2), + () -> { + // code that requires less then 2 minutes to execute + Thread.sleep(1000); + } ); } @Test void whenAssertingTimeoutPreemptively_thenNotExceeded() { assertTimeoutPreemptively( - ofSeconds(2), - () -> { - // code that requires less then 2 minutes to execute - Thread.sleep(1000); - } + ofSeconds(2), + () -> { + // code that requires less then 2 minutes to execute + Thread.sleep(1000); + } ); } @@ -162,10 +148,10 @@ class Junit5AssertionsUnitTest { @Test void whenAssertingException_thenThrown() { Throwable exception = assertThrows( - IllegalArgumentException.class, - () -> { - throw new IllegalArgumentException("Exception message"); - } + IllegalArgumentException.class, + () -> { + throw new IllegalArgumentException("Exception message"); + } ); assertEquals("Exception message", exception.getMessage()); } From 4a30842e106a7f9d052cef6215e06b5200e06587 Mon Sep 17 00:00:00 2001 From: Alex Golub Date: Thu, 21 Apr 2022 11:26:51 +0300 Subject: [PATCH 018/100] Explicitly create Supplier to demonstrate use of assertNull(Object, Supplier) method --- .../junit5vsjunit4assertions/Junit5AssertionsUnitTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5vsjunit4assertions/Junit5AssertionsUnitTest.java b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5vsjunit4assertions/Junit5AssertionsUnitTest.java index fec24ac6d3..27ed1b69a5 100644 --- a/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5vsjunit4assertions/Junit5AssertionsUnitTest.java +++ b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5vsjunit4assertions/Junit5AssertionsUnitTest.java @@ -9,6 +9,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Optional; import java.util.function.BooleanSupplier; +import java.util.function.Supplier; import static java.time.Duration.ofSeconds; import static java.util.Arrays.asList; @@ -57,7 +58,8 @@ class Junit5AssertionsUnitTest { void whenAssertingNull_thenTrue() { Object cat = null; - assertNull(cat, () -> "The cat should be null"); + Supplier messageSupplier = () -> "The cat should be null"; + assertNull(cat, messageSupplier); } @Test From 9df069c8628d9c8050fda2f7dd0aba4031fbca70 Mon Sep 17 00:00:00 2001 From: Alex Golub Date: Thu, 21 Apr 2022 11:27:51 +0300 Subject: [PATCH 019/100] Typos --- .../junit5vsjunit4assertions/Junit5AssertionsUnitTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5vsjunit4assertions/Junit5AssertionsUnitTest.java b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5vsjunit4assertions/Junit5AssertionsUnitTest.java index 27ed1b69a5..1b1b6510fb 100644 --- a/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5vsjunit4assertions/Junit5AssertionsUnitTest.java +++ b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5vsjunit4assertions/Junit5AssertionsUnitTest.java @@ -70,7 +70,7 @@ class Junit5AssertionsUnitTest { } @Test - void whenAssertingSameObject_thenSuccessfull() { + void whenAssertingSameObject_thenSuccessful() { String language = "Java"; Optional optional = Optional.of(language); @@ -115,7 +115,7 @@ class Junit5AssertionsUnitTest { assertTimeout( ofSeconds(2), () -> { - // code that requires less then 2 minutes to execute + // code that requires less than 2 minutes to execute Thread.sleep(1000); } ); @@ -126,7 +126,7 @@ class Junit5AssertionsUnitTest { assertTimeoutPreemptively( ofSeconds(2), () -> { - // code that requires less then 2 minutes to execute + // code that requires less than 2 minutes to execute Thread.sleep(1000); } ); From f56a57f901eae599abada8e53f0998a921963570 Mon Sep 17 00:00:00 2001 From: Alex Golub Date: Thu, 21 Apr 2022 11:33:22 +0300 Subject: [PATCH 020/100] Add an explanation about why this test is skipped as value of @Disabled --- .../junit5vsjunit4assertions/Junit5AssertionsUnitTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5vsjunit4assertions/Junit5AssertionsUnitTest.java b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5vsjunit4assertions/Junit5AssertionsUnitTest.java index 1b1b6510fb..bd64504b65 100644 --- a/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5vsjunit4assertions/Junit5AssertionsUnitTest.java +++ b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5vsjunit4assertions/Junit5AssertionsUnitTest.java @@ -85,9 +85,8 @@ class Junit5AssertionsUnitTest { } @Test - @Disabled + @Disabled("Test not completed") void whenFailingATest_thenFailed() { - // Test not completed fail("FAIL - test not completed"); } From 0e399659c13c211239ace8f1378c44f98f8f094e Mon Sep 17 00:00:00 2001 From: Alex Golub Date: Thu, 21 Apr 2022 11:34:47 +0300 Subject: [PATCH 021/100] Simplify to assertNull(Object, String) --- .../junit5vsjunit4assertions/Junit5AssertionsUnitTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5vsjunit4assertions/Junit5AssertionsUnitTest.java b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5vsjunit4assertions/Junit5AssertionsUnitTest.java index bd64504b65..1ba0b7ba8a 100644 --- a/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5vsjunit4assertions/Junit5AssertionsUnitTest.java +++ b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5vsjunit4assertions/Junit5AssertionsUnitTest.java @@ -97,7 +97,7 @@ class Junit5AssertionsUnitTest { "heading", () -> assertEquals(4, 2 * 2, "4 is 2 times 2"), () -> assertEquals("java", "JAVA".toLowerCase()), - () -> assertEquals(obj, null, "null is equal to null") + () -> assertNull(obj, "obj is null") ); } From f5f4ea015e9d800ba97bb729e7f5a78578c5c723 Mon Sep 17 00:00:00 2001 From: doljae Date: Fri, 22 Apr 2022 15:52:16 +0900 Subject: [PATCH 022/100] Remove unused imports --- .../src/main/java/com/baeldung/uuid/UUIDGenerator.java | 1 - 1 file changed, 1 deletion(-) diff --git a/core-java-modules/core-java-uuid/src/main/java/com/baeldung/uuid/UUIDGenerator.java b/core-java-modules/core-java-uuid/src/main/java/com/baeldung/uuid/UUIDGenerator.java index 54de1f95c6..c0cc1b6b39 100644 --- a/core-java-modules/core-java-uuid/src/main/java/com/baeldung/uuid/UUIDGenerator.java +++ b/core-java-modules/core-java-uuid/src/main/java/com/baeldung/uuid/UUIDGenerator.java @@ -1,7 +1,6 @@ package com.baeldung.uuid; import java.io.UnsupportedEncodingException; -import java.nio.ByteOrder; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; From da30a3efd7b4dbc23aca0d3a6941bfe762d71c3c Mon Sep 17 00:00:00 2001 From: Alex Golub Date: Fri, 22 Apr 2022 21:21:20 +0300 Subject: [PATCH 023/100] JUnit5 test classes and methods should have default package visibility --- .../order/AlphanumericOrderUnitTest.java | 11 +++++----- .../junit5/order/CustomOrderUnitTest.java | 17 ++++++++-------- .../junit5/order/DefaultOrderUnitTest.java | 6 +++--- .../junit5/order/OrderAnnotationUnitTest.java | 20 +++++++++---------- .../junit5/order/RandomOrderUnitTest.java | 6 +++--- 5 files changed, 31 insertions(+), 29 deletions(-) diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/AlphanumericOrderUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/AlphanumericOrderUnitTest.java index 873df30400..262166b1a1 100644 --- a/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/AlphanumericOrderUnitTest.java +++ b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/AlphanumericOrderUnitTest.java @@ -1,28 +1,29 @@ package com.baeldung.junit5.order; -import static org.junit.Assert.assertEquals; - import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; +import static org.junit.Assert.assertEquals; + @TestMethodOrder(MethodOrderer.MethodName.class) public class AlphanumericOrderUnitTest { + private static StringBuilder output = new StringBuilder(""); @Test - public void myATest() { + void myATest() { output.append("A"); } @Test - public void myBTest() { + void myBTest() { output.append("B"); } @Test - public void myaTest() { + void myaTest() { output.append("a"); } diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/CustomOrderUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/CustomOrderUnitTest.java index fa45921879..58e6e6304a 100644 --- a/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/CustomOrderUnitTest.java +++ b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/CustomOrderUnitTest.java @@ -8,24 +8,25 @@ import org.junit.jupiter.api.TestMethodOrder; @TestMethodOrder(CustomOrder.class) public class CustomOrderUnitTest { + private static StringBuilder output = new StringBuilder(""); - + @Test - public void myATest() { + void myATest() { output.append("A"); } - + @Test - public void myBTest() { - output.append("B"); + void myBTest() { + output.append("B"); } - + @Test - public void myaTest() { + void myaTest() { output.append("a"); } - + @AfterAll public static void assertOutput() { assertEquals(output.toString(), "AaB"); diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/DefaultOrderUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/DefaultOrderUnitTest.java index 65cee3e987..adea7e8888 100644 --- a/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/DefaultOrderUnitTest.java +++ b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/DefaultOrderUnitTest.java @@ -12,19 +12,19 @@ public class DefaultOrderUnitTest { @Test @DisplayName("Test A") - public void myATest() { + void myATest() { output.append("A"); } @Test @DisplayName("Test B") - public void myBTest() { + void myBTest() { output.append("B"); } @Test @DisplayName("Test C") - public void myCTest() { + void myCTest() { output.append("C"); } diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/OrderAnnotationUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/OrderAnnotationUnitTest.java index 3d931a4158..f73fcab132 100644 --- a/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/OrderAnnotationUnitTest.java +++ b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/OrderAnnotationUnitTest.java @@ -11,25 +11,25 @@ import org.junit.jupiter.api.TestMethodOrder; @TestMethodOrder(OrderAnnotation.class) public class OrderAnnotationUnitTest { private static StringBuilder output = new StringBuilder(""); - + @Test - @Order(1) - public void firstTest() { + @Order(1) + void firstTest() { output.append("a"); } - + @Test - @Order(2) - public void secondTest() { + @Order(2) + void secondTest() { output.append("b"); } - + @Test - @Order(3) - public void thirdTest() { + @Order(3) + void thirdTest() { output.append("c"); } - + @AfterAll public static void assertOutput() { assertEquals(output.toString(), "abc"); diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/RandomOrderUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/RandomOrderUnitTest.java index 0f64f5bb31..b583cd8f63 100644 --- a/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/RandomOrderUnitTest.java +++ b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/RandomOrderUnitTest.java @@ -13,17 +13,17 @@ public class RandomOrderUnitTest { private static StringBuilder output = new StringBuilder(""); @Test - public void myATest() { + void myATest() { output.append("A"); } @Test - public void myBTest() { + void myBTest() { output.append("B"); } @Test - public void myCTest() { + void myCTest() { output.append("C"); } From e0bdd5a62d7cc41e9f0fe5a169690f96755a9a13 Mon Sep 17 00:00:00 2001 From: Alex Golub Date: Fri, 22 Apr 2022 21:23:11 +0300 Subject: [PATCH 024/100] Junit4 'assertEquals()' from 'Assert' should be replaced with JUnit5 call to method from 'org.junit.jupiter.api.Assertions' --- .../baeldung/junit5/order/AlphanumericOrderUnitTest.java | 4 ++-- .../com/baeldung/junit5/order/CustomOrderUnitTest.java | 4 ++-- .../com/baeldung/junit5/order/DefaultOrderUnitTest.java | 8 ++++---- .../baeldung/junit5/order/OrderAnnotationUnitTest.java | 9 +++------ .../com/baeldung/junit5/order/RandomOrderUnitTest.java | 8 ++++---- 5 files changed, 15 insertions(+), 18 deletions(-) diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/AlphanumericOrderUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/AlphanumericOrderUnitTest.java index 262166b1a1..7fc32c0cc0 100644 --- a/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/AlphanumericOrderUnitTest.java +++ b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/AlphanumericOrderUnitTest.java @@ -5,12 +5,12 @@ import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; @TestMethodOrder(MethodOrderer.MethodName.class) public class AlphanumericOrderUnitTest { - private static StringBuilder output = new StringBuilder(""); + private static final StringBuilder output = new StringBuilder(""); @Test void myATest() { diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/CustomOrderUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/CustomOrderUnitTest.java index 58e6e6304a..472c98e923 100644 --- a/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/CustomOrderUnitTest.java +++ b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/CustomOrderUnitTest.java @@ -1,11 +1,11 @@ package com.baeldung.junit5.order; -import static org.junit.Assert.assertEquals; - import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; +import static org.junit.jupiter.api.Assertions.assertEquals; + @TestMethodOrder(CustomOrder.class) public class CustomOrderUnitTest { diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/DefaultOrderUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/DefaultOrderUnitTest.java index adea7e8888..ee1d86ee43 100644 --- a/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/DefaultOrderUnitTest.java +++ b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/DefaultOrderUnitTest.java @@ -1,14 +1,14 @@ package com.baeldung.junit5.order; -import static org.junit.Assert.assertEquals; - import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class DefaultOrderUnitTest { - private static StringBuilder output = new StringBuilder(""); + private static final StringBuilder output = new StringBuilder(); @Test @DisplayName("Test A") @@ -30,7 +30,7 @@ public class DefaultOrderUnitTest { @AfterAll public static void assertOutput() { - assertEquals(output.toString(), "ABC"); + assertEquals("ABC", output.toString()); } } diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/OrderAnnotationUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/OrderAnnotationUnitTest.java index f73fcab132..72c8bcc2a9 100644 --- a/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/OrderAnnotationUnitTest.java +++ b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/OrderAnnotationUnitTest.java @@ -1,12 +1,9 @@ package com.baeldung.junit5.order; -import static org.junit.Assert.assertEquals; - -import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.*; import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; -import org.junit.jupiter.api.Order; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestMethodOrder; + +import static org.junit.jupiter.api.Assertions.*; @TestMethodOrder(OrderAnnotation.class) public class OrderAnnotationUnitTest { diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/RandomOrderUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/RandomOrderUnitTest.java index b583cd8f63..6c7cf234c8 100644 --- a/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/RandomOrderUnitTest.java +++ b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/RandomOrderUnitTest.java @@ -1,16 +1,16 @@ package com.baeldung.junit5.order; -import static org.junit.Assert.assertEquals; - import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; +import static org.junit.jupiter.api.Assertions.assertEquals; + @TestMethodOrder(MethodOrderer.Random.class) public class RandomOrderUnitTest { - private static StringBuilder output = new StringBuilder(""); + private static final StringBuilder output = new StringBuilder(); @Test void myATest() { @@ -29,7 +29,7 @@ public class RandomOrderUnitTest { @AfterAll public static void assertOutput() { - assertEquals(output.toString(), "ACB"); + assertEquals("ACB", output.toString()); } } From 8861efd87ae098f976fc4c7a86a43e4b296c0310 Mon Sep 17 00:00:00 2001 From: Alex Golub Date: Fri, 22 Apr 2022 21:23:47 +0300 Subject: [PATCH 025/100] Swap these 2 arguments, so they are in the correct order: expected value, actual value --- .../com/baeldung/junit5/order/AlphanumericOrderUnitTest.java | 2 +- .../java/com/baeldung/junit5/order/CustomOrderUnitTest.java | 5 ++--- .../com/baeldung/junit5/order/OrderAnnotationUnitTest.java | 5 +++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/AlphanumericOrderUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/AlphanumericOrderUnitTest.java index 7fc32c0cc0..3a873a6d29 100644 --- a/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/AlphanumericOrderUnitTest.java +++ b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/AlphanumericOrderUnitTest.java @@ -29,6 +29,6 @@ public class AlphanumericOrderUnitTest { @AfterAll public static void assertOutput() { - assertEquals(output.toString(), "ABa"); + assertEquals("ABa", output.toString()); } } diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/CustomOrderUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/CustomOrderUnitTest.java index 472c98e923..299a3cad85 100644 --- a/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/CustomOrderUnitTest.java +++ b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/CustomOrderUnitTest.java @@ -9,7 +9,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; @TestMethodOrder(CustomOrder.class) public class CustomOrderUnitTest { - private static StringBuilder output = new StringBuilder(""); + private static final StringBuilder output = new StringBuilder(""); @Test void myATest() { @@ -26,9 +26,8 @@ public class CustomOrderUnitTest { output.append("a"); } - @AfterAll public static void assertOutput() { - assertEquals(output.toString(), "AaB"); + assertEquals("AaB", output.toString()); } } diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/OrderAnnotationUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/OrderAnnotationUnitTest.java index 72c8bcc2a9..14cf6c552e 100644 --- a/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/OrderAnnotationUnitTest.java +++ b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/OrderAnnotationUnitTest.java @@ -7,7 +7,8 @@ import static org.junit.jupiter.api.Assertions.*; @TestMethodOrder(OrderAnnotation.class) public class OrderAnnotationUnitTest { - private static StringBuilder output = new StringBuilder(""); + + private static final StringBuilder output = new StringBuilder(); @Test @Order(1) @@ -29,6 +30,6 @@ public class OrderAnnotationUnitTest { @AfterAll public static void assertOutput() { - assertEquals(output.toString(), "abc"); + assertEquals("abc", output.toString()); } } From c1cd68d30e5b3fc6393457a7b948568de58322fc Mon Sep 17 00:00:00 2001 From: doljae Date: Mon, 25 Apr 2022 10:51:40 +0900 Subject: [PATCH 026/100] code cleaning --- .../java/com/baeldung/uuid/UUIDGenerator.java | 116 ++++++++---------- 1 file changed, 50 insertions(+), 66 deletions(-) diff --git a/core-java-modules/core-java-uuid/src/main/java/com/baeldung/uuid/UUIDGenerator.java b/core-java-modules/core-java-uuid/src/main/java/com/baeldung/uuid/UUIDGenerator.java index c0cc1b6b39..264744dcba 100644 --- a/core-java-modules/core-java-uuid/src/main/java/com/baeldung/uuid/UUIDGenerator.java +++ b/core-java-modules/core-java-uuid/src/main/java/com/baeldung/uuid/UUIDGenerator.java @@ -1,6 +1,5 @@ package com.baeldung.uuid; -import java.io.UnsupportedEncodingException; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; @@ -10,49 +9,48 @@ import java.util.Arrays; import java.util.Random; import java.util.UUID; -public class UUIDGenerator { +public final class UUIDGenerator { private static final char[] hexArray = "0123456789ABCDEF".toCharArray(); + private UUIDGenerator() {} + /** * Type 1 UUID Generation */ public static UUID generateType1UUID() { - long most64SigBits = get64MostSignificantBitsForVersion1(); - long least64SigBits = get64LeastSignificantBitsForVersion1(); + final long most64SigBits = get64MostSignificantBitsForVersion1(); + final long least64SigBits = get64LeastSignificantBitsForVersion1(); return new UUID(most64SigBits, least64SigBits); } private static long get64LeastSignificantBitsForVersion1() { - Random random = new Random(); - long random63BitLong = random.nextLong() & 0x3FFFFFFFFFFFFFFFL; - long variant3BitFlag = 0x8000000000000000L; + final long random63BitLong = new Random().nextLong() & 0x3FFFFFFFFFFFFFFFL; + final long variant3BitFlag = 0x8000000000000000L; return random63BitLong + variant3BitFlag; } private static long get64MostSignificantBitsForVersion1() { - LocalDateTime start = LocalDateTime.of(1582, 10, 15, 0, 0, 0); - Duration duration = Duration.between(start, LocalDateTime.now()); - long seconds = duration.getSeconds(); - long nanos = duration.getNano(); - long timeForUuidIn100Nanos = seconds * 10000000 + nanos * 100; - long least12SignificatBitOfTime = (timeForUuidIn100Nanos & 0x000000000000FFFFL) >> 4; - long version = 1 << 12; - return (timeForUuidIn100Nanos & 0xFFFFFFFFFFFF0000L) + version + least12SignificatBitOfTime; + final LocalDateTime start = LocalDateTime.of(1582, 10, 15, 0, 0, 0); + final Duration duration = Duration.between(start, LocalDateTime.now()); + final long seconds = duration.getSeconds(); + final long nanos = duration.getNano(); + final long timeForUuidIn100Nanos = seconds * 10000000 + nanos * 100; + final long least12SignificantBitOfTime = (timeForUuidIn100Nanos & 0x000000000000FFFFL) >> 4; + final long version = 1 << 12; + return (timeForUuidIn100Nanos & 0xFFFFFFFFFFFF0000L) + version + least12SignificantBitOfTime; } /** * Type 3 UUID Generation - * - * @throws UnsupportedEncodingException */ - public static UUID generateType3UUID(String namespace, String name) throws UnsupportedEncodingException { + public static UUID generateType3UUID(String namespace, String name) { - byte[] nameSpaceBytes = bytesFromUUID(namespace); - byte[] nameBytes = name.getBytes("UTF-8"); - byte[] result = joinBytes(nameSpaceBytes, nameBytes); + final byte[] nameSpaceBytes = bytesFromUUID(namespace); + final byte[] nameBytes = name.getBytes(StandardCharsets.UTF_8); + final byte[] result = joinBytes(nameSpaceBytes, nameBytes); return UUID.nameUUIDFromBytes(result); } @@ -61,32 +59,29 @@ public class UUIDGenerator { * Type 4 UUID Generation */ public static UUID generateType4UUID() { - UUID uuid = UUID.randomUUID(); - return uuid; + return UUID.randomUUID(); } /** * Type 5 UUID Generation - * - * @throws UnsupportedEncodingException */ - public static UUID generateType5UUID(String namespace, String name) throws UnsupportedEncodingException { + public static UUID generateType5UUID(String namespace, String name) { - byte[] nameSpaceBytes = bytesFromUUID(namespace); - byte[] nameBytes = name.getBytes("UTF-8"); - byte[] result = joinBytes(nameSpaceBytes, nameBytes); + final byte[] nameSpaceBytes = bytesFromUUID(namespace); + final byte[] nameBytes = name.getBytes(StandardCharsets.UTF_8); + final byte[] result = joinBytes(nameSpaceBytes, nameBytes); return type5UUIDFromBytes(result); } public static UUID type5UUIDFromBytes(byte[] name) { - MessageDigest md; + final MessageDigest md; try { md = MessageDigest.getInstance("SHA-1"); - } catch (NoSuchAlgorithmException nsae) { - throw new InternalError("SHA-1 not supported", nsae); + } catch (NoSuchAlgorithmException exception) { + throw new InternalError("SHA-1 not supported", exception); } - byte[] bytes = Arrays.copyOfRange(md.digest(name), 0, 16); + final byte[] bytes = Arrays.copyOfRange(md.digest(name), 0, 16); bytes[6] &= 0x0f; /* clear version */ bytes[6] |= 0x50; /* set to version 5 */ bytes[8] &= 0x3f; /* clear variant */ @@ -99,33 +94,28 @@ public class UUIDGenerator { long lsb = 0; assert data.length == 16 : "data must be 16 bytes in length"; - for (int i = 0; i < 8; i++) - msb = (msb << 8) | (data[i] & 0xff); + for (int i = 0; i < 8; i++) {msb = (msb << 8) | (data[i] & 0xff);} - for (int i = 8; i < 16; i++) - lsb = (lsb << 8) | (data[i] & 0xff); + for (int i = 8; i < 16; i++) {lsb = (lsb << 8) | (data[i] & 0xff);} return new UUID(msb, lsb); } /** * Unique Keys Generation Using Message Digest and Type 4 UUID - * * @throws NoSuchAlgorithmException - * @throws UnsupportedEncodingException */ - public static String generateUniqueKeysWithUUIDAndMessageDigest() throws NoSuchAlgorithmException, UnsupportedEncodingException { - MessageDigest salt = MessageDigest.getInstance("SHA-256"); + public static String generateUniqueKeysWithUUIDAndMessageDigest() throws NoSuchAlgorithmException { + final MessageDigest salt = MessageDigest.getInstance("SHA-256"); salt.update(UUID.randomUUID() - .toString() - .getBytes("UTF-8")); - String digest = bytesToHex(salt.digest()); - return digest; + .toString() + .getBytes(StandardCharsets.UTF_8)); + return bytesToHex(salt.digest()); } private static String bytesToHex(byte[] bytes) { - char[] hexChars = new char[bytes.length * 2]; + final char[] hexChars = new char[bytes.length * 2]; for (int j = 0; j < bytes.length; j++) { - int v = bytes[j] & 0xFF; + final int v = bytes[j] & 0xFF; hexChars[j * 2] = hexArray[v >>> 4]; hexChars[j * 2 + 1] = hexArray[v & 0x0F]; } @@ -133,36 +123,30 @@ public class UUIDGenerator { } private static byte[] bytesFromUUID(String uuidHexString) { - String normalizedUUIDHexString = uuidHexString.replace("-", ""); + final String normalizedUUIDHexString = uuidHexString.replace("-", ""); assert normalizedUUIDHexString.length() == 32; - byte[] bytes = new byte[16]; + final byte[] bytes = new byte[16]; for (int i = 0; i < 16; i++) { - byte b = hexToByte(normalizedUUIDHexString.substring(i * 2, i * 2 + 2)); + final byte b = hexToByte(normalizedUUIDHexString.substring(i * 2, i * 2 + 2)); bytes[i] = b; } return bytes; } public static byte hexToByte(String hexString) { - int firstDigit = Character.digit(hexString.charAt(0), 16); - int secondDigit = Character.digit(hexString.charAt(1), 16); + final int firstDigit = Character.digit(hexString.charAt(0), 16); + final int secondDigit = Character.digit(hexString.charAt(1), 16); return (byte) ((firstDigit << 4) + secondDigit); } public static byte[] joinBytes(byte[] byteArray1, byte[] byteArray2) { - int finalLength = byteArray1.length + byteArray2.length; - byte[] result = new byte[finalLength]; - - for (int i = 0; i < byteArray1.length; i++) { - result[i] = byteArray1[i]; - } - - for (int i = 0; i < byteArray2.length; i++) { - result[byteArray1.length + i] = byteArray2[i]; - } + final int finalLength = byteArray1.length + byteArray2.length; + final byte[] result = new byte[finalLength]; + System.arraycopy(byteArray1, 0, result, 0, byteArray1.length); + System.arraycopy(byteArray2, 0, result, byteArray1.length, byteArray2.length); return result; } @@ -170,16 +154,16 @@ public class UUIDGenerator { try { - byte[] bytes = name.getBytes(StandardCharsets.UTF_8); - MessageDigest md = MessageDigest.getInstance("SHA-1"); + final byte[] bytes = name.getBytes(StandardCharsets.UTF_8); + final MessageDigest md = MessageDigest.getInstance("SHA-1"); - byte[] hash = md.digest(bytes); + final byte[] hash = md.digest(bytes); long msb = getLeastAndMostSignificantBitsVersion5(hash, 0); long lsb = getLeastAndMostSignificantBitsVersion5(hash, 8); // Set the version field msb &= ~(0xfL << 12); - msb |= ((long) 5) << 12; + msb |= 5L << 12; // Set the variant field to 2 lsb &= ~(0x3L << 62); lsb |= 2L << 62; From ec0b628fb40376285315f55be22458a2a68b9feb Mon Sep 17 00:00:00 2001 From: Amitabh Tiwari Date: Fri, 29 Apr 2022 18:42:53 +0530 Subject: [PATCH 027/100] Initial Changes for RequestLine --- .../openfeign/client/EmployeeClient.java | 13 +++++++++++ .../controller/EmployeeController.java | 22 +++++++++++++++++++ .../cloud/openfeign/model/Employee.java | 15 +++++++++++++ 3 files changed, 50 insertions(+) create mode 100644 spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/client/EmployeeClient.java create mode 100644 spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/controller/EmployeeController.java create mode 100644 spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/model/Employee.java diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/client/EmployeeClient.java b/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/client/EmployeeClient.java new file mode 100644 index 0000000000..67ff8b4f9a --- /dev/null +++ b/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/client/EmployeeClient.java @@ -0,0 +1,13 @@ +package com.baeldung.cloud.openfeign.client; + +import com.baeldung.cloud.openfeign.model.Employee; +import feign.Headers; +import feign.Param; +import feign.RequestLine; + +public interface EmployeeClient { + + @RequestLine("GET /empployee/{id}?active={isActive}") + @Headers("Content-Type: application/json") + Employee getEmployee(@Param long id, @Param boolean isActive); +} \ No newline at end of file diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/controller/EmployeeController.java b/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/controller/EmployeeController.java new file mode 100644 index 0000000000..65897ad48e --- /dev/null +++ b/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/controller/EmployeeController.java @@ -0,0 +1,22 @@ +package com.baeldung.cloud.openfeign.controller; + +import com.baeldung.cloud.openfeign.client.EmployeeClient; +import com.baeldung.cloud.openfeign.model.Employee; +import feign.Feign; +import feign.form.spring.SpringFormEncoder; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class EmployeeController { + + private static final String HTTP_FILE_EMPLOYEE_URL = "http://localhost:8081"; + + @GetMapping("/employee/{id}") + public Employee getEmployee(@RequestParam("id") long id) { + EmployeeClient employeeResource = Feign.builder().encoder(new SpringFormEncoder()) + .target(EmployeeClient.class, HTTP_FILE_EMPLOYEE_URL); + return employeeResource.getEmployee(id, true); + } +} diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/model/Employee.java b/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/model/Employee.java new file mode 100644 index 0000000000..7b8ed1232b --- /dev/null +++ b/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/model/Employee.java @@ -0,0 +1,15 @@ +package com.baeldung.cloud.openfeign.model; + +public class Employee { + + private Long id; + private String name; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } +} From da3f8ad4a06720592457b730a040be401d9e3933 Mon Sep 17 00:00:00 2001 From: sharifi Date: Tue, 3 May 2022 17:54:14 +0430 Subject: [PATCH 028/100] bael-5249: add application-properties --- .../src/main/resources/application-embedded.properties | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 spring-boot-modules/spring-boot-keycloak/src/main/resources/application-embedded.properties diff --git a/spring-boot-modules/spring-boot-keycloak/src/main/resources/application-embedded.properties b/spring-boot-modules/spring-boot-keycloak/src/main/resources/application-embedded.properties new file mode 100644 index 0000000000..7e1985f0ad --- /dev/null +++ b/spring-boot-modules/spring-boot-keycloak/src/main/resources/application-embedded.properties @@ -0,0 +1,9 @@ +### server port +server.port=8080 + +#Keycloak Configuration +keycloak.auth-server-url=http://localhost:8083/auth +keycloak.realm=baeldung +keycloak.resource=customerClient +keycloak.public-client=true +keycloak.principal-attribute=preferred_username \ No newline at end of file From b9da120df02930c2d5a1ba0ff8ffc35faf7aa284 Mon Sep 17 00:00:00 2001 From: sharifi Date: Tue, 3 May 2022 17:55:30 +0430 Subject: [PATCH 029/100] bael-5249: add User ID --- .../com/baeldung/keycloak/CustomUserAttrController.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/spring-boot-modules/spring-boot-keycloak/src/main/java/com/baeldung/keycloak/CustomUserAttrController.java b/spring-boot-modules/spring-boot-keycloak/src/main/java/com/baeldung/keycloak/CustomUserAttrController.java index 1959590e5a..5b267ae19e 100644 --- a/spring-boot-modules/spring-boot-keycloak/src/main/java/com/baeldung/keycloak/CustomUserAttrController.java +++ b/spring-boot-modules/spring-boot-keycloak/src/main/java/com/baeldung/keycloak/CustomUserAttrController.java @@ -24,6 +24,8 @@ public class CustomUserAttrController { final Principal principal = (Principal) authentication.getPrincipal(); String dob = ""; + String userIdByToken = ""; + String userIdByMapper = ""; if (principal instanceof KeycloakPrincipal) { @@ -31,6 +33,9 @@ public class CustomUserAttrController { IDToken token = kPrincipal.getKeycloakSecurityContext() .getIdToken(); + userIdByToken = token.getSubject(); + userIdByMapper = token.getOtherClaims().get("user_id").toString(); + Map customClaims = token.getOtherClaims(); if (customClaims.containsKey("DOB")) { @@ -39,6 +44,8 @@ public class CustomUserAttrController { } model.addAttribute("username", principal.getName()); + model.addAttribute("userIDByToken", userIdByToken); + model.addAttribute("userIDByMapper", userIdByMapper); model.addAttribute("dob", dob); return "userInfo"; } From 23e2df0c99aaed57d8eb602ba4e0b129f9823983 Mon Sep 17 00:00:00 2001 From: sharifi Date: Tue, 3 May 2022 17:55:48 +0430 Subject: [PATCH 030/100] bael-5249: add User ID to view --- .../src/main/resources/templates/userInfo.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/spring-boot-modules/spring-boot-keycloak/src/main/resources/templates/userInfo.html b/spring-boot-modules/spring-boot-keycloak/src/main/resources/templates/userInfo.html index 1446fe2124..7f772398c1 100644 --- a/spring-boot-modules/spring-boot-keycloak/src/main/resources/templates/userInfo.html +++ b/spring-boot-modules/spring-boot-keycloak/src/main/resources/templates/userInfo.html @@ -7,6 +7,12 @@

Hello, --name--.

+

+ User ID By Token: --userID--. +

+

+ User ID By Mapper: --userID--. +

Your Date of Birth as per our records is .

From b5e698d26a8a32822820bd133d3dd96f38e84c65 Mon Sep 17 00:00:00 2001 From: Amitabh Tiwari Date: Wed, 4 May 2022 07:16:31 +0530 Subject: [PATCH 031/100] Update EmployeeClient.java --- .../baeldung/cloud/openfeign/client/EmployeeClient.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/client/EmployeeClient.java b/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/client/EmployeeClient.java index 67ff8b4f9a..569401bdcf 100644 --- a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/client/EmployeeClient.java +++ b/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/client/EmployeeClient.java @@ -6,8 +6,7 @@ import feign.Param; import feign.RequestLine; public interface EmployeeClient { - - @RequestLine("GET /empployee/{id}?active={isActive}") - @Headers("Content-Type: application/json") - Employee getEmployee(@Param long id, @Param boolean isActive); + @RequestLine("GET /empployee/{id}?active={isActive}") + @Headers("Content-Type: application/json") + Employee getEmployee(@Param long id, @Param boolean isActive); } \ No newline at end of file From c69f4d207f19190213f6fd857c977ebfb9f4a593 Mon Sep 17 00:00:00 2001 From: Ulisses Lima Date: Sat, 7 May 2022 17:24:56 -0300 Subject: [PATCH 032/100] BAEL-5396 - Configure MongoDB Collection Name for a Class in Spring Data First Draft. --- .../baeldung/boot/collection/name/Naming.java | 35 ++++++++ .../SpringBootCollectionNameApplication.java | 19 +++++ .../name/dao/CompilationRepository.java | 9 +++ .../name/dao/MusicAlbumRepository.java | 9 +++ .../name/dao/MusicTrackRepository.java | 9 +++ .../collection/name/dao/StoreRepository.java | 9 +++ .../collection/name/data/Compilation.java | 36 +++++++++ .../boot/collection/name/data/MusicAlbum.java | 48 +++++++++++ .../boot/collection/name/data/MusicTrack.java | 50 ++++++++++++ .../boot/collection/name/data/Store.java | 36 +++++++++ .../name/service/MusicStoreService.java | 62 ++++++++++++++ .../name/web/CollectionController.java | 24 ++++++ .../name/web/MusicStoreController.java | 63 +++++++++++++++ .../boot.collection.name/app.properties | 1 + .../MusicStoreServiceIntegrationTest.java | 81 +++++++++++++++++++ 15 files changed, 491 insertions(+) create mode 100644 persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/Naming.java create mode 100644 persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/SpringBootCollectionNameApplication.java create mode 100644 persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/dao/CompilationRepository.java create mode 100644 persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/dao/MusicAlbumRepository.java create mode 100644 persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/dao/MusicTrackRepository.java create mode 100644 persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/dao/StoreRepository.java create mode 100644 persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/data/Compilation.java create mode 100644 persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/data/MusicAlbum.java create mode 100644 persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/data/MusicTrack.java create mode 100644 persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/data/Store.java create mode 100644 persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/service/MusicStoreService.java create mode 100644 persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/web/CollectionController.java create mode 100644 persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/web/MusicStoreController.java create mode 100644 persistence-modules/spring-boot-persistence-mongodb/src/main/resources/boot.collection.name/app.properties create mode 100644 persistence-modules/spring-boot-persistence-mongodb/src/test/java/com/baeldung/boot/collection/name/service/MusicStoreServiceIntegrationTest.java diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/Naming.java b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/Naming.java new file mode 100644 index 0000000000..9808ecccb6 --- /dev/null +++ b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/Naming.java @@ -0,0 +1,35 @@ +package com.baeldung.boot.collection.name; + +import java.util.ArrayList; +import java.util.List; + +import org.springframework.data.util.ParsingUtils; +import org.springframework.util.StringUtils; + +public class Naming { + public static void main(String[] args) { + String r = new Naming().fix(args[0]); + System.out.println(r); + } + + public String fix(String name) { + List parts = ParsingUtils.splitCamelCaseToLower(name); + List result = new ArrayList<>(); + + for (String part : parts) { + if (StringUtils.hasText(part)) { + result.add(part); + } + } + + return StringUtils.collectionToDelimitedString(result, "_"); + } + + public String convert(Class type) { + return fix(type.getSimpleName()); + } + + public String convert(Object instance) { + return convert(instance.getClass()); + } +} diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/SpringBootCollectionNameApplication.java b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/SpringBootCollectionNameApplication.java new file mode 100644 index 0000000000..0a5c36db29 --- /dev/null +++ b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/SpringBootCollectionNameApplication.java @@ -0,0 +1,19 @@ +package com.baeldung.boot.collection.name; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.PropertySource; + +@SpringBootApplication +@PropertySource("classpath:boot.collection.name/app.properties") +public class SpringBootCollectionNameApplication { + public static void main(String... args) { + SpringApplication.run(SpringBootCollectionNameApplication.class, args); + } + + @Bean + public Naming naming() { + return new Naming(); + } +} diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/dao/CompilationRepository.java b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/dao/CompilationRepository.java new file mode 100644 index 0000000000..3f83ad4548 --- /dev/null +++ b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/dao/CompilationRepository.java @@ -0,0 +1,9 @@ +package com.baeldung.boot.collection.name.dao; + +import org.springframework.data.mongodb.repository.MongoRepository; + +import com.baeldung.boot.collection.name.data.Compilation; + +public interface CompilationRepository extends MongoRepository { + +} diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/dao/MusicAlbumRepository.java b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/dao/MusicAlbumRepository.java new file mode 100644 index 0000000000..98709361d7 --- /dev/null +++ b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/dao/MusicAlbumRepository.java @@ -0,0 +1,9 @@ +package com.baeldung.boot.collection.name.dao; + +import org.springframework.data.mongodb.repository.MongoRepository; + +import com.baeldung.boot.collection.name.data.MusicAlbum; + +public interface MusicAlbumRepository extends MongoRepository { + +} diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/dao/MusicTrackRepository.java b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/dao/MusicTrackRepository.java new file mode 100644 index 0000000000..0964a8de00 --- /dev/null +++ b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/dao/MusicTrackRepository.java @@ -0,0 +1,9 @@ +package com.baeldung.boot.collection.name.dao; + +import org.springframework.data.mongodb.repository.MongoRepository; + +import com.baeldung.boot.collection.name.data.MusicTrack; + +public interface MusicTrackRepository extends MongoRepository { + +} diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/dao/StoreRepository.java b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/dao/StoreRepository.java new file mode 100644 index 0000000000..b446a7d98d --- /dev/null +++ b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/dao/StoreRepository.java @@ -0,0 +1,9 @@ +package com.baeldung.boot.collection.name.dao; + +import org.springframework.data.mongodb.repository.MongoRepository; + +import com.baeldung.boot.collection.name.data.Store; + +public interface StoreRepository extends MongoRepository { + +} diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/data/Compilation.java b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/data/Compilation.java new file mode 100644 index 0000000000..ce081acf25 --- /dev/null +++ b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/data/Compilation.java @@ -0,0 +1,36 @@ +package com.baeldung.boot.collection.name.data; + +import org.springframework.data.annotation.Id; +import org.springframework.data.mongodb.core.mapping.Document; + +@Document +public class Compilation { + @Id + private String id; + + private String name; + + public Compilation() { + } + + public Compilation(String name) { + super(); + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/data/MusicAlbum.java b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/data/MusicAlbum.java new file mode 100644 index 0000000000..ce2e084504 --- /dev/null +++ b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/data/MusicAlbum.java @@ -0,0 +1,48 @@ +package com.baeldung.boot.collection.name.data; + +import org.springframework.data.annotation.Id; +import org.springframework.data.mongodb.core.mapping.Document; + +@Document("albums") +public class MusicAlbum { + @Id + private String id; + + private String name; + + private String artist; + + public MusicAlbum() { + + } + + public MusicAlbum(String name, String artist) { + super(); + this.name = name; + this.artist = artist; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getArtist() { + return artist; + } + + public void setArtist(String artist) { + this.artist = artist; + } +} diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/data/MusicTrack.java b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/data/MusicTrack.java new file mode 100644 index 0000000000..39ce3994bb --- /dev/null +++ b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/data/MusicTrack.java @@ -0,0 +1,50 @@ +package com.baeldung.boot.collection.name.data; + +import org.springframework.data.annotation.Id; +import org.springframework.data.mongodb.core.mapping.Document; + +@Document("#{@naming.fix('MusicTrack')}") +public class MusicTrack { + @Id + private String id; + + private String name; + + private String artist; + + public MusicTrack() { + } + + public MusicTrack(String name, String artist) { + this.name = name; + this.artist = artist; + } + + public MusicTrack(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getArtist() { + return artist; + } + + public void setArtist(String artist) { + this.artist = artist; + } +} diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/data/Store.java b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/data/Store.java new file mode 100644 index 0000000000..83f5017a13 --- /dev/null +++ b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/data/Store.java @@ -0,0 +1,36 @@ +package com.baeldung.boot.collection.name.data; + +import org.springframework.data.annotation.Id; +import org.springframework.data.mongodb.core.mapping.Document; + +@Document("store-#{@environment.getProperty('collection.suffix')}") +public class Store { + @Id + private String id; + + private String name; + + public Store() { + } + + public Store(String name) { + super(); + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/service/MusicStoreService.java b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/service/MusicStoreService.java new file mode 100644 index 0000000000..6083e3d0c3 --- /dev/null +++ b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/service/MusicStoreService.java @@ -0,0 +1,62 @@ +package com.baeldung.boot.collection.name.service; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.baeldung.boot.collection.name.dao.CompilationRepository; +import com.baeldung.boot.collection.name.dao.MusicAlbumRepository; +import com.baeldung.boot.collection.name.dao.MusicTrackRepository; +import com.baeldung.boot.collection.name.dao.StoreRepository; +import com.baeldung.boot.collection.name.data.Compilation; +import com.baeldung.boot.collection.name.data.MusicAlbum; +import com.baeldung.boot.collection.name.data.MusicTrack; +import com.baeldung.boot.collection.name.data.Store; + +@Service +public class MusicStoreService { + @Autowired + private MusicAlbumRepository albumRepository; + + @Autowired + private CompilationRepository compilationRepository; + + @Autowired + private StoreRepository storeRepository; + + @Autowired + private MusicTrackRepository trackRepository; + + public MusicAlbum add(MusicAlbum item) { + return albumRepository.save(item); + } + + public List getAlbumList() { + return albumRepository.findAll(); + } + + public Compilation add(Compilation item) { + return compilationRepository.save(item); + } + + public List getCompilationList() { + return compilationRepository.findAll(); + } + + public Store add(Store item) { + return storeRepository.save(item); + } + + public List getStoreList() { + return storeRepository.findAll(); + } + + public MusicTrack add(MusicTrack item) { + return trackRepository.save(item); + } + + public List getTrackList() { + return trackRepository.findAll(); + } +} diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/web/CollectionController.java b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/web/CollectionController.java new file mode 100644 index 0000000000..2efca361b9 --- /dev/null +++ b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/web/CollectionController.java @@ -0,0 +1,24 @@ +package com.baeldung.boot.collection.name.web; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.mongodb.core.MongoTemplate; +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; + +import com.mongodb.DBObject; + +@RestController +@RequestMapping("/collection") +public class CollectionController { + @Autowired + private MongoTemplate mongo; + + @GetMapping("/{name}") + public List get(@PathVariable String name) { + return mongo.findAll(DBObject.class, name); + } +} diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/web/MusicStoreController.java b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/web/MusicStoreController.java new file mode 100644 index 0000000000..8c510121c2 --- /dev/null +++ b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/web/MusicStoreController.java @@ -0,0 +1,63 @@ +package com.baeldung.boot.collection.name.web; + +import java.util.List; + +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.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.baeldung.boot.collection.name.data.Compilation; +import com.baeldung.boot.collection.name.data.MusicAlbum; +import com.baeldung.boot.collection.name.data.MusicTrack; +import com.baeldung.boot.collection.name.data.Store; +import com.baeldung.boot.collection.name.service.MusicStoreService; + +@RestController +@RequestMapping("/music") +public class MusicStoreController { + @Autowired + private MusicStoreService service; + + @PostMapping("/album") + public MusicAlbum post(@RequestBody MusicAlbum item) { + return service.add(item); + } + + @GetMapping("/album") + public List getAlbumList() { + return service.getAlbumList(); + } + + @PostMapping("/compilation") + public Compilation post(@RequestBody Compilation item) { + return service.add(item); + } + + @GetMapping("/compilation") + public List getCompilationList() { + return service.getCompilationList(); + } + + @PostMapping("/store") + public Store post(@RequestBody Store item) { + return service.add(item); + } + + @GetMapping("/store") + public List getStoreList() { + return service.getStoreList(); + } + + @PostMapping("/track") + public MusicTrack post(@RequestBody MusicTrack item) { + return service.add(item); + } + + @GetMapping("/track") + public List getTrackList() { + return service.getTrackList(); + } +} diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/resources/boot.collection.name/app.properties b/persistence-modules/spring-boot-persistence-mongodb/src/main/resources/boot.collection.name/app.properties new file mode 100644 index 0000000000..98945a76e1 --- /dev/null +++ b/persistence-modules/spring-boot-persistence-mongodb/src/main/resources/boot.collection.name/app.properties @@ -0,0 +1 @@ +collection.suffix=db diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/test/java/com/baeldung/boot/collection/name/service/MusicStoreServiceIntegrationTest.java b/persistence-modules/spring-boot-persistence-mongodb/src/test/java/com/baeldung/boot/collection/name/service/MusicStoreServiceIntegrationTest.java new file mode 100644 index 0000000000..eda8b8aafb --- /dev/null +++ b/persistence-modules/spring-boot-persistence-mongodb/src/test/java/com/baeldung/boot/collection/name/service/MusicStoreServiceIntegrationTest.java @@ -0,0 +1,81 @@ +package com.baeldung.boot.collection.name.service; + +import static org.assertj.core.api.Assertions.assertThat; + +import java.util.List; + +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.data.mongodb.core.MongoTemplate; +import org.springframework.test.annotation.DirtiesContext; +import org.springframework.test.context.junit4.SpringRunner; + +import com.baeldung.boot.collection.name.data.Compilation; +import com.baeldung.boot.collection.name.data.MusicAlbum; +import com.baeldung.boot.collection.name.data.MusicTrack; +import com.baeldung.boot.collection.name.data.Store; + +@SpringBootTest +@DirtiesContext +@RunWith(SpringRunner.class) +public class MusicStoreServiceIntegrationTest { + @Autowired + private MusicStoreService service; + + @Autowired + private MongoTemplate mongoDb; + + @Test + public void givenAnnotation_whenSearchingByCollectionName_thenFound() { + List list = service.getCompilationList(); + int sizeBefore = list.size(); + + service.add(new Compilation("Spring Hits")); + + list = mongoDb.findAll(Compilation.class, "compilation"); + int sizeAfter = list.size(); + + assertThat(sizeAfter - sizeBefore).isEqualTo(1); + } + + @Test + public void givenAnnotationWithValue_whenSearchingByCollectionName_thenFound() { + List list = service.getAlbumList(); + int sizeBefore = list.size(); + + service.add(new MusicAlbum("Album 1", "Artist A")); + + list = mongoDb.findAll(MusicAlbum.class, "albums"); + int sizeAfter = list.size(); + + assertThat(sizeAfter - sizeBefore).isEqualTo(1); + } + + @Test + public void givenAnnotationWithSpELEnvironment_whenSearchingByCollectionName_thenFound() { + List list = service.getStoreList(); + int sizeBefore = list.size(); + + service.add(new Store("Store A")); + + list = mongoDb.findAll(Store.class, "store-db"); + int sizeAfter = list.size(); + + assertThat(sizeAfter - sizeBefore).isEqualTo(1); + } + + @Test + public void givenAnnotationWithSpELBean_whenSearchingByCollectionName_thenFound() { + List list = service.getTrackList(); + int sizeBefore = list.size(); + + service.add(new MusicTrack("Track 1")); + + list = mongoDb.findAll(MusicTrack.class, "music_track"); + int sizeAfter = list.size(); + + assertThat(sizeAfter - sizeBefore).isEqualTo(1); + } +} From 2065e6b624b9ed69868a2a8df321c252dadc7a90 Mon Sep 17 00:00:00 2001 From: sampadawagde Date: Mon, 16 May 2022 22:25:29 +0530 Subject: [PATCH 033/100] JAVA-11790: Fix references to parents --- apache-tapestry/pom.xml | 7 ++++++- .../aws-lambda/shipping-tracker/ShippingFunction/pom.xml | 7 +++++++ libraries-primitive/pom.xml | 6 ++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/apache-tapestry/pom.xml b/apache-tapestry/pom.xml index 7a4c2b53b5..201b807d9f 100644 --- a/apache-tapestry/pom.xml +++ b/apache-tapestry/pom.xml @@ -3,12 +3,17 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - com.baeldung apache-tapestry 0.0.1-SNAPSHOT apache-tapestry war + + com.baeldung + parent-modules + 1.0.0-SNAPSHOT + + From 18237d20979d94f3868e0053c8348366373cd562 Mon Sep 17 00:00:00 2001 From: Ulisses Lima Date: Mon, 16 May 2022 23:23:26 -0300 Subject: [PATCH 034/100] removing from the old module --- .../baeldung/boot/collection/name/Naming.java | 35 -------- .../SpringBootCollectionNameApplication.java | 19 ----- .../name/dao/CompilationRepository.java | 9 --- .../name/dao/MusicAlbumRepository.java | 9 --- .../name/dao/MusicTrackRepository.java | 9 --- .../collection/name/dao/StoreRepository.java | 9 --- .../collection/name/data/Compilation.java | 36 --------- .../boot/collection/name/data/MusicAlbum.java | 48 ----------- .../boot/collection/name/data/MusicTrack.java | 50 ------------ .../boot/collection/name/data/Store.java | 36 --------- .../name/service/MusicStoreService.java | 62 -------------- .../name/web/CollectionController.java | 24 ------ .../name/web/MusicStoreController.java | 63 --------------- .../boot.collection.name/app.properties | 1 - .../MusicStoreServiceIntegrationTest.java | 81 ------------------- 15 files changed, 491 deletions(-) delete mode 100644 persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/Naming.java delete mode 100644 persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/SpringBootCollectionNameApplication.java delete mode 100644 persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/dao/CompilationRepository.java delete mode 100644 persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/dao/MusicAlbumRepository.java delete mode 100644 persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/dao/MusicTrackRepository.java delete mode 100644 persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/dao/StoreRepository.java delete mode 100644 persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/data/Compilation.java delete mode 100644 persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/data/MusicAlbum.java delete mode 100644 persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/data/MusicTrack.java delete mode 100644 persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/data/Store.java delete mode 100644 persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/service/MusicStoreService.java delete mode 100644 persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/web/CollectionController.java delete mode 100644 persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/web/MusicStoreController.java delete mode 100644 persistence-modules/spring-boot-persistence-mongodb/src/main/resources/boot.collection.name/app.properties delete mode 100644 persistence-modules/spring-boot-persistence-mongodb/src/test/java/com/baeldung/boot/collection/name/service/MusicStoreServiceIntegrationTest.java diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/Naming.java b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/Naming.java deleted file mode 100644 index 9808ecccb6..0000000000 --- a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/Naming.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.baeldung.boot.collection.name; - -import java.util.ArrayList; -import java.util.List; - -import org.springframework.data.util.ParsingUtils; -import org.springframework.util.StringUtils; - -public class Naming { - public static void main(String[] args) { - String r = new Naming().fix(args[0]); - System.out.println(r); - } - - public String fix(String name) { - List parts = ParsingUtils.splitCamelCaseToLower(name); - List result = new ArrayList<>(); - - for (String part : parts) { - if (StringUtils.hasText(part)) { - result.add(part); - } - } - - return StringUtils.collectionToDelimitedString(result, "_"); - } - - public String convert(Class type) { - return fix(type.getSimpleName()); - } - - public String convert(Object instance) { - return convert(instance.getClass()); - } -} diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/SpringBootCollectionNameApplication.java b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/SpringBootCollectionNameApplication.java deleted file mode 100644 index 0a5c36db29..0000000000 --- a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/SpringBootCollectionNameApplication.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.baeldung.boot.collection.name; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.PropertySource; - -@SpringBootApplication -@PropertySource("classpath:boot.collection.name/app.properties") -public class SpringBootCollectionNameApplication { - public static void main(String... args) { - SpringApplication.run(SpringBootCollectionNameApplication.class, args); - } - - @Bean - public Naming naming() { - return new Naming(); - } -} diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/dao/CompilationRepository.java b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/dao/CompilationRepository.java deleted file mode 100644 index 3f83ad4548..0000000000 --- a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/dao/CompilationRepository.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.baeldung.boot.collection.name.dao; - -import org.springframework.data.mongodb.repository.MongoRepository; - -import com.baeldung.boot.collection.name.data.Compilation; - -public interface CompilationRepository extends MongoRepository { - -} diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/dao/MusicAlbumRepository.java b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/dao/MusicAlbumRepository.java deleted file mode 100644 index 98709361d7..0000000000 --- a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/dao/MusicAlbumRepository.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.baeldung.boot.collection.name.dao; - -import org.springframework.data.mongodb.repository.MongoRepository; - -import com.baeldung.boot.collection.name.data.MusicAlbum; - -public interface MusicAlbumRepository extends MongoRepository { - -} diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/dao/MusicTrackRepository.java b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/dao/MusicTrackRepository.java deleted file mode 100644 index 0964a8de00..0000000000 --- a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/dao/MusicTrackRepository.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.baeldung.boot.collection.name.dao; - -import org.springframework.data.mongodb.repository.MongoRepository; - -import com.baeldung.boot.collection.name.data.MusicTrack; - -public interface MusicTrackRepository extends MongoRepository { - -} diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/dao/StoreRepository.java b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/dao/StoreRepository.java deleted file mode 100644 index b446a7d98d..0000000000 --- a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/dao/StoreRepository.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.baeldung.boot.collection.name.dao; - -import org.springframework.data.mongodb.repository.MongoRepository; - -import com.baeldung.boot.collection.name.data.Store; - -public interface StoreRepository extends MongoRepository { - -} diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/data/Compilation.java b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/data/Compilation.java deleted file mode 100644 index ce081acf25..0000000000 --- a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/data/Compilation.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.baeldung.boot.collection.name.data; - -import org.springframework.data.annotation.Id; -import org.springframework.data.mongodb.core.mapping.Document; - -@Document -public class Compilation { - @Id - private String id; - - private String name; - - public Compilation() { - } - - public Compilation(String name) { - super(); - this.name = name; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } -} diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/data/MusicAlbum.java b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/data/MusicAlbum.java deleted file mode 100644 index ce2e084504..0000000000 --- a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/data/MusicAlbum.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.baeldung.boot.collection.name.data; - -import org.springframework.data.annotation.Id; -import org.springframework.data.mongodb.core.mapping.Document; - -@Document("albums") -public class MusicAlbum { - @Id - private String id; - - private String name; - - private String artist; - - public MusicAlbum() { - - } - - public MusicAlbum(String name, String artist) { - super(); - this.name = name; - this.artist = artist; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getArtist() { - return artist; - } - - public void setArtist(String artist) { - this.artist = artist; - } -} diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/data/MusicTrack.java b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/data/MusicTrack.java deleted file mode 100644 index 39ce3994bb..0000000000 --- a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/data/MusicTrack.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.baeldung.boot.collection.name.data; - -import org.springframework.data.annotation.Id; -import org.springframework.data.mongodb.core.mapping.Document; - -@Document("#{@naming.fix('MusicTrack')}") -public class MusicTrack { - @Id - private String id; - - private String name; - - private String artist; - - public MusicTrack() { - } - - public MusicTrack(String name, String artist) { - this.name = name; - this.artist = artist; - } - - public MusicTrack(String name) { - this.name = name; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getArtist() { - return artist; - } - - public void setArtist(String artist) { - this.artist = artist; - } -} diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/data/Store.java b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/data/Store.java deleted file mode 100644 index 83f5017a13..0000000000 --- a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/data/Store.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.baeldung.boot.collection.name.data; - -import org.springframework.data.annotation.Id; -import org.springframework.data.mongodb.core.mapping.Document; - -@Document("store-#{@environment.getProperty('collection.suffix')}") -public class Store { - @Id - private String id; - - private String name; - - public Store() { - } - - public Store(String name) { - super(); - this.name = name; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } -} diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/service/MusicStoreService.java b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/service/MusicStoreService.java deleted file mode 100644 index 6083e3d0c3..0000000000 --- a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/service/MusicStoreService.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.baeldung.boot.collection.name.service; - -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.baeldung.boot.collection.name.dao.CompilationRepository; -import com.baeldung.boot.collection.name.dao.MusicAlbumRepository; -import com.baeldung.boot.collection.name.dao.MusicTrackRepository; -import com.baeldung.boot.collection.name.dao.StoreRepository; -import com.baeldung.boot.collection.name.data.Compilation; -import com.baeldung.boot.collection.name.data.MusicAlbum; -import com.baeldung.boot.collection.name.data.MusicTrack; -import com.baeldung.boot.collection.name.data.Store; - -@Service -public class MusicStoreService { - @Autowired - private MusicAlbumRepository albumRepository; - - @Autowired - private CompilationRepository compilationRepository; - - @Autowired - private StoreRepository storeRepository; - - @Autowired - private MusicTrackRepository trackRepository; - - public MusicAlbum add(MusicAlbum item) { - return albumRepository.save(item); - } - - public List getAlbumList() { - return albumRepository.findAll(); - } - - public Compilation add(Compilation item) { - return compilationRepository.save(item); - } - - public List getCompilationList() { - return compilationRepository.findAll(); - } - - public Store add(Store item) { - return storeRepository.save(item); - } - - public List getStoreList() { - return storeRepository.findAll(); - } - - public MusicTrack add(MusicTrack item) { - return trackRepository.save(item); - } - - public List getTrackList() { - return trackRepository.findAll(); - } -} diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/web/CollectionController.java b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/web/CollectionController.java deleted file mode 100644 index 2efca361b9..0000000000 --- a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/web/CollectionController.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.baeldung.boot.collection.name.web; - -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.mongodb.core.MongoTemplate; -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; - -import com.mongodb.DBObject; - -@RestController -@RequestMapping("/collection") -public class CollectionController { - @Autowired - private MongoTemplate mongo; - - @GetMapping("/{name}") - public List get(@PathVariable String name) { - return mongo.findAll(DBObject.class, name); - } -} diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/web/MusicStoreController.java b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/web/MusicStoreController.java deleted file mode 100644 index 8c510121c2..0000000000 --- a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/collection/name/web/MusicStoreController.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.baeldung.boot.collection.name.web; - -import java.util.List; - -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.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baeldung.boot.collection.name.data.Compilation; -import com.baeldung.boot.collection.name.data.MusicAlbum; -import com.baeldung.boot.collection.name.data.MusicTrack; -import com.baeldung.boot.collection.name.data.Store; -import com.baeldung.boot.collection.name.service.MusicStoreService; - -@RestController -@RequestMapping("/music") -public class MusicStoreController { - @Autowired - private MusicStoreService service; - - @PostMapping("/album") - public MusicAlbum post(@RequestBody MusicAlbum item) { - return service.add(item); - } - - @GetMapping("/album") - public List getAlbumList() { - return service.getAlbumList(); - } - - @PostMapping("/compilation") - public Compilation post(@RequestBody Compilation item) { - return service.add(item); - } - - @GetMapping("/compilation") - public List getCompilationList() { - return service.getCompilationList(); - } - - @PostMapping("/store") - public Store post(@RequestBody Store item) { - return service.add(item); - } - - @GetMapping("/store") - public List getStoreList() { - return service.getStoreList(); - } - - @PostMapping("/track") - public MusicTrack post(@RequestBody MusicTrack item) { - return service.add(item); - } - - @GetMapping("/track") - public List getTrackList() { - return service.getTrackList(); - } -} diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/resources/boot.collection.name/app.properties b/persistence-modules/spring-boot-persistence-mongodb/src/main/resources/boot.collection.name/app.properties deleted file mode 100644 index 98945a76e1..0000000000 --- a/persistence-modules/spring-boot-persistence-mongodb/src/main/resources/boot.collection.name/app.properties +++ /dev/null @@ -1 +0,0 @@ -collection.suffix=db diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/test/java/com/baeldung/boot/collection/name/service/MusicStoreServiceIntegrationTest.java b/persistence-modules/spring-boot-persistence-mongodb/src/test/java/com/baeldung/boot/collection/name/service/MusicStoreServiceIntegrationTest.java deleted file mode 100644 index eda8b8aafb..0000000000 --- a/persistence-modules/spring-boot-persistence-mongodb/src/test/java/com/baeldung/boot/collection/name/service/MusicStoreServiceIntegrationTest.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.baeldung.boot.collection.name.service; - -import static org.assertj.core.api.Assertions.assertThat; - -import java.util.List; - -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.data.mongodb.core.MongoTemplate; -import org.springframework.test.annotation.DirtiesContext; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.boot.collection.name.data.Compilation; -import com.baeldung.boot.collection.name.data.MusicAlbum; -import com.baeldung.boot.collection.name.data.MusicTrack; -import com.baeldung.boot.collection.name.data.Store; - -@SpringBootTest -@DirtiesContext -@RunWith(SpringRunner.class) -public class MusicStoreServiceIntegrationTest { - @Autowired - private MusicStoreService service; - - @Autowired - private MongoTemplate mongoDb; - - @Test - public void givenAnnotation_whenSearchingByCollectionName_thenFound() { - List list = service.getCompilationList(); - int sizeBefore = list.size(); - - service.add(new Compilation("Spring Hits")); - - list = mongoDb.findAll(Compilation.class, "compilation"); - int sizeAfter = list.size(); - - assertThat(sizeAfter - sizeBefore).isEqualTo(1); - } - - @Test - public void givenAnnotationWithValue_whenSearchingByCollectionName_thenFound() { - List list = service.getAlbumList(); - int sizeBefore = list.size(); - - service.add(new MusicAlbum("Album 1", "Artist A")); - - list = mongoDb.findAll(MusicAlbum.class, "albums"); - int sizeAfter = list.size(); - - assertThat(sizeAfter - sizeBefore).isEqualTo(1); - } - - @Test - public void givenAnnotationWithSpELEnvironment_whenSearchingByCollectionName_thenFound() { - List list = service.getStoreList(); - int sizeBefore = list.size(); - - service.add(new Store("Store A")); - - list = mongoDb.findAll(Store.class, "store-db"); - int sizeAfter = list.size(); - - assertThat(sizeAfter - sizeBefore).isEqualTo(1); - } - - @Test - public void givenAnnotationWithSpELBean_whenSearchingByCollectionName_thenFound() { - List list = service.getTrackList(); - int sizeBefore = list.size(); - - service.add(new MusicTrack("Track 1")); - - list = mongoDb.findAll(MusicTrack.class, "music_track"); - int sizeAfter = list.size(); - - assertThat(sizeAfter - sizeBefore).isEqualTo(1); - } -} From 16bb4772ec608cd91845274dac5eb1671f89de18 Mon Sep 17 00:00:00 2001 From: Ulisses Lima Date: Mon, 16 May 2022 23:24:46 -0300 Subject: [PATCH 035/100] moved code to spring-boot-persistence-mongodb-2 --- .../spring-boot-persistence-mongodb-2/pom.xml | 4 + .../baeldung/boot/collection/name/Naming.java | 35 ++++++++ .../SpringBootCollectionNameApplication.java | 19 +++++ .../name/dao/CompilationRepository.java | 9 +++ .../name/dao/MusicAlbumRepository.java | 9 +++ .../name/dao/MusicTrackRepository.java | 9 +++ .../collection/name/dao/StoreRepository.java | 9 +++ .../collection/name/data/Compilation.java | 36 +++++++++ .../boot/collection/name/data/MusicAlbum.java | 48 +++++++++++ .../boot/collection/name/data/MusicTrack.java | 50 ++++++++++++ .../boot/collection/name/data/Store.java | 36 +++++++++ .../name/service/MusicStoreService.java | 62 ++++++++++++++ .../name/web/CollectionController.java | 24 ++++++ .../name/web/MusicStoreController.java | 63 +++++++++++++++ .../boot.collection.name/app.properties | 1 + .../MusicStoreServiceIntegrationTest.java | 81 +++++++++++++++++++ 16 files changed, 495 insertions(+) create mode 100644 persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/Naming.java create mode 100644 persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/SpringBootCollectionNameApplication.java create mode 100644 persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/dao/CompilationRepository.java create mode 100644 persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/dao/MusicAlbumRepository.java create mode 100644 persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/dao/MusicTrackRepository.java create mode 100644 persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/dao/StoreRepository.java create mode 100644 persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/data/Compilation.java create mode 100644 persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/data/MusicAlbum.java create mode 100644 persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/data/MusicTrack.java create mode 100644 persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/data/Store.java create mode 100644 persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/service/MusicStoreService.java create mode 100644 persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/web/CollectionController.java create mode 100644 persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/web/MusicStoreController.java create mode 100644 persistence-modules/spring-boot-persistence-mongodb-2/src/main/resources/boot.collection.name/app.properties create mode 100644 persistence-modules/spring-boot-persistence-mongodb-2/src/test/java/com/baeldung/boot/collection/name/service/MusicStoreServiceIntegrationTest.java diff --git a/persistence-modules/spring-boot-persistence-mongodb-2/pom.xml b/persistence-modules/spring-boot-persistence-mongodb-2/pom.xml index a6ac4987a1..a172c28a80 100644 --- a/persistence-modules/spring-boot-persistence-mongodb-2/pom.xml +++ b/persistence-modules/spring-boot-persistence-mongodb-2/pom.xml @@ -16,6 +16,10 @@ + + org.springframework.boot + spring-boot-starter-web + org.springframework.boot spring-boot-starter-data-mongodb diff --git a/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/Naming.java b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/Naming.java new file mode 100644 index 0000000000..9808ecccb6 --- /dev/null +++ b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/Naming.java @@ -0,0 +1,35 @@ +package com.baeldung.boot.collection.name; + +import java.util.ArrayList; +import java.util.List; + +import org.springframework.data.util.ParsingUtils; +import org.springframework.util.StringUtils; + +public class Naming { + public static void main(String[] args) { + String r = new Naming().fix(args[0]); + System.out.println(r); + } + + public String fix(String name) { + List parts = ParsingUtils.splitCamelCaseToLower(name); + List result = new ArrayList<>(); + + for (String part : parts) { + if (StringUtils.hasText(part)) { + result.add(part); + } + } + + return StringUtils.collectionToDelimitedString(result, "_"); + } + + public String convert(Class type) { + return fix(type.getSimpleName()); + } + + public String convert(Object instance) { + return convert(instance.getClass()); + } +} diff --git a/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/SpringBootCollectionNameApplication.java b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/SpringBootCollectionNameApplication.java new file mode 100644 index 0000000000..0a5c36db29 --- /dev/null +++ b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/SpringBootCollectionNameApplication.java @@ -0,0 +1,19 @@ +package com.baeldung.boot.collection.name; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.PropertySource; + +@SpringBootApplication +@PropertySource("classpath:boot.collection.name/app.properties") +public class SpringBootCollectionNameApplication { + public static void main(String... args) { + SpringApplication.run(SpringBootCollectionNameApplication.class, args); + } + + @Bean + public Naming naming() { + return new Naming(); + } +} diff --git a/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/dao/CompilationRepository.java b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/dao/CompilationRepository.java new file mode 100644 index 0000000000..3f83ad4548 --- /dev/null +++ b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/dao/CompilationRepository.java @@ -0,0 +1,9 @@ +package com.baeldung.boot.collection.name.dao; + +import org.springframework.data.mongodb.repository.MongoRepository; + +import com.baeldung.boot.collection.name.data.Compilation; + +public interface CompilationRepository extends MongoRepository { + +} diff --git a/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/dao/MusicAlbumRepository.java b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/dao/MusicAlbumRepository.java new file mode 100644 index 0000000000..98709361d7 --- /dev/null +++ b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/dao/MusicAlbumRepository.java @@ -0,0 +1,9 @@ +package com.baeldung.boot.collection.name.dao; + +import org.springframework.data.mongodb.repository.MongoRepository; + +import com.baeldung.boot.collection.name.data.MusicAlbum; + +public interface MusicAlbumRepository extends MongoRepository { + +} diff --git a/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/dao/MusicTrackRepository.java b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/dao/MusicTrackRepository.java new file mode 100644 index 0000000000..0964a8de00 --- /dev/null +++ b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/dao/MusicTrackRepository.java @@ -0,0 +1,9 @@ +package com.baeldung.boot.collection.name.dao; + +import org.springframework.data.mongodb.repository.MongoRepository; + +import com.baeldung.boot.collection.name.data.MusicTrack; + +public interface MusicTrackRepository extends MongoRepository { + +} diff --git a/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/dao/StoreRepository.java b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/dao/StoreRepository.java new file mode 100644 index 0000000000..b446a7d98d --- /dev/null +++ b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/dao/StoreRepository.java @@ -0,0 +1,9 @@ +package com.baeldung.boot.collection.name.dao; + +import org.springframework.data.mongodb.repository.MongoRepository; + +import com.baeldung.boot.collection.name.data.Store; + +public interface StoreRepository extends MongoRepository { + +} diff --git a/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/data/Compilation.java b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/data/Compilation.java new file mode 100644 index 0000000000..ce081acf25 --- /dev/null +++ b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/data/Compilation.java @@ -0,0 +1,36 @@ +package com.baeldung.boot.collection.name.data; + +import org.springframework.data.annotation.Id; +import org.springframework.data.mongodb.core.mapping.Document; + +@Document +public class Compilation { + @Id + private String id; + + private String name; + + public Compilation() { + } + + public Compilation(String name) { + super(); + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/data/MusicAlbum.java b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/data/MusicAlbum.java new file mode 100644 index 0000000000..ce2e084504 --- /dev/null +++ b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/data/MusicAlbum.java @@ -0,0 +1,48 @@ +package com.baeldung.boot.collection.name.data; + +import org.springframework.data.annotation.Id; +import org.springframework.data.mongodb.core.mapping.Document; + +@Document("albums") +public class MusicAlbum { + @Id + private String id; + + private String name; + + private String artist; + + public MusicAlbum() { + + } + + public MusicAlbum(String name, String artist) { + super(); + this.name = name; + this.artist = artist; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getArtist() { + return artist; + } + + public void setArtist(String artist) { + this.artist = artist; + } +} diff --git a/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/data/MusicTrack.java b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/data/MusicTrack.java new file mode 100644 index 0000000000..39ce3994bb --- /dev/null +++ b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/data/MusicTrack.java @@ -0,0 +1,50 @@ +package com.baeldung.boot.collection.name.data; + +import org.springframework.data.annotation.Id; +import org.springframework.data.mongodb.core.mapping.Document; + +@Document("#{@naming.fix('MusicTrack')}") +public class MusicTrack { + @Id + private String id; + + private String name; + + private String artist; + + public MusicTrack() { + } + + public MusicTrack(String name, String artist) { + this.name = name; + this.artist = artist; + } + + public MusicTrack(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getArtist() { + return artist; + } + + public void setArtist(String artist) { + this.artist = artist; + } +} diff --git a/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/data/Store.java b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/data/Store.java new file mode 100644 index 0000000000..83f5017a13 --- /dev/null +++ b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/data/Store.java @@ -0,0 +1,36 @@ +package com.baeldung.boot.collection.name.data; + +import org.springframework.data.annotation.Id; +import org.springframework.data.mongodb.core.mapping.Document; + +@Document("store-#{@environment.getProperty('collection.suffix')}") +public class Store { + @Id + private String id; + + private String name; + + public Store() { + } + + public Store(String name) { + super(); + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/service/MusicStoreService.java b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/service/MusicStoreService.java new file mode 100644 index 0000000000..6083e3d0c3 --- /dev/null +++ b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/service/MusicStoreService.java @@ -0,0 +1,62 @@ +package com.baeldung.boot.collection.name.service; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.baeldung.boot.collection.name.dao.CompilationRepository; +import com.baeldung.boot.collection.name.dao.MusicAlbumRepository; +import com.baeldung.boot.collection.name.dao.MusicTrackRepository; +import com.baeldung.boot.collection.name.dao.StoreRepository; +import com.baeldung.boot.collection.name.data.Compilation; +import com.baeldung.boot.collection.name.data.MusicAlbum; +import com.baeldung.boot.collection.name.data.MusicTrack; +import com.baeldung.boot.collection.name.data.Store; + +@Service +public class MusicStoreService { + @Autowired + private MusicAlbumRepository albumRepository; + + @Autowired + private CompilationRepository compilationRepository; + + @Autowired + private StoreRepository storeRepository; + + @Autowired + private MusicTrackRepository trackRepository; + + public MusicAlbum add(MusicAlbum item) { + return albumRepository.save(item); + } + + public List getAlbumList() { + return albumRepository.findAll(); + } + + public Compilation add(Compilation item) { + return compilationRepository.save(item); + } + + public List getCompilationList() { + return compilationRepository.findAll(); + } + + public Store add(Store item) { + return storeRepository.save(item); + } + + public List getStoreList() { + return storeRepository.findAll(); + } + + public MusicTrack add(MusicTrack item) { + return trackRepository.save(item); + } + + public List getTrackList() { + return trackRepository.findAll(); + } +} diff --git a/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/web/CollectionController.java b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/web/CollectionController.java new file mode 100644 index 0000000000..2efca361b9 --- /dev/null +++ b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/web/CollectionController.java @@ -0,0 +1,24 @@ +package com.baeldung.boot.collection.name.web; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.mongodb.core.MongoTemplate; +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; + +import com.mongodb.DBObject; + +@RestController +@RequestMapping("/collection") +public class CollectionController { + @Autowired + private MongoTemplate mongo; + + @GetMapping("/{name}") + public List get(@PathVariable String name) { + return mongo.findAll(DBObject.class, name); + } +} diff --git a/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/web/MusicStoreController.java b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/web/MusicStoreController.java new file mode 100644 index 0000000000..8c510121c2 --- /dev/null +++ b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/web/MusicStoreController.java @@ -0,0 +1,63 @@ +package com.baeldung.boot.collection.name.web; + +import java.util.List; + +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.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.baeldung.boot.collection.name.data.Compilation; +import com.baeldung.boot.collection.name.data.MusicAlbum; +import com.baeldung.boot.collection.name.data.MusicTrack; +import com.baeldung.boot.collection.name.data.Store; +import com.baeldung.boot.collection.name.service.MusicStoreService; + +@RestController +@RequestMapping("/music") +public class MusicStoreController { + @Autowired + private MusicStoreService service; + + @PostMapping("/album") + public MusicAlbum post(@RequestBody MusicAlbum item) { + return service.add(item); + } + + @GetMapping("/album") + public List getAlbumList() { + return service.getAlbumList(); + } + + @PostMapping("/compilation") + public Compilation post(@RequestBody Compilation item) { + return service.add(item); + } + + @GetMapping("/compilation") + public List getCompilationList() { + return service.getCompilationList(); + } + + @PostMapping("/store") + public Store post(@RequestBody Store item) { + return service.add(item); + } + + @GetMapping("/store") + public List getStoreList() { + return service.getStoreList(); + } + + @PostMapping("/track") + public MusicTrack post(@RequestBody MusicTrack item) { + return service.add(item); + } + + @GetMapping("/track") + public List getTrackList() { + return service.getTrackList(); + } +} diff --git a/persistence-modules/spring-boot-persistence-mongodb-2/src/main/resources/boot.collection.name/app.properties b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/resources/boot.collection.name/app.properties new file mode 100644 index 0000000000..98945a76e1 --- /dev/null +++ b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/resources/boot.collection.name/app.properties @@ -0,0 +1 @@ +collection.suffix=db diff --git a/persistence-modules/spring-boot-persistence-mongodb-2/src/test/java/com/baeldung/boot/collection/name/service/MusicStoreServiceIntegrationTest.java b/persistence-modules/spring-boot-persistence-mongodb-2/src/test/java/com/baeldung/boot/collection/name/service/MusicStoreServiceIntegrationTest.java new file mode 100644 index 0000000000..eda8b8aafb --- /dev/null +++ b/persistence-modules/spring-boot-persistence-mongodb-2/src/test/java/com/baeldung/boot/collection/name/service/MusicStoreServiceIntegrationTest.java @@ -0,0 +1,81 @@ +package com.baeldung.boot.collection.name.service; + +import static org.assertj.core.api.Assertions.assertThat; + +import java.util.List; + +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.data.mongodb.core.MongoTemplate; +import org.springframework.test.annotation.DirtiesContext; +import org.springframework.test.context.junit4.SpringRunner; + +import com.baeldung.boot.collection.name.data.Compilation; +import com.baeldung.boot.collection.name.data.MusicAlbum; +import com.baeldung.boot.collection.name.data.MusicTrack; +import com.baeldung.boot.collection.name.data.Store; + +@SpringBootTest +@DirtiesContext +@RunWith(SpringRunner.class) +public class MusicStoreServiceIntegrationTest { + @Autowired + private MusicStoreService service; + + @Autowired + private MongoTemplate mongoDb; + + @Test + public void givenAnnotation_whenSearchingByCollectionName_thenFound() { + List list = service.getCompilationList(); + int sizeBefore = list.size(); + + service.add(new Compilation("Spring Hits")); + + list = mongoDb.findAll(Compilation.class, "compilation"); + int sizeAfter = list.size(); + + assertThat(sizeAfter - sizeBefore).isEqualTo(1); + } + + @Test + public void givenAnnotationWithValue_whenSearchingByCollectionName_thenFound() { + List list = service.getAlbumList(); + int sizeBefore = list.size(); + + service.add(new MusicAlbum("Album 1", "Artist A")); + + list = mongoDb.findAll(MusicAlbum.class, "albums"); + int sizeAfter = list.size(); + + assertThat(sizeAfter - sizeBefore).isEqualTo(1); + } + + @Test + public void givenAnnotationWithSpELEnvironment_whenSearchingByCollectionName_thenFound() { + List list = service.getStoreList(); + int sizeBefore = list.size(); + + service.add(new Store("Store A")); + + list = mongoDb.findAll(Store.class, "store-db"); + int sizeAfter = list.size(); + + assertThat(sizeAfter - sizeBefore).isEqualTo(1); + } + + @Test + public void givenAnnotationWithSpELBean_whenSearchingByCollectionName_thenFound() { + List list = service.getTrackList(); + int sizeBefore = list.size(); + + service.add(new MusicTrack("Track 1")); + + list = mongoDb.findAll(MusicTrack.class, "music_track"); + int sizeAfter = list.size(); + + assertThat(sizeAfter - sizeBefore).isEqualTo(1); + } +} From e1c046fcab423aad3cffce764728fc4f53b620df Mon Sep 17 00:00:00 2001 From: Dhawal Kapil Date: Tue, 17 May 2022 21:53:59 +0530 Subject: [PATCH 036/100] JAVA-11489 Disabled sharing of Restx logs to Restx stats collector which is not working as of now --- restx/src/main/resources/restx/demo/settings.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/restx/src/main/resources/restx/demo/settings.properties b/restx/src/main/resources/restx/demo/settings.properties index a03c2eea97..3b2b591922 100644 --- a/restx/src/main/resources/restx/demo/settings.properties +++ b/restx/src/main/resources/restx/demo/settings.properties @@ -1 +1,2 @@ -app.name=restx-demo \ No newline at end of file +app.name=restx-demo +restx.stats.share.enable=false \ No newline at end of file From 851c7d933e5375f241ff6ea9cffc2bc3d72fdae6 Mon Sep 17 00:00:00 2001 From: Dhawal Kapil Date: Tue, 17 May 2022 22:04:30 +0530 Subject: [PATCH 037/100] JAVA-11489 Removed a test that was designed to run for 50 seconds to a new Manual Test class --- .../flogger/FloggerIntegrationTest.java | 8 ------ .../baeldung/flogger/FloggerManualTest.java | 25 +++++++++++++++++++ 2 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 logging-modules/flogger/src/test/java/com/baeldung/flogger/FloggerManualTest.java diff --git a/logging-modules/flogger/src/test/java/com/baeldung/flogger/FloggerIntegrationTest.java b/logging-modules/flogger/src/test/java/com/baeldung/flogger/FloggerIntegrationTest.java index 80fa0edd96..d3b73637a4 100644 --- a/logging-modules/flogger/src/test/java/com/baeldung/flogger/FloggerIntegrationTest.java +++ b/logging-modules/flogger/src/test/java/com/baeldung/flogger/FloggerIntegrationTest.java @@ -5,7 +5,6 @@ import com.google.common.flogger.LoggerConfig; import com.google.common.flogger.StackSize; import org.junit.Test; -import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.stream.IntStream; @@ -25,13 +24,6 @@ public class FloggerIntegrationTest { }); } - @Test - public void givenATimeInterval_shouldLogAfterEveryTimeInterval() { - IntStream.range(0, 1_000_0000).forEach(value -> { - logger.atInfo().atMostEvery(10, TimeUnit.SECONDS).log("This log shows [every 10 seconds] => %d", value); - }); - } - @Test public void givenAnObject_shouldLogTheObject() { User user = new User(); diff --git a/logging-modules/flogger/src/test/java/com/baeldung/flogger/FloggerManualTest.java b/logging-modules/flogger/src/test/java/com/baeldung/flogger/FloggerManualTest.java new file mode 100644 index 0000000000..a3444e596e --- /dev/null +++ b/logging-modules/flogger/src/test/java/com/baeldung/flogger/FloggerManualTest.java @@ -0,0 +1,25 @@ +package com.baeldung.flogger; + +import java.util.concurrent.TimeUnit; +import java.util.stream.IntStream; + +import org.junit.Test; + +import com.google.common.flogger.FluentLogger; + +public class FloggerManualTest { + static { +// System.setProperty("flogger.backend_factory", "com.google.common.flogger.backend.log4j.Log4jBackendFactory#getInstance"); + System.setProperty("flogger.backend_factory", + "com.google.common.flogger.backend.slf4j.Slf4jBackendFactory#getInstance"); + } + private static final FluentLogger logger = FluentLogger.forEnclosingClass(); + + @Test + public void givenATimeInterval_shouldLogAfterEveryTimeInterval() { + IntStream.range(0, 1_000_0000).forEach(value -> { + logger.atInfo().atMostEvery(10, TimeUnit.SECONDS).log("This log shows [every 10 seconds] => %d", value); + }); + } + +} From 633b5849bb8a65c69ea08443faefd686d01a2819 Mon Sep 17 00:00:00 2001 From: Dhawal Kapil Date: Tue, 17 May 2022 22:28:39 +0530 Subject: [PATCH 038/100] JAVA-11489 Renamed time taking and unused integration tests to *ManualTests --- ...le1IntegrationTest.java => Example1ManualTest.java} | 2 +- ...le2IntegrationTest.java => Example2ManualTest.java} | 2 +- ...lelIntegrationTest.java => ParallelManualTest.java} | 6 +++--- ...nTest.java => Spring5JUnit5ParallelManualTest.java} | 10 +++++----- 4 files changed, 10 insertions(+), 10 deletions(-) rename spring-5/src/test/java/com/baeldung/{Example1IntegrationTest.java => Example1ManualTest.java} (93%) rename spring-5/src/test/java/com/baeldung/{Example2IntegrationTest.java => Example2ManualTest.java} (93%) rename spring-5/src/test/java/com/baeldung/{ParallelIntegrationTest.java => ParallelManualTest.java} (62%) rename spring-5/src/test/java/com/baeldung/jupiter/{Spring5JUnit5ParallelIntegrationTest.java => Spring5JUnit5ParallelManualTest.java} (60%) diff --git a/spring-5/src/test/java/com/baeldung/Example1IntegrationTest.java b/spring-5/src/test/java/com/baeldung/Example1ManualTest.java similarity index 93% rename from spring-5/src/test/java/com/baeldung/Example1IntegrationTest.java rename to spring-5/src/test/java/com/baeldung/Example1ManualTest.java index 8b9e66213f..c3330b4213 100644 --- a/spring-5/src/test/java/com/baeldung/Example1IntegrationTest.java +++ b/spring-5/src/test/java/com/baeldung/Example1ManualTest.java @@ -7,7 +7,7 @@ import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) @SpringBootTest -public class Example1IntegrationTest { +public class Example1ManualTest { @Test public void test1a() { diff --git a/spring-5/src/test/java/com/baeldung/Example2IntegrationTest.java b/spring-5/src/test/java/com/baeldung/Example2ManualTest.java similarity index 93% rename from spring-5/src/test/java/com/baeldung/Example2IntegrationTest.java rename to spring-5/src/test/java/com/baeldung/Example2ManualTest.java index 6ed53ca4e9..9c47b17fdb 100644 --- a/spring-5/src/test/java/com/baeldung/Example2IntegrationTest.java +++ b/spring-5/src/test/java/com/baeldung/Example2ManualTest.java @@ -7,7 +7,7 @@ import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) @SpringBootTest -public class Example2IntegrationTest { +public class Example2ManualTest { @Test public void test1a() { diff --git a/spring-5/src/test/java/com/baeldung/ParallelIntegrationTest.java b/spring-5/src/test/java/com/baeldung/ParallelManualTest.java similarity index 62% rename from spring-5/src/test/java/com/baeldung/ParallelIntegrationTest.java rename to spring-5/src/test/java/com/baeldung/ParallelManualTest.java index 1ce96de4ef..5c3a111c62 100644 --- a/spring-5/src/test/java/com/baeldung/ParallelIntegrationTest.java +++ b/spring-5/src/test/java/com/baeldung/ParallelManualTest.java @@ -5,18 +5,18 @@ import org.junit.experimental.ParallelComputer; import org.junit.runner.Computer; import org.junit.runner.JUnitCore; -public class ParallelIntegrationTest { +public class ParallelManualTest { @Test public void runTests() { - final Class[] classes = { Example1IntegrationTest.class, Example2IntegrationTest.class }; + final Class[] classes = { Example1ManualTest.class, Example2ManualTest.class }; JUnitCore.runClasses(new Computer(), classes); } @Test public void runTestsInParallel() { - final Class[] classes = { Example1IntegrationTest.class, Example2IntegrationTest.class }; + final Class[] classes = { Example1ManualTest.class, Example2ManualTest.class }; JUnitCore.runClasses(new ParallelComputer(true, true), classes); } diff --git a/spring-5/src/test/java/com/baeldung/jupiter/Spring5JUnit5ParallelIntegrationTest.java b/spring-5/src/test/java/com/baeldung/jupiter/Spring5JUnit5ParallelManualTest.java similarity index 60% rename from spring-5/src/test/java/com/baeldung/jupiter/Spring5JUnit5ParallelIntegrationTest.java rename to spring-5/src/test/java/com/baeldung/jupiter/Spring5JUnit5ParallelManualTest.java index 55b0fcf267..b9ed87ed73 100644 --- a/spring-5/src/test/java/com/baeldung/jupiter/Spring5JUnit5ParallelIntegrationTest.java +++ b/spring-5/src/test/java/com/baeldung/jupiter/Spring5JUnit5ParallelManualTest.java @@ -1,24 +1,24 @@ package com.baeldung.jupiter; -import com.baeldung.Example1IntegrationTest; -import com.baeldung.Example2IntegrationTest; +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 Spring5JUnit5ParallelIntegrationTest { +class Spring5JUnit5ParallelManualTest { @Test void givenTwoTestClasses_whenJUnitRunParallel_thenTheTestsExecutingParallel() { - final Class[] classes = { Example1IntegrationTest.class, Example2IntegrationTest.class }; + final Class[] classes = { Example1ManualTest.class, Example2ManualTest.class }; JUnitCore.runClasses(new ParallelComputer(true, true), classes); } @Test void givenTwoTestClasses_whenJUnitRunParallel_thenTheTestsExecutingLinear() { - final Class[] classes = { Example1IntegrationTest.class, Example2IntegrationTest.class }; + final Class[] classes = { Example1ManualTest.class, Example2ManualTest.class }; JUnitCore.runClasses(new Computer(), classes); } From 228c92dc67651662cb31bb6ae49e6b108b9fcb4a Mon Sep 17 00:00:00 2001 From: Dhawal Kapil Date: Wed, 18 May 2022 23:38:44 +0530 Subject: [PATCH 039/100] JAVA-12081 Reverting hazelcast back to previous version - Fixes JAVA-12081 --- libraries-data/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries-data/pom.xml b/libraries-data/pom.xml index c33be5b192..f0f5338560 100644 --- a/libraries-data/pom.xml +++ b/libraries-data/pom.xml @@ -174,7 +174,7 @@ 2.8.2 1.1.1 1.5.0 - 5.1.1 + 3.8.4 0.15.0 2.2.0 1.6.0.1 From b1c0a40b0eb7f087a60f9a1e0a6e59878870528c Mon Sep 17 00:00:00 2001 From: Dhawal Kapil Date: Wed, 18 May 2022 23:59:18 +0530 Subject: [PATCH 040/100] JAVA-11489 Renamed PropertiesReloadIntegrationTest to *ManualTest --- ...loadIntegrationTest.java => PropertiesReloadManualTest.java} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename spring-boot-modules/spring-boot-properties/src/test/java/com/baeldung/properties/reloading/{PropertiesReloadIntegrationTest.java => PropertiesReloadManualTest.java} (99%) diff --git a/spring-boot-modules/spring-boot-properties/src/test/java/com/baeldung/properties/reloading/PropertiesReloadIntegrationTest.java b/spring-boot-modules/spring-boot-properties/src/test/java/com/baeldung/properties/reloading/PropertiesReloadManualTest.java similarity index 99% rename from spring-boot-modules/spring-boot-properties/src/test/java/com/baeldung/properties/reloading/PropertiesReloadIntegrationTest.java rename to spring-boot-modules/spring-boot-properties/src/test/java/com/baeldung/properties/reloading/PropertiesReloadManualTest.java index 0c28cb085b..88e22af4ba 100644 --- a/spring-boot-modules/spring-boot-properties/src/test/java/com/baeldung/properties/reloading/PropertiesReloadIntegrationTest.java +++ b/spring-boot-modules/spring-boot-properties/src/test/java/com/baeldung/properties/reloading/PropertiesReloadManualTest.java @@ -24,7 +24,7 @@ import org.springframework.web.context.WebApplicationContext; @RunWith(SpringJUnit4ClassRunner.class) @SpringBootTest(classes = SpringBootPropertiesTestApplication.class) -public class PropertiesReloadIntegrationTest { +public class PropertiesReloadManualTest { protected MockMvc mvc; From ae6ed6ba95826b0dd217292b5c546a4e89082172 Mon Sep 17 00:00:00 2001 From: apeterlic Date: Thu, 19 May 2022 06:50:58 +0200 Subject: [PATCH 041/100] Get domain name from given URL --- .../domain_name/DomainNameClient.java | 34 +++++++++++++ .../domain_name/DomainNameClientUnitTest.java | 51 +++++++++++++++++++ 2 files changed, 85 insertions(+) create mode 100644 core-java-modules/core-java-networking/src/main/java/com/baeldung/networking/domain_name/DomainNameClient.java create mode 100644 core-java-modules/core-java-networking/src/test/java/com/baeldung/networking/domain_name/DomainNameClientUnitTest.java diff --git a/core-java-modules/core-java-networking/src/main/java/com/baeldung/networking/domain_name/DomainNameClient.java b/core-java-modules/core-java-networking/src/main/java/com/baeldung/networking/domain_name/DomainNameClient.java new file mode 100644 index 0000000000..f38b017f4d --- /dev/null +++ b/core-java-modules/core-java-networking/src/main/java/com/baeldung/networking/domain_name/DomainNameClient.java @@ -0,0 +1,34 @@ +package com.baeldung.networking.domain_name; + +import com.google.common.net.InternetDomainName; + +import java.net.URI; +import java.net.URISyntaxException; + +public class DomainNameClient { + + public String getHost(String url) throws URISyntaxException { + URI uri = new URI(url); + return uri.getHost(); + } + + public String getTopPrivateDomain(String url) { + InternetDomainName internetDomainName = InternetDomainName.from(url) + .topPrivateDomain(); + return internetDomainName.toString(); + } + + public String getName(String url) { + InternetDomainName internetDomainName = InternetDomainName.from(url) + .topPrivateDomain(); + String publicSuffix = internetDomainName.publicSuffix() + .toString(); + String domainName = internetDomainName.toString(); + return domainName.substring(0, domainName.lastIndexOf("." + publicSuffix)); + } + + public String getDomainName(String url) { + String regex = "http(s)?://|www\\.|/.*"; + return url.replaceAll(regex, ""); + } +} diff --git a/core-java-modules/core-java-networking/src/test/java/com/baeldung/networking/domain_name/DomainNameClientUnitTest.java b/core-java-modules/core-java-networking/src/test/java/com/baeldung/networking/domain_name/DomainNameClientUnitTest.java new file mode 100644 index 0000000000..c6f868621d --- /dev/null +++ b/core-java-modules/core-java-networking/src/test/java/com/baeldung/networking/domain_name/DomainNameClientUnitTest.java @@ -0,0 +1,51 @@ +package com.baeldung.networking.domain_name; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +class DomainNameClientUnitTest { + + DomainNameClient domainNameClient = new DomainNameClient(); + + @Test + void givenUrl_whenGetHost_thenReturnSubdomainAndDomainName() { + Assertions.assertAll(() -> { + assertEquals("www.baeldung.com", domainNameClient.getHost("https://www.baeldung.com/domain")); + assertEquals("www.google.co.uk", domainNameClient.getHost("https://www.google.co.uk/domain")); + assertEquals("jira.baeldung.com", domainNameClient.getHost("https://jira.baeldung.com/secure")); + }); + } + + @Test + void givenUrl_whenGetTopPrivateDomain_thenReturnDomainName() { + assertEquals("baeldung.com", domainNameClient.getTopPrivateDomain("www.baeldung.com")); + } + + @Test + void givenUrlWithPublicSuffix_whenGetTopPrivateDomain_thenReturnDomainName() { + assertEquals("google.co.uk", domainNameClient.getTopPrivateDomain("www.google.co.uk")); + assertEquals("baeldung.blogspot.com", domainNameClient.getTopPrivateDomain("www.baeldung.blogspot.com")); + } + + @Test + void givenUrlWithPublicSuffix_whenGetName_thenReturnSecondLevelDomain() { + assertEquals("baeldung", domainNameClient.getName("jira.baeldung.com")); + } + + @Test + void givenUrlWithPublicSuffix_whenGetName_thenReturnThirdLevelDomain() { + assertEquals("baeldung", domainNameClient.getName("www.baeldung.co.uk")); + assertEquals("google", domainNameClient.getName("www.google.co.uk")); + } + + @Test + void givenUrl_whenGetDomainNameRegex_thenReturnDomainName() { + assertEquals("google.com", domainNameClient.getDomainName("www.google.com")); + assertEquals("google.co.uk", domainNameClient.getDomainName("www.google.co.uk")); + assertEquals("jira.baeldung.com", domainNameClient.getDomainName("jira.baeldung.com")); + assertEquals("baeldung.com", domainNameClient.getDomainName("www.baeldung.com/test")); + } + +} From c3d957205a9a3a6f584fc05245966cf3e4b23250 Mon Sep 17 00:00:00 2001 From: apeterlic Date: Thu, 19 May 2022 07:03:06 +0200 Subject: [PATCH 042/100] Move code to different module --- core-java-modules/core-java-networking-3/pom.xml | 7 +++++++ .../java/com/baeldung}/domain_name/DomainNameClient.java | 2 +- .../baeldung}/domain_name/DomainNameClientUnitTest.java | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) rename core-java-modules/{core-java-networking/src/main/java/com/baeldung/networking => core-java-networking-3/src/main/java/com/baeldung}/domain_name/DomainNameClient.java (95%) rename core-java-modules/{core-java-networking/src/test/java/com/baeldung/networking => core-java-networking-3/src/test/java/com/baeldung}/domain_name/DomainNameClientUnitTest.java (97%) diff --git a/core-java-modules/core-java-networking-3/pom.xml b/core-java-modules/core-java-networking-3/pom.xml index 297d665544..63385c2334 100644 --- a/core-java-modules/core-java-networking-3/pom.xml +++ b/core-java-modules/core-java-networking-3/pom.xml @@ -52,6 +52,12 @@ java-ipv6 ${googlecode.ipv6.version} + + + com.google.guava + guava + ${guava.version} + @@ -84,6 +90,7 @@ 1.32 0.17 1.6.2 + 31.0-jre \ No newline at end of file diff --git a/core-java-modules/core-java-networking/src/main/java/com/baeldung/networking/domain_name/DomainNameClient.java b/core-java-modules/core-java-networking-3/src/main/java/com/baeldung/domain_name/DomainNameClient.java similarity index 95% rename from core-java-modules/core-java-networking/src/main/java/com/baeldung/networking/domain_name/DomainNameClient.java rename to core-java-modules/core-java-networking-3/src/main/java/com/baeldung/domain_name/DomainNameClient.java index f38b017f4d..1b2cb636fe 100644 --- a/core-java-modules/core-java-networking/src/main/java/com/baeldung/networking/domain_name/DomainNameClient.java +++ b/core-java-modules/core-java-networking-3/src/main/java/com/baeldung/domain_name/DomainNameClient.java @@ -1,4 +1,4 @@ -package com.baeldung.networking.domain_name; +package com.baeldung.domain_name; import com.google.common.net.InternetDomainName; diff --git a/core-java-modules/core-java-networking/src/test/java/com/baeldung/networking/domain_name/DomainNameClientUnitTest.java b/core-java-modules/core-java-networking-3/src/test/java/com/baeldung/domain_name/DomainNameClientUnitTest.java similarity index 97% rename from core-java-modules/core-java-networking/src/test/java/com/baeldung/networking/domain_name/DomainNameClientUnitTest.java rename to core-java-modules/core-java-networking-3/src/test/java/com/baeldung/domain_name/DomainNameClientUnitTest.java index c6f868621d..d69e7c0333 100644 --- a/core-java-modules/core-java-networking/src/test/java/com/baeldung/networking/domain_name/DomainNameClientUnitTest.java +++ b/core-java-modules/core-java-networking-3/src/test/java/com/baeldung/domain_name/DomainNameClientUnitTest.java @@ -1,4 +1,4 @@ -package com.baeldung.networking.domain_name; +package com.baeldung.domain_name; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; From 762d5f0f56f66972f94d1dc1c19a29842338462a Mon Sep 17 00:00:00 2001 From: Graham Cox Date: Thu, 19 May 2022 10:14:05 +0100 Subject: [PATCH 043/100] Reformatted code --- lightrun/README.md | 9 +- lightrun/api-service/pom.xml | 80 ++++++------ .../apiservice/ApiServiceApplication.java | 6 +- .../apiservice/RequestIdGenerator.java | 14 +-- .../apiservice/RestTemplateConfig.java | 12 +- .../adapters/http/TaskResponse.java | 7 +- .../adapters/http/TasksController.java | 22 ++-- .../apiservice/adapters/tasks/Task.java | 7 +- .../adapters/tasks/TaskRepository.java | 6 +- .../adapters/users/UserRepository.java | 7 +- lightrun/pom.xml | 8 +- lightrun/tasks-service/pom.xml | 114 +++++++++--------- .../tasksservice/TasksServiceApplication.java | 6 +- .../adapters/http/TaskResponse.java | 7 +- .../adapters/http/TasksController.java | 20 ++- .../adapters/jms/JmsConsumer.java | 2 +- .../adapters/repository/TaskRecord.java | 6 +- .../service/DeletedUserService.java | 28 ++--- .../tasksservice/service/TasksService.java | 25 ++-- .../src/main/resources/application.properties | 4 - lightrun/users-service/README.md | 9 +- lightrun/users-service/pom.xml | 114 +++++++++--------- .../usersservice/UsersServiceApplication.java | 6 +- .../adapters/http/UserResponse.java | 3 +- .../adapters/http/UsersController.java | 13 +- .../usersservice/service/UsersService.java | 23 ++-- .../src/main/resources/application.properties | 3 - 27 files changed, 278 insertions(+), 283 deletions(-) diff --git a/lightrun/README.md b/lightrun/README.md index 732d9b03cd..18d4ccc12f 100644 --- a/lightrun/README.md +++ b/lightrun/README.md @@ -3,16 +3,21 @@ This application exists as an example for the Lightrun series of articles. ## Building + This application requires [Apache Maven](https://maven.apache.org/) and [Java 17+](https://www.oracle.com/java/technologies/downloads/). Building the code is done by executing: + ``` $ mvn install ``` + from the top level. ## Running + The application consists of three services: + * Tasks * Users * API @@ -23,7 +28,9 @@ The Tasks and Users services exist as microservices for managing one facet of da This does mean that the startup order is important. The JMS queue exists within the Tasks service and is connected to from the Users service. As such, the Tasks service must be started before the others. -Each service can be started either by executing `mvn spring-boot:run` from within the appropriate directory. Alternatively, as Spring Boot applications, the build will produce an executable JAR file within the `target` directory that can be executed as, for example: +Each service can be started either by executing `mvn spring-boot:run` from within the appropriate directory. Alternatively, as Spring Boot applications, the build will produce an executable JAR file within the `target` directory that can be executed as, for +example: + ``` $ java -jar ./target/tasks-service-0.0.1-SNAPSHOT.jar ``` diff --git a/lightrun/api-service/pom.xml b/lightrun/api-service/pom.xml index c72d66748c..3423c490f1 100644 --- a/lightrun/api-service/pom.xml +++ b/lightrun/api-service/pom.xml @@ -1,45 +1,45 @@ - - 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 2.6.7 - - - com.baeldung - api-service - 0.0.1-SNAPSHOT - api-service - Aggregator Service for LightRun Article - - 17 - - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.boot - spring-boot-starter-web - + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.6.7 + + + com.baeldung + api-service + 0.0.1-SNAPSHOT + api-service + Aggregator Service for LightRun Article + + 17 + + + + org.springframework.boot + spring-boot-starter-actuator + + + org.springframework.boot + spring-boot-starter-web + - - org.springframework.boot - spring-boot-starter-test - test - - + + org.springframework.boot + spring-boot-starter-test + test + + - - - - org.springframework.boot - spring-boot-maven-plugin - - - + + + + org.springframework.boot + spring-boot-maven-plugin + + + diff --git a/lightrun/api-service/src/main/java/com/baeldung/apiservice/ApiServiceApplication.java b/lightrun/api-service/src/main/java/com/baeldung/apiservice/ApiServiceApplication.java index 4d7e2f3ff7..a9b29cbd4b 100644 --- a/lightrun/api-service/src/main/java/com/baeldung/apiservice/ApiServiceApplication.java +++ b/lightrun/api-service/src/main/java/com/baeldung/apiservice/ApiServiceApplication.java @@ -6,8 +6,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication public class ApiServiceApplication { - public static void main(String[] args) { - SpringApplication.run(ApiServiceApplication.class, args); - } + public static void main(String[] args) { + SpringApplication.run(ApiServiceApplication.class, args); + } } diff --git a/lightrun/api-service/src/main/java/com/baeldung/apiservice/RequestIdGenerator.java b/lightrun/api-service/src/main/java/com/baeldung/apiservice/RequestIdGenerator.java index 3ad137ca4d..f15738c1e6 100644 --- a/lightrun/api-service/src/main/java/com/baeldung/apiservice/RequestIdGenerator.java +++ b/lightrun/api-service/src/main/java/com/baeldung/apiservice/RequestIdGenerator.java @@ -1,20 +1,20 @@ package com.baeldung.apiservice; -import org.slf4j.MDC; -import org.springframework.stereotype.Component; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.servlet.HandlerInterceptor; -import org.springframework.web.servlet.ModelAndView; +import java.util.UUID; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.UUID; + +import org.slf4j.MDC; +import org.springframework.stereotype.Component; +import org.springframework.web.servlet.HandlerInterceptor; @Component public class RequestIdGenerator implements HandlerInterceptor { @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { - String requestId = UUID.randomUUID().toString(); + String requestId = UUID.randomUUID() + .toString(); MDC.put(RequestIdGenerator.class.getCanonicalName(), requestId); response.addHeader("X-Request-Id", requestId); diff --git a/lightrun/api-service/src/main/java/com/baeldung/apiservice/RestTemplateConfig.java b/lightrun/api-service/src/main/java/com/baeldung/apiservice/RestTemplateConfig.java index 278e1520c4..1582ba5953 100644 --- a/lightrun/api-service/src/main/java/com/baeldung/apiservice/RestTemplateConfig.java +++ b/lightrun/api-service/src/main/java/com/baeldung/apiservice/RestTemplateConfig.java @@ -9,12 +9,12 @@ import org.springframework.web.client.RestTemplate; public class RestTemplateConfig { @Bean public RestTemplate restTemplate(RestTemplateBuilder builder) { - return builder - .additionalInterceptors((request, body, execution) -> { - request.getHeaders().add("X-Request-Id", RequestIdGenerator.getRequestId()); + return builder.additionalInterceptors((request, body, execution) -> { + request.getHeaders() + .add("X-Request-Id", RequestIdGenerator.getRequestId()); - return execution.execute(request, body); - }) - .build(); + return execution.execute(request, body); + }) + .build(); } } diff --git a/lightrun/api-service/src/main/java/com/baeldung/apiservice/adapters/http/TaskResponse.java b/lightrun/api-service/src/main/java/com/baeldung/apiservice/adapters/http/TaskResponse.java index cec3105c04..875390fdcd 100644 --- a/lightrun/api-service/src/main/java/com/baeldung/apiservice/adapters/http/TaskResponse.java +++ b/lightrun/api-service/src/main/java/com/baeldung/apiservice/adapters/http/TaskResponse.java @@ -2,10 +2,5 @@ package com.baeldung.apiservice.adapters.http; import java.time.Instant; -public record TaskResponse(String id, - String title, - Instant created, - UserResponse createdBy, - UserResponse assignedTo, - String status) { +public record TaskResponse(String id, String title, Instant created, UserResponse createdBy, UserResponse assignedTo, String status) { } diff --git a/lightrun/api-service/src/main/java/com/baeldung/apiservice/adapters/http/TasksController.java b/lightrun/api-service/src/main/java/com/baeldung/apiservice/adapters/http/TasksController.java index e11eaac35f..55b449f249 100644 --- a/lightrun/api-service/src/main/java/com/baeldung/apiservice/adapters/http/TasksController.java +++ b/lightrun/api-service/src/main/java/com/baeldung/apiservice/adapters/http/TasksController.java @@ -1,11 +1,17 @@ package com.baeldung.apiservice.adapters.http; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.ExceptionHandler; +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.ResponseStatus; +import org.springframework.web.bind.annotation.RestController; + import com.baeldung.apiservice.adapters.tasks.Task; import com.baeldung.apiservice.adapters.tasks.TaskRepository; import com.baeldung.apiservice.adapters.users.UserRepository; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.web.bind.annotation.*; @RequestMapping("/") @RestController @@ -27,15 +33,10 @@ public class TasksController { } private TaskResponse buildResponse(Task task) { - return new TaskResponse(task.id(), - task.title(), - task.created(), - getUser(task.createdBy()), - getUser(task.assignedTo()), - task.status()); + return new TaskResponse(task.id(), task.title(), task.created(), getUser(task.createdBy()), getUser(task.assignedTo()), task.status()); } - private UserResponse getUser(String userId) { + private UserResponse getUser(String userId) { if (userId == null) { return null; } @@ -47,6 +48,7 @@ public class TasksController { return new UserResponse(user.id(), user.name()); } + @ExceptionHandler(UnknownTaskException.class) @ResponseStatus(HttpStatus.NOT_FOUND) public void handleUnknownTask() { diff --git a/lightrun/api-service/src/main/java/com/baeldung/apiservice/adapters/tasks/Task.java b/lightrun/api-service/src/main/java/com/baeldung/apiservice/adapters/tasks/Task.java index a83192f188..188d3e951c 100644 --- a/lightrun/api-service/src/main/java/com/baeldung/apiservice/adapters/tasks/Task.java +++ b/lightrun/api-service/src/main/java/com/baeldung/apiservice/adapters/tasks/Task.java @@ -2,10 +2,5 @@ package com.baeldung.apiservice.adapters.tasks; import java.time.Instant; -public record Task(String id, - String title, - Instant created, - String createdBy, - String assignedTo, - String status) { +public record Task(String id, String title, Instant created, String createdBy, String assignedTo, String status) { } diff --git a/lightrun/api-service/src/main/java/com/baeldung/apiservice/adapters/tasks/TaskRepository.java b/lightrun/api-service/src/main/java/com/baeldung/apiservice/adapters/tasks/TaskRepository.java index 49ffa51818..9260a125af 100644 --- a/lightrun/api-service/src/main/java/com/baeldung/apiservice/adapters/tasks/TaskRepository.java +++ b/lightrun/api-service/src/main/java/com/baeldung/apiservice/adapters/tasks/TaskRepository.java @@ -17,9 +17,9 @@ public class TaskRepository { public Task getTaskById(String id) { var uri = UriComponentsBuilder.fromUriString(tasksService) - .path(id) - .build() - .toUri(); + .path(id) + .build() + .toUri(); try { return restTemplate.getForObject(uri, Task.class); diff --git a/lightrun/api-service/src/main/java/com/baeldung/apiservice/adapters/users/UserRepository.java b/lightrun/api-service/src/main/java/com/baeldung/apiservice/adapters/users/UserRepository.java index 5a0e4eb64f..d5625f6efc 100644 --- a/lightrun/api-service/src/main/java/com/baeldung/apiservice/adapters/users/UserRepository.java +++ b/lightrun/api-service/src/main/java/com/baeldung/apiservice/adapters/users/UserRepository.java @@ -1,6 +1,5 @@ package com.baeldung.apiservice.adapters.users; -import com.baeldung.apiservice.adapters.users.User; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Repository; @@ -18,9 +17,9 @@ public class UserRepository { public User getUserById(String id) { var uri = UriComponentsBuilder.fromUriString(usersService) - .path(id) - .build() - .toUri(); + .path(id) + .build() + .toUri(); try { return restTemplate.getForObject(uri, User.class); diff --git a/lightrun/pom.xml b/lightrun/pom.xml index cfe275848f..4d046347ab 100644 --- a/lightrun/pom.xml +++ b/lightrun/pom.xml @@ -1,13 +1,13 @@ - + 4.0.0 com.baelduung lightrun-demo 0.0.1-SNAPSHOT pom - lightrun - Services for LightRun Article + lightrun + Services for LightRun Article tasks-service diff --git a/lightrun/tasks-service/pom.xml b/lightrun/tasks-service/pom.xml index e56a3a9edf..441b4d3713 100644 --- a/lightrun/tasks-service/pom.xml +++ b/lightrun/tasks-service/pom.xml @@ -1,67 +1,67 @@ - - 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 2.6.7 - - - com.baeldung - tasks-service - 0.0.1-SNAPSHOT - tasks-service - Tasks Service for LightRun Article - - 17 - - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.boot - spring-boot-starter-artemis - - - org.springframework.boot - spring-boot-starter-data-jpa - - - org.springframework.boot - spring-boot-starter-web - - - org.flywaydb - flyway-core - + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.6.7 + + + com.baeldung + tasks-service + 0.0.1-SNAPSHOT + tasks-service + Tasks Service for LightRun Article + + 17 + + + + org.springframework.boot + spring-boot-starter-actuator + + + org.springframework.boot + spring-boot-starter-artemis + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-web + + + org.flywaydb + flyway-core + - - com.h2database - h2 - runtime - + + com.h2database + h2 + runtime + org.apache.activemq artemis-jms-server - - org.springframework.boot - spring-boot-starter-test - test - - + + org.springframework.boot + spring-boot-starter-test + test + + - - - - org.springframework.boot - spring-boot-maven-plugin - - - + + + + org.springframework.boot + spring-boot-maven-plugin + + + diff --git a/lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/TasksServiceApplication.java b/lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/TasksServiceApplication.java index f8e0d64c0c..dfd9859674 100644 --- a/lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/TasksServiceApplication.java +++ b/lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/TasksServiceApplication.java @@ -6,8 +6,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication public class TasksServiceApplication { - public static void main(String[] args) { - SpringApplication.run(TasksServiceApplication.class, args); - } + public static void main(String[] args) { + SpringApplication.run(TasksServiceApplication.class, args); + } } diff --git a/lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/adapters/http/TaskResponse.java b/lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/adapters/http/TaskResponse.java index ca13b2ee3d..4e01a649b1 100644 --- a/lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/adapters/http/TaskResponse.java +++ b/lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/adapters/http/TaskResponse.java @@ -13,10 +13,5 @@ package com.baeldung.tasksservice.adapters.http; import java.time.Instant; -public record TaskResponse(String id, - String title, - Instant created, - String createdBy, - String assignedTo, - String status) { +public record TaskResponse(String id, String title, Instant created, String createdBy, String assignedTo, String status) { } diff --git a/lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/adapters/http/TasksController.java b/lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/adapters/http/TasksController.java index 6502e43883..a4145a2243 100644 --- a/lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/adapters/http/TasksController.java +++ b/lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/adapters/http/TasksController.java @@ -15,9 +15,6 @@ import java.util.List; import java.util.Optional; import java.util.stream.Collectors; -import com.baeldung.tasksservice.adapters.repository.TaskRecord; -import com.baeldung.tasksservice.service.TasksService; -import com.baeldung.tasksservice.service.UnknownTaskException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.DeleteMapping; @@ -32,6 +29,10 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; +import com.baeldung.tasksservice.adapters.repository.TaskRecord; +import com.baeldung.tasksservice.service.TasksService; +import com.baeldung.tasksservice.service.UnknownTaskException; + @RestController @RequestMapping("/") class TasksController { @@ -46,13 +47,12 @@ class TasksController { } @GetMapping - public List searchTasks(@RequestParam("status") Optional status, - @RequestParam("createdBy") Optional createdBy) { + public List searchTasks(@RequestParam("status") Optional status, @RequestParam("createdBy") Optional createdBy) { var tasks = tasksService.search(status, createdBy); return tasks.stream() - .map(this::buildResponse) - .collect(Collectors.toList()); + .map(this::buildResponse) + .collect(Collectors.toList()); } @GetMapping("/{id}") @@ -67,16 +67,14 @@ class TasksController { } @PatchMapping("/{id}") - public TaskResponse patchTask(@PathVariable("id") String id, - @RequestBody PatchTaskRequest body) { + public TaskResponse patchTask(@PathVariable("id") String id, @RequestBody PatchTaskRequest body) { var task = tasksService.updateTask(id, body.status(), body.assignedTo()); return buildResponse(task); } private TaskResponse buildResponse(final TaskRecord task) { - return new TaskResponse(task.getId(), task.getTitle(), task.getCreated(), task.getCreatedBy(), - task.getAssignedTo(), task.getStatus()); + return new TaskResponse(task.getId(), task.getTitle(), task.getCreated(), task.getCreatedBy(), task.getAssignedTo(), task.getStatus()); } @ExceptionHandler(UnknownTaskException.class) diff --git a/lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/adapters/jms/JmsConsumer.java b/lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/adapters/jms/JmsConsumer.java index d5a705f56f..c380a16acc 100644 --- a/lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/adapters/jms/JmsConsumer.java +++ b/lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/adapters/jms/JmsConsumer.java @@ -1,8 +1,8 @@ package com.baeldung.tasksservice.adapters.jms; -import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jms.annotation.JmsListener; +import org.springframework.stereotype.Service; import com.baeldung.tasksservice.service.DeletedUserService; diff --git a/lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/adapters/repository/TaskRecord.java b/lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/adapters/repository/TaskRecord.java index 6646258c22..dee3017a59 100644 --- a/lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/adapters/repository/TaskRecord.java +++ b/lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/adapters/repository/TaskRecord.java @@ -11,11 +11,12 @@ package com.baeldung.tasksservice.adapters.repository; +import java.time.Instant; + import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import java.time.Instant; @Entity @Table(name = "tasks") @@ -32,8 +33,7 @@ public class TaskRecord { private String assignedTo; private String status; - public TaskRecord(final String id, final String title, final Instant created, final String createdBy, - final String assignedTo, final String status) { + public TaskRecord(final String id, final String title, final Instant created, final String createdBy, final String assignedTo, final String status) { this.id = id; this.title = title; this.created = created; diff --git a/lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/service/DeletedUserService.java b/lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/service/DeletedUserService.java index 50d35d3f93..fa0c3572fb 100644 --- a/lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/service/DeletedUserService.java +++ b/lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/service/DeletedUserService.java @@ -2,26 +2,26 @@ package com.baeldung.tasksservice.service; import javax.transaction.Transactional; -import com.baeldung.tasksservice.adapters.repository.TaskRecord; -import com.baeldung.tasksservice.adapters.repository.TasksRepository; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import com.baeldung.tasksservice.adapters.repository.TaskRecord; +import com.baeldung.tasksservice.adapters.repository.TasksRepository; + @Service public class DeletedUserService { - @Autowired - private TasksRepository tasksRepository; + @Autowired + private TasksRepository tasksRepository; - @Transactional - public void handleDeletedUser(String user) { - var ownedByUser = tasksRepository.findByCreatedBy(user); - tasksRepository.deleteAll(ownedByUser); + @Transactional + public void handleDeletedUser(String user) { + var ownedByUser = tasksRepository.findByCreatedBy(user); + tasksRepository.deleteAll(ownedByUser); - var assignedToUser = tasksRepository.findByAssignedTo(user); - for (TaskRecord record : assignedToUser) { - record.setAssignedTo(null); - record.setStatus("PENDING"); + var assignedToUser = tasksRepository.findByAssignedTo(user); + for (TaskRecord record : assignedToUser) { + record.setAssignedTo(null); + record.setStatus("PENDING"); + } } - } } diff --git a/lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/service/TasksService.java b/lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/service/TasksService.java index e9ba1a9f70..3539dbbc3c 100644 --- a/lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/service/TasksService.java +++ b/lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/service/TasksService.java @@ -11,29 +11,33 @@ package com.baeldung.tasksservice.service; -import javax.transaction.Transactional; import java.time.Instant; import java.util.List; import java.util.Optional; import java.util.UUID; -import com.baeldung.tasksservice.adapters.repository.TaskRecord; -import com.baeldung.tasksservice.adapters.repository.TasksRepository; +import javax.transaction.Transactional; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import com.baeldung.tasksservice.adapters.repository.TaskRecord; +import com.baeldung.tasksservice.adapters.repository.TasksRepository; + @Service public class TasksService { @Autowired private TasksRepository tasksRepository; public TaskRecord getTaskById(String id) { - return tasksRepository.findById(id).orElseThrow(() -> new UnknownTaskException(id)); + return tasksRepository.findById(id) + .orElseThrow(() -> new UnknownTaskException(id)); } @Transactional public void deleteTaskById(String id) { - var task = tasksRepository.findById(id).orElseThrow(() -> new UnknownTaskException(id)); + var task = tasksRepository.findById(id) + .orElseThrow(() -> new UnknownTaskException(id)); tasksRepository.delete(task); } @@ -51,7 +55,8 @@ public class TasksService { @Transactional public TaskRecord updateTask(String id, Optional newStatus, Optional newAssignedTo) { - var task = tasksRepository.findById(id).orElseThrow(() -> new UnknownTaskException(id)); + var task = tasksRepository.findById(id) + .orElseThrow(() -> new UnknownTaskException(id)); newStatus.ifPresent(task::setStatus); newAssignedTo.ifPresent(task::setAssignedTo); @@ -60,12 +65,8 @@ public class TasksService { } public TaskRecord createTask(String title, String createdBy) { - var task = new TaskRecord(UUID.randomUUID().toString(), - title, - Instant.now(), - createdBy, - null, - "PENDING"); + var task = new TaskRecord(UUID.randomUUID() + .toString(), title, Instant.now(), createdBy, null, "PENDING"); tasksRepository.save(task); return task; } diff --git a/lightrun/tasks-service/src/main/resources/application.properties b/lightrun/tasks-service/src/main/resources/application.properties index 83bbf1a1b8..88326ed10e 100644 --- a/lightrun/tasks-service/src/main/resources/application.properties +++ b/lightrun/tasks-service/src/main/resources/application.properties @@ -1,13 +1,9 @@ server.port=8082 - spring.artemis.mode=EMBEDDED spring.artemis.host=localhost spring.artemis.port=61616 - spring.artemis.embedded.enabled=true - spring.jms.template.default-destination=my-queue-1 - logging.level.org.apache.activemq.audit.base=WARN logging.level.org.apache.activemq.audit.message=WARN diff --git a/lightrun/users-service/README.md b/lightrun/users-service/README.md index 7c713e6638..e7faae858f 100644 --- a/lightrun/users-service/README.md +++ b/lightrun/users-service/README.md @@ -3,16 +3,21 @@ This application exists as an example for the Lightrun series of articles. ## Building + This application requires [Apache Maven](https://maven.apache.org/) and [Java 17+](https://www.oracle.com/java/technologies/downloads/). It does use the Maven Wrapper, so it can be built with only Java available on the path. As such, building the code is done by executing: + ``` $ ./mvnw install ``` + from the top level. ## Running + The application consists of three services: + * Tasks * Users * API @@ -23,7 +28,9 @@ The Tasks and Users services exist as microservices for managing one facet of da This does mean that the startup order is important. The JMS queue exists within the Tasks service and is connected to from the Users service. As such, the Tasks service must be started before the others. -Each service can be started either by executing `mvn spring-boot:run` from within the appropriate directory. Alternatively, as Spring Boot applications, the build will produce an executable JAR file within the `target` directory that can be executed as, for example: +Each service can be started either by executing `mvn spring-boot:run` from within the appropriate directory. Alternatively, as Spring Boot applications, the build will produce an executable JAR file within the `target` directory that can be executed as, for +example: + ``` $ java -jar ./target/tasks-service-0.0.1-SNAPSHOT.jar ``` diff --git a/lightrun/users-service/pom.xml b/lightrun/users-service/pom.xml index a961e4093b..63596ed67b 100644 --- a/lightrun/users-service/pom.xml +++ b/lightrun/users-service/pom.xml @@ -1,63 +1,63 @@ - - 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 2.6.7 - - - com.baeldung - users-service - 0.0.1-SNAPSHOT - users-service - Users Service for LightRun Article - - 17 - - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.boot - spring-boot-starter-artemis - - - org.springframework.boot - spring-boot-starter-data-jpa - - - org.springframework.boot - spring-boot-starter-web - - - org.flywaydb - flyway-core - + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.6.7 + + + com.baeldung + users-service + 0.0.1-SNAPSHOT + users-service + Users Service for LightRun Article + + 17 + + + + org.springframework.boot + spring-boot-starter-actuator + + + org.springframework.boot + spring-boot-starter-artemis + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-web + + + org.flywaydb + flyway-core + - - com.h2database - h2 - runtime - + + com.h2database + h2 + runtime + - - org.springframework.boot - spring-boot-starter-test - test - - + + org.springframework.boot + spring-boot-starter-test + test + + - - - - org.springframework.boot - spring-boot-maven-plugin - - - + + + + org.springframework.boot + spring-boot-maven-plugin + + + diff --git a/lightrun/users-service/src/main/java/com/baeldung/usersservice/UsersServiceApplication.java b/lightrun/users-service/src/main/java/com/baeldung/usersservice/UsersServiceApplication.java index 487e8de45b..3910960282 100644 --- a/lightrun/users-service/src/main/java/com/baeldung/usersservice/UsersServiceApplication.java +++ b/lightrun/users-service/src/main/java/com/baeldung/usersservice/UsersServiceApplication.java @@ -6,8 +6,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication public class UsersServiceApplication { - public static void main(String[] args) { - SpringApplication.run(UsersServiceApplication.class, args); - } + public static void main(String[] args) { + SpringApplication.run(UsersServiceApplication.class, args); + } } diff --git a/lightrun/users-service/src/main/java/com/baeldung/usersservice/adapters/http/UserResponse.java b/lightrun/users-service/src/main/java/com/baeldung/usersservice/adapters/http/UserResponse.java index b9a20c415b..e74ede65d5 100644 --- a/lightrun/users-service/src/main/java/com/baeldung/usersservice/adapters/http/UserResponse.java +++ b/lightrun/users-service/src/main/java/com/baeldung/usersservice/adapters/http/UserResponse.java @@ -11,6 +11,5 @@ package com.baeldung.usersservice.adapters.http; -public record UserResponse(String id, - String name) { +public record UserResponse(String id, String name) { } diff --git a/lightrun/users-service/src/main/java/com/baeldung/usersservice/adapters/http/UsersController.java b/lightrun/users-service/src/main/java/com/baeldung/usersservice/adapters/http/UsersController.java index a5138e31d6..795d240fe9 100644 --- a/lightrun/users-service/src/main/java/com/baeldung/usersservice/adapters/http/UsersController.java +++ b/lightrun/users-service/src/main/java/com/baeldung/usersservice/adapters/http/UsersController.java @@ -11,9 +11,6 @@ package com.baeldung.usersservice.adapters.http; -import com.baeldung.usersservice.adapters.repository.UserRecord; -import com.baeldung.usersservice.service.UsersService; -import com.baeldung.usersservice.service.UnknownUserException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.DeleteMapping; @@ -27,6 +24,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; +import com.baeldung.usersservice.adapters.repository.UserRecord; +import com.baeldung.usersservice.service.UnknownUserException; +import com.baeldung.usersservice.service.UsersService; + @RestController @RequestMapping("/") class UsersController { @@ -50,14 +51,14 @@ class UsersController { var user = usersService.createUser(body.name()); return buildResponse(user); } - + @PatchMapping("/{id}") - public UserResponse patchUser(@PathVariable("id") String id, - @RequestBody PatchUserRequest body) { + public UserResponse patchUser(@PathVariable("id") String id, @RequestBody PatchUserRequest body) { var user = usersService.updateUser(id, body.name()); return buildResponse(user); } + private UserResponse buildResponse(final UserRecord user) { return new UserResponse(user.getId(), user.getName()); } diff --git a/lightrun/users-service/src/main/java/com/baeldung/usersservice/service/UsersService.java b/lightrun/users-service/src/main/java/com/baeldung/usersservice/service/UsersService.java index 46954b1ee0..5115a5a77b 100644 --- a/lightrun/users-service/src/main/java/com/baeldung/usersservice/service/UsersService.java +++ b/lightrun/users-service/src/main/java/com/baeldung/usersservice/service/UsersService.java @@ -11,18 +11,17 @@ package com.baeldung.usersservice.service; -import javax.transaction.Transactional; - -import java.time.Instant; import java.util.Optional; import java.util.UUID; +import javax.transaction.Transactional; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + import com.baeldung.usersservice.adapters.jms.JmsSender; import com.baeldung.usersservice.adapters.repository.UserRecord; import com.baeldung.usersservice.adapters.repository.UsersRepository; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.jms.core.JmsTemplate; -import org.springframework.stereotype.Service; @Service public class UsersService { @@ -33,12 +32,14 @@ public class UsersService { private JmsSender jmsSender; public UserRecord getUserById(String id) { - return usersRepository.findById(id).orElseThrow(() -> new UnknownUserException(id)); + return usersRepository.findById(id) + .orElseThrow(() -> new UnknownUserException(id)); } @Transactional public void deleteUserById(String id) { - var user = usersRepository.findById(id).orElseThrow(() -> new UnknownUserException(id)); + var user = usersRepository.findById(id) + .orElseThrow(() -> new UnknownUserException(id)); usersRepository.delete(user); jmsSender.sendDeleteUserMessage(id); @@ -46,7 +47,8 @@ public class UsersService { @Transactional public UserRecord updateUser(String id, Optional newName) { - var user = usersRepository.findById(id).orElseThrow(() -> new UnknownUserException(id)); + var user = usersRepository.findById(id) + .orElseThrow(() -> new UnknownUserException(id)); newName.ifPresent(user::setName); @@ -54,7 +56,8 @@ public class UsersService { } public UserRecord createUser(String name) { - var user = new UserRecord(UUID.randomUUID().toString(), name); + var user = new UserRecord(UUID.randomUUID() + .toString(), name); usersRepository.save(user); return user; } diff --git a/lightrun/users-service/src/main/resources/application.properties b/lightrun/users-service/src/main/resources/application.properties index 8cc8f67d92..616131c42e 100644 --- a/lightrun/users-service/src/main/resources/application.properties +++ b/lightrun/users-service/src/main/resources/application.properties @@ -1,10 +1,7 @@ server.port=8081 - spring.artemis.host=localhost spring.artemis.port=61616 - spring.jms.template.default-destination=my-queue-1 - logging.level.org.apache.activemq.audit.base=WARN logging.level.org.apache.activemq.audit.message=WARN From 9ada6d69ae5d425bd3352d8bf057df81b1063f88 Mon Sep 17 00:00:00 2001 From: Dhawal Kapil Date: Thu, 19 May 2022 20:46:52 +0530 Subject: [PATCH 044/100] JAVA-11849 Disabled NPM and Frontend Tasks from Integration builds, added jhipster-5 to integration-heavy profile --- jhipster-5/bookstore-monolith/pom.xml | 60 +++++++++++++++++++++++++++ pom.xml | 9 ++-- 2 files changed, 65 insertions(+), 4 deletions(-) diff --git a/jhipster-5/bookstore-monolith/pom.xml b/jhipster-5/bookstore-monolith/pom.xml index 411de0e712..ccf7a3c85e 100644 --- a/jhipster-5/bookstore-monolith/pom.xml +++ b/jhipster-5/bookstore-monolith/pom.xml @@ -1090,6 +1090,66 @@ + + integration-lite-first + + + + com.github.eirslett + frontend-maven-plugin + + + + install node and npm + none + + + npm install + none + + + webpack build dev + none + + + webpack build test + none + + + + + + + + integration-lite-second + + + + com.github.eirslett + frontend-maven-plugin + + + + install node and npm + none + + + npm install + none + + + webpack build dev + none + + + webpack build test + none + + + + + + diff --git a/pom.xml b/pom.xml index 106bb7516a..37cc9a3ea1 100644 --- a/pom.xml +++ b/pom.xml @@ -366,7 +366,7 @@ atomix aws-modules - + axon azure @@ -836,7 +836,7 @@ atomix aws-modules - + axon azure @@ -895,7 +895,7 @@ helidon apache-httpclient httpclient-simple - hystrix + hystrix jackson-modules jackson-simple @@ -1209,6 +1209,7 @@ jenkins/plugins jhipster + jhipster-5 jws libraries @@ -1326,7 +1327,7 @@ quarkus-vs-springboot quarkus-jandex spring-boot-modules/spring-boot-cassandre - spring-boot-modules/spring-boot-camel + spring-boot-modules/spring-boot-camel testing-modules/testing-assertions persistence-modules/fauna From 2e8c7dc728cff6fdac37762049f2a65b884260e5 Mon Sep 17 00:00:00 2001 From: sampadawagde Date: Fri, 20 May 2022 10:32:38 +0530 Subject: [PATCH 045/100] JAVA-12015: Align module names, folder names and artifact id --- docker/docker-push-to-private-repo/pom.xml | 24 +++++++++++++--------- lightrun/pom.xml | 2 +- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/docker/docker-push-to-private-repo/pom.xml b/docker/docker-push-to-private-repo/pom.xml index 59a909ff07..19be098794 100644 --- a/docker/docker-push-to-private-repo/pom.xml +++ b/docker/docker-push-to-private-repo/pom.xml @@ -1,19 +1,19 @@ - + 4.0.0 + docker-push-to-private-repo + 0.0.1-SNAPSHOT + docker-push-to-private-repo + Example application to showcase how to push a docker image to a private repository + com.baeldung.docker docker 0.0.1 - push-to-private-repo - 0.0.1-SNAPSHOT - push-to-private-repo - Example application to showcase how to push a docker image to a private repository - - 11 - + org.springframework.boot @@ -40,4 +40,8 @@ - + + 11 + + + \ No newline at end of file diff --git a/lightrun/pom.xml b/lightrun/pom.xml index cfe275848f..ddb720b023 100644 --- a/lightrun/pom.xml +++ b/lightrun/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.baelduung - lightrun-demo + lightrun 0.0.1-SNAPSHOT pom lightrun From 028347b1961a6fc4328462879a637c1026d9b2ce Mon Sep 17 00:00:00 2001 From: sampadawagde Date: Fri, 20 May 2022 20:25:37 +0530 Subject: [PATCH 046/100] JAVA-12097: moved algorithms-genetic inside algorithms-module --- .../algorithms-genetic}/.gitignore | 0 .../algorithms-genetic}/README.md | 0 .../algorithms-genetic}/pom.xml | 2 +- .../src/main/java/com/baeldung/algorithms/RunAlgorithm.java | 0 .../main/java/com/baeldung/algorithms/ga/annealing/City.java | 0 .../baeldung/algorithms/ga/annealing/SimulatedAnnealing.java | 0 .../main/java/com/baeldung/algorithms/ga/annealing/Travel.java | 0 .../main/java/com/baeldung/algorithms/ga/ant_colony/Ant.java | 0 .../algorithms/ga/ant_colony/AntColonyOptimization.java | 0 .../main/java/com/baeldung/algorithms/ga/binary/Individual.java | 0 .../main/java/com/baeldung/algorithms/ga/binary/Population.java | 0 .../baeldung/algorithms/ga/binary/SimpleGeneticAlgorithm.java | 0 .../main/java/com/baeldung/algorithms/ga/jenetics/Knapsack.java | 0 .../java/com/baeldung/algorithms/ga/jenetics/KnapsackFF.java | 0 .../java/com/baeldung/algorithms/ga/jenetics/KnapsackItem.java | 0 .../baeldung/algorithms/ga/jenetics/SimpleGeneticAlgorithm.java | 0 .../com/baeldung/algorithms/ga/jenetics/SpringsteenProblem.java | 0 .../com/baeldung/algorithms/ga/jenetics/SpringsteenRecord.java | 0 .../java/com/baeldung/algorithms/ga/jenetics/SubsetSum.java | 0 .../com/baeldung/algorithms/ga/jenetics/TravelingSalesman.java | 0 .../algorithms-genetic}/src/main/resources/logback.xml | 0 .../algorithms/AntColonyOptimizationLongRunningUnitTest.java | 0 .../algorithms/BinaryGeneticAlgorithmLongRunningUnitTest.java | 0 .../algorithms/SimulatedAnnealingLongRunningUnitTest.java | 0 24 files changed, 1 insertion(+), 1 deletion(-) rename {algorithms-genetic => algorithms-module/algorithms-genetic}/.gitignore (100%) rename {algorithms-genetic => algorithms-module/algorithms-genetic}/README.md (100%) rename {algorithms-genetic => algorithms-module/algorithms-genetic}/pom.xml (96%) rename {algorithms-genetic => algorithms-module/algorithms-genetic}/src/main/java/com/baeldung/algorithms/RunAlgorithm.java (100%) rename {algorithms-genetic => algorithms-module/algorithms-genetic}/src/main/java/com/baeldung/algorithms/ga/annealing/City.java (100%) rename {algorithms-genetic => algorithms-module/algorithms-genetic}/src/main/java/com/baeldung/algorithms/ga/annealing/SimulatedAnnealing.java (100%) rename {algorithms-genetic => algorithms-module/algorithms-genetic}/src/main/java/com/baeldung/algorithms/ga/annealing/Travel.java (100%) rename {algorithms-genetic => algorithms-module/algorithms-genetic}/src/main/java/com/baeldung/algorithms/ga/ant_colony/Ant.java (100%) rename {algorithms-genetic => algorithms-module/algorithms-genetic}/src/main/java/com/baeldung/algorithms/ga/ant_colony/AntColonyOptimization.java (100%) rename {algorithms-genetic => algorithms-module/algorithms-genetic}/src/main/java/com/baeldung/algorithms/ga/binary/Individual.java (100%) rename {algorithms-genetic => algorithms-module/algorithms-genetic}/src/main/java/com/baeldung/algorithms/ga/binary/Population.java (100%) rename {algorithms-genetic => algorithms-module/algorithms-genetic}/src/main/java/com/baeldung/algorithms/ga/binary/SimpleGeneticAlgorithm.java (100%) rename {algorithms-genetic => algorithms-module/algorithms-genetic}/src/main/java/com/baeldung/algorithms/ga/jenetics/Knapsack.java (100%) rename {algorithms-genetic => algorithms-module/algorithms-genetic}/src/main/java/com/baeldung/algorithms/ga/jenetics/KnapsackFF.java (100%) rename {algorithms-genetic => algorithms-module/algorithms-genetic}/src/main/java/com/baeldung/algorithms/ga/jenetics/KnapsackItem.java (100%) rename {algorithms-genetic => algorithms-module/algorithms-genetic}/src/main/java/com/baeldung/algorithms/ga/jenetics/SimpleGeneticAlgorithm.java (100%) rename {algorithms-genetic => algorithms-module/algorithms-genetic}/src/main/java/com/baeldung/algorithms/ga/jenetics/SpringsteenProblem.java (100%) rename {algorithms-genetic => algorithms-module/algorithms-genetic}/src/main/java/com/baeldung/algorithms/ga/jenetics/SpringsteenRecord.java (100%) rename {algorithms-genetic => algorithms-module/algorithms-genetic}/src/main/java/com/baeldung/algorithms/ga/jenetics/SubsetSum.java (100%) rename {algorithms-genetic => algorithms-module/algorithms-genetic}/src/main/java/com/baeldung/algorithms/ga/jenetics/TravelingSalesman.java (100%) rename {algorithms-genetic => algorithms-module/algorithms-genetic}/src/main/resources/logback.xml (100%) rename {algorithms-genetic => algorithms-module/algorithms-genetic}/src/test/java/com/baeldung/algorithms/AntColonyOptimizationLongRunningUnitTest.java (100%) rename {algorithms-genetic => algorithms-module/algorithms-genetic}/src/test/java/com/baeldung/algorithms/BinaryGeneticAlgorithmLongRunningUnitTest.java (100%) rename {algorithms-genetic => algorithms-module/algorithms-genetic}/src/test/java/com/baeldung/algorithms/SimulatedAnnealingLongRunningUnitTest.java (100%) diff --git a/algorithms-genetic/.gitignore b/algorithms-module/algorithms-genetic/.gitignore similarity index 100% rename from algorithms-genetic/.gitignore rename to algorithms-module/algorithms-genetic/.gitignore diff --git a/algorithms-genetic/README.md b/algorithms-module/algorithms-genetic/README.md similarity index 100% rename from algorithms-genetic/README.md rename to algorithms-module/algorithms-genetic/README.md diff --git a/algorithms-genetic/pom.xml b/algorithms-module/algorithms-genetic/pom.xml similarity index 96% rename from algorithms-genetic/pom.xml rename to algorithms-module/algorithms-genetic/pom.xml index c53ae0f776..c18ba0e7f1 100644 --- a/algorithms-genetic/pom.xml +++ b/algorithms-module/algorithms-genetic/pom.xml @@ -9,7 +9,7 @@ com.baeldung - parent-modules + algorithms-modules 1.0.0-SNAPSHOT diff --git a/algorithms-genetic/src/main/java/com/baeldung/algorithms/RunAlgorithm.java b/algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/RunAlgorithm.java similarity index 100% rename from algorithms-genetic/src/main/java/com/baeldung/algorithms/RunAlgorithm.java rename to algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/RunAlgorithm.java diff --git a/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/annealing/City.java b/algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/annealing/City.java similarity index 100% rename from algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/annealing/City.java rename to algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/annealing/City.java diff --git a/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/annealing/SimulatedAnnealing.java b/algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/annealing/SimulatedAnnealing.java similarity index 100% rename from algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/annealing/SimulatedAnnealing.java rename to algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/annealing/SimulatedAnnealing.java diff --git a/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/annealing/Travel.java b/algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/annealing/Travel.java similarity index 100% rename from algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/annealing/Travel.java rename to algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/annealing/Travel.java diff --git a/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/ant_colony/Ant.java b/algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/ant_colony/Ant.java similarity index 100% rename from algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/ant_colony/Ant.java rename to algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/ant_colony/Ant.java diff --git a/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/ant_colony/AntColonyOptimization.java b/algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/ant_colony/AntColonyOptimization.java similarity index 100% rename from algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/ant_colony/AntColonyOptimization.java rename to algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/ant_colony/AntColonyOptimization.java diff --git a/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/binary/Individual.java b/algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/binary/Individual.java similarity index 100% rename from algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/binary/Individual.java rename to algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/binary/Individual.java diff --git a/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/binary/Population.java b/algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/binary/Population.java similarity index 100% rename from algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/binary/Population.java rename to algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/binary/Population.java diff --git a/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/binary/SimpleGeneticAlgorithm.java b/algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/binary/SimpleGeneticAlgorithm.java similarity index 100% rename from algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/binary/SimpleGeneticAlgorithm.java rename to algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/binary/SimpleGeneticAlgorithm.java diff --git a/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/Knapsack.java b/algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/Knapsack.java similarity index 100% rename from algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/Knapsack.java rename to algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/Knapsack.java diff --git a/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/KnapsackFF.java b/algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/KnapsackFF.java similarity index 100% rename from algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/KnapsackFF.java rename to algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/KnapsackFF.java diff --git a/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/KnapsackItem.java b/algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/KnapsackItem.java similarity index 100% rename from algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/KnapsackItem.java rename to algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/KnapsackItem.java diff --git a/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/SimpleGeneticAlgorithm.java b/algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/SimpleGeneticAlgorithm.java similarity index 100% rename from algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/SimpleGeneticAlgorithm.java rename to algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/SimpleGeneticAlgorithm.java diff --git a/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/SpringsteenProblem.java b/algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/SpringsteenProblem.java similarity index 100% rename from algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/SpringsteenProblem.java rename to algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/SpringsteenProblem.java diff --git a/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/SpringsteenRecord.java b/algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/SpringsteenRecord.java similarity index 100% rename from algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/SpringsteenRecord.java rename to algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/SpringsteenRecord.java diff --git a/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/SubsetSum.java b/algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/SubsetSum.java similarity index 100% rename from algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/SubsetSum.java rename to algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/SubsetSum.java diff --git a/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/TravelingSalesman.java b/algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/TravelingSalesman.java similarity index 100% rename from algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/TravelingSalesman.java rename to algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/TravelingSalesman.java diff --git a/algorithms-genetic/src/main/resources/logback.xml b/algorithms-module/algorithms-genetic/src/main/resources/logback.xml similarity index 100% rename from algorithms-genetic/src/main/resources/logback.xml rename to algorithms-module/algorithms-genetic/src/main/resources/logback.xml diff --git a/algorithms-genetic/src/test/java/com/baeldung/algorithms/AntColonyOptimizationLongRunningUnitTest.java b/algorithms-module/algorithms-genetic/src/test/java/com/baeldung/algorithms/AntColonyOptimizationLongRunningUnitTest.java similarity index 100% rename from algorithms-genetic/src/test/java/com/baeldung/algorithms/AntColonyOptimizationLongRunningUnitTest.java rename to algorithms-module/algorithms-genetic/src/test/java/com/baeldung/algorithms/AntColonyOptimizationLongRunningUnitTest.java diff --git a/algorithms-genetic/src/test/java/com/baeldung/algorithms/BinaryGeneticAlgorithmLongRunningUnitTest.java b/algorithms-module/algorithms-genetic/src/test/java/com/baeldung/algorithms/BinaryGeneticAlgorithmLongRunningUnitTest.java similarity index 100% rename from algorithms-genetic/src/test/java/com/baeldung/algorithms/BinaryGeneticAlgorithmLongRunningUnitTest.java rename to algorithms-module/algorithms-genetic/src/test/java/com/baeldung/algorithms/BinaryGeneticAlgorithmLongRunningUnitTest.java diff --git a/algorithms-genetic/src/test/java/com/baeldung/algorithms/SimulatedAnnealingLongRunningUnitTest.java b/algorithms-module/algorithms-genetic/src/test/java/com/baeldung/algorithms/SimulatedAnnealingLongRunningUnitTest.java similarity index 100% rename from algorithms-genetic/src/test/java/com/baeldung/algorithms/SimulatedAnnealingLongRunningUnitTest.java rename to algorithms-module/algorithms-genetic/src/test/java/com/baeldung/algorithms/SimulatedAnnealingLongRunningUnitTest.java From 22a63fe7d8fe314b160acebeb5e2836c2333c892 Mon Sep 17 00:00:00 2001 From: sampadawagde Date: Fri, 20 May 2022 20:27:05 +0530 Subject: [PATCH 047/100] JAVA-12097: moved algorithms-miscellaneous-1 inside algorithms-module --- .../algorithms-miscellaneous-1}/README.md | 0 .../algorithms-miscellaneous-1}/pom.xml | 2 +- .../com/baeldung/algorithms/automata/FiniteStateMachine.java | 0 .../com/baeldung/algorithms/automata/RtFiniteStateMachine.java | 0 .../src/main/java/com/baeldung/algorithms/automata/RtState.java | 0 .../java/com/baeldung/algorithms/automata/RtTransition.java | 0 .../src/main/java/com/baeldung/algorithms/automata/State.java | 0 .../main/java/com/baeldung/algorithms/automata/Transition.java | 0 .../java/com/baeldung/algorithms/hillclimbing/HillClimbing.java | 0 .../main/java/com/baeldung/algorithms/hillclimbing/State.java | 0 .../java/com/baeldung/algorithms/kthlargest/FindKthLargest.java | 0 .../main/java/com/baeldung/algorithms/minimax/GameOfBones.java | 0 .../src/main/java/com/baeldung/algorithms/minimax/MiniMax.java | 0 .../src/main/java/com/baeldung/algorithms/minimax/Node.java | 0 .../src/main/java/com/baeldung/algorithms/minimax/Tree.java | 0 .../algorithms-miscellaneous-1}/src/main/resources/logback.xml | 0 .../com/baeldung/algorithms/HillClimbingAlgorithmUnitTest.java | 0 .../algorithms/RtFiniteStateMachineLongRunningUnitTest.java | 0 .../baeldung/algorithms/kthlargest/FindKthLargestUnitTest.java | 0 .../java/com/baeldung/algorithms/minimax/MinimaxUnitTest.java | 0 20 files changed, 1 insertion(+), 1 deletion(-) rename {algorithms-miscellaneous-1 => algorithms-module/algorithms-miscellaneous-1}/README.md (100%) rename {algorithms-miscellaneous-1 => algorithms-module/algorithms-miscellaneous-1}/pom.xml (97%) rename {algorithms-miscellaneous-1 => algorithms-module/algorithms-miscellaneous-1}/src/main/java/com/baeldung/algorithms/automata/FiniteStateMachine.java (100%) rename {algorithms-miscellaneous-1 => algorithms-module/algorithms-miscellaneous-1}/src/main/java/com/baeldung/algorithms/automata/RtFiniteStateMachine.java (100%) rename {algorithms-miscellaneous-1 => algorithms-module/algorithms-miscellaneous-1}/src/main/java/com/baeldung/algorithms/automata/RtState.java (100%) rename {algorithms-miscellaneous-1 => algorithms-module/algorithms-miscellaneous-1}/src/main/java/com/baeldung/algorithms/automata/RtTransition.java (100%) rename {algorithms-miscellaneous-1 => algorithms-module/algorithms-miscellaneous-1}/src/main/java/com/baeldung/algorithms/automata/State.java (100%) rename {algorithms-miscellaneous-1 => algorithms-module/algorithms-miscellaneous-1}/src/main/java/com/baeldung/algorithms/automata/Transition.java (100%) rename {algorithms-miscellaneous-1 => algorithms-module/algorithms-miscellaneous-1}/src/main/java/com/baeldung/algorithms/hillclimbing/HillClimbing.java (100%) rename {algorithms-miscellaneous-1 => algorithms-module/algorithms-miscellaneous-1}/src/main/java/com/baeldung/algorithms/hillclimbing/State.java (100%) rename {algorithms-miscellaneous-1 => algorithms-module/algorithms-miscellaneous-1}/src/main/java/com/baeldung/algorithms/kthlargest/FindKthLargest.java (100%) rename {algorithms-miscellaneous-1 => algorithms-module/algorithms-miscellaneous-1}/src/main/java/com/baeldung/algorithms/minimax/GameOfBones.java (100%) rename {algorithms-miscellaneous-1 => algorithms-module/algorithms-miscellaneous-1}/src/main/java/com/baeldung/algorithms/minimax/MiniMax.java (100%) rename {algorithms-miscellaneous-1 => algorithms-module/algorithms-miscellaneous-1}/src/main/java/com/baeldung/algorithms/minimax/Node.java (100%) rename {algorithms-miscellaneous-1 => algorithms-module/algorithms-miscellaneous-1}/src/main/java/com/baeldung/algorithms/minimax/Tree.java (100%) rename {algorithms-miscellaneous-1 => algorithms-module/algorithms-miscellaneous-1}/src/main/resources/logback.xml (100%) rename {algorithms-miscellaneous-1 => algorithms-module/algorithms-miscellaneous-1}/src/test/java/com/baeldung/algorithms/HillClimbingAlgorithmUnitTest.java (100%) rename {algorithms-miscellaneous-1 => algorithms-module/algorithms-miscellaneous-1}/src/test/java/com/baeldung/algorithms/RtFiniteStateMachineLongRunningUnitTest.java (100%) rename {algorithms-miscellaneous-1 => algorithms-module/algorithms-miscellaneous-1}/src/test/java/com/baeldung/algorithms/kthlargest/FindKthLargestUnitTest.java (100%) rename {algorithms-miscellaneous-1 => algorithms-module/algorithms-miscellaneous-1}/src/test/java/com/baeldung/algorithms/minimax/MinimaxUnitTest.java (100%) diff --git a/algorithms-miscellaneous-1/README.md b/algorithms-module/algorithms-miscellaneous-1/README.md similarity index 100% rename from algorithms-miscellaneous-1/README.md rename to algorithms-module/algorithms-miscellaneous-1/README.md diff --git a/algorithms-miscellaneous-1/pom.xml b/algorithms-module/algorithms-miscellaneous-1/pom.xml similarity index 97% rename from algorithms-miscellaneous-1/pom.xml rename to algorithms-module/algorithms-miscellaneous-1/pom.xml index c6f247f4e3..62c9738f1a 100644 --- a/algorithms-miscellaneous-1/pom.xml +++ b/algorithms-module/algorithms-miscellaneous-1/pom.xml @@ -9,7 +9,7 @@ com.baeldung - parent-modules + algorithms-modules 1.0.0-SNAPSHOT diff --git a/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/FiniteStateMachine.java b/algorithms-module/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/FiniteStateMachine.java similarity index 100% rename from algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/FiniteStateMachine.java rename to algorithms-module/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/FiniteStateMachine.java diff --git a/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/RtFiniteStateMachine.java b/algorithms-module/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/RtFiniteStateMachine.java similarity index 100% rename from algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/RtFiniteStateMachine.java rename to algorithms-module/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/RtFiniteStateMachine.java diff --git a/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/RtState.java b/algorithms-module/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/RtState.java similarity index 100% rename from algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/RtState.java rename to algorithms-module/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/RtState.java diff --git a/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/RtTransition.java b/algorithms-module/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/RtTransition.java similarity index 100% rename from algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/RtTransition.java rename to algorithms-module/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/RtTransition.java diff --git a/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/State.java b/algorithms-module/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/State.java similarity index 100% rename from algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/State.java rename to algorithms-module/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/State.java diff --git a/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/Transition.java b/algorithms-module/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/Transition.java similarity index 100% rename from algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/Transition.java rename to algorithms-module/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/Transition.java diff --git a/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/hillclimbing/HillClimbing.java b/algorithms-module/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/hillclimbing/HillClimbing.java similarity index 100% rename from algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/hillclimbing/HillClimbing.java rename to algorithms-module/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/hillclimbing/HillClimbing.java diff --git a/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/hillclimbing/State.java b/algorithms-module/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/hillclimbing/State.java similarity index 100% rename from algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/hillclimbing/State.java rename to algorithms-module/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/hillclimbing/State.java diff --git a/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/kthlargest/FindKthLargest.java b/algorithms-module/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/kthlargest/FindKthLargest.java similarity index 100% rename from algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/kthlargest/FindKthLargest.java rename to algorithms-module/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/kthlargest/FindKthLargest.java diff --git a/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/minimax/GameOfBones.java b/algorithms-module/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/minimax/GameOfBones.java similarity index 100% rename from algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/minimax/GameOfBones.java rename to algorithms-module/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/minimax/GameOfBones.java diff --git a/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/minimax/MiniMax.java b/algorithms-module/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/minimax/MiniMax.java similarity index 100% rename from algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/minimax/MiniMax.java rename to algorithms-module/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/minimax/MiniMax.java diff --git a/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/minimax/Node.java b/algorithms-module/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/minimax/Node.java similarity index 100% rename from algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/minimax/Node.java rename to algorithms-module/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/minimax/Node.java diff --git a/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/minimax/Tree.java b/algorithms-module/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/minimax/Tree.java similarity index 100% rename from algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/minimax/Tree.java rename to algorithms-module/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/minimax/Tree.java diff --git a/algorithms-miscellaneous-1/src/main/resources/logback.xml b/algorithms-module/algorithms-miscellaneous-1/src/main/resources/logback.xml similarity index 100% rename from algorithms-miscellaneous-1/src/main/resources/logback.xml rename to algorithms-module/algorithms-miscellaneous-1/src/main/resources/logback.xml diff --git a/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/HillClimbingAlgorithmUnitTest.java b/algorithms-module/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/HillClimbingAlgorithmUnitTest.java similarity index 100% rename from algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/HillClimbingAlgorithmUnitTest.java rename to algorithms-module/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/HillClimbingAlgorithmUnitTest.java diff --git a/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/RtFiniteStateMachineLongRunningUnitTest.java b/algorithms-module/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/RtFiniteStateMachineLongRunningUnitTest.java similarity index 100% rename from algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/RtFiniteStateMachineLongRunningUnitTest.java rename to algorithms-module/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/RtFiniteStateMachineLongRunningUnitTest.java diff --git a/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/kthlargest/FindKthLargestUnitTest.java b/algorithms-module/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/kthlargest/FindKthLargestUnitTest.java similarity index 100% rename from algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/kthlargest/FindKthLargestUnitTest.java rename to algorithms-module/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/kthlargest/FindKthLargestUnitTest.java diff --git a/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/minimax/MinimaxUnitTest.java b/algorithms-module/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/minimax/MinimaxUnitTest.java similarity index 100% rename from algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/minimax/MinimaxUnitTest.java rename to algorithms-module/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/minimax/MinimaxUnitTest.java From cd0c9ae05edd748f26cf54e760aa36c919e84211 Mon Sep 17 00:00:00 2001 From: sampadawagde Date: Fri, 20 May 2022 20:27:38 +0530 Subject: [PATCH 048/100] JAVA-12097: moved algorithms-miscellaneous-2 inside algorithms-module --- .../algorithms-miscellaneous-2}/README.md | 0 .../algorithms-miscellaneous-2}/pom.xml | 2 +- .../java/com/baeldung/algorithms/RunAlgorithm.java | 0 .../algorithms/editdistance/EditDistanceBase.java | 0 .../EditDistanceDynamicProgramming.java | 0 .../editdistance/EditDistanceRecursive.java | 0 .../baeldung/algorithms/ga/dijkstra/Dijkstra.java | 0 .../com/baeldung/algorithms/ga/dijkstra/Graph.java | 0 .../com/baeldung/algorithms/ga/dijkstra/Node.java | 0 .../linkedlist/CycleDetectionBruteForce.java | 0 .../CycleDetectionByFastAndSlowIterators.java | 0 .../linkedlist/CycleDetectionByHashing.java | 0 .../algorithms/linkedlist/CycleDetectionResult.java | 0 .../linkedlist/CycleRemovalBruteForce.java | 0 .../linkedlist/CycleRemovalByCountingLoopNodes.java | 0 .../CycleRemovalWithoutCountingLoopNodes.java | 0 .../com/baeldung/algorithms/linkedlist/Node.java | 0 .../algorithms/maze/solver/BFSMazeSolver.java | 0 .../baeldung/algorithms/maze/solver/Coordinate.java | 0 .../algorithms/maze/solver/DFSMazeSolver.java | 0 .../com/baeldung/algorithms/maze/solver/Maze.java | 0 .../baeldung/algorithms/maze/solver/MazeDriver.java | 0 .../numberwordconverter/NumberWordConverter.java | 0 .../baeldung/algorithms/slope_one/InputData.java | 0 .../com/baeldung/algorithms/slope_one/Item.java | 0 .../com/baeldung/algorithms/slope_one/SlopeOne.java | 0 .../com/baeldung/algorithms/slope_one/User.java | 0 .../algorithms/sudoku/BacktrackingAlgorithm.java | 0 .../com/baeldung/algorithms/sudoku/ColumnNode.java | 0 .../baeldung/algorithms/sudoku/DancingLinks.java | 0 .../algorithms/sudoku/DancingLinksAlgorithm.java | 0 .../com/baeldung/algorithms/sudoku/DancingNode.java | 0 .../src/main/resources/logback.xml | 0 .../src/main/resources/maze/maze1.txt | 0 .../src/main/resources/maze/maze2.txt | 0 .../DijkstraAlgorithmLongRunningUnitTest.java | 0 .../java/com/baeldung/algorithms/astar/Graph.java | 0 .../com/baeldung/algorithms/astar/GraphNode.java | 0 .../com/baeldung/algorithms/astar/RouteFinder.java | 0 .../com/baeldung/algorithms/astar/RouteNode.java | 0 .../java/com/baeldung/algorithms/astar/Scorer.java | 0 .../astar/underground/HaversineScorer.java | 0 .../underground/RouteFinderIntegrationTest.java | 0 .../algorithms/astar/underground/Station.java | 0 .../editdistance/EditDistanceDataProvider.java | 0 .../editdistance/EditDistanceUnitTest.java | 0 .../CycleDetectionBruteForceUnitTest.java | 0 ...ycleDetectionByFastAndSlowIteratorsUnitTest.java | 0 .../linkedlist/CycleDetectionByHashingUnitTest.java | 0 .../linkedlist/CycleDetectionTestBase.java | 0 .../linkedlist/CycleRemovalBruteForceUnitTest.java | 0 .../CycleRemovalByCountingLoopNodesUnitTest.java | 0 ...ycleRemovalWithoutCountingLoopNodesUnitTest.java | 0 .../moneywords/NumberWordConverterUnitTest.java | 0 .../com/baeldung/jgrapht/CompleteGraphUnitTest.java | 0 .../com/baeldung/jgrapht/DirectedGraphUnitTest.java | 0 .../baeldung/jgrapht/EulerianCircuitUnitTest.java | 0 .../jgrapht/GraphImageGenerationUnitTest.java | 0 .../src/test/resources/graph.png | Bin 59 files changed, 1 insertion(+), 1 deletion(-) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/README.md (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/pom.xml (97%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/main/java/com/baeldung/algorithms/RunAlgorithm.java (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceBase.java (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceDynamicProgramming.java (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceRecursive.java (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/main/java/com/baeldung/algorithms/ga/dijkstra/Dijkstra.java (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/main/java/com/baeldung/algorithms/ga/dijkstra/Graph.java (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/main/java/com/baeldung/algorithms/ga/dijkstra/Node.java (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/main/java/com/baeldung/algorithms/linkedlist/CycleDetectionBruteForce.java (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/main/java/com/baeldung/algorithms/linkedlist/CycleDetectionByFastAndSlowIterators.java (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/main/java/com/baeldung/algorithms/linkedlist/CycleDetectionByHashing.java (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/main/java/com/baeldung/algorithms/linkedlist/CycleDetectionResult.java (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/main/java/com/baeldung/algorithms/linkedlist/CycleRemovalBruteForce.java (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/main/java/com/baeldung/algorithms/linkedlist/CycleRemovalByCountingLoopNodes.java (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/main/java/com/baeldung/algorithms/linkedlist/CycleRemovalWithoutCountingLoopNodes.java (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/main/java/com/baeldung/algorithms/linkedlist/Node.java (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/main/java/com/baeldung/algorithms/maze/solver/BFSMazeSolver.java (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/main/java/com/baeldung/algorithms/maze/solver/Coordinate.java (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/main/java/com/baeldung/algorithms/maze/solver/DFSMazeSolver.java (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/main/java/com/baeldung/algorithms/maze/solver/Maze.java (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/main/java/com/baeldung/algorithms/maze/solver/MazeDriver.java (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/main/java/com/baeldung/algorithms/numberwordconverter/NumberWordConverter.java (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/main/java/com/baeldung/algorithms/slope_one/InputData.java (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/main/java/com/baeldung/algorithms/slope_one/Item.java (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/main/java/com/baeldung/algorithms/slope_one/SlopeOne.java (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/main/java/com/baeldung/algorithms/slope_one/User.java (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/main/java/com/baeldung/algorithms/sudoku/BacktrackingAlgorithm.java (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/main/java/com/baeldung/algorithms/sudoku/ColumnNode.java (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/main/java/com/baeldung/algorithms/sudoku/DancingLinks.java (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/main/java/com/baeldung/algorithms/sudoku/DancingLinksAlgorithm.java (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/main/java/com/baeldung/algorithms/sudoku/DancingNode.java (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/main/resources/logback.xml (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/main/resources/maze/maze1.txt (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/main/resources/maze/maze2.txt (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/test/java/com/baeldung/algorithms/DijkstraAlgorithmLongRunningUnitTest.java (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/test/java/com/baeldung/algorithms/astar/Graph.java (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/test/java/com/baeldung/algorithms/astar/GraphNode.java (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/test/java/com/baeldung/algorithms/astar/RouteFinder.java (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/test/java/com/baeldung/algorithms/astar/RouteNode.java (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/test/java/com/baeldung/algorithms/astar/Scorer.java (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/test/java/com/baeldung/algorithms/astar/underground/HaversineScorer.java (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/test/java/com/baeldung/algorithms/astar/underground/RouteFinderIntegrationTest.java (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/test/java/com/baeldung/algorithms/astar/underground/Station.java (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/test/java/com/baeldung/algorithms/editdistance/EditDistanceDataProvider.java (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/test/java/com/baeldung/algorithms/editdistance/EditDistanceUnitTest.java (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionBruteForceUnitTest.java (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionByFastAndSlowIteratorsUnitTest.java (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionByHashingUnitTest.java (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionTestBase.java (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalBruteForceUnitTest.java (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalByCountingLoopNodesUnitTest.java (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalWithoutCountingLoopNodesUnitTest.java (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/test/java/com/baeldung/algorithms/moneywords/NumberWordConverterUnitTest.java (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/test/java/com/baeldung/jgrapht/CompleteGraphUnitTest.java (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/test/java/com/baeldung/jgrapht/DirectedGraphUnitTest.java (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/test/java/com/baeldung/jgrapht/EulerianCircuitUnitTest.java (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/test/java/com/baeldung/jgrapht/GraphImageGenerationUnitTest.java (100%) rename {algorithms-miscellaneous-2 => algorithms-module/algorithms-miscellaneous-2}/src/test/resources/graph.png (100%) diff --git a/algorithms-miscellaneous-2/README.md b/algorithms-module/algorithms-miscellaneous-2/README.md similarity index 100% rename from algorithms-miscellaneous-2/README.md rename to algorithms-module/algorithms-miscellaneous-2/README.md diff --git a/algorithms-miscellaneous-2/pom.xml b/algorithms-module/algorithms-miscellaneous-2/pom.xml similarity index 97% rename from algorithms-miscellaneous-2/pom.xml rename to algorithms-module/algorithms-miscellaneous-2/pom.xml index a411cfdb71..f3b41cb7f8 100644 --- a/algorithms-miscellaneous-2/pom.xml +++ b/algorithms-module/algorithms-miscellaneous-2/pom.xml @@ -9,7 +9,7 @@ com.baeldung - parent-modules + algorithms-modules 1.0.0-SNAPSHOT diff --git a/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/RunAlgorithm.java b/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/RunAlgorithm.java similarity index 100% rename from algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/RunAlgorithm.java rename to algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/RunAlgorithm.java diff --git a/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceBase.java b/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceBase.java similarity index 100% rename from algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceBase.java rename to algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceBase.java diff --git a/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceDynamicProgramming.java b/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceDynamicProgramming.java similarity index 100% rename from algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceDynamicProgramming.java rename to algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceDynamicProgramming.java diff --git a/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceRecursive.java b/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceRecursive.java similarity index 100% rename from algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceRecursive.java rename to algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceRecursive.java diff --git a/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/ga/dijkstra/Dijkstra.java b/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/ga/dijkstra/Dijkstra.java similarity index 100% rename from algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/ga/dijkstra/Dijkstra.java rename to algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/ga/dijkstra/Dijkstra.java diff --git a/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/ga/dijkstra/Graph.java b/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/ga/dijkstra/Graph.java similarity index 100% rename from algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/ga/dijkstra/Graph.java rename to algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/ga/dijkstra/Graph.java diff --git a/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/ga/dijkstra/Node.java b/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/ga/dijkstra/Node.java similarity index 100% rename from algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/ga/dijkstra/Node.java rename to algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/ga/dijkstra/Node.java diff --git a/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleDetectionBruteForce.java b/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleDetectionBruteForce.java similarity index 100% rename from algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleDetectionBruteForce.java rename to algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleDetectionBruteForce.java diff --git a/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleDetectionByFastAndSlowIterators.java b/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleDetectionByFastAndSlowIterators.java similarity index 100% rename from algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleDetectionByFastAndSlowIterators.java rename to algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleDetectionByFastAndSlowIterators.java diff --git a/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleDetectionByHashing.java b/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleDetectionByHashing.java similarity index 100% rename from algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleDetectionByHashing.java rename to algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleDetectionByHashing.java diff --git a/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleDetectionResult.java b/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleDetectionResult.java similarity index 100% rename from algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleDetectionResult.java rename to algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleDetectionResult.java diff --git a/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleRemovalBruteForce.java b/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleRemovalBruteForce.java similarity index 100% rename from algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleRemovalBruteForce.java rename to algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleRemovalBruteForce.java diff --git a/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleRemovalByCountingLoopNodes.java b/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleRemovalByCountingLoopNodes.java similarity index 100% rename from algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleRemovalByCountingLoopNodes.java rename to algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleRemovalByCountingLoopNodes.java diff --git a/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleRemovalWithoutCountingLoopNodes.java b/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleRemovalWithoutCountingLoopNodes.java similarity index 100% rename from algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleRemovalWithoutCountingLoopNodes.java rename to algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleRemovalWithoutCountingLoopNodes.java diff --git a/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/Node.java b/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/Node.java similarity index 100% rename from algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/Node.java rename to algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/Node.java diff --git a/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/maze/solver/BFSMazeSolver.java b/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/maze/solver/BFSMazeSolver.java similarity index 100% rename from algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/maze/solver/BFSMazeSolver.java rename to algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/maze/solver/BFSMazeSolver.java diff --git a/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/maze/solver/Coordinate.java b/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/maze/solver/Coordinate.java similarity index 100% rename from algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/maze/solver/Coordinate.java rename to algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/maze/solver/Coordinate.java diff --git a/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/maze/solver/DFSMazeSolver.java b/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/maze/solver/DFSMazeSolver.java similarity index 100% rename from algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/maze/solver/DFSMazeSolver.java rename to algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/maze/solver/DFSMazeSolver.java diff --git a/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/maze/solver/Maze.java b/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/maze/solver/Maze.java similarity index 100% rename from algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/maze/solver/Maze.java rename to algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/maze/solver/Maze.java diff --git a/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/maze/solver/MazeDriver.java b/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/maze/solver/MazeDriver.java similarity index 100% rename from algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/maze/solver/MazeDriver.java rename to algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/maze/solver/MazeDriver.java diff --git a/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/numberwordconverter/NumberWordConverter.java b/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/numberwordconverter/NumberWordConverter.java similarity index 100% rename from algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/numberwordconverter/NumberWordConverter.java rename to algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/numberwordconverter/NumberWordConverter.java diff --git a/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/slope_one/InputData.java b/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/slope_one/InputData.java similarity index 100% rename from algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/slope_one/InputData.java rename to algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/slope_one/InputData.java diff --git a/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/slope_one/Item.java b/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/slope_one/Item.java similarity index 100% rename from algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/slope_one/Item.java rename to algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/slope_one/Item.java diff --git a/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/slope_one/SlopeOne.java b/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/slope_one/SlopeOne.java similarity index 100% rename from algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/slope_one/SlopeOne.java rename to algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/slope_one/SlopeOne.java diff --git a/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/slope_one/User.java b/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/slope_one/User.java similarity index 100% rename from algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/slope_one/User.java rename to algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/slope_one/User.java diff --git a/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/sudoku/BacktrackingAlgorithm.java b/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/sudoku/BacktrackingAlgorithm.java similarity index 100% rename from algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/sudoku/BacktrackingAlgorithm.java rename to algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/sudoku/BacktrackingAlgorithm.java diff --git a/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/sudoku/ColumnNode.java b/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/sudoku/ColumnNode.java similarity index 100% rename from algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/sudoku/ColumnNode.java rename to algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/sudoku/ColumnNode.java diff --git a/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/sudoku/DancingLinks.java b/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/sudoku/DancingLinks.java similarity index 100% rename from algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/sudoku/DancingLinks.java rename to algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/sudoku/DancingLinks.java diff --git a/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/sudoku/DancingLinksAlgorithm.java b/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/sudoku/DancingLinksAlgorithm.java similarity index 100% rename from algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/sudoku/DancingLinksAlgorithm.java rename to algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/sudoku/DancingLinksAlgorithm.java diff --git a/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/sudoku/DancingNode.java b/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/sudoku/DancingNode.java similarity index 100% rename from algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/sudoku/DancingNode.java rename to algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/sudoku/DancingNode.java diff --git a/algorithms-miscellaneous-2/src/main/resources/logback.xml b/algorithms-module/algorithms-miscellaneous-2/src/main/resources/logback.xml similarity index 100% rename from algorithms-miscellaneous-2/src/main/resources/logback.xml rename to algorithms-module/algorithms-miscellaneous-2/src/main/resources/logback.xml diff --git a/algorithms-miscellaneous-2/src/main/resources/maze/maze1.txt b/algorithms-module/algorithms-miscellaneous-2/src/main/resources/maze/maze1.txt similarity index 100% rename from algorithms-miscellaneous-2/src/main/resources/maze/maze1.txt rename to algorithms-module/algorithms-miscellaneous-2/src/main/resources/maze/maze1.txt diff --git a/algorithms-miscellaneous-2/src/main/resources/maze/maze2.txt b/algorithms-module/algorithms-miscellaneous-2/src/main/resources/maze/maze2.txt similarity index 100% rename from algorithms-miscellaneous-2/src/main/resources/maze/maze2.txt rename to algorithms-module/algorithms-miscellaneous-2/src/main/resources/maze/maze2.txt diff --git a/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/DijkstraAlgorithmLongRunningUnitTest.java b/algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/DijkstraAlgorithmLongRunningUnitTest.java similarity index 100% rename from algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/DijkstraAlgorithmLongRunningUnitTest.java rename to algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/DijkstraAlgorithmLongRunningUnitTest.java diff --git a/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/Graph.java b/algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/Graph.java similarity index 100% rename from algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/Graph.java rename to algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/Graph.java diff --git a/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/GraphNode.java b/algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/GraphNode.java similarity index 100% rename from algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/GraphNode.java rename to algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/GraphNode.java diff --git a/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/RouteFinder.java b/algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/RouteFinder.java similarity index 100% rename from algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/RouteFinder.java rename to algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/RouteFinder.java diff --git a/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/RouteNode.java b/algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/RouteNode.java similarity index 100% rename from algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/RouteNode.java rename to algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/RouteNode.java diff --git a/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/Scorer.java b/algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/Scorer.java similarity index 100% rename from algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/Scorer.java rename to algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/Scorer.java diff --git a/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/underground/HaversineScorer.java b/algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/underground/HaversineScorer.java similarity index 100% rename from algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/underground/HaversineScorer.java rename to algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/underground/HaversineScorer.java diff --git a/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/underground/RouteFinderIntegrationTest.java b/algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/underground/RouteFinderIntegrationTest.java similarity index 100% rename from algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/underground/RouteFinderIntegrationTest.java rename to algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/underground/RouteFinderIntegrationTest.java diff --git a/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/underground/Station.java b/algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/underground/Station.java similarity index 100% rename from algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/underground/Station.java rename to algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/underground/Station.java diff --git a/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/editdistance/EditDistanceDataProvider.java b/algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/editdistance/EditDistanceDataProvider.java similarity index 100% rename from algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/editdistance/EditDistanceDataProvider.java rename to algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/editdistance/EditDistanceDataProvider.java diff --git a/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/editdistance/EditDistanceUnitTest.java b/algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/editdistance/EditDistanceUnitTest.java similarity index 100% rename from algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/editdistance/EditDistanceUnitTest.java rename to algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/editdistance/EditDistanceUnitTest.java diff --git a/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionBruteForceUnitTest.java b/algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionBruteForceUnitTest.java similarity index 100% rename from algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionBruteForceUnitTest.java rename to algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionBruteForceUnitTest.java diff --git a/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionByFastAndSlowIteratorsUnitTest.java b/algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionByFastAndSlowIteratorsUnitTest.java similarity index 100% rename from algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionByFastAndSlowIteratorsUnitTest.java rename to algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionByFastAndSlowIteratorsUnitTest.java diff --git a/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionByHashingUnitTest.java b/algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionByHashingUnitTest.java similarity index 100% rename from algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionByHashingUnitTest.java rename to algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionByHashingUnitTest.java diff --git a/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionTestBase.java b/algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionTestBase.java similarity index 100% rename from algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionTestBase.java rename to algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionTestBase.java diff --git a/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalBruteForceUnitTest.java b/algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalBruteForceUnitTest.java similarity index 100% rename from algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalBruteForceUnitTest.java rename to algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalBruteForceUnitTest.java diff --git a/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalByCountingLoopNodesUnitTest.java b/algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalByCountingLoopNodesUnitTest.java similarity index 100% rename from algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalByCountingLoopNodesUnitTest.java rename to algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalByCountingLoopNodesUnitTest.java diff --git a/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalWithoutCountingLoopNodesUnitTest.java b/algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalWithoutCountingLoopNodesUnitTest.java similarity index 100% rename from algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalWithoutCountingLoopNodesUnitTest.java rename to algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalWithoutCountingLoopNodesUnitTest.java diff --git a/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/moneywords/NumberWordConverterUnitTest.java b/algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/moneywords/NumberWordConverterUnitTest.java similarity index 100% rename from algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/moneywords/NumberWordConverterUnitTest.java rename to algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/moneywords/NumberWordConverterUnitTest.java diff --git a/algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/CompleteGraphUnitTest.java b/algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/CompleteGraphUnitTest.java similarity index 100% rename from algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/CompleteGraphUnitTest.java rename to algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/CompleteGraphUnitTest.java diff --git a/algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/DirectedGraphUnitTest.java b/algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/DirectedGraphUnitTest.java similarity index 100% rename from algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/DirectedGraphUnitTest.java rename to algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/DirectedGraphUnitTest.java diff --git a/algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/EulerianCircuitUnitTest.java b/algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/EulerianCircuitUnitTest.java similarity index 100% rename from algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/EulerianCircuitUnitTest.java rename to algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/EulerianCircuitUnitTest.java diff --git a/algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/GraphImageGenerationUnitTest.java b/algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/GraphImageGenerationUnitTest.java similarity index 100% rename from algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/GraphImageGenerationUnitTest.java rename to algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/GraphImageGenerationUnitTest.java diff --git a/algorithms-miscellaneous-2/src/test/resources/graph.png b/algorithms-module/algorithms-miscellaneous-2/src/test/resources/graph.png similarity index 100% rename from algorithms-miscellaneous-2/src/test/resources/graph.png rename to algorithms-module/algorithms-miscellaneous-2/src/test/resources/graph.png From 02f84766edd7d87d6e2e3789893be0c060d565c2 Mon Sep 17 00:00:00 2001 From: sampadawagde Date: Fri, 20 May 2022 20:28:10 +0530 Subject: [PATCH 049/100] JAVA-12097: moved algorithms-miscellaneous-3 inside algorithms-module --- .../algorithms-miscellaneous-3}/.gitignore | 0 .../algorithms-miscellaneous-3}/README.md | 0 .../algorithms-miscellaneous-3}/pom.xml | 2 +- .../java/com/baeldung/algorithms/checksortedlist/Employee.java | 0 .../baeldung/algorithms/checksortedlist/SortedListChecker.java | 0 .../baeldung/algorithms/enumstatemachine/LeaveRequestState.java | 0 .../baeldung/algorithms/graphcycledetection/domain/Graph.java | 0 .../baeldung/algorithms/graphcycledetection/domain/Vertex.java | 0 .../src/main/java/com/baeldung/algorithms/kmeans/Centroid.java | 0 .../src/main/java/com/baeldung/algorithms/kmeans/Distance.java | 0 .../src/main/java/com/baeldung/algorithms/kmeans/Errors.java | 0 .../java/com/baeldung/algorithms/kmeans/EuclideanDistance.java | 0 .../src/main/java/com/baeldung/algorithms/kmeans/KMeans.java | 0 .../src/main/java/com/baeldung/algorithms/kmeans/LastFm.java | 0 .../main/java/com/baeldung/algorithms/kmeans/LastFmService.java | 0 .../src/main/java/com/baeldung/algorithms/kmeans/Record.java | 0 .../algorithms/printtriangles/PrintTriangleExamples.java | 0 .../baeldung/algorithms/romannumerals/RomanArabicConverter.java | 0 .../com/baeldung/algorithms/romannumerals/RomanNumeral.java | 0 .../algorithms/twopointertechnique/LinkedListFindMiddle.java | 0 .../com/baeldung/algorithms/twopointertechnique/MyNode.java | 0 .../baeldung/algorithms/twopointertechnique/RotateArray.java | 0 .../com/baeldung/algorithms/twopointertechnique/TwoSum.java | 0 .../src/main/java/com/baeldung/folding/FoldingHash.java | 0 .../src/main/java/com/baeldung/folding/Main.java | 0 .../src/main/resources/kmeans/artists.json | 0 .../src/main/resources/kmeans/lastfm.json | 0 .../src/main/resources/kmeans/radial.html | 0 .../algorithms-miscellaneous-3}/src/main/resources/logback.xml | 0 .../baeldung/algorithms/analysis/AnalysisRunnerLiveTest.java | 0 .../algorithms/checksortedlist/SortedListCheckerUnitTest.java | 0 .../algorithms/enumstatemachine/LeaveRequestStateUnitTest.java | 0 .../graphcycledetection/GraphCycleDetectionUnitTest.java | 0 .../printtriangles/PrintTriangleExamplesUnitTest.java | 0 .../algorithms/romannumerals/RomanArabicConverterUnitTest.java | 0 .../twopointertechnique/LinkedListFindMiddleUnitTest.java | 0 .../algorithms/twopointertechnique/RotateArrayUnitTest.java | 0 .../baeldung/algorithms/twopointertechnique/TwoSumUnitTest.java | 0 .../src/test/java/com/baeldung/counter/CounterStatistics.java | 0 .../src/test/java/com/baeldung/counter/CounterUnitTest.java | 0 .../src/test/java/com/baeldung/counter/CounterUtil.java | 0 .../src/test/java/com/baeldung/folding/FoldingHashUnitTest.java | 0 42 files changed, 1 insertion(+), 1 deletion(-) rename {algorithms-miscellaneous-3 => algorithms-module/algorithms-miscellaneous-3}/.gitignore (100%) rename {algorithms-miscellaneous-3 => algorithms-module/algorithms-miscellaneous-3}/README.md (100%) rename {algorithms-miscellaneous-3 => algorithms-module/algorithms-miscellaneous-3}/pom.xml (97%) rename {algorithms-miscellaneous-3 => algorithms-module/algorithms-miscellaneous-3}/src/main/java/com/baeldung/algorithms/checksortedlist/Employee.java (100%) rename {algorithms-miscellaneous-3 => algorithms-module/algorithms-miscellaneous-3}/src/main/java/com/baeldung/algorithms/checksortedlist/SortedListChecker.java (100%) rename {algorithms-miscellaneous-3 => algorithms-module/algorithms-miscellaneous-3}/src/main/java/com/baeldung/algorithms/enumstatemachine/LeaveRequestState.java (100%) rename {algorithms-miscellaneous-3 => algorithms-module/algorithms-miscellaneous-3}/src/main/java/com/baeldung/algorithms/graphcycledetection/domain/Graph.java (100%) rename {algorithms-miscellaneous-3 => algorithms-module/algorithms-miscellaneous-3}/src/main/java/com/baeldung/algorithms/graphcycledetection/domain/Vertex.java (100%) rename {algorithms-miscellaneous-3 => algorithms-module/algorithms-miscellaneous-3}/src/main/java/com/baeldung/algorithms/kmeans/Centroid.java (100%) rename {algorithms-miscellaneous-3 => algorithms-module/algorithms-miscellaneous-3}/src/main/java/com/baeldung/algorithms/kmeans/Distance.java (100%) rename {algorithms-miscellaneous-3 => algorithms-module/algorithms-miscellaneous-3}/src/main/java/com/baeldung/algorithms/kmeans/Errors.java (100%) rename {algorithms-miscellaneous-3 => algorithms-module/algorithms-miscellaneous-3}/src/main/java/com/baeldung/algorithms/kmeans/EuclideanDistance.java (100%) rename {algorithms-miscellaneous-3 => algorithms-module/algorithms-miscellaneous-3}/src/main/java/com/baeldung/algorithms/kmeans/KMeans.java (100%) rename {algorithms-miscellaneous-3 => algorithms-module/algorithms-miscellaneous-3}/src/main/java/com/baeldung/algorithms/kmeans/LastFm.java (100%) rename {algorithms-miscellaneous-3 => algorithms-module/algorithms-miscellaneous-3}/src/main/java/com/baeldung/algorithms/kmeans/LastFmService.java (100%) rename {algorithms-miscellaneous-3 => algorithms-module/algorithms-miscellaneous-3}/src/main/java/com/baeldung/algorithms/kmeans/Record.java (100%) rename {algorithms-miscellaneous-3 => algorithms-module/algorithms-miscellaneous-3}/src/main/java/com/baeldung/algorithms/printtriangles/PrintTriangleExamples.java (100%) rename {algorithms-miscellaneous-3 => algorithms-module/algorithms-miscellaneous-3}/src/main/java/com/baeldung/algorithms/romannumerals/RomanArabicConverter.java (100%) rename {algorithms-miscellaneous-3 => algorithms-module/algorithms-miscellaneous-3}/src/main/java/com/baeldung/algorithms/romannumerals/RomanNumeral.java (100%) rename {algorithms-miscellaneous-3 => algorithms-module/algorithms-miscellaneous-3}/src/main/java/com/baeldung/algorithms/twopointertechnique/LinkedListFindMiddle.java (100%) rename {algorithms-miscellaneous-3 => algorithms-module/algorithms-miscellaneous-3}/src/main/java/com/baeldung/algorithms/twopointertechnique/MyNode.java (100%) rename {algorithms-miscellaneous-3 => algorithms-module/algorithms-miscellaneous-3}/src/main/java/com/baeldung/algorithms/twopointertechnique/RotateArray.java (100%) rename {algorithms-miscellaneous-3 => algorithms-module/algorithms-miscellaneous-3}/src/main/java/com/baeldung/algorithms/twopointertechnique/TwoSum.java (100%) rename {algorithms-miscellaneous-3 => algorithms-module/algorithms-miscellaneous-3}/src/main/java/com/baeldung/folding/FoldingHash.java (100%) rename {algorithms-miscellaneous-3 => algorithms-module/algorithms-miscellaneous-3}/src/main/java/com/baeldung/folding/Main.java (100%) rename {algorithms-miscellaneous-3 => algorithms-module/algorithms-miscellaneous-3}/src/main/resources/kmeans/artists.json (100%) rename {algorithms-miscellaneous-3 => algorithms-module/algorithms-miscellaneous-3}/src/main/resources/kmeans/lastfm.json (100%) rename {algorithms-miscellaneous-3 => algorithms-module/algorithms-miscellaneous-3}/src/main/resources/kmeans/radial.html (100%) rename {algorithms-miscellaneous-3 => algorithms-module/algorithms-miscellaneous-3}/src/main/resources/logback.xml (100%) rename {algorithms-miscellaneous-3 => algorithms-module/algorithms-miscellaneous-3}/src/test/java/com/baeldung/algorithms/analysis/AnalysisRunnerLiveTest.java (100%) rename {algorithms-miscellaneous-3 => algorithms-module/algorithms-miscellaneous-3}/src/test/java/com/baeldung/algorithms/checksortedlist/SortedListCheckerUnitTest.java (100%) rename {algorithms-miscellaneous-3 => algorithms-module/algorithms-miscellaneous-3}/src/test/java/com/baeldung/algorithms/enumstatemachine/LeaveRequestStateUnitTest.java (100%) rename {algorithms-miscellaneous-3 => algorithms-module/algorithms-miscellaneous-3}/src/test/java/com/baeldung/algorithms/graphcycledetection/GraphCycleDetectionUnitTest.java (100%) rename {algorithms-miscellaneous-3 => algorithms-module/algorithms-miscellaneous-3}/src/test/java/com/baeldung/algorithms/printtriangles/PrintTriangleExamplesUnitTest.java (100%) rename {algorithms-miscellaneous-3 => algorithms-module/algorithms-miscellaneous-3}/src/test/java/com/baeldung/algorithms/romannumerals/RomanArabicConverterUnitTest.java (100%) rename {algorithms-miscellaneous-3 => algorithms-module/algorithms-miscellaneous-3}/src/test/java/com/baeldung/algorithms/twopointertechnique/LinkedListFindMiddleUnitTest.java (100%) rename {algorithms-miscellaneous-3 => algorithms-module/algorithms-miscellaneous-3}/src/test/java/com/baeldung/algorithms/twopointertechnique/RotateArrayUnitTest.java (100%) rename {algorithms-miscellaneous-3 => algorithms-module/algorithms-miscellaneous-3}/src/test/java/com/baeldung/algorithms/twopointertechnique/TwoSumUnitTest.java (100%) rename {algorithms-miscellaneous-3 => algorithms-module/algorithms-miscellaneous-3}/src/test/java/com/baeldung/counter/CounterStatistics.java (100%) rename {algorithms-miscellaneous-3 => algorithms-module/algorithms-miscellaneous-3}/src/test/java/com/baeldung/counter/CounterUnitTest.java (100%) rename {algorithms-miscellaneous-3 => algorithms-module/algorithms-miscellaneous-3}/src/test/java/com/baeldung/counter/CounterUtil.java (100%) rename {algorithms-miscellaneous-3 => algorithms-module/algorithms-miscellaneous-3}/src/test/java/com/baeldung/folding/FoldingHashUnitTest.java (100%) diff --git a/algorithms-miscellaneous-3/.gitignore b/algorithms-module/algorithms-miscellaneous-3/.gitignore similarity index 100% rename from algorithms-miscellaneous-3/.gitignore rename to algorithms-module/algorithms-miscellaneous-3/.gitignore diff --git a/algorithms-miscellaneous-3/README.md b/algorithms-module/algorithms-miscellaneous-3/README.md similarity index 100% rename from algorithms-miscellaneous-3/README.md rename to algorithms-module/algorithms-miscellaneous-3/README.md diff --git a/algorithms-miscellaneous-3/pom.xml b/algorithms-module/algorithms-miscellaneous-3/pom.xml similarity index 97% rename from algorithms-miscellaneous-3/pom.xml rename to algorithms-module/algorithms-miscellaneous-3/pom.xml index 2f180da5e1..8958cbef88 100644 --- a/algorithms-miscellaneous-3/pom.xml +++ b/algorithms-module/algorithms-miscellaneous-3/pom.xml @@ -9,7 +9,7 @@ com.baeldung - parent-modules + algorithms-modules 1.0.0-SNAPSHOT diff --git a/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/checksortedlist/Employee.java b/algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/checksortedlist/Employee.java similarity index 100% rename from algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/checksortedlist/Employee.java rename to algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/checksortedlist/Employee.java diff --git a/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/checksortedlist/SortedListChecker.java b/algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/checksortedlist/SortedListChecker.java similarity index 100% rename from algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/checksortedlist/SortedListChecker.java rename to algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/checksortedlist/SortedListChecker.java diff --git a/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/enumstatemachine/LeaveRequestState.java b/algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/enumstatemachine/LeaveRequestState.java similarity index 100% rename from algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/enumstatemachine/LeaveRequestState.java rename to algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/enumstatemachine/LeaveRequestState.java diff --git a/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/graphcycledetection/domain/Graph.java b/algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/graphcycledetection/domain/Graph.java similarity index 100% rename from algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/graphcycledetection/domain/Graph.java rename to algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/graphcycledetection/domain/Graph.java diff --git a/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/graphcycledetection/domain/Vertex.java b/algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/graphcycledetection/domain/Vertex.java similarity index 100% rename from algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/graphcycledetection/domain/Vertex.java rename to algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/graphcycledetection/domain/Vertex.java diff --git a/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/Centroid.java b/algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/Centroid.java similarity index 100% rename from algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/Centroid.java rename to algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/Centroid.java diff --git a/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/Distance.java b/algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/Distance.java similarity index 100% rename from algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/Distance.java rename to algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/Distance.java diff --git a/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/Errors.java b/algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/Errors.java similarity index 100% rename from algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/Errors.java rename to algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/Errors.java diff --git a/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/EuclideanDistance.java b/algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/EuclideanDistance.java similarity index 100% rename from algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/EuclideanDistance.java rename to algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/EuclideanDistance.java diff --git a/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/KMeans.java b/algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/KMeans.java similarity index 100% rename from algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/KMeans.java rename to algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/KMeans.java diff --git a/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/LastFm.java b/algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/LastFm.java similarity index 100% rename from algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/LastFm.java rename to algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/LastFm.java diff --git a/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/LastFmService.java b/algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/LastFmService.java similarity index 100% rename from algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/LastFmService.java rename to algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/LastFmService.java diff --git a/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/Record.java b/algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/Record.java similarity index 100% rename from algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/Record.java rename to algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/Record.java diff --git a/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/printtriangles/PrintTriangleExamples.java b/algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/printtriangles/PrintTriangleExamples.java similarity index 100% rename from algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/printtriangles/PrintTriangleExamples.java rename to algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/printtriangles/PrintTriangleExamples.java diff --git a/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/romannumerals/RomanArabicConverter.java b/algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/romannumerals/RomanArabicConverter.java similarity index 100% rename from algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/romannumerals/RomanArabicConverter.java rename to algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/romannumerals/RomanArabicConverter.java diff --git a/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/romannumerals/RomanNumeral.java b/algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/romannumerals/RomanNumeral.java similarity index 100% rename from algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/romannumerals/RomanNumeral.java rename to algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/romannumerals/RomanNumeral.java diff --git a/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/twopointertechnique/LinkedListFindMiddle.java b/algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/twopointertechnique/LinkedListFindMiddle.java similarity index 100% rename from algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/twopointertechnique/LinkedListFindMiddle.java rename to algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/twopointertechnique/LinkedListFindMiddle.java diff --git a/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/twopointertechnique/MyNode.java b/algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/twopointertechnique/MyNode.java similarity index 100% rename from algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/twopointertechnique/MyNode.java rename to algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/twopointertechnique/MyNode.java diff --git a/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/twopointertechnique/RotateArray.java b/algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/twopointertechnique/RotateArray.java similarity index 100% rename from algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/twopointertechnique/RotateArray.java rename to algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/twopointertechnique/RotateArray.java diff --git a/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/twopointertechnique/TwoSum.java b/algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/twopointertechnique/TwoSum.java similarity index 100% rename from algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/twopointertechnique/TwoSum.java rename to algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/twopointertechnique/TwoSum.java diff --git a/algorithms-miscellaneous-3/src/main/java/com/baeldung/folding/FoldingHash.java b/algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/folding/FoldingHash.java similarity index 100% rename from algorithms-miscellaneous-3/src/main/java/com/baeldung/folding/FoldingHash.java rename to algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/folding/FoldingHash.java diff --git a/algorithms-miscellaneous-3/src/main/java/com/baeldung/folding/Main.java b/algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/folding/Main.java similarity index 100% rename from algorithms-miscellaneous-3/src/main/java/com/baeldung/folding/Main.java rename to algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/folding/Main.java diff --git a/algorithms-miscellaneous-3/src/main/resources/kmeans/artists.json b/algorithms-module/algorithms-miscellaneous-3/src/main/resources/kmeans/artists.json similarity index 100% rename from algorithms-miscellaneous-3/src/main/resources/kmeans/artists.json rename to algorithms-module/algorithms-miscellaneous-3/src/main/resources/kmeans/artists.json diff --git a/algorithms-miscellaneous-3/src/main/resources/kmeans/lastfm.json b/algorithms-module/algorithms-miscellaneous-3/src/main/resources/kmeans/lastfm.json similarity index 100% rename from algorithms-miscellaneous-3/src/main/resources/kmeans/lastfm.json rename to algorithms-module/algorithms-miscellaneous-3/src/main/resources/kmeans/lastfm.json diff --git a/algorithms-miscellaneous-3/src/main/resources/kmeans/radial.html b/algorithms-module/algorithms-miscellaneous-3/src/main/resources/kmeans/radial.html similarity index 100% rename from algorithms-miscellaneous-3/src/main/resources/kmeans/radial.html rename to algorithms-module/algorithms-miscellaneous-3/src/main/resources/kmeans/radial.html diff --git a/algorithms-miscellaneous-3/src/main/resources/logback.xml b/algorithms-module/algorithms-miscellaneous-3/src/main/resources/logback.xml similarity index 100% rename from algorithms-miscellaneous-3/src/main/resources/logback.xml rename to algorithms-module/algorithms-miscellaneous-3/src/main/resources/logback.xml diff --git a/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/analysis/AnalysisRunnerLiveTest.java b/algorithms-module/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/analysis/AnalysisRunnerLiveTest.java similarity index 100% rename from algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/analysis/AnalysisRunnerLiveTest.java rename to algorithms-module/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/analysis/AnalysisRunnerLiveTest.java diff --git a/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/checksortedlist/SortedListCheckerUnitTest.java b/algorithms-module/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/checksortedlist/SortedListCheckerUnitTest.java similarity index 100% rename from algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/checksortedlist/SortedListCheckerUnitTest.java rename to algorithms-module/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/checksortedlist/SortedListCheckerUnitTest.java diff --git a/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/enumstatemachine/LeaveRequestStateUnitTest.java b/algorithms-module/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/enumstatemachine/LeaveRequestStateUnitTest.java similarity index 100% rename from algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/enumstatemachine/LeaveRequestStateUnitTest.java rename to algorithms-module/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/enumstatemachine/LeaveRequestStateUnitTest.java diff --git a/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/graphcycledetection/GraphCycleDetectionUnitTest.java b/algorithms-module/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/graphcycledetection/GraphCycleDetectionUnitTest.java similarity index 100% rename from algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/graphcycledetection/GraphCycleDetectionUnitTest.java rename to algorithms-module/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/graphcycledetection/GraphCycleDetectionUnitTest.java diff --git a/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/printtriangles/PrintTriangleExamplesUnitTest.java b/algorithms-module/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/printtriangles/PrintTriangleExamplesUnitTest.java similarity index 100% rename from algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/printtriangles/PrintTriangleExamplesUnitTest.java rename to algorithms-module/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/printtriangles/PrintTriangleExamplesUnitTest.java diff --git a/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/romannumerals/RomanArabicConverterUnitTest.java b/algorithms-module/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/romannumerals/RomanArabicConverterUnitTest.java similarity index 100% rename from algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/romannumerals/RomanArabicConverterUnitTest.java rename to algorithms-module/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/romannumerals/RomanArabicConverterUnitTest.java diff --git a/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/twopointertechnique/LinkedListFindMiddleUnitTest.java b/algorithms-module/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/twopointertechnique/LinkedListFindMiddleUnitTest.java similarity index 100% rename from algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/twopointertechnique/LinkedListFindMiddleUnitTest.java rename to algorithms-module/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/twopointertechnique/LinkedListFindMiddleUnitTest.java diff --git a/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/twopointertechnique/RotateArrayUnitTest.java b/algorithms-module/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/twopointertechnique/RotateArrayUnitTest.java similarity index 100% rename from algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/twopointertechnique/RotateArrayUnitTest.java rename to algorithms-module/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/twopointertechnique/RotateArrayUnitTest.java diff --git a/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/twopointertechnique/TwoSumUnitTest.java b/algorithms-module/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/twopointertechnique/TwoSumUnitTest.java similarity index 100% rename from algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/twopointertechnique/TwoSumUnitTest.java rename to algorithms-module/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/twopointertechnique/TwoSumUnitTest.java diff --git a/algorithms-miscellaneous-3/src/test/java/com/baeldung/counter/CounterStatistics.java b/algorithms-module/algorithms-miscellaneous-3/src/test/java/com/baeldung/counter/CounterStatistics.java similarity index 100% rename from algorithms-miscellaneous-3/src/test/java/com/baeldung/counter/CounterStatistics.java rename to algorithms-module/algorithms-miscellaneous-3/src/test/java/com/baeldung/counter/CounterStatistics.java diff --git a/algorithms-miscellaneous-3/src/test/java/com/baeldung/counter/CounterUnitTest.java b/algorithms-module/algorithms-miscellaneous-3/src/test/java/com/baeldung/counter/CounterUnitTest.java similarity index 100% rename from algorithms-miscellaneous-3/src/test/java/com/baeldung/counter/CounterUnitTest.java rename to algorithms-module/algorithms-miscellaneous-3/src/test/java/com/baeldung/counter/CounterUnitTest.java diff --git a/algorithms-miscellaneous-3/src/test/java/com/baeldung/counter/CounterUtil.java b/algorithms-module/algorithms-miscellaneous-3/src/test/java/com/baeldung/counter/CounterUtil.java similarity index 100% rename from algorithms-miscellaneous-3/src/test/java/com/baeldung/counter/CounterUtil.java rename to algorithms-module/algorithms-miscellaneous-3/src/test/java/com/baeldung/counter/CounterUtil.java diff --git a/algorithms-miscellaneous-3/src/test/java/com/baeldung/folding/FoldingHashUnitTest.java b/algorithms-module/algorithms-miscellaneous-3/src/test/java/com/baeldung/folding/FoldingHashUnitTest.java similarity index 100% rename from algorithms-miscellaneous-3/src/test/java/com/baeldung/folding/FoldingHashUnitTest.java rename to algorithms-module/algorithms-miscellaneous-3/src/test/java/com/baeldung/folding/FoldingHashUnitTest.java From c6f3e940412978e490e03e153cd7f3aa4f30e847 Mon Sep 17 00:00:00 2001 From: sampadawagde Date: Fri, 20 May 2022 20:28:36 +0530 Subject: [PATCH 050/100] JAVA-12097: moved algorithms-miscellaneous-4 inside algorithms-module --- .../algorithms-miscellaneous-4}/README.md | 0 .../algorithms-miscellaneous-4}/pom.xml | 2 +- .../algorithms/middleelementlookup/MiddleElementLookup.java | 0 .../java/com/baeldung/algorithms/middleelementlookup/Node.java | 0 .../main/java/com/baeldung/algorithms/multiswarm/Constants.java | 0 .../com/baeldung/algorithms/multiswarm/FitnessFunction.java | 0 .../java/com/baeldung/algorithms/multiswarm/Multiswarm.java | 0 .../main/java/com/baeldung/algorithms/multiswarm/Particle.java | 0 .../src/main/java/com/baeldung/algorithms/multiswarm/Swarm.java | 0 .../java/com/baeldung/algorithms/permutation/Permutation.java | 0 .../smallestinteger/SmallestMissingPositiveInteger.java | 0 .../com/baeldung/algorithms/string/EnglishAlphabetLetters.java | 0 .../string/LongestSubstringNonRepeatingCharacters.java | 0 .../com/baeldung/algorithms/string/SubstringPalindrome.java | 0 .../algorithms-miscellaneous-4}/src/main/resources/logback.xml | 0 .../com/baeldung/algorithms/MiddleElementLookupUnitTest.java | 0 .../com/baeldung/algorithms/multiswarm/LolFitnessFunction.java | 0 .../com/baeldung/algorithms/multiswarm/MultiswarmUnitTest.java | 0 .../smallestinteger/SmallestMissingPositiveIntegerUnitTest.java | 0 .../algorithms/string/EnglishAlphabetLettersUnitTest.java | 0 .../string/LongestSubstringNonRepeatingCharactersUnitTest.java | 0 .../baeldung/algorithms/string/SubstringPalindromeUnitTest.java | 0 .../test/java/com/baeldung/algorithms/support/MayFailRule.java | 0 23 files changed, 1 insertion(+), 1 deletion(-) rename {algorithms-miscellaneous-4 => algorithms-module/algorithms-miscellaneous-4}/README.md (100%) rename {algorithms-miscellaneous-4 => algorithms-module/algorithms-miscellaneous-4}/pom.xml (94%) rename {algorithms-miscellaneous-4 => algorithms-module/algorithms-miscellaneous-4}/src/main/java/com/baeldung/algorithms/middleelementlookup/MiddleElementLookup.java (100%) rename {algorithms-miscellaneous-4 => algorithms-module/algorithms-miscellaneous-4}/src/main/java/com/baeldung/algorithms/middleelementlookup/Node.java (100%) rename {algorithms-miscellaneous-4 => algorithms-module/algorithms-miscellaneous-4}/src/main/java/com/baeldung/algorithms/multiswarm/Constants.java (100%) rename {algorithms-miscellaneous-4 => algorithms-module/algorithms-miscellaneous-4}/src/main/java/com/baeldung/algorithms/multiswarm/FitnessFunction.java (100%) rename {algorithms-miscellaneous-4 => algorithms-module/algorithms-miscellaneous-4}/src/main/java/com/baeldung/algorithms/multiswarm/Multiswarm.java (100%) rename {algorithms-miscellaneous-4 => algorithms-module/algorithms-miscellaneous-4}/src/main/java/com/baeldung/algorithms/multiswarm/Particle.java (100%) rename {algorithms-miscellaneous-4 => algorithms-module/algorithms-miscellaneous-4}/src/main/java/com/baeldung/algorithms/multiswarm/Swarm.java (100%) rename {algorithms-miscellaneous-4 => algorithms-module/algorithms-miscellaneous-4}/src/main/java/com/baeldung/algorithms/permutation/Permutation.java (100%) rename {algorithms-miscellaneous-4 => algorithms-module/algorithms-miscellaneous-4}/src/main/java/com/baeldung/algorithms/smallestinteger/SmallestMissingPositiveInteger.java (100%) rename {algorithms-miscellaneous-4 => algorithms-module/algorithms-miscellaneous-4}/src/main/java/com/baeldung/algorithms/string/EnglishAlphabetLetters.java (100%) rename {algorithms-miscellaneous-4 => algorithms-module/algorithms-miscellaneous-4}/src/main/java/com/baeldung/algorithms/string/LongestSubstringNonRepeatingCharacters.java (100%) rename {algorithms-miscellaneous-4 => algorithms-module/algorithms-miscellaneous-4}/src/main/java/com/baeldung/algorithms/string/SubstringPalindrome.java (100%) rename {algorithms-miscellaneous-4 => algorithms-module/algorithms-miscellaneous-4}/src/main/resources/logback.xml (100%) rename {algorithms-miscellaneous-4 => algorithms-module/algorithms-miscellaneous-4}/src/test/java/com/baeldung/algorithms/MiddleElementLookupUnitTest.java (100%) rename {algorithms-miscellaneous-4 => algorithms-module/algorithms-miscellaneous-4}/src/test/java/com/baeldung/algorithms/multiswarm/LolFitnessFunction.java (100%) rename {algorithms-miscellaneous-4 => algorithms-module/algorithms-miscellaneous-4}/src/test/java/com/baeldung/algorithms/multiswarm/MultiswarmUnitTest.java (100%) rename {algorithms-miscellaneous-4 => algorithms-module/algorithms-miscellaneous-4}/src/test/java/com/baeldung/algorithms/smallestinteger/SmallestMissingPositiveIntegerUnitTest.java (100%) rename {algorithms-miscellaneous-4 => algorithms-module/algorithms-miscellaneous-4}/src/test/java/com/baeldung/algorithms/string/EnglishAlphabetLettersUnitTest.java (100%) rename {algorithms-miscellaneous-4 => algorithms-module/algorithms-miscellaneous-4}/src/test/java/com/baeldung/algorithms/string/LongestSubstringNonRepeatingCharactersUnitTest.java (100%) rename {algorithms-miscellaneous-4 => algorithms-module/algorithms-miscellaneous-4}/src/test/java/com/baeldung/algorithms/string/SubstringPalindromeUnitTest.java (100%) rename {algorithms-miscellaneous-4 => algorithms-module/algorithms-miscellaneous-4}/src/test/java/com/baeldung/algorithms/support/MayFailRule.java (100%) diff --git a/algorithms-miscellaneous-4/README.md b/algorithms-module/algorithms-miscellaneous-4/README.md similarity index 100% rename from algorithms-miscellaneous-4/README.md rename to algorithms-module/algorithms-miscellaneous-4/README.md diff --git a/algorithms-miscellaneous-4/pom.xml b/algorithms-module/algorithms-miscellaneous-4/pom.xml similarity index 94% rename from algorithms-miscellaneous-4/pom.xml rename to algorithms-module/algorithms-miscellaneous-4/pom.xml index 1dc9a62f64..ed752a6b41 100644 --- a/algorithms-miscellaneous-4/pom.xml +++ b/algorithms-module/algorithms-miscellaneous-4/pom.xml @@ -9,7 +9,7 @@ com.baeldung - parent-modules + algorithms-modules 1.0.0-SNAPSHOT diff --git a/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/middleelementlookup/MiddleElementLookup.java b/algorithms-module/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/middleelementlookup/MiddleElementLookup.java similarity index 100% rename from algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/middleelementlookup/MiddleElementLookup.java rename to algorithms-module/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/middleelementlookup/MiddleElementLookup.java diff --git a/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/middleelementlookup/Node.java b/algorithms-module/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/middleelementlookup/Node.java similarity index 100% rename from algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/middleelementlookup/Node.java rename to algorithms-module/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/middleelementlookup/Node.java diff --git a/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/multiswarm/Constants.java b/algorithms-module/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/multiswarm/Constants.java similarity index 100% rename from algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/multiswarm/Constants.java rename to algorithms-module/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/multiswarm/Constants.java diff --git a/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/multiswarm/FitnessFunction.java b/algorithms-module/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/multiswarm/FitnessFunction.java similarity index 100% rename from algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/multiswarm/FitnessFunction.java rename to algorithms-module/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/multiswarm/FitnessFunction.java diff --git a/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/multiswarm/Multiswarm.java b/algorithms-module/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/multiswarm/Multiswarm.java similarity index 100% rename from algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/multiswarm/Multiswarm.java rename to algorithms-module/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/multiswarm/Multiswarm.java diff --git a/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/multiswarm/Particle.java b/algorithms-module/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/multiswarm/Particle.java similarity index 100% rename from algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/multiswarm/Particle.java rename to algorithms-module/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/multiswarm/Particle.java diff --git a/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/multiswarm/Swarm.java b/algorithms-module/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/multiswarm/Swarm.java similarity index 100% rename from algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/multiswarm/Swarm.java rename to algorithms-module/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/multiswarm/Swarm.java diff --git a/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/permutation/Permutation.java b/algorithms-module/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/permutation/Permutation.java similarity index 100% rename from algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/permutation/Permutation.java rename to algorithms-module/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/permutation/Permutation.java diff --git a/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/smallestinteger/SmallestMissingPositiveInteger.java b/algorithms-module/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/smallestinteger/SmallestMissingPositiveInteger.java similarity index 100% rename from algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/smallestinteger/SmallestMissingPositiveInteger.java rename to algorithms-module/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/smallestinteger/SmallestMissingPositiveInteger.java diff --git a/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/string/EnglishAlphabetLetters.java b/algorithms-module/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/string/EnglishAlphabetLetters.java similarity index 100% rename from algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/string/EnglishAlphabetLetters.java rename to algorithms-module/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/string/EnglishAlphabetLetters.java diff --git a/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/string/LongestSubstringNonRepeatingCharacters.java b/algorithms-module/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/string/LongestSubstringNonRepeatingCharacters.java similarity index 100% rename from algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/string/LongestSubstringNonRepeatingCharacters.java rename to algorithms-module/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/string/LongestSubstringNonRepeatingCharacters.java diff --git a/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/string/SubstringPalindrome.java b/algorithms-module/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/string/SubstringPalindrome.java similarity index 100% rename from algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/string/SubstringPalindrome.java rename to algorithms-module/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/string/SubstringPalindrome.java diff --git a/algorithms-miscellaneous-4/src/main/resources/logback.xml b/algorithms-module/algorithms-miscellaneous-4/src/main/resources/logback.xml similarity index 100% rename from algorithms-miscellaneous-4/src/main/resources/logback.xml rename to algorithms-module/algorithms-miscellaneous-4/src/main/resources/logback.xml diff --git a/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/MiddleElementLookupUnitTest.java b/algorithms-module/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/MiddleElementLookupUnitTest.java similarity index 100% rename from algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/MiddleElementLookupUnitTest.java rename to algorithms-module/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/MiddleElementLookupUnitTest.java diff --git a/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/multiswarm/LolFitnessFunction.java b/algorithms-module/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/multiswarm/LolFitnessFunction.java similarity index 100% rename from algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/multiswarm/LolFitnessFunction.java rename to algorithms-module/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/multiswarm/LolFitnessFunction.java diff --git a/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/multiswarm/MultiswarmUnitTest.java b/algorithms-module/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/multiswarm/MultiswarmUnitTest.java similarity index 100% rename from algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/multiswarm/MultiswarmUnitTest.java rename to algorithms-module/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/multiswarm/MultiswarmUnitTest.java diff --git a/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/smallestinteger/SmallestMissingPositiveIntegerUnitTest.java b/algorithms-module/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/smallestinteger/SmallestMissingPositiveIntegerUnitTest.java similarity index 100% rename from algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/smallestinteger/SmallestMissingPositiveIntegerUnitTest.java rename to algorithms-module/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/smallestinteger/SmallestMissingPositiveIntegerUnitTest.java diff --git a/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/string/EnglishAlphabetLettersUnitTest.java b/algorithms-module/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/string/EnglishAlphabetLettersUnitTest.java similarity index 100% rename from algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/string/EnglishAlphabetLettersUnitTest.java rename to algorithms-module/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/string/EnglishAlphabetLettersUnitTest.java diff --git a/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/string/LongestSubstringNonRepeatingCharactersUnitTest.java b/algorithms-module/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/string/LongestSubstringNonRepeatingCharactersUnitTest.java similarity index 100% rename from algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/string/LongestSubstringNonRepeatingCharactersUnitTest.java rename to algorithms-module/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/string/LongestSubstringNonRepeatingCharactersUnitTest.java diff --git a/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/string/SubstringPalindromeUnitTest.java b/algorithms-module/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/string/SubstringPalindromeUnitTest.java similarity index 100% rename from algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/string/SubstringPalindromeUnitTest.java rename to algorithms-module/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/string/SubstringPalindromeUnitTest.java diff --git a/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/support/MayFailRule.java b/algorithms-module/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/support/MayFailRule.java similarity index 100% rename from algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/support/MayFailRule.java rename to algorithms-module/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/support/MayFailRule.java From ff86f70a1039b28410b65701cda5a261fd9badc6 Mon Sep 17 00:00:00 2001 From: sampadawagde Date: Fri, 20 May 2022 20:29:14 +0530 Subject: [PATCH 051/100] JAVA-12097: moved algorithms-miscellaneous-5 inside algorithms-module --- .../algorithms-miscellaneous-5}/README.md | 0 .../algorithms-miscellaneous-5}/pom.xml | 2 +- .../algorithms/balancedbinarytree/BalancedBinaryTree.java | 0 .../java/com/baeldung/algorithms/balancedbinarytree/Tree.java | 0 .../main/java/com/baeldung/algorithms/binarygap/BinaryGap.java | 0 .../com/baeldung/algorithms/combinatorics/Combinatorics.java | 0 .../com/baeldung/algorithms/conversion/HexStringConverter.java | 0 .../algorithms/integerstreammedian/MedianOfIntegerStream.java | 0 .../algorithms/integerstreammedian/MedianOfIntegerStream2.java | 0 .../main/java/com/baeldung/algorithms/knapsack/Knapsack.java | 0 .../algorithms/maximumsubarray/BruteForceAlgorithm.java | 0 .../baeldung/algorithms/maximumsubarray/KadaneAlgorithm.java | 0 .../com/baeldung/algorithms/mergesortedarrays/SortedArrays.java | 0 .../src/main/java/com/baeldung/algorithms/prim/Edge.java | 0 .../src/main/java/com/baeldung/algorithms/prim/Prim.java | 0 .../src/main/java/com/baeldung/algorithms/prim/Vertex.java | 0 .../baeldung/algorithms/relativelyprime/RelativelyPrime.java | 0 .../java/com/baeldung/algorithms/reversingtree/TreeNode.java | 0 .../com/baeldung/algorithms/reversingtree/TreeReverser.java | 0 .../algorithms-miscellaneous-5}/src/main/resources/logback.xml | 0 .../balancedbinarytree/BalancedBinaryTreeUnitTest.java | 0 .../algorithms/balancedbinarytree/BinaryTreeDataProvider.java | 0 .../com/baeldung/algorithms/binarygap/BinaryGapUnitTest.java | 0 .../algorithms/combinatorics/CombinatoricsUnitTest.java | 0 .../algorithms/conversion/ByteArrayConverterUnitTest.java | 0 .../integerstreammedian/MedianOfIntegerStreamUnitTest.java | 0 .../java/com/baeldung/algorithms/knapsack/KnapsackUnitTest.java | 0 .../algorithms/maximumsubarray/BruteForceAlgorithmUnitTest.java | 0 .../algorithms/maximumsubarray/KadaneAlgorithmUnitTest.java | 0 .../algorithms/mergesortedarrays/SortedArraysUnitTest.java | 0 .../test/java/com/baeldung/algorithms/prim/PrimUnitTest.java | 0 .../algorithms/relativelyprime/RelativelyPrimeUnitTest.java | 0 .../baeldung/algorithms/reversingtree/TreeReverserUnitTest.java | 0 .../algorithms-miscellaneous-5}/src/test/resources/input.json | 0 34 files changed, 1 insertion(+), 1 deletion(-) rename {algorithms-miscellaneous-5 => algorithms-module/algorithms-miscellaneous-5}/README.md (100%) rename {algorithms-miscellaneous-5 => algorithms-module/algorithms-miscellaneous-5}/pom.xml (96%) rename {algorithms-miscellaneous-5 => algorithms-module/algorithms-miscellaneous-5}/src/main/java/com/baeldung/algorithms/balancedbinarytree/BalancedBinaryTree.java (100%) rename {algorithms-miscellaneous-5 => algorithms-module/algorithms-miscellaneous-5}/src/main/java/com/baeldung/algorithms/balancedbinarytree/Tree.java (100%) rename {algorithms-miscellaneous-5 => algorithms-module/algorithms-miscellaneous-5}/src/main/java/com/baeldung/algorithms/binarygap/BinaryGap.java (100%) rename {algorithms-miscellaneous-5 => algorithms-module/algorithms-miscellaneous-5}/src/main/java/com/baeldung/algorithms/combinatorics/Combinatorics.java (100%) rename {algorithms-miscellaneous-5 => algorithms-module/algorithms-miscellaneous-5}/src/main/java/com/baeldung/algorithms/conversion/HexStringConverter.java (100%) rename {algorithms-miscellaneous-5 => algorithms-module/algorithms-miscellaneous-5}/src/main/java/com/baeldung/algorithms/integerstreammedian/MedianOfIntegerStream.java (100%) rename {algorithms-miscellaneous-5 => algorithms-module/algorithms-miscellaneous-5}/src/main/java/com/baeldung/algorithms/integerstreammedian/MedianOfIntegerStream2.java (100%) rename {algorithms-miscellaneous-5 => algorithms-module/algorithms-miscellaneous-5}/src/main/java/com/baeldung/algorithms/knapsack/Knapsack.java (100%) rename {algorithms-miscellaneous-5 => algorithms-module/algorithms-miscellaneous-5}/src/main/java/com/baeldung/algorithms/maximumsubarray/BruteForceAlgorithm.java (100%) rename {algorithms-miscellaneous-5 => algorithms-module/algorithms-miscellaneous-5}/src/main/java/com/baeldung/algorithms/maximumsubarray/KadaneAlgorithm.java (100%) rename {algorithms-miscellaneous-5 => algorithms-module/algorithms-miscellaneous-5}/src/main/java/com/baeldung/algorithms/mergesortedarrays/SortedArrays.java (100%) rename {algorithms-miscellaneous-5 => algorithms-module/algorithms-miscellaneous-5}/src/main/java/com/baeldung/algorithms/prim/Edge.java (100%) rename {algorithms-miscellaneous-5 => algorithms-module/algorithms-miscellaneous-5}/src/main/java/com/baeldung/algorithms/prim/Prim.java (100%) rename {algorithms-miscellaneous-5 => algorithms-module/algorithms-miscellaneous-5}/src/main/java/com/baeldung/algorithms/prim/Vertex.java (100%) rename {algorithms-miscellaneous-5 => algorithms-module/algorithms-miscellaneous-5}/src/main/java/com/baeldung/algorithms/relativelyprime/RelativelyPrime.java (100%) rename {algorithms-miscellaneous-5 => algorithms-module/algorithms-miscellaneous-5}/src/main/java/com/baeldung/algorithms/reversingtree/TreeNode.java (100%) rename {algorithms-miscellaneous-5 => algorithms-module/algorithms-miscellaneous-5}/src/main/java/com/baeldung/algorithms/reversingtree/TreeReverser.java (100%) rename {algorithms-miscellaneous-5 => algorithms-module/algorithms-miscellaneous-5}/src/main/resources/logback.xml (100%) rename {algorithms-miscellaneous-5 => algorithms-module/algorithms-miscellaneous-5}/src/test/java/com/baeldung/algorithms/balancedbinarytree/BalancedBinaryTreeUnitTest.java (100%) rename {algorithms-miscellaneous-5 => algorithms-module/algorithms-miscellaneous-5}/src/test/java/com/baeldung/algorithms/balancedbinarytree/BinaryTreeDataProvider.java (100%) rename {algorithms-miscellaneous-5 => algorithms-module/algorithms-miscellaneous-5}/src/test/java/com/baeldung/algorithms/binarygap/BinaryGapUnitTest.java (100%) rename {algorithms-miscellaneous-5 => algorithms-module/algorithms-miscellaneous-5}/src/test/java/com/baeldung/algorithms/combinatorics/CombinatoricsUnitTest.java (100%) rename {algorithms-miscellaneous-5 => algorithms-module/algorithms-miscellaneous-5}/src/test/java/com/baeldung/algorithms/conversion/ByteArrayConverterUnitTest.java (100%) rename {algorithms-miscellaneous-5 => algorithms-module/algorithms-miscellaneous-5}/src/test/java/com/baeldung/algorithms/integerstreammedian/MedianOfIntegerStreamUnitTest.java (100%) rename {algorithms-miscellaneous-5 => algorithms-module/algorithms-miscellaneous-5}/src/test/java/com/baeldung/algorithms/knapsack/KnapsackUnitTest.java (100%) rename {algorithms-miscellaneous-5 => algorithms-module/algorithms-miscellaneous-5}/src/test/java/com/baeldung/algorithms/maximumsubarray/BruteForceAlgorithmUnitTest.java (100%) rename {algorithms-miscellaneous-5 => algorithms-module/algorithms-miscellaneous-5}/src/test/java/com/baeldung/algorithms/maximumsubarray/KadaneAlgorithmUnitTest.java (100%) rename {algorithms-miscellaneous-5 => algorithms-module/algorithms-miscellaneous-5}/src/test/java/com/baeldung/algorithms/mergesortedarrays/SortedArraysUnitTest.java (100%) rename {algorithms-miscellaneous-5 => algorithms-module/algorithms-miscellaneous-5}/src/test/java/com/baeldung/algorithms/prim/PrimUnitTest.java (100%) rename {algorithms-miscellaneous-5 => algorithms-module/algorithms-miscellaneous-5}/src/test/java/com/baeldung/algorithms/relativelyprime/RelativelyPrimeUnitTest.java (100%) rename {algorithms-miscellaneous-5 => algorithms-module/algorithms-miscellaneous-5}/src/test/java/com/baeldung/algorithms/reversingtree/TreeReverserUnitTest.java (100%) rename {algorithms-miscellaneous-5 => algorithms-module/algorithms-miscellaneous-5}/src/test/resources/input.json (100%) diff --git a/algorithms-miscellaneous-5/README.md b/algorithms-module/algorithms-miscellaneous-5/README.md similarity index 100% rename from algorithms-miscellaneous-5/README.md rename to algorithms-module/algorithms-miscellaneous-5/README.md diff --git a/algorithms-miscellaneous-5/pom.xml b/algorithms-module/algorithms-miscellaneous-5/pom.xml similarity index 96% rename from algorithms-miscellaneous-5/pom.xml rename to algorithms-module/algorithms-miscellaneous-5/pom.xml index 7ceede9cb9..26b445555b 100644 --- a/algorithms-miscellaneous-5/pom.xml +++ b/algorithms-module/algorithms-miscellaneous-5/pom.xml @@ -9,7 +9,7 @@ com.baeldung - parent-modules + algorithms-modules 1.0.0-SNAPSHOT diff --git a/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/balancedbinarytree/BalancedBinaryTree.java b/algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/balancedbinarytree/BalancedBinaryTree.java similarity index 100% rename from algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/balancedbinarytree/BalancedBinaryTree.java rename to algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/balancedbinarytree/BalancedBinaryTree.java diff --git a/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/balancedbinarytree/Tree.java b/algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/balancedbinarytree/Tree.java similarity index 100% rename from algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/balancedbinarytree/Tree.java rename to algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/balancedbinarytree/Tree.java diff --git a/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/binarygap/BinaryGap.java b/algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/binarygap/BinaryGap.java similarity index 100% rename from algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/binarygap/BinaryGap.java rename to algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/binarygap/BinaryGap.java diff --git a/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/combinatorics/Combinatorics.java b/algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/combinatorics/Combinatorics.java similarity index 100% rename from algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/combinatorics/Combinatorics.java rename to algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/combinatorics/Combinatorics.java diff --git a/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/conversion/HexStringConverter.java b/algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/conversion/HexStringConverter.java similarity index 100% rename from algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/conversion/HexStringConverter.java rename to algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/conversion/HexStringConverter.java diff --git a/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/integerstreammedian/MedianOfIntegerStream.java b/algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/integerstreammedian/MedianOfIntegerStream.java similarity index 100% rename from algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/integerstreammedian/MedianOfIntegerStream.java rename to algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/integerstreammedian/MedianOfIntegerStream.java diff --git a/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/integerstreammedian/MedianOfIntegerStream2.java b/algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/integerstreammedian/MedianOfIntegerStream2.java similarity index 100% rename from algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/integerstreammedian/MedianOfIntegerStream2.java rename to algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/integerstreammedian/MedianOfIntegerStream2.java diff --git a/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/knapsack/Knapsack.java b/algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/knapsack/Knapsack.java similarity index 100% rename from algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/knapsack/Knapsack.java rename to algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/knapsack/Knapsack.java diff --git a/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/maximumsubarray/BruteForceAlgorithm.java b/algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/maximumsubarray/BruteForceAlgorithm.java similarity index 100% rename from algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/maximumsubarray/BruteForceAlgorithm.java rename to algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/maximumsubarray/BruteForceAlgorithm.java diff --git a/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/maximumsubarray/KadaneAlgorithm.java b/algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/maximumsubarray/KadaneAlgorithm.java similarity index 100% rename from algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/maximumsubarray/KadaneAlgorithm.java rename to algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/maximumsubarray/KadaneAlgorithm.java diff --git a/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/mergesortedarrays/SortedArrays.java b/algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/mergesortedarrays/SortedArrays.java similarity index 100% rename from algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/mergesortedarrays/SortedArrays.java rename to algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/mergesortedarrays/SortedArrays.java diff --git a/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/prim/Edge.java b/algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/prim/Edge.java similarity index 100% rename from algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/prim/Edge.java rename to algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/prim/Edge.java diff --git a/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/prim/Prim.java b/algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/prim/Prim.java similarity index 100% rename from algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/prim/Prim.java rename to algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/prim/Prim.java diff --git a/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/prim/Vertex.java b/algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/prim/Vertex.java similarity index 100% rename from algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/prim/Vertex.java rename to algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/prim/Vertex.java diff --git a/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/relativelyprime/RelativelyPrime.java b/algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/relativelyprime/RelativelyPrime.java similarity index 100% rename from algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/relativelyprime/RelativelyPrime.java rename to algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/relativelyprime/RelativelyPrime.java diff --git a/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/reversingtree/TreeNode.java b/algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/reversingtree/TreeNode.java similarity index 100% rename from algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/reversingtree/TreeNode.java rename to algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/reversingtree/TreeNode.java diff --git a/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/reversingtree/TreeReverser.java b/algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/reversingtree/TreeReverser.java similarity index 100% rename from algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/reversingtree/TreeReverser.java rename to algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/reversingtree/TreeReverser.java diff --git a/algorithms-miscellaneous-5/src/main/resources/logback.xml b/algorithms-module/algorithms-miscellaneous-5/src/main/resources/logback.xml similarity index 100% rename from algorithms-miscellaneous-5/src/main/resources/logback.xml rename to algorithms-module/algorithms-miscellaneous-5/src/main/resources/logback.xml diff --git a/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/balancedbinarytree/BalancedBinaryTreeUnitTest.java b/algorithms-module/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/balancedbinarytree/BalancedBinaryTreeUnitTest.java similarity index 100% rename from algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/balancedbinarytree/BalancedBinaryTreeUnitTest.java rename to algorithms-module/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/balancedbinarytree/BalancedBinaryTreeUnitTest.java diff --git a/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/balancedbinarytree/BinaryTreeDataProvider.java b/algorithms-module/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/balancedbinarytree/BinaryTreeDataProvider.java similarity index 100% rename from algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/balancedbinarytree/BinaryTreeDataProvider.java rename to algorithms-module/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/balancedbinarytree/BinaryTreeDataProvider.java diff --git a/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/binarygap/BinaryGapUnitTest.java b/algorithms-module/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/binarygap/BinaryGapUnitTest.java similarity index 100% rename from algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/binarygap/BinaryGapUnitTest.java rename to algorithms-module/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/binarygap/BinaryGapUnitTest.java diff --git a/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/combinatorics/CombinatoricsUnitTest.java b/algorithms-module/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/combinatorics/CombinatoricsUnitTest.java similarity index 100% rename from algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/combinatorics/CombinatoricsUnitTest.java rename to algorithms-module/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/combinatorics/CombinatoricsUnitTest.java diff --git a/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/conversion/ByteArrayConverterUnitTest.java b/algorithms-module/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/conversion/ByteArrayConverterUnitTest.java similarity index 100% rename from algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/conversion/ByteArrayConverterUnitTest.java rename to algorithms-module/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/conversion/ByteArrayConverterUnitTest.java diff --git a/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/integerstreammedian/MedianOfIntegerStreamUnitTest.java b/algorithms-module/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/integerstreammedian/MedianOfIntegerStreamUnitTest.java similarity index 100% rename from algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/integerstreammedian/MedianOfIntegerStreamUnitTest.java rename to algorithms-module/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/integerstreammedian/MedianOfIntegerStreamUnitTest.java diff --git a/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/knapsack/KnapsackUnitTest.java b/algorithms-module/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/knapsack/KnapsackUnitTest.java similarity index 100% rename from algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/knapsack/KnapsackUnitTest.java rename to algorithms-module/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/knapsack/KnapsackUnitTest.java diff --git a/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/maximumsubarray/BruteForceAlgorithmUnitTest.java b/algorithms-module/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/maximumsubarray/BruteForceAlgorithmUnitTest.java similarity index 100% rename from algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/maximumsubarray/BruteForceAlgorithmUnitTest.java rename to algorithms-module/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/maximumsubarray/BruteForceAlgorithmUnitTest.java diff --git a/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/maximumsubarray/KadaneAlgorithmUnitTest.java b/algorithms-module/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/maximumsubarray/KadaneAlgorithmUnitTest.java similarity index 100% rename from algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/maximumsubarray/KadaneAlgorithmUnitTest.java rename to algorithms-module/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/maximumsubarray/KadaneAlgorithmUnitTest.java diff --git a/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/mergesortedarrays/SortedArraysUnitTest.java b/algorithms-module/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/mergesortedarrays/SortedArraysUnitTest.java similarity index 100% rename from algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/mergesortedarrays/SortedArraysUnitTest.java rename to algorithms-module/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/mergesortedarrays/SortedArraysUnitTest.java diff --git a/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/prim/PrimUnitTest.java b/algorithms-module/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/prim/PrimUnitTest.java similarity index 100% rename from algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/prim/PrimUnitTest.java rename to algorithms-module/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/prim/PrimUnitTest.java diff --git a/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/relativelyprime/RelativelyPrimeUnitTest.java b/algorithms-module/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/relativelyprime/RelativelyPrimeUnitTest.java similarity index 100% rename from algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/relativelyprime/RelativelyPrimeUnitTest.java rename to algorithms-module/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/relativelyprime/RelativelyPrimeUnitTest.java diff --git a/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/reversingtree/TreeReverserUnitTest.java b/algorithms-module/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/reversingtree/TreeReverserUnitTest.java similarity index 100% rename from algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/reversingtree/TreeReverserUnitTest.java rename to algorithms-module/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/reversingtree/TreeReverserUnitTest.java diff --git a/algorithms-miscellaneous-5/src/test/resources/input.json b/algorithms-module/algorithms-miscellaneous-5/src/test/resources/input.json similarity index 100% rename from algorithms-miscellaneous-5/src/test/resources/input.json rename to algorithms-module/algorithms-miscellaneous-5/src/test/resources/input.json From 02de2268ec3b9a116928648be5610c739a0b58af Mon Sep 17 00:00:00 2001 From: sampadawagde Date: Fri, 20 May 2022 20:29:42 +0530 Subject: [PATCH 052/100] JAVA-12097: moved algorithms-miscellaneous-6 inside algorithms-module --- .../algorithms-miscellaneous-6}/README.md | 0 .../algorithms-miscellaneous-6}/pom.xml | 2 +- .../algorithms/balancedbrackets/BalancedBracketsUsingDeque.java | 0 .../balancedbrackets/BalancedBracketsUsingString.java | 0 .../main/java/com/baeldung/algorithms/boruvka/BoruvkaMST.java | 0 .../main/java/com/baeldung/algorithms/boruvka/UnionFind.java | 0 .../java/com/baeldung/algorithms/caesarcipher/CaesarCipher.java | 0 .../baeldung/algorithms/gradientdescent/GradientDescent.java | 0 .../src/main/java/com/baeldung/algorithms/greedy/Follower.java | 0 .../main/java/com/baeldung/algorithms/greedy/FollowersPath.java | 0 .../java/com/baeldung/algorithms/greedy/GreedyAlgorithm.java | 0 .../java/com/baeldung/algorithms/greedy/NonGreedyAlgorithm.java | 0 .../java/com/baeldung/algorithms/greedy/SocialConnector.java | 0 .../main/java/com/baeldung/algorithms/greedy/SocialUser.java | 0 .../java/com/baeldung/algorithms/kruskal/CycleDetector.java | 0 .../java/com/baeldung/algorithms/kruskal/DisjointSetInfo.java | 0 .../src/main/java/com/baeldung/algorithms/kruskal/Kruskal.java | 0 .../com/baeldung/algorithms/linkedlist/LinkedListReversal.java | 0 .../main/java/com/baeldung/algorithms/linkedlist/ListNode.java | 0 .../java/com/baeldung/algorithms/minheapmerge/HeapNode.java | 0 .../main/java/com/baeldung/algorithms/minheapmerge/MinHeap.java | 0 .../src/main/java/com/baeldung/algorithms/play2048/Board.java | 0 .../src/main/java/com/baeldung/algorithms/play2048/Cell.java | 0 .../main/java/com/baeldung/algorithms/play2048/Computer.java | 0 .../src/main/java/com/baeldung/algorithms/play2048/Human.java | 0 .../src/main/java/com/baeldung/algorithms/play2048/Move.java | 0 .../main/java/com/baeldung/algorithms/play2048/Play2048.java | 0 .../algorithms/topkelements/BruteForceTopKElementsFinder.java | 0 .../algorithms/topkelements/MaxHeapTopKElementsFinder.java | 0 .../baeldung/algorithms/topkelements/TopKElementsFinder.java | 0 .../algorithms/topkelements/TreeSetTopKElementsFinder.java | 0 .../algorithms-miscellaneous-6}/src/main/resources/logback.xml | 0 .../balancedbrackets/BalancedBracketsUsingDequeUnitTest.java | 0 .../balancedbrackets/BalancedBracketsUsingStringUnitTest.java | 0 .../java/com/baeldung/algorithms/boruvka/BoruvkaUnitTest.java | 0 .../baeldung/algorithms/caesarcipher/CaesarCipherUnitTest.java | 0 .../algorithms/gradientdescent/GradientDescentUnitTest.java | 0 .../com/baeldung/algorithms/greedy/GreedyAlgorithmUnitTest.java | 0 .../java/com/baeldung/algorithms/kruskal/KruskalUnitTest.java | 0 .../algorithms/linkedlist/LinkedListReversalUnitTest.java | 0 .../com/baeldung/algorithms/minheapmerge/MinHeapUnitTest.java | 0 .../algorithms/topkelements/TopKElementsFinderUnitTest.java | 0 42 files changed, 1 insertion(+), 1 deletion(-) rename {algorithms-miscellaneous-6 => algorithms-module/algorithms-miscellaneous-6}/README.md (100%) rename {algorithms-miscellaneous-6 => algorithms-module/algorithms-miscellaneous-6}/pom.xml (95%) rename {algorithms-miscellaneous-6 => algorithms-module/algorithms-miscellaneous-6}/src/main/java/com/baeldung/algorithms/balancedbrackets/BalancedBracketsUsingDeque.java (100%) rename {algorithms-miscellaneous-6 => algorithms-module/algorithms-miscellaneous-6}/src/main/java/com/baeldung/algorithms/balancedbrackets/BalancedBracketsUsingString.java (100%) rename {algorithms-miscellaneous-6 => algorithms-module/algorithms-miscellaneous-6}/src/main/java/com/baeldung/algorithms/boruvka/BoruvkaMST.java (100%) rename {algorithms-miscellaneous-6 => algorithms-module/algorithms-miscellaneous-6}/src/main/java/com/baeldung/algorithms/boruvka/UnionFind.java (100%) rename {algorithms-miscellaneous-6 => algorithms-module/algorithms-miscellaneous-6}/src/main/java/com/baeldung/algorithms/caesarcipher/CaesarCipher.java (100%) rename {algorithms-miscellaneous-6 => algorithms-module/algorithms-miscellaneous-6}/src/main/java/com/baeldung/algorithms/gradientdescent/GradientDescent.java (100%) rename {algorithms-miscellaneous-6 => algorithms-module/algorithms-miscellaneous-6}/src/main/java/com/baeldung/algorithms/greedy/Follower.java (100%) rename {algorithms-miscellaneous-6 => algorithms-module/algorithms-miscellaneous-6}/src/main/java/com/baeldung/algorithms/greedy/FollowersPath.java (100%) rename {algorithms-miscellaneous-6 => algorithms-module/algorithms-miscellaneous-6}/src/main/java/com/baeldung/algorithms/greedy/GreedyAlgorithm.java (100%) rename {algorithms-miscellaneous-6 => algorithms-module/algorithms-miscellaneous-6}/src/main/java/com/baeldung/algorithms/greedy/NonGreedyAlgorithm.java (100%) rename {algorithms-miscellaneous-6 => algorithms-module/algorithms-miscellaneous-6}/src/main/java/com/baeldung/algorithms/greedy/SocialConnector.java (100%) rename {algorithms-miscellaneous-6 => algorithms-module/algorithms-miscellaneous-6}/src/main/java/com/baeldung/algorithms/greedy/SocialUser.java (100%) rename {algorithms-miscellaneous-6 => algorithms-module/algorithms-miscellaneous-6}/src/main/java/com/baeldung/algorithms/kruskal/CycleDetector.java (100%) rename {algorithms-miscellaneous-6 => algorithms-module/algorithms-miscellaneous-6}/src/main/java/com/baeldung/algorithms/kruskal/DisjointSetInfo.java (100%) rename {algorithms-miscellaneous-6 => algorithms-module/algorithms-miscellaneous-6}/src/main/java/com/baeldung/algorithms/kruskal/Kruskal.java (100%) rename {algorithms-miscellaneous-6 => algorithms-module/algorithms-miscellaneous-6}/src/main/java/com/baeldung/algorithms/linkedlist/LinkedListReversal.java (100%) rename {algorithms-miscellaneous-6 => algorithms-module/algorithms-miscellaneous-6}/src/main/java/com/baeldung/algorithms/linkedlist/ListNode.java (100%) rename {algorithms-miscellaneous-6 => algorithms-module/algorithms-miscellaneous-6}/src/main/java/com/baeldung/algorithms/minheapmerge/HeapNode.java (100%) rename {algorithms-miscellaneous-6 => algorithms-module/algorithms-miscellaneous-6}/src/main/java/com/baeldung/algorithms/minheapmerge/MinHeap.java (100%) rename {algorithms-miscellaneous-6 => algorithms-module/algorithms-miscellaneous-6}/src/main/java/com/baeldung/algorithms/play2048/Board.java (100%) rename {algorithms-miscellaneous-6 => algorithms-module/algorithms-miscellaneous-6}/src/main/java/com/baeldung/algorithms/play2048/Cell.java (100%) rename {algorithms-miscellaneous-6 => algorithms-module/algorithms-miscellaneous-6}/src/main/java/com/baeldung/algorithms/play2048/Computer.java (100%) rename {algorithms-miscellaneous-6 => algorithms-module/algorithms-miscellaneous-6}/src/main/java/com/baeldung/algorithms/play2048/Human.java (100%) rename {algorithms-miscellaneous-6 => algorithms-module/algorithms-miscellaneous-6}/src/main/java/com/baeldung/algorithms/play2048/Move.java (100%) rename {algorithms-miscellaneous-6 => algorithms-module/algorithms-miscellaneous-6}/src/main/java/com/baeldung/algorithms/play2048/Play2048.java (100%) rename {algorithms-miscellaneous-6 => algorithms-module/algorithms-miscellaneous-6}/src/main/java/com/baeldung/algorithms/topkelements/BruteForceTopKElementsFinder.java (100%) rename {algorithms-miscellaneous-6 => algorithms-module/algorithms-miscellaneous-6}/src/main/java/com/baeldung/algorithms/topkelements/MaxHeapTopKElementsFinder.java (100%) rename {algorithms-miscellaneous-6 => algorithms-module/algorithms-miscellaneous-6}/src/main/java/com/baeldung/algorithms/topkelements/TopKElementsFinder.java (100%) rename {algorithms-miscellaneous-6 => algorithms-module/algorithms-miscellaneous-6}/src/main/java/com/baeldung/algorithms/topkelements/TreeSetTopKElementsFinder.java (100%) rename {algorithms-miscellaneous-6 => algorithms-module/algorithms-miscellaneous-6}/src/main/resources/logback.xml (100%) rename {algorithms-miscellaneous-6 => algorithms-module/algorithms-miscellaneous-6}/src/test/java/com/baeldung/algorithms/balancedbrackets/BalancedBracketsUsingDequeUnitTest.java (100%) rename {algorithms-miscellaneous-6 => algorithms-module/algorithms-miscellaneous-6}/src/test/java/com/baeldung/algorithms/balancedbrackets/BalancedBracketsUsingStringUnitTest.java (100%) rename {algorithms-miscellaneous-6 => algorithms-module/algorithms-miscellaneous-6}/src/test/java/com/baeldung/algorithms/boruvka/BoruvkaUnitTest.java (100%) rename {algorithms-miscellaneous-6 => algorithms-module/algorithms-miscellaneous-6}/src/test/java/com/baeldung/algorithms/caesarcipher/CaesarCipherUnitTest.java (100%) rename {algorithms-miscellaneous-6 => algorithms-module/algorithms-miscellaneous-6}/src/test/java/com/baeldung/algorithms/gradientdescent/GradientDescentUnitTest.java (100%) rename {algorithms-miscellaneous-6 => algorithms-module/algorithms-miscellaneous-6}/src/test/java/com/baeldung/algorithms/greedy/GreedyAlgorithmUnitTest.java (100%) rename {algorithms-miscellaneous-6 => algorithms-module/algorithms-miscellaneous-6}/src/test/java/com/baeldung/algorithms/kruskal/KruskalUnitTest.java (100%) rename {algorithms-miscellaneous-6 => algorithms-module/algorithms-miscellaneous-6}/src/test/java/com/baeldung/algorithms/linkedlist/LinkedListReversalUnitTest.java (100%) rename {algorithms-miscellaneous-6 => algorithms-module/algorithms-miscellaneous-6}/src/test/java/com/baeldung/algorithms/minheapmerge/MinHeapUnitTest.java (100%) rename {algorithms-miscellaneous-6 => algorithms-module/algorithms-miscellaneous-6}/src/test/java/com/baeldung/algorithms/topkelements/TopKElementsFinderUnitTest.java (100%) diff --git a/algorithms-miscellaneous-6/README.md b/algorithms-module/algorithms-miscellaneous-6/README.md similarity index 100% rename from algorithms-miscellaneous-6/README.md rename to algorithms-module/algorithms-miscellaneous-6/README.md diff --git a/algorithms-miscellaneous-6/pom.xml b/algorithms-module/algorithms-miscellaneous-6/pom.xml similarity index 95% rename from algorithms-miscellaneous-6/pom.xml rename to algorithms-module/algorithms-miscellaneous-6/pom.xml index 584ec8a8dd..34eae2e2b9 100644 --- a/algorithms-miscellaneous-6/pom.xml +++ b/algorithms-module/algorithms-miscellaneous-6/pom.xml @@ -9,7 +9,7 @@ com.baeldung - parent-modules + algorithms-modules 1.0.0-SNAPSHOT diff --git a/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/balancedbrackets/BalancedBracketsUsingDeque.java b/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/balancedbrackets/BalancedBracketsUsingDeque.java similarity index 100% rename from algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/balancedbrackets/BalancedBracketsUsingDeque.java rename to algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/balancedbrackets/BalancedBracketsUsingDeque.java diff --git a/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/balancedbrackets/BalancedBracketsUsingString.java b/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/balancedbrackets/BalancedBracketsUsingString.java similarity index 100% rename from algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/balancedbrackets/BalancedBracketsUsingString.java rename to algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/balancedbrackets/BalancedBracketsUsingString.java diff --git a/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/boruvka/BoruvkaMST.java b/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/boruvka/BoruvkaMST.java similarity index 100% rename from algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/boruvka/BoruvkaMST.java rename to algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/boruvka/BoruvkaMST.java diff --git a/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/boruvka/UnionFind.java b/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/boruvka/UnionFind.java similarity index 100% rename from algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/boruvka/UnionFind.java rename to algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/boruvka/UnionFind.java diff --git a/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/caesarcipher/CaesarCipher.java b/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/caesarcipher/CaesarCipher.java similarity index 100% rename from algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/caesarcipher/CaesarCipher.java rename to algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/caesarcipher/CaesarCipher.java diff --git a/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/gradientdescent/GradientDescent.java b/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/gradientdescent/GradientDescent.java similarity index 100% rename from algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/gradientdescent/GradientDescent.java rename to algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/gradientdescent/GradientDescent.java diff --git a/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/Follower.java b/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/Follower.java similarity index 100% rename from algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/Follower.java rename to algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/Follower.java diff --git a/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/FollowersPath.java b/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/FollowersPath.java similarity index 100% rename from algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/FollowersPath.java rename to algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/FollowersPath.java diff --git a/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/GreedyAlgorithm.java b/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/GreedyAlgorithm.java similarity index 100% rename from algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/GreedyAlgorithm.java rename to algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/GreedyAlgorithm.java diff --git a/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/NonGreedyAlgorithm.java b/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/NonGreedyAlgorithm.java similarity index 100% rename from algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/NonGreedyAlgorithm.java rename to algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/NonGreedyAlgorithm.java diff --git a/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/SocialConnector.java b/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/SocialConnector.java similarity index 100% rename from algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/SocialConnector.java rename to algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/SocialConnector.java diff --git a/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/SocialUser.java b/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/SocialUser.java similarity index 100% rename from algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/SocialUser.java rename to algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/SocialUser.java diff --git a/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/kruskal/CycleDetector.java b/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/kruskal/CycleDetector.java similarity index 100% rename from algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/kruskal/CycleDetector.java rename to algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/kruskal/CycleDetector.java diff --git a/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/kruskal/DisjointSetInfo.java b/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/kruskal/DisjointSetInfo.java similarity index 100% rename from algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/kruskal/DisjointSetInfo.java rename to algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/kruskal/DisjointSetInfo.java diff --git a/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/kruskal/Kruskal.java b/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/kruskal/Kruskal.java similarity index 100% rename from algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/kruskal/Kruskal.java rename to algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/kruskal/Kruskal.java diff --git a/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/linkedlist/LinkedListReversal.java b/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/linkedlist/LinkedListReversal.java similarity index 100% rename from algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/linkedlist/LinkedListReversal.java rename to algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/linkedlist/LinkedListReversal.java diff --git a/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/linkedlist/ListNode.java b/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/linkedlist/ListNode.java similarity index 100% rename from algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/linkedlist/ListNode.java rename to algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/linkedlist/ListNode.java diff --git a/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/minheapmerge/HeapNode.java b/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/minheapmerge/HeapNode.java similarity index 100% rename from algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/minheapmerge/HeapNode.java rename to algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/minheapmerge/HeapNode.java diff --git a/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/minheapmerge/MinHeap.java b/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/minheapmerge/MinHeap.java similarity index 100% rename from algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/minheapmerge/MinHeap.java rename to algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/minheapmerge/MinHeap.java diff --git a/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Board.java b/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Board.java similarity index 100% rename from algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Board.java rename to algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Board.java diff --git a/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Cell.java b/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Cell.java similarity index 100% rename from algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Cell.java rename to algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Cell.java diff --git a/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Computer.java b/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Computer.java similarity index 100% rename from algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Computer.java rename to algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Computer.java diff --git a/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Human.java b/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Human.java similarity index 100% rename from algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Human.java rename to algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Human.java diff --git a/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Move.java b/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Move.java similarity index 100% rename from algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Move.java rename to algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Move.java diff --git a/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Play2048.java b/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Play2048.java similarity index 100% rename from algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Play2048.java rename to algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Play2048.java diff --git a/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/topkelements/BruteForceTopKElementsFinder.java b/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/topkelements/BruteForceTopKElementsFinder.java similarity index 100% rename from algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/topkelements/BruteForceTopKElementsFinder.java rename to algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/topkelements/BruteForceTopKElementsFinder.java diff --git a/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/topkelements/MaxHeapTopKElementsFinder.java b/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/topkelements/MaxHeapTopKElementsFinder.java similarity index 100% rename from algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/topkelements/MaxHeapTopKElementsFinder.java rename to algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/topkelements/MaxHeapTopKElementsFinder.java diff --git a/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/topkelements/TopKElementsFinder.java b/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/topkelements/TopKElementsFinder.java similarity index 100% rename from algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/topkelements/TopKElementsFinder.java rename to algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/topkelements/TopKElementsFinder.java diff --git a/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/topkelements/TreeSetTopKElementsFinder.java b/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/topkelements/TreeSetTopKElementsFinder.java similarity index 100% rename from algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/topkelements/TreeSetTopKElementsFinder.java rename to algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/topkelements/TreeSetTopKElementsFinder.java diff --git a/algorithms-miscellaneous-6/src/main/resources/logback.xml b/algorithms-module/algorithms-miscellaneous-6/src/main/resources/logback.xml similarity index 100% rename from algorithms-miscellaneous-6/src/main/resources/logback.xml rename to algorithms-module/algorithms-miscellaneous-6/src/main/resources/logback.xml diff --git a/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/balancedbrackets/BalancedBracketsUsingDequeUnitTest.java b/algorithms-module/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/balancedbrackets/BalancedBracketsUsingDequeUnitTest.java similarity index 100% rename from algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/balancedbrackets/BalancedBracketsUsingDequeUnitTest.java rename to algorithms-module/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/balancedbrackets/BalancedBracketsUsingDequeUnitTest.java diff --git a/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/balancedbrackets/BalancedBracketsUsingStringUnitTest.java b/algorithms-module/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/balancedbrackets/BalancedBracketsUsingStringUnitTest.java similarity index 100% rename from algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/balancedbrackets/BalancedBracketsUsingStringUnitTest.java rename to algorithms-module/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/balancedbrackets/BalancedBracketsUsingStringUnitTest.java diff --git a/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/boruvka/BoruvkaUnitTest.java b/algorithms-module/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/boruvka/BoruvkaUnitTest.java similarity index 100% rename from algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/boruvka/BoruvkaUnitTest.java rename to algorithms-module/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/boruvka/BoruvkaUnitTest.java diff --git a/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/caesarcipher/CaesarCipherUnitTest.java b/algorithms-module/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/caesarcipher/CaesarCipherUnitTest.java similarity index 100% rename from algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/caesarcipher/CaesarCipherUnitTest.java rename to algorithms-module/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/caesarcipher/CaesarCipherUnitTest.java diff --git a/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/gradientdescent/GradientDescentUnitTest.java b/algorithms-module/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/gradientdescent/GradientDescentUnitTest.java similarity index 100% rename from algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/gradientdescent/GradientDescentUnitTest.java rename to algorithms-module/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/gradientdescent/GradientDescentUnitTest.java diff --git a/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/greedy/GreedyAlgorithmUnitTest.java b/algorithms-module/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/greedy/GreedyAlgorithmUnitTest.java similarity index 100% rename from algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/greedy/GreedyAlgorithmUnitTest.java rename to algorithms-module/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/greedy/GreedyAlgorithmUnitTest.java diff --git a/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/kruskal/KruskalUnitTest.java b/algorithms-module/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/kruskal/KruskalUnitTest.java similarity index 100% rename from algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/kruskal/KruskalUnitTest.java rename to algorithms-module/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/kruskal/KruskalUnitTest.java diff --git a/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/linkedlist/LinkedListReversalUnitTest.java b/algorithms-module/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/linkedlist/LinkedListReversalUnitTest.java similarity index 100% rename from algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/linkedlist/LinkedListReversalUnitTest.java rename to algorithms-module/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/linkedlist/LinkedListReversalUnitTest.java diff --git a/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/minheapmerge/MinHeapUnitTest.java b/algorithms-module/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/minheapmerge/MinHeapUnitTest.java similarity index 100% rename from algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/minheapmerge/MinHeapUnitTest.java rename to algorithms-module/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/minheapmerge/MinHeapUnitTest.java diff --git a/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/topkelements/TopKElementsFinderUnitTest.java b/algorithms-module/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/topkelements/TopKElementsFinderUnitTest.java similarity index 100% rename from algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/topkelements/TopKElementsFinderUnitTest.java rename to algorithms-module/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/topkelements/TopKElementsFinderUnitTest.java From edb880df59830be9c352bf977cbd7703e7822822 Mon Sep 17 00:00:00 2001 From: sampadawagde Date: Fri, 20 May 2022 20:30:20 +0530 Subject: [PATCH 053/100] JAVA-12097: moved algorithms-searching inside algorithms-module --- .../algorithms-searching}/README.md | 0 .../algorithms-searching}/pom.xml | 2 +- .../java/com/baeldung/algorithms/binarysearch/BinarySearch.java | 0 .../breadthfirstsearch/BreadthFirstSearchAlgorithm.java | 0 .../java/com/baeldung/algorithms/breadthfirstsearch/Node.java | 0 .../java/com/baeldung/algorithms/breadthfirstsearch/Tree.java | 0 .../src/main/java/com/baeldung/algorithms/dfs/BinaryTree.java | 0 .../src/main/java/com/baeldung/algorithms/dfs/Graph.java | 0 .../algorithms/interpolationsearch/InterpolationSearch.java | 0 .../java/com/baeldung/algorithms/kthsmallest/KthSmallest.java | 0 .../algorithms/mcts/montecarlo/MonteCarloTreeSearch.java | 0 .../java/com/baeldung/algorithms/mcts/montecarlo/State.java | 0 .../main/java/com/baeldung/algorithms/mcts/montecarlo/UCT.java | 0 .../main/java/com/baeldung/algorithms/mcts/tictactoe/Board.java | 0 .../java/com/baeldung/algorithms/mcts/tictactoe/Position.java | 0 .../src/main/java/com/baeldung/algorithms/mcts/tree/Node.java | 0 .../src/main/java/com/baeldung/algorithms/mcts/tree/Tree.java | 0 .../src/main/java/com/baeldung/algorithms/quadtree/Point.java | 0 .../main/java/com/baeldung/algorithms/quadtree/QuadTree.java | 0 .../src/main/java/com/baeldung/algorithms/quadtree/Region.java | 0 .../src/main/java/com/baeldung/algorithms/suffixtree/Node.java | 0 .../java/com/baeldung/algorithms/suffixtree/SuffixTree.java | 0 .../baeldung/algorithms/textsearch/TextSearchAlgorithms.java | 0 .../algorithms-searching}/src/main/resources/logback.xml | 0 .../baeldung/algorithms/binarysearch/BinarySearchUnitTest.java | 0 .../breadthfirstsearch/BreadthFirstSearchAlgorithmUnitTest.java | 0 .../java/com/baeldung/algorithms/dfs/BinaryTreeUnitTest.java | 0 .../test/java/com/baeldung/algorithms/dfs/GraphUnitTest.java | 0 .../interpolationsearch/InterpolationSearchUnitTest.java | 0 .../baeldung/algorithms/kthsmallest/KthSmallestUnitTest.java | 0 .../test/java/com/baeldung/algorithms/mcts/MCTSUnitTest.java | 0 .../baeldung/algorithms/quadtree/QuadTreeSearchUnitTest.java | 0 .../com/baeldung/algorithms/suffixtree/SuffixTreeUnitTest.java | 0 .../algorithms/textsearch/TextSearchAlgorithmsUnitTest.java | 0 34 files changed, 1 insertion(+), 1 deletion(-) rename {algorithms-searching => algorithms-module/algorithms-searching}/README.md (100%) rename {algorithms-searching => algorithms-module/algorithms-searching}/pom.xml (92%) rename {algorithms-searching => algorithms-module/algorithms-searching}/src/main/java/com/baeldung/algorithms/binarysearch/BinarySearch.java (100%) rename {algorithms-searching => algorithms-module/algorithms-searching}/src/main/java/com/baeldung/algorithms/breadthfirstsearch/BreadthFirstSearchAlgorithm.java (100%) rename {algorithms-searching => algorithms-module/algorithms-searching}/src/main/java/com/baeldung/algorithms/breadthfirstsearch/Node.java (100%) rename {algorithms-searching => algorithms-module/algorithms-searching}/src/main/java/com/baeldung/algorithms/breadthfirstsearch/Tree.java (100%) rename {algorithms-searching => algorithms-module/algorithms-searching}/src/main/java/com/baeldung/algorithms/dfs/BinaryTree.java (100%) rename {algorithms-searching => algorithms-module/algorithms-searching}/src/main/java/com/baeldung/algorithms/dfs/Graph.java (100%) rename {algorithms-searching => algorithms-module/algorithms-searching}/src/main/java/com/baeldung/algorithms/interpolationsearch/InterpolationSearch.java (100%) rename {algorithms-searching => algorithms-module/algorithms-searching}/src/main/java/com/baeldung/algorithms/kthsmallest/KthSmallest.java (100%) rename {algorithms-searching => algorithms-module/algorithms-searching}/src/main/java/com/baeldung/algorithms/mcts/montecarlo/MonteCarloTreeSearch.java (100%) rename {algorithms-searching => algorithms-module/algorithms-searching}/src/main/java/com/baeldung/algorithms/mcts/montecarlo/State.java (100%) rename {algorithms-searching => algorithms-module/algorithms-searching}/src/main/java/com/baeldung/algorithms/mcts/montecarlo/UCT.java (100%) rename {algorithms-searching => algorithms-module/algorithms-searching}/src/main/java/com/baeldung/algorithms/mcts/tictactoe/Board.java (100%) rename {algorithms-searching => algorithms-module/algorithms-searching}/src/main/java/com/baeldung/algorithms/mcts/tictactoe/Position.java (100%) rename {algorithms-searching => algorithms-module/algorithms-searching}/src/main/java/com/baeldung/algorithms/mcts/tree/Node.java (100%) rename {algorithms-searching => algorithms-module/algorithms-searching}/src/main/java/com/baeldung/algorithms/mcts/tree/Tree.java (100%) rename {algorithms-searching => algorithms-module/algorithms-searching}/src/main/java/com/baeldung/algorithms/quadtree/Point.java (100%) rename {algorithms-searching => algorithms-module/algorithms-searching}/src/main/java/com/baeldung/algorithms/quadtree/QuadTree.java (100%) rename {algorithms-searching => algorithms-module/algorithms-searching}/src/main/java/com/baeldung/algorithms/quadtree/Region.java (100%) rename {algorithms-searching => algorithms-module/algorithms-searching}/src/main/java/com/baeldung/algorithms/suffixtree/Node.java (100%) rename {algorithms-searching => algorithms-module/algorithms-searching}/src/main/java/com/baeldung/algorithms/suffixtree/SuffixTree.java (100%) rename {algorithms-searching => algorithms-module/algorithms-searching}/src/main/java/com/baeldung/algorithms/textsearch/TextSearchAlgorithms.java (100%) rename {algorithms-searching => algorithms-module/algorithms-searching}/src/main/resources/logback.xml (100%) rename {algorithms-searching => algorithms-module/algorithms-searching}/src/test/java/com/baeldung/algorithms/binarysearch/BinarySearchUnitTest.java (100%) rename {algorithms-searching => algorithms-module/algorithms-searching}/src/test/java/com/baeldung/algorithms/breadthfirstsearch/BreadthFirstSearchAlgorithmUnitTest.java (100%) rename {algorithms-searching => algorithms-module/algorithms-searching}/src/test/java/com/baeldung/algorithms/dfs/BinaryTreeUnitTest.java (100%) rename {algorithms-searching => algorithms-module/algorithms-searching}/src/test/java/com/baeldung/algorithms/dfs/GraphUnitTest.java (100%) rename {algorithms-searching => algorithms-module/algorithms-searching}/src/test/java/com/baeldung/algorithms/interpolationsearch/InterpolationSearchUnitTest.java (100%) rename {algorithms-searching => algorithms-module/algorithms-searching}/src/test/java/com/baeldung/algorithms/kthsmallest/KthSmallestUnitTest.java (100%) rename {algorithms-searching => algorithms-module/algorithms-searching}/src/test/java/com/baeldung/algorithms/mcts/MCTSUnitTest.java (100%) rename {algorithms-searching => algorithms-module/algorithms-searching}/src/test/java/com/baeldung/algorithms/quadtree/QuadTreeSearchUnitTest.java (100%) rename {algorithms-searching => algorithms-module/algorithms-searching}/src/test/java/com/baeldung/algorithms/suffixtree/SuffixTreeUnitTest.java (100%) rename {algorithms-searching => algorithms-module/algorithms-searching}/src/test/java/com/baeldung/algorithms/textsearch/TextSearchAlgorithmsUnitTest.java (100%) diff --git a/algorithms-searching/README.md b/algorithms-module/algorithms-searching/README.md similarity index 100% rename from algorithms-searching/README.md rename to algorithms-module/algorithms-searching/README.md diff --git a/algorithms-searching/pom.xml b/algorithms-module/algorithms-searching/pom.xml similarity index 92% rename from algorithms-searching/pom.xml rename to algorithms-module/algorithms-searching/pom.xml index edb8a0c423..f981b4542f 100644 --- a/algorithms-searching/pom.xml +++ b/algorithms-module/algorithms-searching/pom.xml @@ -9,7 +9,7 @@ com.baeldung - parent-modules + algorithms-modules 1.0.0-SNAPSHOT diff --git a/algorithms-searching/src/main/java/com/baeldung/algorithms/binarysearch/BinarySearch.java b/algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/binarysearch/BinarySearch.java similarity index 100% rename from algorithms-searching/src/main/java/com/baeldung/algorithms/binarysearch/BinarySearch.java rename to algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/binarysearch/BinarySearch.java diff --git a/algorithms-searching/src/main/java/com/baeldung/algorithms/breadthfirstsearch/BreadthFirstSearchAlgorithm.java b/algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/breadthfirstsearch/BreadthFirstSearchAlgorithm.java similarity index 100% rename from algorithms-searching/src/main/java/com/baeldung/algorithms/breadthfirstsearch/BreadthFirstSearchAlgorithm.java rename to algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/breadthfirstsearch/BreadthFirstSearchAlgorithm.java diff --git a/algorithms-searching/src/main/java/com/baeldung/algorithms/breadthfirstsearch/Node.java b/algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/breadthfirstsearch/Node.java similarity index 100% rename from algorithms-searching/src/main/java/com/baeldung/algorithms/breadthfirstsearch/Node.java rename to algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/breadthfirstsearch/Node.java diff --git a/algorithms-searching/src/main/java/com/baeldung/algorithms/breadthfirstsearch/Tree.java b/algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/breadthfirstsearch/Tree.java similarity index 100% rename from algorithms-searching/src/main/java/com/baeldung/algorithms/breadthfirstsearch/Tree.java rename to algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/breadthfirstsearch/Tree.java diff --git a/algorithms-searching/src/main/java/com/baeldung/algorithms/dfs/BinaryTree.java b/algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/dfs/BinaryTree.java similarity index 100% rename from algorithms-searching/src/main/java/com/baeldung/algorithms/dfs/BinaryTree.java rename to algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/dfs/BinaryTree.java diff --git a/algorithms-searching/src/main/java/com/baeldung/algorithms/dfs/Graph.java b/algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/dfs/Graph.java similarity index 100% rename from algorithms-searching/src/main/java/com/baeldung/algorithms/dfs/Graph.java rename to algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/dfs/Graph.java diff --git a/algorithms-searching/src/main/java/com/baeldung/algorithms/interpolationsearch/InterpolationSearch.java b/algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/interpolationsearch/InterpolationSearch.java similarity index 100% rename from algorithms-searching/src/main/java/com/baeldung/algorithms/interpolationsearch/InterpolationSearch.java rename to algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/interpolationsearch/InterpolationSearch.java diff --git a/algorithms-searching/src/main/java/com/baeldung/algorithms/kthsmallest/KthSmallest.java b/algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/kthsmallest/KthSmallest.java similarity index 100% rename from algorithms-searching/src/main/java/com/baeldung/algorithms/kthsmallest/KthSmallest.java rename to algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/kthsmallest/KthSmallest.java diff --git a/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/montecarlo/MonteCarloTreeSearch.java b/algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/montecarlo/MonteCarloTreeSearch.java similarity index 100% rename from algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/montecarlo/MonteCarloTreeSearch.java rename to algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/montecarlo/MonteCarloTreeSearch.java diff --git a/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/montecarlo/State.java b/algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/montecarlo/State.java similarity index 100% rename from algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/montecarlo/State.java rename to algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/montecarlo/State.java diff --git a/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/montecarlo/UCT.java b/algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/montecarlo/UCT.java similarity index 100% rename from algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/montecarlo/UCT.java rename to algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/montecarlo/UCT.java diff --git a/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/tictactoe/Board.java b/algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/tictactoe/Board.java similarity index 100% rename from algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/tictactoe/Board.java rename to algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/tictactoe/Board.java diff --git a/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/tictactoe/Position.java b/algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/tictactoe/Position.java similarity index 100% rename from algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/tictactoe/Position.java rename to algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/tictactoe/Position.java diff --git a/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/tree/Node.java b/algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/tree/Node.java similarity index 100% rename from algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/tree/Node.java rename to algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/tree/Node.java diff --git a/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/tree/Tree.java b/algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/tree/Tree.java similarity index 100% rename from algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/tree/Tree.java rename to algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/tree/Tree.java diff --git a/algorithms-searching/src/main/java/com/baeldung/algorithms/quadtree/Point.java b/algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/quadtree/Point.java similarity index 100% rename from algorithms-searching/src/main/java/com/baeldung/algorithms/quadtree/Point.java rename to algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/quadtree/Point.java diff --git a/algorithms-searching/src/main/java/com/baeldung/algorithms/quadtree/QuadTree.java b/algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/quadtree/QuadTree.java similarity index 100% rename from algorithms-searching/src/main/java/com/baeldung/algorithms/quadtree/QuadTree.java rename to algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/quadtree/QuadTree.java diff --git a/algorithms-searching/src/main/java/com/baeldung/algorithms/quadtree/Region.java b/algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/quadtree/Region.java similarity index 100% rename from algorithms-searching/src/main/java/com/baeldung/algorithms/quadtree/Region.java rename to algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/quadtree/Region.java diff --git a/algorithms-searching/src/main/java/com/baeldung/algorithms/suffixtree/Node.java b/algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/suffixtree/Node.java similarity index 100% rename from algorithms-searching/src/main/java/com/baeldung/algorithms/suffixtree/Node.java rename to algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/suffixtree/Node.java diff --git a/algorithms-searching/src/main/java/com/baeldung/algorithms/suffixtree/SuffixTree.java b/algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/suffixtree/SuffixTree.java similarity index 100% rename from algorithms-searching/src/main/java/com/baeldung/algorithms/suffixtree/SuffixTree.java rename to algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/suffixtree/SuffixTree.java diff --git a/algorithms-searching/src/main/java/com/baeldung/algorithms/textsearch/TextSearchAlgorithms.java b/algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/textsearch/TextSearchAlgorithms.java similarity index 100% rename from algorithms-searching/src/main/java/com/baeldung/algorithms/textsearch/TextSearchAlgorithms.java rename to algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/textsearch/TextSearchAlgorithms.java diff --git a/algorithms-searching/src/main/resources/logback.xml b/algorithms-module/algorithms-searching/src/main/resources/logback.xml similarity index 100% rename from algorithms-searching/src/main/resources/logback.xml rename to algorithms-module/algorithms-searching/src/main/resources/logback.xml diff --git a/algorithms-searching/src/test/java/com/baeldung/algorithms/binarysearch/BinarySearchUnitTest.java b/algorithms-module/algorithms-searching/src/test/java/com/baeldung/algorithms/binarysearch/BinarySearchUnitTest.java similarity index 100% rename from algorithms-searching/src/test/java/com/baeldung/algorithms/binarysearch/BinarySearchUnitTest.java rename to algorithms-module/algorithms-searching/src/test/java/com/baeldung/algorithms/binarysearch/BinarySearchUnitTest.java diff --git a/algorithms-searching/src/test/java/com/baeldung/algorithms/breadthfirstsearch/BreadthFirstSearchAlgorithmUnitTest.java b/algorithms-module/algorithms-searching/src/test/java/com/baeldung/algorithms/breadthfirstsearch/BreadthFirstSearchAlgorithmUnitTest.java similarity index 100% rename from algorithms-searching/src/test/java/com/baeldung/algorithms/breadthfirstsearch/BreadthFirstSearchAlgorithmUnitTest.java rename to algorithms-module/algorithms-searching/src/test/java/com/baeldung/algorithms/breadthfirstsearch/BreadthFirstSearchAlgorithmUnitTest.java diff --git a/algorithms-searching/src/test/java/com/baeldung/algorithms/dfs/BinaryTreeUnitTest.java b/algorithms-module/algorithms-searching/src/test/java/com/baeldung/algorithms/dfs/BinaryTreeUnitTest.java similarity index 100% rename from algorithms-searching/src/test/java/com/baeldung/algorithms/dfs/BinaryTreeUnitTest.java rename to algorithms-module/algorithms-searching/src/test/java/com/baeldung/algorithms/dfs/BinaryTreeUnitTest.java diff --git a/algorithms-searching/src/test/java/com/baeldung/algorithms/dfs/GraphUnitTest.java b/algorithms-module/algorithms-searching/src/test/java/com/baeldung/algorithms/dfs/GraphUnitTest.java similarity index 100% rename from algorithms-searching/src/test/java/com/baeldung/algorithms/dfs/GraphUnitTest.java rename to algorithms-module/algorithms-searching/src/test/java/com/baeldung/algorithms/dfs/GraphUnitTest.java diff --git a/algorithms-searching/src/test/java/com/baeldung/algorithms/interpolationsearch/InterpolationSearchUnitTest.java b/algorithms-module/algorithms-searching/src/test/java/com/baeldung/algorithms/interpolationsearch/InterpolationSearchUnitTest.java similarity index 100% rename from algorithms-searching/src/test/java/com/baeldung/algorithms/interpolationsearch/InterpolationSearchUnitTest.java rename to algorithms-module/algorithms-searching/src/test/java/com/baeldung/algorithms/interpolationsearch/InterpolationSearchUnitTest.java diff --git a/algorithms-searching/src/test/java/com/baeldung/algorithms/kthsmallest/KthSmallestUnitTest.java b/algorithms-module/algorithms-searching/src/test/java/com/baeldung/algorithms/kthsmallest/KthSmallestUnitTest.java similarity index 100% rename from algorithms-searching/src/test/java/com/baeldung/algorithms/kthsmallest/KthSmallestUnitTest.java rename to algorithms-module/algorithms-searching/src/test/java/com/baeldung/algorithms/kthsmallest/KthSmallestUnitTest.java diff --git a/algorithms-searching/src/test/java/com/baeldung/algorithms/mcts/MCTSUnitTest.java b/algorithms-module/algorithms-searching/src/test/java/com/baeldung/algorithms/mcts/MCTSUnitTest.java similarity index 100% rename from algorithms-searching/src/test/java/com/baeldung/algorithms/mcts/MCTSUnitTest.java rename to algorithms-module/algorithms-searching/src/test/java/com/baeldung/algorithms/mcts/MCTSUnitTest.java diff --git a/algorithms-searching/src/test/java/com/baeldung/algorithms/quadtree/QuadTreeSearchUnitTest.java b/algorithms-module/algorithms-searching/src/test/java/com/baeldung/algorithms/quadtree/QuadTreeSearchUnitTest.java similarity index 100% rename from algorithms-searching/src/test/java/com/baeldung/algorithms/quadtree/QuadTreeSearchUnitTest.java rename to algorithms-module/algorithms-searching/src/test/java/com/baeldung/algorithms/quadtree/QuadTreeSearchUnitTest.java diff --git a/algorithms-searching/src/test/java/com/baeldung/algorithms/suffixtree/SuffixTreeUnitTest.java b/algorithms-module/algorithms-searching/src/test/java/com/baeldung/algorithms/suffixtree/SuffixTreeUnitTest.java similarity index 100% rename from algorithms-searching/src/test/java/com/baeldung/algorithms/suffixtree/SuffixTreeUnitTest.java rename to algorithms-module/algorithms-searching/src/test/java/com/baeldung/algorithms/suffixtree/SuffixTreeUnitTest.java diff --git a/algorithms-searching/src/test/java/com/baeldung/algorithms/textsearch/TextSearchAlgorithmsUnitTest.java b/algorithms-module/algorithms-searching/src/test/java/com/baeldung/algorithms/textsearch/TextSearchAlgorithmsUnitTest.java similarity index 100% rename from algorithms-searching/src/test/java/com/baeldung/algorithms/textsearch/TextSearchAlgorithmsUnitTest.java rename to algorithms-module/algorithms-searching/src/test/java/com/baeldung/algorithms/textsearch/TextSearchAlgorithmsUnitTest.java From ddb21dd81b44c7ef5d461b1abb6a232dddb73270 Mon Sep 17 00:00:00 2001 From: sampadawagde Date: Fri, 20 May 2022 20:30:56 +0530 Subject: [PATCH 054/100] JAVA-12097: moved algorithms-sorting inside algorithms-module --- .../algorithms-sorting}/.gitignore | 0 .../algorithms-sorting}/README.md | 0 .../algorithms-sorting}/pom.xml | 2 +- .../com/baeldung/algorithms/bubblesort/BubbleSort.java | 0 .../algorithms/bucketsort/IntegerBucketSorter.java | 2 +- .../java/com/baeldung/algorithms/bucketsort/Sorter.java | 2 +- .../com/baeldung/algorithms/counting/CountingSort.java | 0 .../main/java/com/baeldung/algorithms/heapsort/Heap.java | 0 .../baeldung/algorithms/insertionsort/InsertionSort.java | 0 .../com/baeldung/algorithms/mergesort/MergeSort.java | 0 .../com/baeldung/algorithms/quicksort/QuickSort.java | 0 .../baeldung/algorithms/quicksort/ThreeWayQuickSort.java | 0 .../com/baeldung/algorithms/radixsort/RadixSort.java | 0 .../baeldung/algorithms/selectionsort/SelectionSort.java | 0 .../com/baeldung/algorithms/shellsort/ShellSort.java | 0 .../algorithms-sorting}/src/main/resources/logback.xml | 0 .../algorithms/bubblesort/BubbleSortUnitTest.java | 0 .../bucketsort/IntegerBucketSorterUnitTest.java | 9 ++++----- .../algorithms/counting/CountingSortUnitTest.java | 0 .../com/baeldung/algorithms/heapsort/HeapUnitTest.java | 0 .../algorithms/insertionsort/InsertionSortUnitTest.java | 0 .../baeldung/algorithms/mergesort/MergeSortUnitTest.java | 0 .../baeldung/algorithms/quicksort/QuickSortUnitTest.java | 0 .../algorithms/quicksort/ThreeWayQuickSortUnitTest.java | 0 .../baeldung/algorithms/radixsort/RadixSortUnitTest.java | 0 .../algorithms/selectionsort/SelectionSortUnitTest.java | 0 .../baeldung/algorithms/shellsort/ShellSortUnitTest.java | 0 27 files changed, 7 insertions(+), 8 deletions(-) rename {algorithms-sorting => algorithms-module/algorithms-sorting}/.gitignore (100%) rename {algorithms-sorting => algorithms-module/algorithms-sorting}/README.md (100%) rename {algorithms-sorting => algorithms-module/algorithms-sorting}/pom.xml (95%) rename {algorithms-sorting => algorithms-module/algorithms-sorting}/src/main/java/com/baeldung/algorithms/bubblesort/BubbleSort.java (100%) rename {algorithms-sorting => algorithms-module/algorithms-sorting}/src/main/java/com/baeldung/algorithms/bucketsort/IntegerBucketSorter.java (97%) rename {algorithms-sorting => algorithms-module/algorithms-sorting}/src/main/java/com/baeldung/algorithms/bucketsort/Sorter.java (68%) rename {algorithms-sorting => algorithms-module/algorithms-sorting}/src/main/java/com/baeldung/algorithms/counting/CountingSort.java (100%) rename {algorithms-sorting => algorithms-module/algorithms-sorting}/src/main/java/com/baeldung/algorithms/heapsort/Heap.java (100%) rename {algorithms-sorting => algorithms-module/algorithms-sorting}/src/main/java/com/baeldung/algorithms/insertionsort/InsertionSort.java (100%) rename {algorithms-sorting => algorithms-module/algorithms-sorting}/src/main/java/com/baeldung/algorithms/mergesort/MergeSort.java (100%) rename {algorithms-sorting => algorithms-module/algorithms-sorting}/src/main/java/com/baeldung/algorithms/quicksort/QuickSort.java (100%) rename {algorithms-sorting => algorithms-module/algorithms-sorting}/src/main/java/com/baeldung/algorithms/quicksort/ThreeWayQuickSort.java (100%) rename {algorithms-sorting => algorithms-module/algorithms-sorting}/src/main/java/com/baeldung/algorithms/radixsort/RadixSort.java (100%) rename {algorithms-sorting => algorithms-module/algorithms-sorting}/src/main/java/com/baeldung/algorithms/selectionsort/SelectionSort.java (100%) rename {algorithms-sorting => algorithms-module/algorithms-sorting}/src/main/java/com/baeldung/algorithms/shellsort/ShellSort.java (100%) rename {algorithms-sorting => algorithms-module/algorithms-sorting}/src/main/resources/logback.xml (100%) rename {algorithms-sorting => algorithms-module/algorithms-sorting}/src/test/java/com/baeldung/algorithms/bubblesort/BubbleSortUnitTest.java (100%) rename {algorithms-sorting => algorithms-module/algorithms-sorting}/src/test/java/com/baeldung/algorithms/bucketsort/IntegerBucketSorterUnitTest.java (89%) rename {algorithms-sorting => algorithms-module/algorithms-sorting}/src/test/java/com/baeldung/algorithms/counting/CountingSortUnitTest.java (100%) rename {algorithms-sorting => algorithms-module/algorithms-sorting}/src/test/java/com/baeldung/algorithms/heapsort/HeapUnitTest.java (100%) rename {algorithms-sorting => algorithms-module/algorithms-sorting}/src/test/java/com/baeldung/algorithms/insertionsort/InsertionSortUnitTest.java (100%) rename {algorithms-sorting => algorithms-module/algorithms-sorting}/src/test/java/com/baeldung/algorithms/mergesort/MergeSortUnitTest.java (100%) rename {algorithms-sorting => algorithms-module/algorithms-sorting}/src/test/java/com/baeldung/algorithms/quicksort/QuickSortUnitTest.java (100%) rename {algorithms-sorting => algorithms-module/algorithms-sorting}/src/test/java/com/baeldung/algorithms/quicksort/ThreeWayQuickSortUnitTest.java (100%) rename {algorithms-sorting => algorithms-module/algorithms-sorting}/src/test/java/com/baeldung/algorithms/radixsort/RadixSortUnitTest.java (100%) rename {algorithms-sorting => algorithms-module/algorithms-sorting}/src/test/java/com/baeldung/algorithms/selectionsort/SelectionSortUnitTest.java (100%) rename {algorithms-sorting => algorithms-module/algorithms-sorting}/src/test/java/com/baeldung/algorithms/shellsort/ShellSortUnitTest.java (100%) diff --git a/algorithms-sorting/.gitignore b/algorithms-module/algorithms-sorting/.gitignore similarity index 100% rename from algorithms-sorting/.gitignore rename to algorithms-module/algorithms-sorting/.gitignore diff --git a/algorithms-sorting/README.md b/algorithms-module/algorithms-sorting/README.md similarity index 100% rename from algorithms-sorting/README.md rename to algorithms-module/algorithms-sorting/README.md diff --git a/algorithms-sorting/pom.xml b/algorithms-module/algorithms-sorting/pom.xml similarity index 95% rename from algorithms-sorting/pom.xml rename to algorithms-module/algorithms-sorting/pom.xml index 383014d528..eeccbf814d 100644 --- a/algorithms-sorting/pom.xml +++ b/algorithms-module/algorithms-sorting/pom.xml @@ -9,7 +9,7 @@ com.baeldung - parent-modules + algorithms-modules 1.0.0-SNAPSHOT diff --git a/algorithms-sorting/src/main/java/com/baeldung/algorithms/bubblesort/BubbleSort.java b/algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/bubblesort/BubbleSort.java similarity index 100% rename from algorithms-sorting/src/main/java/com/baeldung/algorithms/bubblesort/BubbleSort.java rename to algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/bubblesort/BubbleSort.java diff --git a/algorithms-sorting/src/main/java/com/baeldung/algorithms/bucketsort/IntegerBucketSorter.java b/algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/bucketsort/IntegerBucketSorter.java similarity index 97% rename from algorithms-sorting/src/main/java/com/baeldung/algorithms/bucketsort/IntegerBucketSorter.java rename to algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/bucketsort/IntegerBucketSorter.java index 002d4997f4..cf86eda4a6 100644 --- a/algorithms-sorting/src/main/java/com/baeldung/algorithms/bucketsort/IntegerBucketSorter.java +++ b/algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/bucketsort/IntegerBucketSorter.java @@ -1,4 +1,4 @@ -package com.baeldung.bucketsort; +package com.baeldung.algorithms.bucketsort; import java.util.ArrayList; import java.util.Comparator; diff --git a/algorithms-sorting/src/main/java/com/baeldung/algorithms/bucketsort/Sorter.java b/algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/bucketsort/Sorter.java similarity index 68% rename from algorithms-sorting/src/main/java/com/baeldung/algorithms/bucketsort/Sorter.java rename to algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/bucketsort/Sorter.java index b86f60324f..c1207088da 100644 --- a/algorithms-sorting/src/main/java/com/baeldung/algorithms/bucketsort/Sorter.java +++ b/algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/bucketsort/Sorter.java @@ -1,4 +1,4 @@ -package com.baeldung.bucketsort; +package com.baeldung.algorithms.bucketsort; import java.util.List; diff --git a/algorithms-sorting/src/main/java/com/baeldung/algorithms/counting/CountingSort.java b/algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/counting/CountingSort.java similarity index 100% rename from algorithms-sorting/src/main/java/com/baeldung/algorithms/counting/CountingSort.java rename to algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/counting/CountingSort.java diff --git a/algorithms-sorting/src/main/java/com/baeldung/algorithms/heapsort/Heap.java b/algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/heapsort/Heap.java similarity index 100% rename from algorithms-sorting/src/main/java/com/baeldung/algorithms/heapsort/Heap.java rename to algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/heapsort/Heap.java diff --git a/algorithms-sorting/src/main/java/com/baeldung/algorithms/insertionsort/InsertionSort.java b/algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/insertionsort/InsertionSort.java similarity index 100% rename from algorithms-sorting/src/main/java/com/baeldung/algorithms/insertionsort/InsertionSort.java rename to algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/insertionsort/InsertionSort.java diff --git a/algorithms-sorting/src/main/java/com/baeldung/algorithms/mergesort/MergeSort.java b/algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/mergesort/MergeSort.java similarity index 100% rename from algorithms-sorting/src/main/java/com/baeldung/algorithms/mergesort/MergeSort.java rename to algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/mergesort/MergeSort.java diff --git a/algorithms-sorting/src/main/java/com/baeldung/algorithms/quicksort/QuickSort.java b/algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/quicksort/QuickSort.java similarity index 100% rename from algorithms-sorting/src/main/java/com/baeldung/algorithms/quicksort/QuickSort.java rename to algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/quicksort/QuickSort.java diff --git a/algorithms-sorting/src/main/java/com/baeldung/algorithms/quicksort/ThreeWayQuickSort.java b/algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/quicksort/ThreeWayQuickSort.java similarity index 100% rename from algorithms-sorting/src/main/java/com/baeldung/algorithms/quicksort/ThreeWayQuickSort.java rename to algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/quicksort/ThreeWayQuickSort.java diff --git a/algorithms-sorting/src/main/java/com/baeldung/algorithms/radixsort/RadixSort.java b/algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/radixsort/RadixSort.java similarity index 100% rename from algorithms-sorting/src/main/java/com/baeldung/algorithms/radixsort/RadixSort.java rename to algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/radixsort/RadixSort.java diff --git a/algorithms-sorting/src/main/java/com/baeldung/algorithms/selectionsort/SelectionSort.java b/algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/selectionsort/SelectionSort.java similarity index 100% rename from algorithms-sorting/src/main/java/com/baeldung/algorithms/selectionsort/SelectionSort.java rename to algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/selectionsort/SelectionSort.java diff --git a/algorithms-sorting/src/main/java/com/baeldung/algorithms/shellsort/ShellSort.java b/algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/shellsort/ShellSort.java similarity index 100% rename from algorithms-sorting/src/main/java/com/baeldung/algorithms/shellsort/ShellSort.java rename to algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/shellsort/ShellSort.java diff --git a/algorithms-sorting/src/main/resources/logback.xml b/algorithms-module/algorithms-sorting/src/main/resources/logback.xml similarity index 100% rename from algorithms-sorting/src/main/resources/logback.xml rename to algorithms-module/algorithms-sorting/src/main/resources/logback.xml diff --git a/algorithms-sorting/src/test/java/com/baeldung/algorithms/bubblesort/BubbleSortUnitTest.java b/algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/bubblesort/BubbleSortUnitTest.java similarity index 100% rename from algorithms-sorting/src/test/java/com/baeldung/algorithms/bubblesort/BubbleSortUnitTest.java rename to algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/bubblesort/BubbleSortUnitTest.java diff --git a/algorithms-sorting/src/test/java/com/baeldung/algorithms/bucketsort/IntegerBucketSorterUnitTest.java b/algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/bucketsort/IntegerBucketSorterUnitTest.java similarity index 89% rename from algorithms-sorting/src/test/java/com/baeldung/algorithms/bucketsort/IntegerBucketSorterUnitTest.java rename to algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/bucketsort/IntegerBucketSorterUnitTest.java index 2773d8a68f..4671819673 100644 --- a/algorithms-sorting/src/test/java/com/baeldung/algorithms/bucketsort/IntegerBucketSorterUnitTest.java +++ b/algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/bucketsort/IntegerBucketSorterUnitTest.java @@ -1,13 +1,12 @@ -package com.baeldung.bucketsort; +package com.baeldung.algorithms.bucketsort; -import com.baeldung.bucketsort.IntegerBucketSorter; -import org.junit.Before; -import org.junit.Test; +import static org.junit.Assert.assertEquals; import java.util.Arrays; import java.util.List; -import static org.junit.Assert.assertEquals; +import org.junit.Before; +import org.junit.Test; public class IntegerBucketSorterUnitTest { diff --git a/algorithms-sorting/src/test/java/com/baeldung/algorithms/counting/CountingSortUnitTest.java b/algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/counting/CountingSortUnitTest.java similarity index 100% rename from algorithms-sorting/src/test/java/com/baeldung/algorithms/counting/CountingSortUnitTest.java rename to algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/counting/CountingSortUnitTest.java diff --git a/algorithms-sorting/src/test/java/com/baeldung/algorithms/heapsort/HeapUnitTest.java b/algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/heapsort/HeapUnitTest.java similarity index 100% rename from algorithms-sorting/src/test/java/com/baeldung/algorithms/heapsort/HeapUnitTest.java rename to algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/heapsort/HeapUnitTest.java diff --git a/algorithms-sorting/src/test/java/com/baeldung/algorithms/insertionsort/InsertionSortUnitTest.java b/algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/insertionsort/InsertionSortUnitTest.java similarity index 100% rename from algorithms-sorting/src/test/java/com/baeldung/algorithms/insertionsort/InsertionSortUnitTest.java rename to algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/insertionsort/InsertionSortUnitTest.java diff --git a/algorithms-sorting/src/test/java/com/baeldung/algorithms/mergesort/MergeSortUnitTest.java b/algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/mergesort/MergeSortUnitTest.java similarity index 100% rename from algorithms-sorting/src/test/java/com/baeldung/algorithms/mergesort/MergeSortUnitTest.java rename to algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/mergesort/MergeSortUnitTest.java diff --git a/algorithms-sorting/src/test/java/com/baeldung/algorithms/quicksort/QuickSortUnitTest.java b/algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/quicksort/QuickSortUnitTest.java similarity index 100% rename from algorithms-sorting/src/test/java/com/baeldung/algorithms/quicksort/QuickSortUnitTest.java rename to algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/quicksort/QuickSortUnitTest.java diff --git a/algorithms-sorting/src/test/java/com/baeldung/algorithms/quicksort/ThreeWayQuickSortUnitTest.java b/algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/quicksort/ThreeWayQuickSortUnitTest.java similarity index 100% rename from algorithms-sorting/src/test/java/com/baeldung/algorithms/quicksort/ThreeWayQuickSortUnitTest.java rename to algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/quicksort/ThreeWayQuickSortUnitTest.java diff --git a/algorithms-sorting/src/test/java/com/baeldung/algorithms/radixsort/RadixSortUnitTest.java b/algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/radixsort/RadixSortUnitTest.java similarity index 100% rename from algorithms-sorting/src/test/java/com/baeldung/algorithms/radixsort/RadixSortUnitTest.java rename to algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/radixsort/RadixSortUnitTest.java diff --git a/algorithms-sorting/src/test/java/com/baeldung/algorithms/selectionsort/SelectionSortUnitTest.java b/algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/selectionsort/SelectionSortUnitTest.java similarity index 100% rename from algorithms-sorting/src/test/java/com/baeldung/algorithms/selectionsort/SelectionSortUnitTest.java rename to algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/selectionsort/SelectionSortUnitTest.java diff --git a/algorithms-sorting/src/test/java/com/baeldung/algorithms/shellsort/ShellSortUnitTest.java b/algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/shellsort/ShellSortUnitTest.java similarity index 100% rename from algorithms-sorting/src/test/java/com/baeldung/algorithms/shellsort/ShellSortUnitTest.java rename to algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/shellsort/ShellSortUnitTest.java From 2d7de1343f0c80b084bbdd9e012028a675e846ee Mon Sep 17 00:00:00 2001 From: sampadawagde Date: Fri, 20 May 2022 20:31:27 +0530 Subject: [PATCH 055/100] JAVA-12097: moved algorithms-miscellaneous-1 inside algorithms-module --- .../algorithms-sorting-2}/.gitignore | 0 .../algorithms-sorting-2}/README.md | 0 .../algorithms-sorting-2}/pom.xml | 2 +- .../baeldung/algorithms/bynumber/NaturalOrderComparators.java | 0 .../main/java/com/baeldung/algorithms/inoutsort/InOutSort.java | 0 .../baeldung/algorithms/quicksort/BentleyMcIlroyPartioning.java | 0 .../algorithms/quicksort/DutchNationalFlagPartioning.java | 0 .../main/java/com/baeldung/algorithms/quicksort/Partition.java | 0 .../java/com/baeldung/algorithms/quicksort/SortingUtils.java | 0 .../com/baeldung/algorithms/stringsort/AnagramValidator.java | 0 .../algorithms-sorting-2}/src/main/resources/logback.xml | 0 .../algorithms/bynumber/NaturalOrderComparatorsUnitTest.java | 0 .../com/baeldung/algorithms/inoutsort/InOutSortUnitTest.java | 0 .../quicksort/BentleyMcilroyPartitioningUnitTest.java | 0 .../algorithms/quicksort/DNFThreeWayQuickSortUnitTest.java | 0 .../algorithms/stringsort/AnagramValidatorUnitTest.java | 0 .../com/baeldung/algorithms/stringsort/SortStringUnitTest.java | 0 17 files changed, 1 insertion(+), 1 deletion(-) rename {algorithms-sorting-2 => algorithms-module/algorithms-sorting-2}/.gitignore (100%) rename {algorithms-sorting-2 => algorithms-module/algorithms-sorting-2}/README.md (100%) rename {algorithms-sorting-2 => algorithms-module/algorithms-sorting-2}/pom.xml (95%) rename {algorithms-sorting-2 => algorithms-module/algorithms-sorting-2}/src/main/java/com/baeldung/algorithms/bynumber/NaturalOrderComparators.java (100%) rename {algorithms-sorting-2 => algorithms-module/algorithms-sorting-2}/src/main/java/com/baeldung/algorithms/inoutsort/InOutSort.java (100%) rename {algorithms-sorting-2 => algorithms-module/algorithms-sorting-2}/src/main/java/com/baeldung/algorithms/quicksort/BentleyMcIlroyPartioning.java (100%) rename {algorithms-sorting-2 => algorithms-module/algorithms-sorting-2}/src/main/java/com/baeldung/algorithms/quicksort/DutchNationalFlagPartioning.java (100%) rename {algorithms-sorting-2 => algorithms-module/algorithms-sorting-2}/src/main/java/com/baeldung/algorithms/quicksort/Partition.java (100%) rename {algorithms-sorting-2 => algorithms-module/algorithms-sorting-2}/src/main/java/com/baeldung/algorithms/quicksort/SortingUtils.java (100%) rename {algorithms-sorting-2 => algorithms-module/algorithms-sorting-2}/src/main/java/com/baeldung/algorithms/stringsort/AnagramValidator.java (100%) rename {algorithms-sorting-2 => algorithms-module/algorithms-sorting-2}/src/main/resources/logback.xml (100%) rename {algorithms-sorting-2 => algorithms-module/algorithms-sorting-2}/src/test/java/com/baeldung/algorithms/bynumber/NaturalOrderComparatorsUnitTest.java (100%) rename {algorithms-sorting-2 => algorithms-module/algorithms-sorting-2}/src/test/java/com/baeldung/algorithms/inoutsort/InOutSortUnitTest.java (100%) rename {algorithms-sorting-2 => algorithms-module/algorithms-sorting-2}/src/test/java/com/baeldung/algorithms/quicksort/BentleyMcilroyPartitioningUnitTest.java (100%) rename {algorithms-sorting-2 => algorithms-module/algorithms-sorting-2}/src/test/java/com/baeldung/algorithms/quicksort/DNFThreeWayQuickSortUnitTest.java (100%) rename {algorithms-sorting-2 => algorithms-module/algorithms-sorting-2}/src/test/java/com/baeldung/algorithms/stringsort/AnagramValidatorUnitTest.java (100%) rename {algorithms-sorting-2 => algorithms-module/algorithms-sorting-2}/src/test/java/com/baeldung/algorithms/stringsort/SortStringUnitTest.java (100%) diff --git a/algorithms-sorting-2/.gitignore b/algorithms-module/algorithms-sorting-2/.gitignore similarity index 100% rename from algorithms-sorting-2/.gitignore rename to algorithms-module/algorithms-sorting-2/.gitignore diff --git a/algorithms-sorting-2/README.md b/algorithms-module/algorithms-sorting-2/README.md similarity index 100% rename from algorithms-sorting-2/README.md rename to algorithms-module/algorithms-sorting-2/README.md diff --git a/algorithms-sorting-2/pom.xml b/algorithms-module/algorithms-sorting-2/pom.xml similarity index 95% rename from algorithms-sorting-2/pom.xml rename to algorithms-module/algorithms-sorting-2/pom.xml index a8477bf624..d81df0adec 100644 --- a/algorithms-sorting-2/pom.xml +++ b/algorithms-module/algorithms-sorting-2/pom.xml @@ -8,7 +8,7 @@ com.baeldung - parent-modules + algorithms-modules 1.0.0-SNAPSHOT diff --git a/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/bynumber/NaturalOrderComparators.java b/algorithms-module/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/bynumber/NaturalOrderComparators.java similarity index 100% rename from algorithms-sorting-2/src/main/java/com/baeldung/algorithms/bynumber/NaturalOrderComparators.java rename to algorithms-module/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/bynumber/NaturalOrderComparators.java diff --git a/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/inoutsort/InOutSort.java b/algorithms-module/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/inoutsort/InOutSort.java similarity index 100% rename from algorithms-sorting-2/src/main/java/com/baeldung/algorithms/inoutsort/InOutSort.java rename to algorithms-module/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/inoutsort/InOutSort.java diff --git a/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/quicksort/BentleyMcIlroyPartioning.java b/algorithms-module/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/quicksort/BentleyMcIlroyPartioning.java similarity index 100% rename from algorithms-sorting-2/src/main/java/com/baeldung/algorithms/quicksort/BentleyMcIlroyPartioning.java rename to algorithms-module/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/quicksort/BentleyMcIlroyPartioning.java diff --git a/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/quicksort/DutchNationalFlagPartioning.java b/algorithms-module/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/quicksort/DutchNationalFlagPartioning.java similarity index 100% rename from algorithms-sorting-2/src/main/java/com/baeldung/algorithms/quicksort/DutchNationalFlagPartioning.java rename to algorithms-module/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/quicksort/DutchNationalFlagPartioning.java diff --git a/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/quicksort/Partition.java b/algorithms-module/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/quicksort/Partition.java similarity index 100% rename from algorithms-sorting-2/src/main/java/com/baeldung/algorithms/quicksort/Partition.java rename to algorithms-module/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/quicksort/Partition.java diff --git a/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/quicksort/SortingUtils.java b/algorithms-module/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/quicksort/SortingUtils.java similarity index 100% rename from algorithms-sorting-2/src/main/java/com/baeldung/algorithms/quicksort/SortingUtils.java rename to algorithms-module/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/quicksort/SortingUtils.java diff --git a/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/stringsort/AnagramValidator.java b/algorithms-module/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/stringsort/AnagramValidator.java similarity index 100% rename from algorithms-sorting-2/src/main/java/com/baeldung/algorithms/stringsort/AnagramValidator.java rename to algorithms-module/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/stringsort/AnagramValidator.java diff --git a/algorithms-sorting-2/src/main/resources/logback.xml b/algorithms-module/algorithms-sorting-2/src/main/resources/logback.xml similarity index 100% rename from algorithms-sorting-2/src/main/resources/logback.xml rename to algorithms-module/algorithms-sorting-2/src/main/resources/logback.xml diff --git a/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/bynumber/NaturalOrderComparatorsUnitTest.java b/algorithms-module/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/bynumber/NaturalOrderComparatorsUnitTest.java similarity index 100% rename from algorithms-sorting-2/src/test/java/com/baeldung/algorithms/bynumber/NaturalOrderComparatorsUnitTest.java rename to algorithms-module/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/bynumber/NaturalOrderComparatorsUnitTest.java diff --git a/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/inoutsort/InOutSortUnitTest.java b/algorithms-module/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/inoutsort/InOutSortUnitTest.java similarity index 100% rename from algorithms-sorting-2/src/test/java/com/baeldung/algorithms/inoutsort/InOutSortUnitTest.java rename to algorithms-module/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/inoutsort/InOutSortUnitTest.java diff --git a/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/quicksort/BentleyMcilroyPartitioningUnitTest.java b/algorithms-module/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/quicksort/BentleyMcilroyPartitioningUnitTest.java similarity index 100% rename from algorithms-sorting-2/src/test/java/com/baeldung/algorithms/quicksort/BentleyMcilroyPartitioningUnitTest.java rename to algorithms-module/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/quicksort/BentleyMcilroyPartitioningUnitTest.java diff --git a/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/quicksort/DNFThreeWayQuickSortUnitTest.java b/algorithms-module/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/quicksort/DNFThreeWayQuickSortUnitTest.java similarity index 100% rename from algorithms-sorting-2/src/test/java/com/baeldung/algorithms/quicksort/DNFThreeWayQuickSortUnitTest.java rename to algorithms-module/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/quicksort/DNFThreeWayQuickSortUnitTest.java diff --git a/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/stringsort/AnagramValidatorUnitTest.java b/algorithms-module/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/stringsort/AnagramValidatorUnitTest.java similarity index 100% rename from algorithms-sorting-2/src/test/java/com/baeldung/algorithms/stringsort/AnagramValidatorUnitTest.java rename to algorithms-module/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/stringsort/AnagramValidatorUnitTest.java diff --git a/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/stringsort/SortStringUnitTest.java b/algorithms-module/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/stringsort/SortStringUnitTest.java similarity index 100% rename from algorithms-sorting-2/src/test/java/com/baeldung/algorithms/stringsort/SortStringUnitTest.java rename to algorithms-module/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/stringsort/SortStringUnitTest.java From 93b93417e0b645098efb3d2aa5c287eab63a10fe Mon Sep 17 00:00:00 2001 From: sampadawagde Date: Fri, 20 May 2022 22:07:32 +0530 Subject: [PATCH 056/100] JAVA-12097: renamed algorithms-module to algorithms-modules --- .../algorithms-genetic/.gitignore | 0 .../algorithms-genetic/README.md | 0 .../algorithms-genetic/pom.xml | 0 .../com/baeldung/algorithms/RunAlgorithm.java | 0 .../algorithms/ga/annealing/City.java | 0 .../ga/annealing/SimulatedAnnealing.java | 0 .../algorithms/ga/annealing/Travel.java | 0 .../algorithms/ga/ant_colony/Ant.java | 0 .../ga/ant_colony/AntColonyOptimization.java | 0 .../algorithms/ga/binary/Individual.java | 0 .../algorithms/ga/binary/Population.java | 0 .../ga/binary/SimpleGeneticAlgorithm.java | 0 .../algorithms/ga/jenetics/Knapsack.java | 0 .../algorithms/ga/jenetics/KnapsackFF.java | 0 .../algorithms/ga/jenetics/KnapsackItem.java | 0 .../ga/jenetics/SimpleGeneticAlgorithm.java | 0 .../ga/jenetics/SpringsteenProblem.java | 0 .../ga/jenetics/SpringsteenRecord.java | 0 .../algorithms/ga/jenetics/SubsetSum.java | 0 .../ga/jenetics/TravelingSalesman.java | 0 .../src/main/resources/logback.xml | 0 ...ColonyOptimizationLongRunningUnitTest.java | 0 ...ryGeneticAlgorithmLongRunningUnitTest.java | 0 ...SimulatedAnnealingLongRunningUnitTest.java | 0 .../algorithms-miscellaneous-1/README.md | 0 .../algorithms-miscellaneous-1/pom.xml | 0 .../automata/FiniteStateMachine.java | 0 .../automata/RtFiniteStateMachine.java | 0 .../baeldung/algorithms/automata/RtState.java | 0 .../algorithms/automata/RtTransition.java | 0 .../baeldung/algorithms/automata/State.java | 0 .../algorithms/automata/Transition.java | 0 .../algorithms/hillclimbing/HillClimbing.java | 0 .../algorithms/hillclimbing/State.java | 0 .../algorithms/kthlargest/FindKthLargest.java | 0 .../algorithms/minimax/GameOfBones.java | 0 .../baeldung/algorithms/minimax/MiniMax.java | 0 .../com/baeldung/algorithms/minimax/Node.java | 0 .../com/baeldung/algorithms/minimax/Tree.java | 0 .../src/main/resources/logback.xml | 0 .../HillClimbingAlgorithmUnitTest.java | 0 ...FiniteStateMachineLongRunningUnitTest.java | 0 .../kthlargest/FindKthLargestUnitTest.java | 0 .../algorithms/minimax/MinimaxUnitTest.java | 0 .../algorithms-miscellaneous-2/README.md | 0 .../algorithms-miscellaneous-2/pom.xml | 0 .../com/baeldung/algorithms/RunAlgorithm.java | 0 .../editdistance/EditDistanceBase.java | 0 .../EditDistanceDynamicProgramming.java | 0 .../editdistance/EditDistanceRecursive.java | 0 .../algorithms/ga/dijkstra/Dijkstra.java | 0 .../algorithms/ga/dijkstra/Graph.java | 0 .../baeldung/algorithms/ga/dijkstra/Node.java | 0 .../linkedlist/CycleDetectionBruteForce.java | 0 .../CycleDetectionByFastAndSlowIterators.java | 0 .../linkedlist/CycleDetectionByHashing.java | 0 .../linkedlist/CycleDetectionResult.java | 0 .../linkedlist/CycleRemovalBruteForce.java | 0 .../CycleRemovalByCountingLoopNodes.java | 0 .../CycleRemovalWithoutCountingLoopNodes.java | 0 .../baeldung/algorithms/linkedlist/Node.java | 0 .../algorithms/maze/solver/BFSMazeSolver.java | 0 .../algorithms/maze/solver/Coordinate.java | 0 .../algorithms/maze/solver/DFSMazeSolver.java | 0 .../baeldung/algorithms/maze/solver/Maze.java | 0 .../algorithms/maze/solver/MazeDriver.java | 0 .../NumberWordConverter.java | 0 .../algorithms/slope_one/InputData.java | 0 .../baeldung/algorithms/slope_one/Item.java | 0 .../algorithms/slope_one/SlopeOne.java | 0 .../baeldung/algorithms/slope_one/User.java | 0 .../sudoku/BacktrackingAlgorithm.java | 0 .../algorithms/sudoku/ColumnNode.java | 0 .../algorithms/sudoku/DancingLinks.java | 0 .../sudoku/DancingLinksAlgorithm.java | 0 .../algorithms/sudoku/DancingNode.java | 0 .../src/main/resources/logback.xml | 0 .../src/main/resources/maze/maze1.txt | 0 .../src/main/resources/maze/maze2.txt | 0 .../DijkstraAlgorithmLongRunningUnitTest.java | 0 .../com/baeldung/algorithms/astar/Graph.java | 0 .../baeldung/algorithms/astar/GraphNode.java | 0 .../algorithms/astar/RouteFinder.java | 0 .../baeldung/algorithms/astar/RouteNode.java | 0 .../com/baeldung/algorithms/astar/Scorer.java | 0 .../astar/underground/HaversineScorer.java | 0 .../RouteFinderIntegrationTest.java | 0 .../algorithms/astar/underground/Station.java | 0 .../EditDistanceDataProvider.java | 0 .../editdistance/EditDistanceUnitTest.java | 0 .../CycleDetectionBruteForceUnitTest.java | 0 ...tectionByFastAndSlowIteratorsUnitTest.java | 0 .../CycleDetectionByHashingUnitTest.java | 0 .../linkedlist/CycleDetectionTestBase.java | 0 .../CycleRemovalBruteForceUnitTest.java | 0 ...cleRemovalByCountingLoopNodesUnitTest.java | 0 ...movalWithoutCountingLoopNodesUnitTest.java | 0 .../NumberWordConverterUnitTest.java | 0 .../jgrapht/CompleteGraphUnitTest.java | 0 .../jgrapht/DirectedGraphUnitTest.java | 0 .../jgrapht/EulerianCircuitUnitTest.java | 0 .../jgrapht/GraphImageGenerationUnitTest.java | 0 .../src/test/resources/graph.png | Bin .../algorithms-miscellaneous-3/.gitignore | 0 .../algorithms-miscellaneous-3/README.md | 0 .../algorithms-miscellaneous-3/pom.xml | 0 .../algorithms/checksortedlist/Employee.java | 0 .../checksortedlist/SortedListChecker.java | 0 .../enumstatemachine/LeaveRequestState.java | 0 .../graphcycledetection/domain/Graph.java | 0 .../graphcycledetection/domain/Vertex.java | 0 .../baeldung/algorithms/kmeans/Centroid.java | 0 .../baeldung/algorithms/kmeans/Distance.java | 0 .../baeldung/algorithms/kmeans/Errors.java | 0 .../algorithms/kmeans/EuclideanDistance.java | 0 .../baeldung/algorithms/kmeans/KMeans.java | 0 .../baeldung/algorithms/kmeans/LastFm.java | 0 .../algorithms/kmeans/LastFmService.java | 0 .../baeldung/algorithms/kmeans/Record.java | 0 .../printtriangles/PrintTriangleExamples.java | 0 .../romannumerals/RomanArabicConverter.java | 0 .../romannumerals/RomanNumeral.java | 0 .../LinkedListFindMiddle.java | 0 .../twopointertechnique/MyNode.java | 0 .../twopointertechnique/RotateArray.java | 0 .../twopointertechnique/TwoSum.java | 0 .../com/baeldung/folding/FoldingHash.java | 0 .../main/java/com/baeldung/folding/Main.java | 0 .../src/main/resources/kmeans/artists.json | 0 .../src/main/resources/kmeans/lastfm.json | 0 .../src/main/resources/kmeans/radial.html | 0 .../src/main/resources/logback.xml | 0 .../analysis/AnalysisRunnerLiveTest.java | 0 .../SortedListCheckerUnitTest.java | 0 .../LeaveRequestStateUnitTest.java | 0 .../GraphCycleDetectionUnitTest.java | 0 .../PrintTriangleExamplesUnitTest.java | 0 .../RomanArabicConverterUnitTest.java | 0 .../LinkedListFindMiddleUnitTest.java | 0 .../RotateArrayUnitTest.java | 0 .../twopointertechnique/TwoSumUnitTest.java | 0 .../baeldung/counter/CounterStatistics.java | 0 .../com/baeldung/counter/CounterUnitTest.java | 0 .../com/baeldung/counter/CounterUtil.java | 0 .../baeldung/folding/FoldingHashUnitTest.java | 0 .../algorithms-miscellaneous-4/README.md | 0 .../algorithms-miscellaneous-4/pom.xml | 0 .../MiddleElementLookup.java | 0 .../algorithms/middleelementlookup/Node.java | 0 .../algorithms/multiswarm/Constants.java | 0 .../multiswarm/FitnessFunction.java | 0 .../algorithms/multiswarm/Multiswarm.java | 0 .../algorithms/multiswarm/Particle.java | 0 .../baeldung/algorithms/multiswarm/Swarm.java | 0 .../algorithms/permutation/Permutation.java | 0 .../SmallestMissingPositiveInteger.java | 0 .../string/EnglishAlphabetLetters.java | 0 ...ongestSubstringNonRepeatingCharacters.java | 0 .../string/SubstringPalindrome.java | 0 .../src/main/resources/logback.xml | 0 .../MiddleElementLookupUnitTest.java | 0 .../multiswarm/LolFitnessFunction.java | 0 .../multiswarm/MultiswarmUnitTest.java | 0 ...mallestMissingPositiveIntegerUnitTest.java | 0 .../EnglishAlphabetLettersUnitTest.java | 0 ...bstringNonRepeatingCharactersUnitTest.java | 0 .../string/SubstringPalindromeUnitTest.java | 0 .../algorithms/support/MayFailRule.java | 0 .../algorithms-miscellaneous-5/README.md | 0 .../algorithms-miscellaneous-5/pom.xml | 0 .../BalancedBinaryTree.java | 0 .../algorithms/balancedbinarytree/Tree.java | 0 .../algorithms/binarygap/BinaryGap.java | 0 .../combinatorics/Combinatorics.java | 0 .../conversion/HexStringConverter.java | 0 .../MedianOfIntegerStream.java | 0 .../MedianOfIntegerStream2.java | 0 .../algorithms/knapsack/Knapsack.java | 0 .../maximumsubarray/BruteForceAlgorithm.java | 0 .../maximumsubarray/KadaneAlgorithm.java | 0 .../mergesortedarrays/SortedArrays.java | 0 .../com/baeldung/algorithms/prim/Edge.java | 0 .../com/baeldung/algorithms/prim/Prim.java | 0 .../com/baeldung/algorithms/prim/Vertex.java | 0 .../relativelyprime/RelativelyPrime.java | 0 .../algorithms/reversingtree/TreeNode.java | 0 .../reversingtree/TreeReverser.java | 0 .../src/main/resources/logback.xml | 0 .../BalancedBinaryTreeUnitTest.java | 0 .../BinaryTreeDataProvider.java | 0 .../binarygap/BinaryGapUnitTest.java | 0 .../combinatorics/CombinatoricsUnitTest.java | 0 .../ByteArrayConverterUnitTest.java | 0 .../MedianOfIntegerStreamUnitTest.java | 0 .../algorithms/knapsack/KnapsackUnitTest.java | 0 .../BruteForceAlgorithmUnitTest.java | 0 .../KadaneAlgorithmUnitTest.java | 0 .../SortedArraysUnitTest.java | 0 .../algorithms/prim/PrimUnitTest.java | 0 .../RelativelyPrimeUnitTest.java | 0 .../reversingtree/TreeReverserUnitTest.java | 0 .../src/test/resources/input.json | 0 .../algorithms-miscellaneous-6/README.md | 0 .../algorithms-miscellaneous-6/pom.xml | 0 .../BalancedBracketsUsingDeque.java | 0 .../BalancedBracketsUsingString.java | 0 .../algorithms/boruvka/BoruvkaMST.java | 0 .../algorithms/boruvka/UnionFind.java | 0 .../algorithms/caesarcipher/CaesarCipher.java | 0 .../gradientdescent/GradientDescent.java | 0 .../baeldung/algorithms/greedy/Follower.java | 0 .../algorithms/greedy/FollowersPath.java | 0 .../algorithms/greedy/GreedyAlgorithm.java | 0 .../algorithms/greedy/NonGreedyAlgorithm.java | 0 .../algorithms/greedy/SocialConnector.java | 0 .../algorithms/greedy/SocialUser.java | 0 .../algorithms/kruskal/CycleDetector.java | 0 .../algorithms/kruskal/DisjointSetInfo.java | 0 .../baeldung/algorithms/kruskal/Kruskal.java | 0 .../linkedlist/LinkedListReversal.java | 0 .../algorithms/linkedlist/ListNode.java | 0 .../algorithms/minheapmerge/HeapNode.java | 0 .../algorithms/minheapmerge/MinHeap.java | 0 .../baeldung/algorithms/play2048/Board.java | 0 .../baeldung/algorithms/play2048/Cell.java | 0 .../algorithms/play2048/Computer.java | 0 .../baeldung/algorithms/play2048/Human.java | 0 .../baeldung/algorithms/play2048/Move.java | 0 .../algorithms/play2048/Play2048.java | 0 .../BruteForceTopKElementsFinder.java | 0 .../MaxHeapTopKElementsFinder.java | 0 .../topkelements/TopKElementsFinder.java | 0 .../TreeSetTopKElementsFinder.java | 0 .../src/main/resources/logback.xml | 0 .../BalancedBracketsUsingDequeUnitTest.java | 0 .../BalancedBracketsUsingStringUnitTest.java | 0 .../algorithms/boruvka/BoruvkaUnitTest.java | 0 .../caesarcipher/CaesarCipherUnitTest.java | 0 .../GradientDescentUnitTest.java | 0 .../greedy/GreedyAlgorithmUnitTest.java | 0 .../algorithms/kruskal/KruskalUnitTest.java | 0 .../LinkedListReversalUnitTest.java | 0 .../minheapmerge/MinHeapUnitTest.java | 0 .../TopKElementsFinderUnitTest.java | 0 .../algorithms-searching/README.md | 0 .../algorithms-searching/pom.xml | 0 .../algorithms/binarysearch/BinarySearch.java | 0 .../BreadthFirstSearchAlgorithm.java | 0 .../algorithms/breadthfirstsearch/Node.java | 0 .../algorithms/breadthfirstsearch/Tree.java | 0 .../baeldung/algorithms/dfs/BinaryTree.java | 0 .../com/baeldung/algorithms/dfs/Graph.java | 0 .../InterpolationSearch.java | 0 .../algorithms/kthsmallest/KthSmallest.java | 0 .../mcts/montecarlo/MonteCarloTreeSearch.java | 0 .../algorithms/mcts/montecarlo/State.java | 0 .../algorithms/mcts/montecarlo/UCT.java | 0 .../algorithms/mcts/tictactoe/Board.java | 0 .../algorithms/mcts/tictactoe/Position.java | 0 .../baeldung/algorithms/mcts/tree/Node.java | 0 .../baeldung/algorithms/mcts/tree/Tree.java | 0 .../baeldung/algorithms/quadtree/Point.java | 0 .../algorithms/quadtree/QuadTree.java | 0 .../baeldung/algorithms/quadtree/Region.java | 0 .../baeldung/algorithms/suffixtree/Node.java | 0 .../algorithms/suffixtree/SuffixTree.java | 0 .../textsearch/TextSearchAlgorithms.java | 0 .../src/main/resources/logback.xml | 0 .../binarysearch/BinarySearchUnitTest.java | 0 .../BreadthFirstSearchAlgorithmUnitTest.java | 0 .../algorithms/dfs/BinaryTreeUnitTest.java | 0 .../algorithms/dfs/GraphUnitTest.java | 0 .../InterpolationSearchUnitTest.java | 0 .../kthsmallest/KthSmallestUnitTest.java | 0 .../algorithms/mcts/MCTSUnitTest.java | 0 .../quadtree/QuadTreeSearchUnitTest.java | 0 .../suffixtree/SuffixTreeUnitTest.java | 0 .../TextSearchAlgorithmsUnitTest.java | 0 .../algorithms-sorting-2/.gitignore | 0 .../algorithms-sorting-2/README.md | 0 .../algorithms-sorting-2/pom.xml | 0 .../bynumber/NaturalOrderComparators.java | 0 .../algorithms/inoutsort/InOutSort.java | 0 .../quicksort/BentleyMcIlroyPartioning.java | 0 .../DutchNationalFlagPartioning.java | 0 .../algorithms/quicksort/Partition.java | 0 .../algorithms/quicksort/SortingUtils.java | 0 .../stringsort/AnagramValidator.java | 0 .../src/main/resources/logback.xml | 0 .../NaturalOrderComparatorsUnitTest.java | 0 .../inoutsort/InOutSortUnitTest.java | 0 .../BentleyMcilroyPartitioningUnitTest.java | 0 .../DNFThreeWayQuickSortUnitTest.java | 0 .../stringsort/AnagramValidatorUnitTest.java | 0 .../stringsort/SortStringUnitTest.java | 0 .../algorithms-sorting/.gitignore | 0 .../algorithms-sorting/README.md | 0 .../algorithms-sorting/pom.xml | 0 .../algorithms/bubblesort/BubbleSort.java | 0 .../bucketsort/IntegerBucketSorter.java | 0 .../algorithms/bucketsort/Sorter.java | 0 .../algorithms/counting/CountingSort.java | 0 .../baeldung/algorithms/heapsort/Heap.java | 0 .../insertionsort/InsertionSort.java | 0 .../algorithms/mergesort/MergeSort.java | 0 .../algorithms/quicksort/QuickSort.java | 0 .../quicksort/ThreeWayQuickSort.java | 0 .../algorithms/radixsort/RadixSort.java | 0 .../selectionsort/SelectionSort.java | 0 .../algorithms/shellsort/ShellSort.java | 0 .../src/main/resources/logback.xml | 0 .../bubblesort/BubbleSortUnitTest.java | 0 .../IntegerBucketSorterUnitTest.java | 0 .../counting/CountingSortUnitTest.java | 0 .../algorithms/heapsort/HeapUnitTest.java | 0 .../insertionsort/InsertionSortUnitTest.java | 0 .../mergesort/MergeSortUnitTest.java | 0 .../quicksort/QuickSortUnitTest.java | 0 .../quicksort/ThreeWayQuickSortUnitTest.java | 0 .../radixsort/RadixSortUnitTest.java | 0 .../selectionsort/SelectionSortUnitTest.java | 0 .../shellsort/ShellSortUnitTest.java | 0 algorithms-modules/pom.xml | 29 ++++++++++++++++++ pom.xml | 22 ++----------- 324 files changed, 31 insertions(+), 20 deletions(-) rename {algorithms-module => algorithms-modules}/algorithms-genetic/.gitignore (100%) rename {algorithms-module => algorithms-modules}/algorithms-genetic/README.md (100%) rename {algorithms-module => algorithms-modules}/algorithms-genetic/pom.xml (100%) rename {algorithms-module => algorithms-modules}/algorithms-genetic/src/main/java/com/baeldung/algorithms/RunAlgorithm.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/annealing/City.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/annealing/SimulatedAnnealing.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/annealing/Travel.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/ant_colony/Ant.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/ant_colony/AntColonyOptimization.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/binary/Individual.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/binary/Population.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/binary/SimpleGeneticAlgorithm.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/Knapsack.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/KnapsackFF.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/KnapsackItem.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/SimpleGeneticAlgorithm.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/SpringsteenProblem.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/SpringsteenRecord.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/SubsetSum.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/TravelingSalesman.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-genetic/src/main/resources/logback.xml (100%) rename {algorithms-module => algorithms-modules}/algorithms-genetic/src/test/java/com/baeldung/algorithms/AntColonyOptimizationLongRunningUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-genetic/src/test/java/com/baeldung/algorithms/BinaryGeneticAlgorithmLongRunningUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-genetic/src/test/java/com/baeldung/algorithms/SimulatedAnnealingLongRunningUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-1/README.md (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-1/pom.xml (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/FiniteStateMachine.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/RtFiniteStateMachine.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/RtState.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/RtTransition.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/State.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/Transition.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/hillclimbing/HillClimbing.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/hillclimbing/State.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/kthlargest/FindKthLargest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/minimax/GameOfBones.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/minimax/MiniMax.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/minimax/Node.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/minimax/Tree.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-1/src/main/resources/logback.xml (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/HillClimbingAlgorithmUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/RtFiniteStateMachineLongRunningUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/kthlargest/FindKthLargestUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/minimax/MinimaxUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/README.md (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/pom.xml (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/RunAlgorithm.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceBase.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceDynamicProgramming.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceRecursive.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/ga/dijkstra/Dijkstra.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/ga/dijkstra/Graph.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/ga/dijkstra/Node.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleDetectionBruteForce.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleDetectionByFastAndSlowIterators.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleDetectionByHashing.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleDetectionResult.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleRemovalBruteForce.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleRemovalByCountingLoopNodes.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleRemovalWithoutCountingLoopNodes.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/Node.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/maze/solver/BFSMazeSolver.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/maze/solver/Coordinate.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/maze/solver/DFSMazeSolver.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/maze/solver/Maze.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/maze/solver/MazeDriver.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/numberwordconverter/NumberWordConverter.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/slope_one/InputData.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/slope_one/Item.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/slope_one/SlopeOne.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/slope_one/User.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/sudoku/BacktrackingAlgorithm.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/sudoku/ColumnNode.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/sudoku/DancingLinks.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/sudoku/DancingLinksAlgorithm.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/sudoku/DancingNode.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/main/resources/logback.xml (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/main/resources/maze/maze1.txt (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/main/resources/maze/maze2.txt (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/DijkstraAlgorithmLongRunningUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/Graph.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/GraphNode.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/RouteFinder.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/RouteNode.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/Scorer.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/underground/HaversineScorer.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/underground/RouteFinderIntegrationTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/underground/Station.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/editdistance/EditDistanceDataProvider.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/editdistance/EditDistanceUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionBruteForceUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionByFastAndSlowIteratorsUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionByHashingUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionTestBase.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalBruteForceUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalByCountingLoopNodesUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalWithoutCountingLoopNodesUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/moneywords/NumberWordConverterUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/CompleteGraphUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/DirectedGraphUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/EulerianCircuitUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/GraphImageGenerationUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-2/src/test/resources/graph.png (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-3/.gitignore (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-3/README.md (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-3/pom.xml (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/checksortedlist/Employee.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/checksortedlist/SortedListChecker.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/enumstatemachine/LeaveRequestState.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/graphcycledetection/domain/Graph.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/graphcycledetection/domain/Vertex.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/Centroid.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/Distance.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/Errors.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/EuclideanDistance.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/KMeans.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/LastFm.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/LastFmService.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/Record.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/printtriangles/PrintTriangleExamples.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/romannumerals/RomanArabicConverter.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/romannumerals/RomanNumeral.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/twopointertechnique/LinkedListFindMiddle.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/twopointertechnique/MyNode.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/twopointertechnique/RotateArray.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/twopointertechnique/TwoSum.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-3/src/main/java/com/baeldung/folding/FoldingHash.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-3/src/main/java/com/baeldung/folding/Main.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-3/src/main/resources/kmeans/artists.json (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-3/src/main/resources/kmeans/lastfm.json (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-3/src/main/resources/kmeans/radial.html (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-3/src/main/resources/logback.xml (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/analysis/AnalysisRunnerLiveTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/checksortedlist/SortedListCheckerUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/enumstatemachine/LeaveRequestStateUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/graphcycledetection/GraphCycleDetectionUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/printtriangles/PrintTriangleExamplesUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/romannumerals/RomanArabicConverterUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/twopointertechnique/LinkedListFindMiddleUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/twopointertechnique/RotateArrayUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/twopointertechnique/TwoSumUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-3/src/test/java/com/baeldung/counter/CounterStatistics.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-3/src/test/java/com/baeldung/counter/CounterUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-3/src/test/java/com/baeldung/counter/CounterUtil.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-3/src/test/java/com/baeldung/folding/FoldingHashUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-4/README.md (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-4/pom.xml (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/middleelementlookup/MiddleElementLookup.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/middleelementlookup/Node.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/multiswarm/Constants.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/multiswarm/FitnessFunction.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/multiswarm/Multiswarm.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/multiswarm/Particle.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/multiswarm/Swarm.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/permutation/Permutation.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/smallestinteger/SmallestMissingPositiveInteger.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/string/EnglishAlphabetLetters.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/string/LongestSubstringNonRepeatingCharacters.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/string/SubstringPalindrome.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-4/src/main/resources/logback.xml (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/MiddleElementLookupUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/multiswarm/LolFitnessFunction.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/multiswarm/MultiswarmUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/smallestinteger/SmallestMissingPositiveIntegerUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/string/EnglishAlphabetLettersUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/string/LongestSubstringNonRepeatingCharactersUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/string/SubstringPalindromeUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/support/MayFailRule.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-5/README.md (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-5/pom.xml (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/balancedbinarytree/BalancedBinaryTree.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/balancedbinarytree/Tree.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/binarygap/BinaryGap.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/combinatorics/Combinatorics.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/conversion/HexStringConverter.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/integerstreammedian/MedianOfIntegerStream.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/integerstreammedian/MedianOfIntegerStream2.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/knapsack/Knapsack.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/maximumsubarray/BruteForceAlgorithm.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/maximumsubarray/KadaneAlgorithm.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/mergesortedarrays/SortedArrays.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/prim/Edge.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/prim/Prim.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/prim/Vertex.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/relativelyprime/RelativelyPrime.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/reversingtree/TreeNode.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/reversingtree/TreeReverser.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-5/src/main/resources/logback.xml (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/balancedbinarytree/BalancedBinaryTreeUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/balancedbinarytree/BinaryTreeDataProvider.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/binarygap/BinaryGapUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/combinatorics/CombinatoricsUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/conversion/ByteArrayConverterUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/integerstreammedian/MedianOfIntegerStreamUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/knapsack/KnapsackUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/maximumsubarray/BruteForceAlgorithmUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/maximumsubarray/KadaneAlgorithmUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/mergesortedarrays/SortedArraysUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/prim/PrimUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/relativelyprime/RelativelyPrimeUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/reversingtree/TreeReverserUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-5/src/test/resources/input.json (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-6/README.md (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-6/pom.xml (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/balancedbrackets/BalancedBracketsUsingDeque.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/balancedbrackets/BalancedBracketsUsingString.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/boruvka/BoruvkaMST.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/boruvka/UnionFind.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/caesarcipher/CaesarCipher.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/gradientdescent/GradientDescent.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/Follower.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/FollowersPath.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/GreedyAlgorithm.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/NonGreedyAlgorithm.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/SocialConnector.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/SocialUser.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/kruskal/CycleDetector.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/kruskal/DisjointSetInfo.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/kruskal/Kruskal.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/linkedlist/LinkedListReversal.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/linkedlist/ListNode.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/minheapmerge/HeapNode.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/minheapmerge/MinHeap.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Board.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Cell.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Computer.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Human.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Move.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Play2048.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/topkelements/BruteForceTopKElementsFinder.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/topkelements/MaxHeapTopKElementsFinder.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/topkelements/TopKElementsFinder.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/topkelements/TreeSetTopKElementsFinder.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-6/src/main/resources/logback.xml (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/balancedbrackets/BalancedBracketsUsingDequeUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/balancedbrackets/BalancedBracketsUsingStringUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/boruvka/BoruvkaUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/caesarcipher/CaesarCipherUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/gradientdescent/GradientDescentUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/greedy/GreedyAlgorithmUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/kruskal/KruskalUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/linkedlist/LinkedListReversalUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/minheapmerge/MinHeapUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/topkelements/TopKElementsFinderUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-searching/README.md (100%) rename {algorithms-module => algorithms-modules}/algorithms-searching/pom.xml (100%) rename {algorithms-module => algorithms-modules}/algorithms-searching/src/main/java/com/baeldung/algorithms/binarysearch/BinarySearch.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-searching/src/main/java/com/baeldung/algorithms/breadthfirstsearch/BreadthFirstSearchAlgorithm.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-searching/src/main/java/com/baeldung/algorithms/breadthfirstsearch/Node.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-searching/src/main/java/com/baeldung/algorithms/breadthfirstsearch/Tree.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-searching/src/main/java/com/baeldung/algorithms/dfs/BinaryTree.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-searching/src/main/java/com/baeldung/algorithms/dfs/Graph.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-searching/src/main/java/com/baeldung/algorithms/interpolationsearch/InterpolationSearch.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-searching/src/main/java/com/baeldung/algorithms/kthsmallest/KthSmallest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/montecarlo/MonteCarloTreeSearch.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/montecarlo/State.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/montecarlo/UCT.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/tictactoe/Board.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/tictactoe/Position.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/tree/Node.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/tree/Tree.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-searching/src/main/java/com/baeldung/algorithms/quadtree/Point.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-searching/src/main/java/com/baeldung/algorithms/quadtree/QuadTree.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-searching/src/main/java/com/baeldung/algorithms/quadtree/Region.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-searching/src/main/java/com/baeldung/algorithms/suffixtree/Node.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-searching/src/main/java/com/baeldung/algorithms/suffixtree/SuffixTree.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-searching/src/main/java/com/baeldung/algorithms/textsearch/TextSearchAlgorithms.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-searching/src/main/resources/logback.xml (100%) rename {algorithms-module => algorithms-modules}/algorithms-searching/src/test/java/com/baeldung/algorithms/binarysearch/BinarySearchUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-searching/src/test/java/com/baeldung/algorithms/breadthfirstsearch/BreadthFirstSearchAlgorithmUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-searching/src/test/java/com/baeldung/algorithms/dfs/BinaryTreeUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-searching/src/test/java/com/baeldung/algorithms/dfs/GraphUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-searching/src/test/java/com/baeldung/algorithms/interpolationsearch/InterpolationSearchUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-searching/src/test/java/com/baeldung/algorithms/kthsmallest/KthSmallestUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-searching/src/test/java/com/baeldung/algorithms/mcts/MCTSUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-searching/src/test/java/com/baeldung/algorithms/quadtree/QuadTreeSearchUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-searching/src/test/java/com/baeldung/algorithms/suffixtree/SuffixTreeUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-searching/src/test/java/com/baeldung/algorithms/textsearch/TextSearchAlgorithmsUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-sorting-2/.gitignore (100%) rename {algorithms-module => algorithms-modules}/algorithms-sorting-2/README.md (100%) rename {algorithms-module => algorithms-modules}/algorithms-sorting-2/pom.xml (100%) rename {algorithms-module => algorithms-modules}/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/bynumber/NaturalOrderComparators.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/inoutsort/InOutSort.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/quicksort/BentleyMcIlroyPartioning.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/quicksort/DutchNationalFlagPartioning.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/quicksort/Partition.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/quicksort/SortingUtils.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/stringsort/AnagramValidator.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-sorting-2/src/main/resources/logback.xml (100%) rename {algorithms-module => algorithms-modules}/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/bynumber/NaturalOrderComparatorsUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/inoutsort/InOutSortUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/quicksort/BentleyMcilroyPartitioningUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/quicksort/DNFThreeWayQuickSortUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/stringsort/AnagramValidatorUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/stringsort/SortStringUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-sorting/.gitignore (100%) rename {algorithms-module => algorithms-modules}/algorithms-sorting/README.md (100%) rename {algorithms-module => algorithms-modules}/algorithms-sorting/pom.xml (100%) rename {algorithms-module => algorithms-modules}/algorithms-sorting/src/main/java/com/baeldung/algorithms/bubblesort/BubbleSort.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-sorting/src/main/java/com/baeldung/algorithms/bucketsort/IntegerBucketSorter.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-sorting/src/main/java/com/baeldung/algorithms/bucketsort/Sorter.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-sorting/src/main/java/com/baeldung/algorithms/counting/CountingSort.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-sorting/src/main/java/com/baeldung/algorithms/heapsort/Heap.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-sorting/src/main/java/com/baeldung/algorithms/insertionsort/InsertionSort.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-sorting/src/main/java/com/baeldung/algorithms/mergesort/MergeSort.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-sorting/src/main/java/com/baeldung/algorithms/quicksort/QuickSort.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-sorting/src/main/java/com/baeldung/algorithms/quicksort/ThreeWayQuickSort.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-sorting/src/main/java/com/baeldung/algorithms/radixsort/RadixSort.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-sorting/src/main/java/com/baeldung/algorithms/selectionsort/SelectionSort.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-sorting/src/main/java/com/baeldung/algorithms/shellsort/ShellSort.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-sorting/src/main/resources/logback.xml (100%) rename {algorithms-module => algorithms-modules}/algorithms-sorting/src/test/java/com/baeldung/algorithms/bubblesort/BubbleSortUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-sorting/src/test/java/com/baeldung/algorithms/bucketsort/IntegerBucketSorterUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-sorting/src/test/java/com/baeldung/algorithms/counting/CountingSortUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-sorting/src/test/java/com/baeldung/algorithms/heapsort/HeapUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-sorting/src/test/java/com/baeldung/algorithms/insertionsort/InsertionSortUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-sorting/src/test/java/com/baeldung/algorithms/mergesort/MergeSortUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-sorting/src/test/java/com/baeldung/algorithms/quicksort/QuickSortUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-sorting/src/test/java/com/baeldung/algorithms/quicksort/ThreeWayQuickSortUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-sorting/src/test/java/com/baeldung/algorithms/radixsort/RadixSortUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-sorting/src/test/java/com/baeldung/algorithms/selectionsort/SelectionSortUnitTest.java (100%) rename {algorithms-module => algorithms-modules}/algorithms-sorting/src/test/java/com/baeldung/algorithms/shellsort/ShellSortUnitTest.java (100%) create mode 100644 algorithms-modules/pom.xml diff --git a/algorithms-module/algorithms-genetic/.gitignore b/algorithms-modules/algorithms-genetic/.gitignore similarity index 100% rename from algorithms-module/algorithms-genetic/.gitignore rename to algorithms-modules/algorithms-genetic/.gitignore diff --git a/algorithms-module/algorithms-genetic/README.md b/algorithms-modules/algorithms-genetic/README.md similarity index 100% rename from algorithms-module/algorithms-genetic/README.md rename to algorithms-modules/algorithms-genetic/README.md diff --git a/algorithms-module/algorithms-genetic/pom.xml b/algorithms-modules/algorithms-genetic/pom.xml similarity index 100% rename from algorithms-module/algorithms-genetic/pom.xml rename to algorithms-modules/algorithms-genetic/pom.xml diff --git a/algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/RunAlgorithm.java b/algorithms-modules/algorithms-genetic/src/main/java/com/baeldung/algorithms/RunAlgorithm.java similarity index 100% rename from algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/RunAlgorithm.java rename to algorithms-modules/algorithms-genetic/src/main/java/com/baeldung/algorithms/RunAlgorithm.java diff --git a/algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/annealing/City.java b/algorithms-modules/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/annealing/City.java similarity index 100% rename from algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/annealing/City.java rename to algorithms-modules/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/annealing/City.java diff --git a/algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/annealing/SimulatedAnnealing.java b/algorithms-modules/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/annealing/SimulatedAnnealing.java similarity index 100% rename from algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/annealing/SimulatedAnnealing.java rename to algorithms-modules/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/annealing/SimulatedAnnealing.java diff --git a/algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/annealing/Travel.java b/algorithms-modules/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/annealing/Travel.java similarity index 100% rename from algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/annealing/Travel.java rename to algorithms-modules/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/annealing/Travel.java diff --git a/algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/ant_colony/Ant.java b/algorithms-modules/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/ant_colony/Ant.java similarity index 100% rename from algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/ant_colony/Ant.java rename to algorithms-modules/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/ant_colony/Ant.java diff --git a/algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/ant_colony/AntColonyOptimization.java b/algorithms-modules/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/ant_colony/AntColonyOptimization.java similarity index 100% rename from algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/ant_colony/AntColonyOptimization.java rename to algorithms-modules/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/ant_colony/AntColonyOptimization.java diff --git a/algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/binary/Individual.java b/algorithms-modules/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/binary/Individual.java similarity index 100% rename from algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/binary/Individual.java rename to algorithms-modules/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/binary/Individual.java diff --git a/algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/binary/Population.java b/algorithms-modules/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/binary/Population.java similarity index 100% rename from algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/binary/Population.java rename to algorithms-modules/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/binary/Population.java diff --git a/algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/binary/SimpleGeneticAlgorithm.java b/algorithms-modules/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/binary/SimpleGeneticAlgorithm.java similarity index 100% rename from algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/binary/SimpleGeneticAlgorithm.java rename to algorithms-modules/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/binary/SimpleGeneticAlgorithm.java diff --git a/algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/Knapsack.java b/algorithms-modules/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/Knapsack.java similarity index 100% rename from algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/Knapsack.java rename to algorithms-modules/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/Knapsack.java diff --git a/algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/KnapsackFF.java b/algorithms-modules/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/KnapsackFF.java similarity index 100% rename from algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/KnapsackFF.java rename to algorithms-modules/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/KnapsackFF.java diff --git a/algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/KnapsackItem.java b/algorithms-modules/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/KnapsackItem.java similarity index 100% rename from algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/KnapsackItem.java rename to algorithms-modules/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/KnapsackItem.java diff --git a/algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/SimpleGeneticAlgorithm.java b/algorithms-modules/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/SimpleGeneticAlgorithm.java similarity index 100% rename from algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/SimpleGeneticAlgorithm.java rename to algorithms-modules/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/SimpleGeneticAlgorithm.java diff --git a/algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/SpringsteenProblem.java b/algorithms-modules/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/SpringsteenProblem.java similarity index 100% rename from algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/SpringsteenProblem.java rename to algorithms-modules/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/SpringsteenProblem.java diff --git a/algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/SpringsteenRecord.java b/algorithms-modules/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/SpringsteenRecord.java similarity index 100% rename from algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/SpringsteenRecord.java rename to algorithms-modules/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/SpringsteenRecord.java diff --git a/algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/SubsetSum.java b/algorithms-modules/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/SubsetSum.java similarity index 100% rename from algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/SubsetSum.java rename to algorithms-modules/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/SubsetSum.java diff --git a/algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/TravelingSalesman.java b/algorithms-modules/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/TravelingSalesman.java similarity index 100% rename from algorithms-module/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/TravelingSalesman.java rename to algorithms-modules/algorithms-genetic/src/main/java/com/baeldung/algorithms/ga/jenetics/TravelingSalesman.java diff --git a/algorithms-module/algorithms-genetic/src/main/resources/logback.xml b/algorithms-modules/algorithms-genetic/src/main/resources/logback.xml similarity index 100% rename from algorithms-module/algorithms-genetic/src/main/resources/logback.xml rename to algorithms-modules/algorithms-genetic/src/main/resources/logback.xml diff --git a/algorithms-module/algorithms-genetic/src/test/java/com/baeldung/algorithms/AntColonyOptimizationLongRunningUnitTest.java b/algorithms-modules/algorithms-genetic/src/test/java/com/baeldung/algorithms/AntColonyOptimizationLongRunningUnitTest.java similarity index 100% rename from algorithms-module/algorithms-genetic/src/test/java/com/baeldung/algorithms/AntColonyOptimizationLongRunningUnitTest.java rename to algorithms-modules/algorithms-genetic/src/test/java/com/baeldung/algorithms/AntColonyOptimizationLongRunningUnitTest.java diff --git a/algorithms-module/algorithms-genetic/src/test/java/com/baeldung/algorithms/BinaryGeneticAlgorithmLongRunningUnitTest.java b/algorithms-modules/algorithms-genetic/src/test/java/com/baeldung/algorithms/BinaryGeneticAlgorithmLongRunningUnitTest.java similarity index 100% rename from algorithms-module/algorithms-genetic/src/test/java/com/baeldung/algorithms/BinaryGeneticAlgorithmLongRunningUnitTest.java rename to algorithms-modules/algorithms-genetic/src/test/java/com/baeldung/algorithms/BinaryGeneticAlgorithmLongRunningUnitTest.java diff --git a/algorithms-module/algorithms-genetic/src/test/java/com/baeldung/algorithms/SimulatedAnnealingLongRunningUnitTest.java b/algorithms-modules/algorithms-genetic/src/test/java/com/baeldung/algorithms/SimulatedAnnealingLongRunningUnitTest.java similarity index 100% rename from algorithms-module/algorithms-genetic/src/test/java/com/baeldung/algorithms/SimulatedAnnealingLongRunningUnitTest.java rename to algorithms-modules/algorithms-genetic/src/test/java/com/baeldung/algorithms/SimulatedAnnealingLongRunningUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-1/README.md b/algorithms-modules/algorithms-miscellaneous-1/README.md similarity index 100% rename from algorithms-module/algorithms-miscellaneous-1/README.md rename to algorithms-modules/algorithms-miscellaneous-1/README.md diff --git a/algorithms-module/algorithms-miscellaneous-1/pom.xml b/algorithms-modules/algorithms-miscellaneous-1/pom.xml similarity index 100% rename from algorithms-module/algorithms-miscellaneous-1/pom.xml rename to algorithms-modules/algorithms-miscellaneous-1/pom.xml diff --git a/algorithms-module/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/FiniteStateMachine.java b/algorithms-modules/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/FiniteStateMachine.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/FiniteStateMachine.java rename to algorithms-modules/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/FiniteStateMachine.java diff --git a/algorithms-module/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/RtFiniteStateMachine.java b/algorithms-modules/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/RtFiniteStateMachine.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/RtFiniteStateMachine.java rename to algorithms-modules/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/RtFiniteStateMachine.java diff --git a/algorithms-module/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/RtState.java b/algorithms-modules/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/RtState.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/RtState.java rename to algorithms-modules/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/RtState.java diff --git a/algorithms-module/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/RtTransition.java b/algorithms-modules/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/RtTransition.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/RtTransition.java rename to algorithms-modules/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/RtTransition.java diff --git a/algorithms-module/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/State.java b/algorithms-modules/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/State.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/State.java rename to algorithms-modules/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/State.java diff --git a/algorithms-module/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/Transition.java b/algorithms-modules/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/Transition.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/Transition.java rename to algorithms-modules/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/automata/Transition.java diff --git a/algorithms-module/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/hillclimbing/HillClimbing.java b/algorithms-modules/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/hillclimbing/HillClimbing.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/hillclimbing/HillClimbing.java rename to algorithms-modules/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/hillclimbing/HillClimbing.java diff --git a/algorithms-module/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/hillclimbing/State.java b/algorithms-modules/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/hillclimbing/State.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/hillclimbing/State.java rename to algorithms-modules/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/hillclimbing/State.java diff --git a/algorithms-module/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/kthlargest/FindKthLargest.java b/algorithms-modules/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/kthlargest/FindKthLargest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/kthlargest/FindKthLargest.java rename to algorithms-modules/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/kthlargest/FindKthLargest.java diff --git a/algorithms-module/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/minimax/GameOfBones.java b/algorithms-modules/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/minimax/GameOfBones.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/minimax/GameOfBones.java rename to algorithms-modules/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/minimax/GameOfBones.java diff --git a/algorithms-module/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/minimax/MiniMax.java b/algorithms-modules/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/minimax/MiniMax.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/minimax/MiniMax.java rename to algorithms-modules/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/minimax/MiniMax.java diff --git a/algorithms-module/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/minimax/Node.java b/algorithms-modules/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/minimax/Node.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/minimax/Node.java rename to algorithms-modules/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/minimax/Node.java diff --git a/algorithms-module/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/minimax/Tree.java b/algorithms-modules/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/minimax/Tree.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/minimax/Tree.java rename to algorithms-modules/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/minimax/Tree.java diff --git a/algorithms-module/algorithms-miscellaneous-1/src/main/resources/logback.xml b/algorithms-modules/algorithms-miscellaneous-1/src/main/resources/logback.xml similarity index 100% rename from algorithms-module/algorithms-miscellaneous-1/src/main/resources/logback.xml rename to algorithms-modules/algorithms-miscellaneous-1/src/main/resources/logback.xml diff --git a/algorithms-module/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/HillClimbingAlgorithmUnitTest.java b/algorithms-modules/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/HillClimbingAlgorithmUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/HillClimbingAlgorithmUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/HillClimbingAlgorithmUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/RtFiniteStateMachineLongRunningUnitTest.java b/algorithms-modules/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/RtFiniteStateMachineLongRunningUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/RtFiniteStateMachineLongRunningUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/RtFiniteStateMachineLongRunningUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/kthlargest/FindKthLargestUnitTest.java b/algorithms-modules/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/kthlargest/FindKthLargestUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/kthlargest/FindKthLargestUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/kthlargest/FindKthLargestUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/minimax/MinimaxUnitTest.java b/algorithms-modules/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/minimax/MinimaxUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/minimax/MinimaxUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/minimax/MinimaxUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-2/README.md b/algorithms-modules/algorithms-miscellaneous-2/README.md similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/README.md rename to algorithms-modules/algorithms-miscellaneous-2/README.md diff --git a/algorithms-module/algorithms-miscellaneous-2/pom.xml b/algorithms-modules/algorithms-miscellaneous-2/pom.xml similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/pom.xml rename to algorithms-modules/algorithms-miscellaneous-2/pom.xml diff --git a/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/RunAlgorithm.java b/algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/RunAlgorithm.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/RunAlgorithm.java rename to algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/RunAlgorithm.java diff --git a/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceBase.java b/algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceBase.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceBase.java rename to algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceBase.java diff --git a/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceDynamicProgramming.java b/algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceDynamicProgramming.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceDynamicProgramming.java rename to algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceDynamicProgramming.java diff --git a/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceRecursive.java b/algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceRecursive.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceRecursive.java rename to algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceRecursive.java diff --git a/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/ga/dijkstra/Dijkstra.java b/algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/ga/dijkstra/Dijkstra.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/ga/dijkstra/Dijkstra.java rename to algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/ga/dijkstra/Dijkstra.java diff --git a/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/ga/dijkstra/Graph.java b/algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/ga/dijkstra/Graph.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/ga/dijkstra/Graph.java rename to algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/ga/dijkstra/Graph.java diff --git a/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/ga/dijkstra/Node.java b/algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/ga/dijkstra/Node.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/ga/dijkstra/Node.java rename to algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/ga/dijkstra/Node.java diff --git a/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleDetectionBruteForce.java b/algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleDetectionBruteForce.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleDetectionBruteForce.java rename to algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleDetectionBruteForce.java diff --git a/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleDetectionByFastAndSlowIterators.java b/algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleDetectionByFastAndSlowIterators.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleDetectionByFastAndSlowIterators.java rename to algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleDetectionByFastAndSlowIterators.java diff --git a/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleDetectionByHashing.java b/algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleDetectionByHashing.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleDetectionByHashing.java rename to algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleDetectionByHashing.java diff --git a/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleDetectionResult.java b/algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleDetectionResult.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleDetectionResult.java rename to algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleDetectionResult.java diff --git a/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleRemovalBruteForce.java b/algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleRemovalBruteForce.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleRemovalBruteForce.java rename to algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleRemovalBruteForce.java diff --git a/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleRemovalByCountingLoopNodes.java b/algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleRemovalByCountingLoopNodes.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleRemovalByCountingLoopNodes.java rename to algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleRemovalByCountingLoopNodes.java diff --git a/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleRemovalWithoutCountingLoopNodes.java b/algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleRemovalWithoutCountingLoopNodes.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleRemovalWithoutCountingLoopNodes.java rename to algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/CycleRemovalWithoutCountingLoopNodes.java diff --git a/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/Node.java b/algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/Node.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/Node.java rename to algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/linkedlist/Node.java diff --git a/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/maze/solver/BFSMazeSolver.java b/algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/maze/solver/BFSMazeSolver.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/maze/solver/BFSMazeSolver.java rename to algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/maze/solver/BFSMazeSolver.java diff --git a/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/maze/solver/Coordinate.java b/algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/maze/solver/Coordinate.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/maze/solver/Coordinate.java rename to algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/maze/solver/Coordinate.java diff --git a/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/maze/solver/DFSMazeSolver.java b/algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/maze/solver/DFSMazeSolver.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/maze/solver/DFSMazeSolver.java rename to algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/maze/solver/DFSMazeSolver.java diff --git a/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/maze/solver/Maze.java b/algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/maze/solver/Maze.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/maze/solver/Maze.java rename to algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/maze/solver/Maze.java diff --git a/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/maze/solver/MazeDriver.java b/algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/maze/solver/MazeDriver.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/maze/solver/MazeDriver.java rename to algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/maze/solver/MazeDriver.java diff --git a/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/numberwordconverter/NumberWordConverter.java b/algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/numberwordconverter/NumberWordConverter.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/numberwordconverter/NumberWordConverter.java rename to algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/numberwordconverter/NumberWordConverter.java diff --git a/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/slope_one/InputData.java b/algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/slope_one/InputData.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/slope_one/InputData.java rename to algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/slope_one/InputData.java diff --git a/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/slope_one/Item.java b/algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/slope_one/Item.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/slope_one/Item.java rename to algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/slope_one/Item.java diff --git a/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/slope_one/SlopeOne.java b/algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/slope_one/SlopeOne.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/slope_one/SlopeOne.java rename to algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/slope_one/SlopeOne.java diff --git a/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/slope_one/User.java b/algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/slope_one/User.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/slope_one/User.java rename to algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/slope_one/User.java diff --git a/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/sudoku/BacktrackingAlgorithm.java b/algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/sudoku/BacktrackingAlgorithm.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/sudoku/BacktrackingAlgorithm.java rename to algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/sudoku/BacktrackingAlgorithm.java diff --git a/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/sudoku/ColumnNode.java b/algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/sudoku/ColumnNode.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/sudoku/ColumnNode.java rename to algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/sudoku/ColumnNode.java diff --git a/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/sudoku/DancingLinks.java b/algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/sudoku/DancingLinks.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/sudoku/DancingLinks.java rename to algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/sudoku/DancingLinks.java diff --git a/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/sudoku/DancingLinksAlgorithm.java b/algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/sudoku/DancingLinksAlgorithm.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/sudoku/DancingLinksAlgorithm.java rename to algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/sudoku/DancingLinksAlgorithm.java diff --git a/algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/sudoku/DancingNode.java b/algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/sudoku/DancingNode.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/sudoku/DancingNode.java rename to algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/sudoku/DancingNode.java diff --git a/algorithms-module/algorithms-miscellaneous-2/src/main/resources/logback.xml b/algorithms-modules/algorithms-miscellaneous-2/src/main/resources/logback.xml similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/main/resources/logback.xml rename to algorithms-modules/algorithms-miscellaneous-2/src/main/resources/logback.xml diff --git a/algorithms-module/algorithms-miscellaneous-2/src/main/resources/maze/maze1.txt b/algorithms-modules/algorithms-miscellaneous-2/src/main/resources/maze/maze1.txt similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/main/resources/maze/maze1.txt rename to algorithms-modules/algorithms-miscellaneous-2/src/main/resources/maze/maze1.txt diff --git a/algorithms-module/algorithms-miscellaneous-2/src/main/resources/maze/maze2.txt b/algorithms-modules/algorithms-miscellaneous-2/src/main/resources/maze/maze2.txt similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/main/resources/maze/maze2.txt rename to algorithms-modules/algorithms-miscellaneous-2/src/main/resources/maze/maze2.txt diff --git a/algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/DijkstraAlgorithmLongRunningUnitTest.java b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/DijkstraAlgorithmLongRunningUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/DijkstraAlgorithmLongRunningUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/DijkstraAlgorithmLongRunningUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/Graph.java b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/Graph.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/Graph.java rename to algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/Graph.java diff --git a/algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/GraphNode.java b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/GraphNode.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/GraphNode.java rename to algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/GraphNode.java diff --git a/algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/RouteFinder.java b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/RouteFinder.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/RouteFinder.java rename to algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/RouteFinder.java diff --git a/algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/RouteNode.java b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/RouteNode.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/RouteNode.java rename to algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/RouteNode.java diff --git a/algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/Scorer.java b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/Scorer.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/Scorer.java rename to algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/Scorer.java diff --git a/algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/underground/HaversineScorer.java b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/underground/HaversineScorer.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/underground/HaversineScorer.java rename to algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/underground/HaversineScorer.java diff --git a/algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/underground/RouteFinderIntegrationTest.java b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/underground/RouteFinderIntegrationTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/underground/RouteFinderIntegrationTest.java rename to algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/underground/RouteFinderIntegrationTest.java diff --git a/algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/underground/Station.java b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/underground/Station.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/underground/Station.java rename to algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/underground/Station.java diff --git a/algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/editdistance/EditDistanceDataProvider.java b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/editdistance/EditDistanceDataProvider.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/editdistance/EditDistanceDataProvider.java rename to algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/editdistance/EditDistanceDataProvider.java diff --git a/algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/editdistance/EditDistanceUnitTest.java b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/editdistance/EditDistanceUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/editdistance/EditDistanceUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/editdistance/EditDistanceUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionBruteForceUnitTest.java b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionBruteForceUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionBruteForceUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionBruteForceUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionByFastAndSlowIteratorsUnitTest.java b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionByFastAndSlowIteratorsUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionByFastAndSlowIteratorsUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionByFastAndSlowIteratorsUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionByHashingUnitTest.java b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionByHashingUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionByHashingUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionByHashingUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionTestBase.java b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionTestBase.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionTestBase.java rename to algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionTestBase.java diff --git a/algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalBruteForceUnitTest.java b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalBruteForceUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalBruteForceUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalBruteForceUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalByCountingLoopNodesUnitTest.java b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalByCountingLoopNodesUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalByCountingLoopNodesUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalByCountingLoopNodesUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalWithoutCountingLoopNodesUnitTest.java b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalWithoutCountingLoopNodesUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalWithoutCountingLoopNodesUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalWithoutCountingLoopNodesUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/moneywords/NumberWordConverterUnitTest.java b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/moneywords/NumberWordConverterUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/moneywords/NumberWordConverterUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/moneywords/NumberWordConverterUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/CompleteGraphUnitTest.java b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/CompleteGraphUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/CompleteGraphUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/CompleteGraphUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/DirectedGraphUnitTest.java b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/DirectedGraphUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/DirectedGraphUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/DirectedGraphUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/EulerianCircuitUnitTest.java b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/EulerianCircuitUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/EulerianCircuitUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/EulerianCircuitUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/GraphImageGenerationUnitTest.java b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/GraphImageGenerationUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/GraphImageGenerationUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/GraphImageGenerationUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-2/src/test/resources/graph.png b/algorithms-modules/algorithms-miscellaneous-2/src/test/resources/graph.png similarity index 100% rename from algorithms-module/algorithms-miscellaneous-2/src/test/resources/graph.png rename to algorithms-modules/algorithms-miscellaneous-2/src/test/resources/graph.png diff --git a/algorithms-module/algorithms-miscellaneous-3/.gitignore b/algorithms-modules/algorithms-miscellaneous-3/.gitignore similarity index 100% rename from algorithms-module/algorithms-miscellaneous-3/.gitignore rename to algorithms-modules/algorithms-miscellaneous-3/.gitignore diff --git a/algorithms-module/algorithms-miscellaneous-3/README.md b/algorithms-modules/algorithms-miscellaneous-3/README.md similarity index 100% rename from algorithms-module/algorithms-miscellaneous-3/README.md rename to algorithms-modules/algorithms-miscellaneous-3/README.md diff --git a/algorithms-module/algorithms-miscellaneous-3/pom.xml b/algorithms-modules/algorithms-miscellaneous-3/pom.xml similarity index 100% rename from algorithms-module/algorithms-miscellaneous-3/pom.xml rename to algorithms-modules/algorithms-miscellaneous-3/pom.xml diff --git a/algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/checksortedlist/Employee.java b/algorithms-modules/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/checksortedlist/Employee.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/checksortedlist/Employee.java rename to algorithms-modules/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/checksortedlist/Employee.java diff --git a/algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/checksortedlist/SortedListChecker.java b/algorithms-modules/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/checksortedlist/SortedListChecker.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/checksortedlist/SortedListChecker.java rename to algorithms-modules/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/checksortedlist/SortedListChecker.java diff --git a/algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/enumstatemachine/LeaveRequestState.java b/algorithms-modules/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/enumstatemachine/LeaveRequestState.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/enumstatemachine/LeaveRequestState.java rename to algorithms-modules/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/enumstatemachine/LeaveRequestState.java diff --git a/algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/graphcycledetection/domain/Graph.java b/algorithms-modules/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/graphcycledetection/domain/Graph.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/graphcycledetection/domain/Graph.java rename to algorithms-modules/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/graphcycledetection/domain/Graph.java diff --git a/algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/graphcycledetection/domain/Vertex.java b/algorithms-modules/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/graphcycledetection/domain/Vertex.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/graphcycledetection/domain/Vertex.java rename to algorithms-modules/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/graphcycledetection/domain/Vertex.java diff --git a/algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/Centroid.java b/algorithms-modules/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/Centroid.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/Centroid.java rename to algorithms-modules/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/Centroid.java diff --git a/algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/Distance.java b/algorithms-modules/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/Distance.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/Distance.java rename to algorithms-modules/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/Distance.java diff --git a/algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/Errors.java b/algorithms-modules/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/Errors.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/Errors.java rename to algorithms-modules/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/Errors.java diff --git a/algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/EuclideanDistance.java b/algorithms-modules/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/EuclideanDistance.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/EuclideanDistance.java rename to algorithms-modules/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/EuclideanDistance.java diff --git a/algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/KMeans.java b/algorithms-modules/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/KMeans.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/KMeans.java rename to algorithms-modules/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/KMeans.java diff --git a/algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/LastFm.java b/algorithms-modules/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/LastFm.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/LastFm.java rename to algorithms-modules/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/LastFm.java diff --git a/algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/LastFmService.java b/algorithms-modules/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/LastFmService.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/LastFmService.java rename to algorithms-modules/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/LastFmService.java diff --git a/algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/Record.java b/algorithms-modules/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/Record.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/Record.java rename to algorithms-modules/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/kmeans/Record.java diff --git a/algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/printtriangles/PrintTriangleExamples.java b/algorithms-modules/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/printtriangles/PrintTriangleExamples.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/printtriangles/PrintTriangleExamples.java rename to algorithms-modules/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/printtriangles/PrintTriangleExamples.java diff --git a/algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/romannumerals/RomanArabicConverter.java b/algorithms-modules/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/romannumerals/RomanArabicConverter.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/romannumerals/RomanArabicConverter.java rename to algorithms-modules/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/romannumerals/RomanArabicConverter.java diff --git a/algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/romannumerals/RomanNumeral.java b/algorithms-modules/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/romannumerals/RomanNumeral.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/romannumerals/RomanNumeral.java rename to algorithms-modules/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/romannumerals/RomanNumeral.java diff --git a/algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/twopointertechnique/LinkedListFindMiddle.java b/algorithms-modules/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/twopointertechnique/LinkedListFindMiddle.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/twopointertechnique/LinkedListFindMiddle.java rename to algorithms-modules/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/twopointertechnique/LinkedListFindMiddle.java diff --git a/algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/twopointertechnique/MyNode.java b/algorithms-modules/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/twopointertechnique/MyNode.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/twopointertechnique/MyNode.java rename to algorithms-modules/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/twopointertechnique/MyNode.java diff --git a/algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/twopointertechnique/RotateArray.java b/algorithms-modules/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/twopointertechnique/RotateArray.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/twopointertechnique/RotateArray.java rename to algorithms-modules/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/twopointertechnique/RotateArray.java diff --git a/algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/twopointertechnique/TwoSum.java b/algorithms-modules/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/twopointertechnique/TwoSum.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/twopointertechnique/TwoSum.java rename to algorithms-modules/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/twopointertechnique/TwoSum.java diff --git a/algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/folding/FoldingHash.java b/algorithms-modules/algorithms-miscellaneous-3/src/main/java/com/baeldung/folding/FoldingHash.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/folding/FoldingHash.java rename to algorithms-modules/algorithms-miscellaneous-3/src/main/java/com/baeldung/folding/FoldingHash.java diff --git a/algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/folding/Main.java b/algorithms-modules/algorithms-miscellaneous-3/src/main/java/com/baeldung/folding/Main.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-3/src/main/java/com/baeldung/folding/Main.java rename to algorithms-modules/algorithms-miscellaneous-3/src/main/java/com/baeldung/folding/Main.java diff --git a/algorithms-module/algorithms-miscellaneous-3/src/main/resources/kmeans/artists.json b/algorithms-modules/algorithms-miscellaneous-3/src/main/resources/kmeans/artists.json similarity index 100% rename from algorithms-module/algorithms-miscellaneous-3/src/main/resources/kmeans/artists.json rename to algorithms-modules/algorithms-miscellaneous-3/src/main/resources/kmeans/artists.json diff --git a/algorithms-module/algorithms-miscellaneous-3/src/main/resources/kmeans/lastfm.json b/algorithms-modules/algorithms-miscellaneous-3/src/main/resources/kmeans/lastfm.json similarity index 100% rename from algorithms-module/algorithms-miscellaneous-3/src/main/resources/kmeans/lastfm.json rename to algorithms-modules/algorithms-miscellaneous-3/src/main/resources/kmeans/lastfm.json diff --git a/algorithms-module/algorithms-miscellaneous-3/src/main/resources/kmeans/radial.html b/algorithms-modules/algorithms-miscellaneous-3/src/main/resources/kmeans/radial.html similarity index 100% rename from algorithms-module/algorithms-miscellaneous-3/src/main/resources/kmeans/radial.html rename to algorithms-modules/algorithms-miscellaneous-3/src/main/resources/kmeans/radial.html diff --git a/algorithms-module/algorithms-miscellaneous-3/src/main/resources/logback.xml b/algorithms-modules/algorithms-miscellaneous-3/src/main/resources/logback.xml similarity index 100% rename from algorithms-module/algorithms-miscellaneous-3/src/main/resources/logback.xml rename to algorithms-modules/algorithms-miscellaneous-3/src/main/resources/logback.xml diff --git a/algorithms-module/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/analysis/AnalysisRunnerLiveTest.java b/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/analysis/AnalysisRunnerLiveTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/analysis/AnalysisRunnerLiveTest.java rename to algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/analysis/AnalysisRunnerLiveTest.java diff --git a/algorithms-module/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/checksortedlist/SortedListCheckerUnitTest.java b/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/checksortedlist/SortedListCheckerUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/checksortedlist/SortedListCheckerUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/checksortedlist/SortedListCheckerUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/enumstatemachine/LeaveRequestStateUnitTest.java b/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/enumstatemachine/LeaveRequestStateUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/enumstatemachine/LeaveRequestStateUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/enumstatemachine/LeaveRequestStateUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/graphcycledetection/GraphCycleDetectionUnitTest.java b/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/graphcycledetection/GraphCycleDetectionUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/graphcycledetection/GraphCycleDetectionUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/graphcycledetection/GraphCycleDetectionUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/printtriangles/PrintTriangleExamplesUnitTest.java b/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/printtriangles/PrintTriangleExamplesUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/printtriangles/PrintTriangleExamplesUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/printtriangles/PrintTriangleExamplesUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/romannumerals/RomanArabicConverterUnitTest.java b/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/romannumerals/RomanArabicConverterUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/romannumerals/RomanArabicConverterUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/romannumerals/RomanArabicConverterUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/twopointertechnique/LinkedListFindMiddleUnitTest.java b/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/twopointertechnique/LinkedListFindMiddleUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/twopointertechnique/LinkedListFindMiddleUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/twopointertechnique/LinkedListFindMiddleUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/twopointertechnique/RotateArrayUnitTest.java b/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/twopointertechnique/RotateArrayUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/twopointertechnique/RotateArrayUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/twopointertechnique/RotateArrayUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/twopointertechnique/TwoSumUnitTest.java b/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/twopointertechnique/TwoSumUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/twopointertechnique/TwoSumUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/twopointertechnique/TwoSumUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-3/src/test/java/com/baeldung/counter/CounterStatistics.java b/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/counter/CounterStatistics.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-3/src/test/java/com/baeldung/counter/CounterStatistics.java rename to algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/counter/CounterStatistics.java diff --git a/algorithms-module/algorithms-miscellaneous-3/src/test/java/com/baeldung/counter/CounterUnitTest.java b/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/counter/CounterUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-3/src/test/java/com/baeldung/counter/CounterUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/counter/CounterUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-3/src/test/java/com/baeldung/counter/CounterUtil.java b/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/counter/CounterUtil.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-3/src/test/java/com/baeldung/counter/CounterUtil.java rename to algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/counter/CounterUtil.java diff --git a/algorithms-module/algorithms-miscellaneous-3/src/test/java/com/baeldung/folding/FoldingHashUnitTest.java b/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/folding/FoldingHashUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-3/src/test/java/com/baeldung/folding/FoldingHashUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/folding/FoldingHashUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-4/README.md b/algorithms-modules/algorithms-miscellaneous-4/README.md similarity index 100% rename from algorithms-module/algorithms-miscellaneous-4/README.md rename to algorithms-modules/algorithms-miscellaneous-4/README.md diff --git a/algorithms-module/algorithms-miscellaneous-4/pom.xml b/algorithms-modules/algorithms-miscellaneous-4/pom.xml similarity index 100% rename from algorithms-module/algorithms-miscellaneous-4/pom.xml rename to algorithms-modules/algorithms-miscellaneous-4/pom.xml diff --git a/algorithms-module/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/middleelementlookup/MiddleElementLookup.java b/algorithms-modules/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/middleelementlookup/MiddleElementLookup.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/middleelementlookup/MiddleElementLookup.java rename to algorithms-modules/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/middleelementlookup/MiddleElementLookup.java diff --git a/algorithms-module/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/middleelementlookup/Node.java b/algorithms-modules/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/middleelementlookup/Node.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/middleelementlookup/Node.java rename to algorithms-modules/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/middleelementlookup/Node.java diff --git a/algorithms-module/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/multiswarm/Constants.java b/algorithms-modules/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/multiswarm/Constants.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/multiswarm/Constants.java rename to algorithms-modules/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/multiswarm/Constants.java diff --git a/algorithms-module/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/multiswarm/FitnessFunction.java b/algorithms-modules/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/multiswarm/FitnessFunction.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/multiswarm/FitnessFunction.java rename to algorithms-modules/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/multiswarm/FitnessFunction.java diff --git a/algorithms-module/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/multiswarm/Multiswarm.java b/algorithms-modules/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/multiswarm/Multiswarm.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/multiswarm/Multiswarm.java rename to algorithms-modules/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/multiswarm/Multiswarm.java diff --git a/algorithms-module/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/multiswarm/Particle.java b/algorithms-modules/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/multiswarm/Particle.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/multiswarm/Particle.java rename to algorithms-modules/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/multiswarm/Particle.java diff --git a/algorithms-module/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/multiswarm/Swarm.java b/algorithms-modules/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/multiswarm/Swarm.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/multiswarm/Swarm.java rename to algorithms-modules/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/multiswarm/Swarm.java diff --git a/algorithms-module/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/permutation/Permutation.java b/algorithms-modules/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/permutation/Permutation.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/permutation/Permutation.java rename to algorithms-modules/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/permutation/Permutation.java diff --git a/algorithms-module/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/smallestinteger/SmallestMissingPositiveInteger.java b/algorithms-modules/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/smallestinteger/SmallestMissingPositiveInteger.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/smallestinteger/SmallestMissingPositiveInteger.java rename to algorithms-modules/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/smallestinteger/SmallestMissingPositiveInteger.java diff --git a/algorithms-module/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/string/EnglishAlphabetLetters.java b/algorithms-modules/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/string/EnglishAlphabetLetters.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/string/EnglishAlphabetLetters.java rename to algorithms-modules/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/string/EnglishAlphabetLetters.java diff --git a/algorithms-module/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/string/LongestSubstringNonRepeatingCharacters.java b/algorithms-modules/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/string/LongestSubstringNonRepeatingCharacters.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/string/LongestSubstringNonRepeatingCharacters.java rename to algorithms-modules/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/string/LongestSubstringNonRepeatingCharacters.java diff --git a/algorithms-module/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/string/SubstringPalindrome.java b/algorithms-modules/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/string/SubstringPalindrome.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/string/SubstringPalindrome.java rename to algorithms-modules/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/string/SubstringPalindrome.java diff --git a/algorithms-module/algorithms-miscellaneous-4/src/main/resources/logback.xml b/algorithms-modules/algorithms-miscellaneous-4/src/main/resources/logback.xml similarity index 100% rename from algorithms-module/algorithms-miscellaneous-4/src/main/resources/logback.xml rename to algorithms-modules/algorithms-miscellaneous-4/src/main/resources/logback.xml diff --git a/algorithms-module/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/MiddleElementLookupUnitTest.java b/algorithms-modules/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/MiddleElementLookupUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/MiddleElementLookupUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/MiddleElementLookupUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/multiswarm/LolFitnessFunction.java b/algorithms-modules/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/multiswarm/LolFitnessFunction.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/multiswarm/LolFitnessFunction.java rename to algorithms-modules/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/multiswarm/LolFitnessFunction.java diff --git a/algorithms-module/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/multiswarm/MultiswarmUnitTest.java b/algorithms-modules/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/multiswarm/MultiswarmUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/multiswarm/MultiswarmUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/multiswarm/MultiswarmUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/smallestinteger/SmallestMissingPositiveIntegerUnitTest.java b/algorithms-modules/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/smallestinteger/SmallestMissingPositiveIntegerUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/smallestinteger/SmallestMissingPositiveIntegerUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/smallestinteger/SmallestMissingPositiveIntegerUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/string/EnglishAlphabetLettersUnitTest.java b/algorithms-modules/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/string/EnglishAlphabetLettersUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/string/EnglishAlphabetLettersUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/string/EnglishAlphabetLettersUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/string/LongestSubstringNonRepeatingCharactersUnitTest.java b/algorithms-modules/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/string/LongestSubstringNonRepeatingCharactersUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/string/LongestSubstringNonRepeatingCharactersUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/string/LongestSubstringNonRepeatingCharactersUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/string/SubstringPalindromeUnitTest.java b/algorithms-modules/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/string/SubstringPalindromeUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/string/SubstringPalindromeUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/string/SubstringPalindromeUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/support/MayFailRule.java b/algorithms-modules/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/support/MayFailRule.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/support/MayFailRule.java rename to algorithms-modules/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/support/MayFailRule.java diff --git a/algorithms-module/algorithms-miscellaneous-5/README.md b/algorithms-modules/algorithms-miscellaneous-5/README.md similarity index 100% rename from algorithms-module/algorithms-miscellaneous-5/README.md rename to algorithms-modules/algorithms-miscellaneous-5/README.md diff --git a/algorithms-module/algorithms-miscellaneous-5/pom.xml b/algorithms-modules/algorithms-miscellaneous-5/pom.xml similarity index 100% rename from algorithms-module/algorithms-miscellaneous-5/pom.xml rename to algorithms-modules/algorithms-miscellaneous-5/pom.xml diff --git a/algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/balancedbinarytree/BalancedBinaryTree.java b/algorithms-modules/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/balancedbinarytree/BalancedBinaryTree.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/balancedbinarytree/BalancedBinaryTree.java rename to algorithms-modules/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/balancedbinarytree/BalancedBinaryTree.java diff --git a/algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/balancedbinarytree/Tree.java b/algorithms-modules/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/balancedbinarytree/Tree.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/balancedbinarytree/Tree.java rename to algorithms-modules/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/balancedbinarytree/Tree.java diff --git a/algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/binarygap/BinaryGap.java b/algorithms-modules/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/binarygap/BinaryGap.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/binarygap/BinaryGap.java rename to algorithms-modules/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/binarygap/BinaryGap.java diff --git a/algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/combinatorics/Combinatorics.java b/algorithms-modules/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/combinatorics/Combinatorics.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/combinatorics/Combinatorics.java rename to algorithms-modules/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/combinatorics/Combinatorics.java diff --git a/algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/conversion/HexStringConverter.java b/algorithms-modules/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/conversion/HexStringConverter.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/conversion/HexStringConverter.java rename to algorithms-modules/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/conversion/HexStringConverter.java diff --git a/algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/integerstreammedian/MedianOfIntegerStream.java b/algorithms-modules/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/integerstreammedian/MedianOfIntegerStream.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/integerstreammedian/MedianOfIntegerStream.java rename to algorithms-modules/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/integerstreammedian/MedianOfIntegerStream.java diff --git a/algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/integerstreammedian/MedianOfIntegerStream2.java b/algorithms-modules/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/integerstreammedian/MedianOfIntegerStream2.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/integerstreammedian/MedianOfIntegerStream2.java rename to algorithms-modules/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/integerstreammedian/MedianOfIntegerStream2.java diff --git a/algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/knapsack/Knapsack.java b/algorithms-modules/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/knapsack/Knapsack.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/knapsack/Knapsack.java rename to algorithms-modules/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/knapsack/Knapsack.java diff --git a/algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/maximumsubarray/BruteForceAlgorithm.java b/algorithms-modules/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/maximumsubarray/BruteForceAlgorithm.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/maximumsubarray/BruteForceAlgorithm.java rename to algorithms-modules/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/maximumsubarray/BruteForceAlgorithm.java diff --git a/algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/maximumsubarray/KadaneAlgorithm.java b/algorithms-modules/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/maximumsubarray/KadaneAlgorithm.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/maximumsubarray/KadaneAlgorithm.java rename to algorithms-modules/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/maximumsubarray/KadaneAlgorithm.java diff --git a/algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/mergesortedarrays/SortedArrays.java b/algorithms-modules/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/mergesortedarrays/SortedArrays.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/mergesortedarrays/SortedArrays.java rename to algorithms-modules/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/mergesortedarrays/SortedArrays.java diff --git a/algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/prim/Edge.java b/algorithms-modules/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/prim/Edge.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/prim/Edge.java rename to algorithms-modules/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/prim/Edge.java diff --git a/algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/prim/Prim.java b/algorithms-modules/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/prim/Prim.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/prim/Prim.java rename to algorithms-modules/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/prim/Prim.java diff --git a/algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/prim/Vertex.java b/algorithms-modules/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/prim/Vertex.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/prim/Vertex.java rename to algorithms-modules/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/prim/Vertex.java diff --git a/algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/relativelyprime/RelativelyPrime.java b/algorithms-modules/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/relativelyprime/RelativelyPrime.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/relativelyprime/RelativelyPrime.java rename to algorithms-modules/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/relativelyprime/RelativelyPrime.java diff --git a/algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/reversingtree/TreeNode.java b/algorithms-modules/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/reversingtree/TreeNode.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/reversingtree/TreeNode.java rename to algorithms-modules/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/reversingtree/TreeNode.java diff --git a/algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/reversingtree/TreeReverser.java b/algorithms-modules/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/reversingtree/TreeReverser.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/reversingtree/TreeReverser.java rename to algorithms-modules/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/reversingtree/TreeReverser.java diff --git a/algorithms-module/algorithms-miscellaneous-5/src/main/resources/logback.xml b/algorithms-modules/algorithms-miscellaneous-5/src/main/resources/logback.xml similarity index 100% rename from algorithms-module/algorithms-miscellaneous-5/src/main/resources/logback.xml rename to algorithms-modules/algorithms-miscellaneous-5/src/main/resources/logback.xml diff --git a/algorithms-module/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/balancedbinarytree/BalancedBinaryTreeUnitTest.java b/algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/balancedbinarytree/BalancedBinaryTreeUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/balancedbinarytree/BalancedBinaryTreeUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/balancedbinarytree/BalancedBinaryTreeUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/balancedbinarytree/BinaryTreeDataProvider.java b/algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/balancedbinarytree/BinaryTreeDataProvider.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/balancedbinarytree/BinaryTreeDataProvider.java rename to algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/balancedbinarytree/BinaryTreeDataProvider.java diff --git a/algorithms-module/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/binarygap/BinaryGapUnitTest.java b/algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/binarygap/BinaryGapUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/binarygap/BinaryGapUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/binarygap/BinaryGapUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/combinatorics/CombinatoricsUnitTest.java b/algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/combinatorics/CombinatoricsUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/combinatorics/CombinatoricsUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/combinatorics/CombinatoricsUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/conversion/ByteArrayConverterUnitTest.java b/algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/conversion/ByteArrayConverterUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/conversion/ByteArrayConverterUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/conversion/ByteArrayConverterUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/integerstreammedian/MedianOfIntegerStreamUnitTest.java b/algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/integerstreammedian/MedianOfIntegerStreamUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/integerstreammedian/MedianOfIntegerStreamUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/integerstreammedian/MedianOfIntegerStreamUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/knapsack/KnapsackUnitTest.java b/algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/knapsack/KnapsackUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/knapsack/KnapsackUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/knapsack/KnapsackUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/maximumsubarray/BruteForceAlgorithmUnitTest.java b/algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/maximumsubarray/BruteForceAlgorithmUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/maximumsubarray/BruteForceAlgorithmUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/maximumsubarray/BruteForceAlgorithmUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/maximumsubarray/KadaneAlgorithmUnitTest.java b/algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/maximumsubarray/KadaneAlgorithmUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/maximumsubarray/KadaneAlgorithmUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/maximumsubarray/KadaneAlgorithmUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/mergesortedarrays/SortedArraysUnitTest.java b/algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/mergesortedarrays/SortedArraysUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/mergesortedarrays/SortedArraysUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/mergesortedarrays/SortedArraysUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/prim/PrimUnitTest.java b/algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/prim/PrimUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/prim/PrimUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/prim/PrimUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/relativelyprime/RelativelyPrimeUnitTest.java b/algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/relativelyprime/RelativelyPrimeUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/relativelyprime/RelativelyPrimeUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/relativelyprime/RelativelyPrimeUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/reversingtree/TreeReverserUnitTest.java b/algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/reversingtree/TreeReverserUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/reversingtree/TreeReverserUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/reversingtree/TreeReverserUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-5/src/test/resources/input.json b/algorithms-modules/algorithms-miscellaneous-5/src/test/resources/input.json similarity index 100% rename from algorithms-module/algorithms-miscellaneous-5/src/test/resources/input.json rename to algorithms-modules/algorithms-miscellaneous-5/src/test/resources/input.json diff --git a/algorithms-module/algorithms-miscellaneous-6/README.md b/algorithms-modules/algorithms-miscellaneous-6/README.md similarity index 100% rename from algorithms-module/algorithms-miscellaneous-6/README.md rename to algorithms-modules/algorithms-miscellaneous-6/README.md diff --git a/algorithms-module/algorithms-miscellaneous-6/pom.xml b/algorithms-modules/algorithms-miscellaneous-6/pom.xml similarity index 100% rename from algorithms-module/algorithms-miscellaneous-6/pom.xml rename to algorithms-modules/algorithms-miscellaneous-6/pom.xml diff --git a/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/balancedbrackets/BalancedBracketsUsingDeque.java b/algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/balancedbrackets/BalancedBracketsUsingDeque.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/balancedbrackets/BalancedBracketsUsingDeque.java rename to algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/balancedbrackets/BalancedBracketsUsingDeque.java diff --git a/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/balancedbrackets/BalancedBracketsUsingString.java b/algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/balancedbrackets/BalancedBracketsUsingString.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/balancedbrackets/BalancedBracketsUsingString.java rename to algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/balancedbrackets/BalancedBracketsUsingString.java diff --git a/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/boruvka/BoruvkaMST.java b/algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/boruvka/BoruvkaMST.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/boruvka/BoruvkaMST.java rename to algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/boruvka/BoruvkaMST.java diff --git a/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/boruvka/UnionFind.java b/algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/boruvka/UnionFind.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/boruvka/UnionFind.java rename to algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/boruvka/UnionFind.java diff --git a/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/caesarcipher/CaesarCipher.java b/algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/caesarcipher/CaesarCipher.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/caesarcipher/CaesarCipher.java rename to algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/caesarcipher/CaesarCipher.java diff --git a/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/gradientdescent/GradientDescent.java b/algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/gradientdescent/GradientDescent.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/gradientdescent/GradientDescent.java rename to algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/gradientdescent/GradientDescent.java diff --git a/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/Follower.java b/algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/Follower.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/Follower.java rename to algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/Follower.java diff --git a/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/FollowersPath.java b/algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/FollowersPath.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/FollowersPath.java rename to algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/FollowersPath.java diff --git a/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/GreedyAlgorithm.java b/algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/GreedyAlgorithm.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/GreedyAlgorithm.java rename to algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/GreedyAlgorithm.java diff --git a/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/NonGreedyAlgorithm.java b/algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/NonGreedyAlgorithm.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/NonGreedyAlgorithm.java rename to algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/NonGreedyAlgorithm.java diff --git a/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/SocialConnector.java b/algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/SocialConnector.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/SocialConnector.java rename to algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/SocialConnector.java diff --git a/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/SocialUser.java b/algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/SocialUser.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/SocialUser.java rename to algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/greedy/SocialUser.java diff --git a/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/kruskal/CycleDetector.java b/algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/kruskal/CycleDetector.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/kruskal/CycleDetector.java rename to algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/kruskal/CycleDetector.java diff --git a/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/kruskal/DisjointSetInfo.java b/algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/kruskal/DisjointSetInfo.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/kruskal/DisjointSetInfo.java rename to algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/kruskal/DisjointSetInfo.java diff --git a/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/kruskal/Kruskal.java b/algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/kruskal/Kruskal.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/kruskal/Kruskal.java rename to algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/kruskal/Kruskal.java diff --git a/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/linkedlist/LinkedListReversal.java b/algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/linkedlist/LinkedListReversal.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/linkedlist/LinkedListReversal.java rename to algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/linkedlist/LinkedListReversal.java diff --git a/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/linkedlist/ListNode.java b/algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/linkedlist/ListNode.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/linkedlist/ListNode.java rename to algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/linkedlist/ListNode.java diff --git a/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/minheapmerge/HeapNode.java b/algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/minheapmerge/HeapNode.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/minheapmerge/HeapNode.java rename to algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/minheapmerge/HeapNode.java diff --git a/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/minheapmerge/MinHeap.java b/algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/minheapmerge/MinHeap.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/minheapmerge/MinHeap.java rename to algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/minheapmerge/MinHeap.java diff --git a/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Board.java b/algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Board.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Board.java rename to algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Board.java diff --git a/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Cell.java b/algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Cell.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Cell.java rename to algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Cell.java diff --git a/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Computer.java b/algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Computer.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Computer.java rename to algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Computer.java diff --git a/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Human.java b/algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Human.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Human.java rename to algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Human.java diff --git a/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Move.java b/algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Move.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Move.java rename to algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Move.java diff --git a/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Play2048.java b/algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Play2048.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Play2048.java rename to algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Play2048.java diff --git a/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/topkelements/BruteForceTopKElementsFinder.java b/algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/topkelements/BruteForceTopKElementsFinder.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/topkelements/BruteForceTopKElementsFinder.java rename to algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/topkelements/BruteForceTopKElementsFinder.java diff --git a/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/topkelements/MaxHeapTopKElementsFinder.java b/algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/topkelements/MaxHeapTopKElementsFinder.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/topkelements/MaxHeapTopKElementsFinder.java rename to algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/topkelements/MaxHeapTopKElementsFinder.java diff --git a/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/topkelements/TopKElementsFinder.java b/algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/topkelements/TopKElementsFinder.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/topkelements/TopKElementsFinder.java rename to algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/topkelements/TopKElementsFinder.java diff --git a/algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/topkelements/TreeSetTopKElementsFinder.java b/algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/topkelements/TreeSetTopKElementsFinder.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/topkelements/TreeSetTopKElementsFinder.java rename to algorithms-modules/algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/topkelements/TreeSetTopKElementsFinder.java diff --git a/algorithms-module/algorithms-miscellaneous-6/src/main/resources/logback.xml b/algorithms-modules/algorithms-miscellaneous-6/src/main/resources/logback.xml similarity index 100% rename from algorithms-module/algorithms-miscellaneous-6/src/main/resources/logback.xml rename to algorithms-modules/algorithms-miscellaneous-6/src/main/resources/logback.xml diff --git a/algorithms-module/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/balancedbrackets/BalancedBracketsUsingDequeUnitTest.java b/algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/balancedbrackets/BalancedBracketsUsingDequeUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/balancedbrackets/BalancedBracketsUsingDequeUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/balancedbrackets/BalancedBracketsUsingDequeUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/balancedbrackets/BalancedBracketsUsingStringUnitTest.java b/algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/balancedbrackets/BalancedBracketsUsingStringUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/balancedbrackets/BalancedBracketsUsingStringUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/balancedbrackets/BalancedBracketsUsingStringUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/boruvka/BoruvkaUnitTest.java b/algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/boruvka/BoruvkaUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/boruvka/BoruvkaUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/boruvka/BoruvkaUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/caesarcipher/CaesarCipherUnitTest.java b/algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/caesarcipher/CaesarCipherUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/caesarcipher/CaesarCipherUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/caesarcipher/CaesarCipherUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/gradientdescent/GradientDescentUnitTest.java b/algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/gradientdescent/GradientDescentUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/gradientdescent/GradientDescentUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/gradientdescent/GradientDescentUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/greedy/GreedyAlgorithmUnitTest.java b/algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/greedy/GreedyAlgorithmUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/greedy/GreedyAlgorithmUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/greedy/GreedyAlgorithmUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/kruskal/KruskalUnitTest.java b/algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/kruskal/KruskalUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/kruskal/KruskalUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/kruskal/KruskalUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/linkedlist/LinkedListReversalUnitTest.java b/algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/linkedlist/LinkedListReversalUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/linkedlist/LinkedListReversalUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/linkedlist/LinkedListReversalUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/minheapmerge/MinHeapUnitTest.java b/algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/minheapmerge/MinHeapUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/minheapmerge/MinHeapUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/minheapmerge/MinHeapUnitTest.java diff --git a/algorithms-module/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/topkelements/TopKElementsFinderUnitTest.java b/algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/topkelements/TopKElementsFinderUnitTest.java similarity index 100% rename from algorithms-module/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/topkelements/TopKElementsFinderUnitTest.java rename to algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/topkelements/TopKElementsFinderUnitTest.java diff --git a/algorithms-module/algorithms-searching/README.md b/algorithms-modules/algorithms-searching/README.md similarity index 100% rename from algorithms-module/algorithms-searching/README.md rename to algorithms-modules/algorithms-searching/README.md diff --git a/algorithms-module/algorithms-searching/pom.xml b/algorithms-modules/algorithms-searching/pom.xml similarity index 100% rename from algorithms-module/algorithms-searching/pom.xml rename to algorithms-modules/algorithms-searching/pom.xml diff --git a/algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/binarysearch/BinarySearch.java b/algorithms-modules/algorithms-searching/src/main/java/com/baeldung/algorithms/binarysearch/BinarySearch.java similarity index 100% rename from algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/binarysearch/BinarySearch.java rename to algorithms-modules/algorithms-searching/src/main/java/com/baeldung/algorithms/binarysearch/BinarySearch.java diff --git a/algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/breadthfirstsearch/BreadthFirstSearchAlgorithm.java b/algorithms-modules/algorithms-searching/src/main/java/com/baeldung/algorithms/breadthfirstsearch/BreadthFirstSearchAlgorithm.java similarity index 100% rename from algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/breadthfirstsearch/BreadthFirstSearchAlgorithm.java rename to algorithms-modules/algorithms-searching/src/main/java/com/baeldung/algorithms/breadthfirstsearch/BreadthFirstSearchAlgorithm.java diff --git a/algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/breadthfirstsearch/Node.java b/algorithms-modules/algorithms-searching/src/main/java/com/baeldung/algorithms/breadthfirstsearch/Node.java similarity index 100% rename from algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/breadthfirstsearch/Node.java rename to algorithms-modules/algorithms-searching/src/main/java/com/baeldung/algorithms/breadthfirstsearch/Node.java diff --git a/algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/breadthfirstsearch/Tree.java b/algorithms-modules/algorithms-searching/src/main/java/com/baeldung/algorithms/breadthfirstsearch/Tree.java similarity index 100% rename from algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/breadthfirstsearch/Tree.java rename to algorithms-modules/algorithms-searching/src/main/java/com/baeldung/algorithms/breadthfirstsearch/Tree.java diff --git a/algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/dfs/BinaryTree.java b/algorithms-modules/algorithms-searching/src/main/java/com/baeldung/algorithms/dfs/BinaryTree.java similarity index 100% rename from algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/dfs/BinaryTree.java rename to algorithms-modules/algorithms-searching/src/main/java/com/baeldung/algorithms/dfs/BinaryTree.java diff --git a/algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/dfs/Graph.java b/algorithms-modules/algorithms-searching/src/main/java/com/baeldung/algorithms/dfs/Graph.java similarity index 100% rename from algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/dfs/Graph.java rename to algorithms-modules/algorithms-searching/src/main/java/com/baeldung/algorithms/dfs/Graph.java diff --git a/algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/interpolationsearch/InterpolationSearch.java b/algorithms-modules/algorithms-searching/src/main/java/com/baeldung/algorithms/interpolationsearch/InterpolationSearch.java similarity index 100% rename from algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/interpolationsearch/InterpolationSearch.java rename to algorithms-modules/algorithms-searching/src/main/java/com/baeldung/algorithms/interpolationsearch/InterpolationSearch.java diff --git a/algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/kthsmallest/KthSmallest.java b/algorithms-modules/algorithms-searching/src/main/java/com/baeldung/algorithms/kthsmallest/KthSmallest.java similarity index 100% rename from algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/kthsmallest/KthSmallest.java rename to algorithms-modules/algorithms-searching/src/main/java/com/baeldung/algorithms/kthsmallest/KthSmallest.java diff --git a/algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/montecarlo/MonteCarloTreeSearch.java b/algorithms-modules/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/montecarlo/MonteCarloTreeSearch.java similarity index 100% rename from algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/montecarlo/MonteCarloTreeSearch.java rename to algorithms-modules/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/montecarlo/MonteCarloTreeSearch.java diff --git a/algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/montecarlo/State.java b/algorithms-modules/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/montecarlo/State.java similarity index 100% rename from algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/montecarlo/State.java rename to algorithms-modules/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/montecarlo/State.java diff --git a/algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/montecarlo/UCT.java b/algorithms-modules/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/montecarlo/UCT.java similarity index 100% rename from algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/montecarlo/UCT.java rename to algorithms-modules/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/montecarlo/UCT.java diff --git a/algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/tictactoe/Board.java b/algorithms-modules/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/tictactoe/Board.java similarity index 100% rename from algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/tictactoe/Board.java rename to algorithms-modules/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/tictactoe/Board.java diff --git a/algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/tictactoe/Position.java b/algorithms-modules/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/tictactoe/Position.java similarity index 100% rename from algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/tictactoe/Position.java rename to algorithms-modules/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/tictactoe/Position.java diff --git a/algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/tree/Node.java b/algorithms-modules/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/tree/Node.java similarity index 100% rename from algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/tree/Node.java rename to algorithms-modules/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/tree/Node.java diff --git a/algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/tree/Tree.java b/algorithms-modules/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/tree/Tree.java similarity index 100% rename from algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/tree/Tree.java rename to algorithms-modules/algorithms-searching/src/main/java/com/baeldung/algorithms/mcts/tree/Tree.java diff --git a/algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/quadtree/Point.java b/algorithms-modules/algorithms-searching/src/main/java/com/baeldung/algorithms/quadtree/Point.java similarity index 100% rename from algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/quadtree/Point.java rename to algorithms-modules/algorithms-searching/src/main/java/com/baeldung/algorithms/quadtree/Point.java diff --git a/algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/quadtree/QuadTree.java b/algorithms-modules/algorithms-searching/src/main/java/com/baeldung/algorithms/quadtree/QuadTree.java similarity index 100% rename from algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/quadtree/QuadTree.java rename to algorithms-modules/algorithms-searching/src/main/java/com/baeldung/algorithms/quadtree/QuadTree.java diff --git a/algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/quadtree/Region.java b/algorithms-modules/algorithms-searching/src/main/java/com/baeldung/algorithms/quadtree/Region.java similarity index 100% rename from algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/quadtree/Region.java rename to algorithms-modules/algorithms-searching/src/main/java/com/baeldung/algorithms/quadtree/Region.java diff --git a/algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/suffixtree/Node.java b/algorithms-modules/algorithms-searching/src/main/java/com/baeldung/algorithms/suffixtree/Node.java similarity index 100% rename from algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/suffixtree/Node.java rename to algorithms-modules/algorithms-searching/src/main/java/com/baeldung/algorithms/suffixtree/Node.java diff --git a/algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/suffixtree/SuffixTree.java b/algorithms-modules/algorithms-searching/src/main/java/com/baeldung/algorithms/suffixtree/SuffixTree.java similarity index 100% rename from algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/suffixtree/SuffixTree.java rename to algorithms-modules/algorithms-searching/src/main/java/com/baeldung/algorithms/suffixtree/SuffixTree.java diff --git a/algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/textsearch/TextSearchAlgorithms.java b/algorithms-modules/algorithms-searching/src/main/java/com/baeldung/algorithms/textsearch/TextSearchAlgorithms.java similarity index 100% rename from algorithms-module/algorithms-searching/src/main/java/com/baeldung/algorithms/textsearch/TextSearchAlgorithms.java rename to algorithms-modules/algorithms-searching/src/main/java/com/baeldung/algorithms/textsearch/TextSearchAlgorithms.java diff --git a/algorithms-module/algorithms-searching/src/main/resources/logback.xml b/algorithms-modules/algorithms-searching/src/main/resources/logback.xml similarity index 100% rename from algorithms-module/algorithms-searching/src/main/resources/logback.xml rename to algorithms-modules/algorithms-searching/src/main/resources/logback.xml diff --git a/algorithms-module/algorithms-searching/src/test/java/com/baeldung/algorithms/binarysearch/BinarySearchUnitTest.java b/algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/binarysearch/BinarySearchUnitTest.java similarity index 100% rename from algorithms-module/algorithms-searching/src/test/java/com/baeldung/algorithms/binarysearch/BinarySearchUnitTest.java rename to algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/binarysearch/BinarySearchUnitTest.java diff --git a/algorithms-module/algorithms-searching/src/test/java/com/baeldung/algorithms/breadthfirstsearch/BreadthFirstSearchAlgorithmUnitTest.java b/algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/breadthfirstsearch/BreadthFirstSearchAlgorithmUnitTest.java similarity index 100% rename from algorithms-module/algorithms-searching/src/test/java/com/baeldung/algorithms/breadthfirstsearch/BreadthFirstSearchAlgorithmUnitTest.java rename to algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/breadthfirstsearch/BreadthFirstSearchAlgorithmUnitTest.java diff --git a/algorithms-module/algorithms-searching/src/test/java/com/baeldung/algorithms/dfs/BinaryTreeUnitTest.java b/algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/dfs/BinaryTreeUnitTest.java similarity index 100% rename from algorithms-module/algorithms-searching/src/test/java/com/baeldung/algorithms/dfs/BinaryTreeUnitTest.java rename to algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/dfs/BinaryTreeUnitTest.java diff --git a/algorithms-module/algorithms-searching/src/test/java/com/baeldung/algorithms/dfs/GraphUnitTest.java b/algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/dfs/GraphUnitTest.java similarity index 100% rename from algorithms-module/algorithms-searching/src/test/java/com/baeldung/algorithms/dfs/GraphUnitTest.java rename to algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/dfs/GraphUnitTest.java diff --git a/algorithms-module/algorithms-searching/src/test/java/com/baeldung/algorithms/interpolationsearch/InterpolationSearchUnitTest.java b/algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/interpolationsearch/InterpolationSearchUnitTest.java similarity index 100% rename from algorithms-module/algorithms-searching/src/test/java/com/baeldung/algorithms/interpolationsearch/InterpolationSearchUnitTest.java rename to algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/interpolationsearch/InterpolationSearchUnitTest.java diff --git a/algorithms-module/algorithms-searching/src/test/java/com/baeldung/algorithms/kthsmallest/KthSmallestUnitTest.java b/algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/kthsmallest/KthSmallestUnitTest.java similarity index 100% rename from algorithms-module/algorithms-searching/src/test/java/com/baeldung/algorithms/kthsmallest/KthSmallestUnitTest.java rename to algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/kthsmallest/KthSmallestUnitTest.java diff --git a/algorithms-module/algorithms-searching/src/test/java/com/baeldung/algorithms/mcts/MCTSUnitTest.java b/algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/mcts/MCTSUnitTest.java similarity index 100% rename from algorithms-module/algorithms-searching/src/test/java/com/baeldung/algorithms/mcts/MCTSUnitTest.java rename to algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/mcts/MCTSUnitTest.java diff --git a/algorithms-module/algorithms-searching/src/test/java/com/baeldung/algorithms/quadtree/QuadTreeSearchUnitTest.java b/algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/quadtree/QuadTreeSearchUnitTest.java similarity index 100% rename from algorithms-module/algorithms-searching/src/test/java/com/baeldung/algorithms/quadtree/QuadTreeSearchUnitTest.java rename to algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/quadtree/QuadTreeSearchUnitTest.java diff --git a/algorithms-module/algorithms-searching/src/test/java/com/baeldung/algorithms/suffixtree/SuffixTreeUnitTest.java b/algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/suffixtree/SuffixTreeUnitTest.java similarity index 100% rename from algorithms-module/algorithms-searching/src/test/java/com/baeldung/algorithms/suffixtree/SuffixTreeUnitTest.java rename to algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/suffixtree/SuffixTreeUnitTest.java diff --git a/algorithms-module/algorithms-searching/src/test/java/com/baeldung/algorithms/textsearch/TextSearchAlgorithmsUnitTest.java b/algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/textsearch/TextSearchAlgorithmsUnitTest.java similarity index 100% rename from algorithms-module/algorithms-searching/src/test/java/com/baeldung/algorithms/textsearch/TextSearchAlgorithmsUnitTest.java rename to algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/textsearch/TextSearchAlgorithmsUnitTest.java diff --git a/algorithms-module/algorithms-sorting-2/.gitignore b/algorithms-modules/algorithms-sorting-2/.gitignore similarity index 100% rename from algorithms-module/algorithms-sorting-2/.gitignore rename to algorithms-modules/algorithms-sorting-2/.gitignore diff --git a/algorithms-module/algorithms-sorting-2/README.md b/algorithms-modules/algorithms-sorting-2/README.md similarity index 100% rename from algorithms-module/algorithms-sorting-2/README.md rename to algorithms-modules/algorithms-sorting-2/README.md diff --git a/algorithms-module/algorithms-sorting-2/pom.xml b/algorithms-modules/algorithms-sorting-2/pom.xml similarity index 100% rename from algorithms-module/algorithms-sorting-2/pom.xml rename to algorithms-modules/algorithms-sorting-2/pom.xml diff --git a/algorithms-module/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/bynumber/NaturalOrderComparators.java b/algorithms-modules/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/bynumber/NaturalOrderComparators.java similarity index 100% rename from algorithms-module/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/bynumber/NaturalOrderComparators.java rename to algorithms-modules/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/bynumber/NaturalOrderComparators.java diff --git a/algorithms-module/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/inoutsort/InOutSort.java b/algorithms-modules/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/inoutsort/InOutSort.java similarity index 100% rename from algorithms-module/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/inoutsort/InOutSort.java rename to algorithms-modules/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/inoutsort/InOutSort.java diff --git a/algorithms-module/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/quicksort/BentleyMcIlroyPartioning.java b/algorithms-modules/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/quicksort/BentleyMcIlroyPartioning.java similarity index 100% rename from algorithms-module/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/quicksort/BentleyMcIlroyPartioning.java rename to algorithms-modules/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/quicksort/BentleyMcIlroyPartioning.java diff --git a/algorithms-module/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/quicksort/DutchNationalFlagPartioning.java b/algorithms-modules/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/quicksort/DutchNationalFlagPartioning.java similarity index 100% rename from algorithms-module/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/quicksort/DutchNationalFlagPartioning.java rename to algorithms-modules/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/quicksort/DutchNationalFlagPartioning.java diff --git a/algorithms-module/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/quicksort/Partition.java b/algorithms-modules/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/quicksort/Partition.java similarity index 100% rename from algorithms-module/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/quicksort/Partition.java rename to algorithms-modules/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/quicksort/Partition.java diff --git a/algorithms-module/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/quicksort/SortingUtils.java b/algorithms-modules/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/quicksort/SortingUtils.java similarity index 100% rename from algorithms-module/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/quicksort/SortingUtils.java rename to algorithms-modules/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/quicksort/SortingUtils.java diff --git a/algorithms-module/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/stringsort/AnagramValidator.java b/algorithms-modules/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/stringsort/AnagramValidator.java similarity index 100% rename from algorithms-module/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/stringsort/AnagramValidator.java rename to algorithms-modules/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/stringsort/AnagramValidator.java diff --git a/algorithms-module/algorithms-sorting-2/src/main/resources/logback.xml b/algorithms-modules/algorithms-sorting-2/src/main/resources/logback.xml similarity index 100% rename from algorithms-module/algorithms-sorting-2/src/main/resources/logback.xml rename to algorithms-modules/algorithms-sorting-2/src/main/resources/logback.xml diff --git a/algorithms-module/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/bynumber/NaturalOrderComparatorsUnitTest.java b/algorithms-modules/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/bynumber/NaturalOrderComparatorsUnitTest.java similarity index 100% rename from algorithms-module/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/bynumber/NaturalOrderComparatorsUnitTest.java rename to algorithms-modules/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/bynumber/NaturalOrderComparatorsUnitTest.java diff --git a/algorithms-module/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/inoutsort/InOutSortUnitTest.java b/algorithms-modules/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/inoutsort/InOutSortUnitTest.java similarity index 100% rename from algorithms-module/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/inoutsort/InOutSortUnitTest.java rename to algorithms-modules/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/inoutsort/InOutSortUnitTest.java diff --git a/algorithms-module/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/quicksort/BentleyMcilroyPartitioningUnitTest.java b/algorithms-modules/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/quicksort/BentleyMcilroyPartitioningUnitTest.java similarity index 100% rename from algorithms-module/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/quicksort/BentleyMcilroyPartitioningUnitTest.java rename to algorithms-modules/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/quicksort/BentleyMcilroyPartitioningUnitTest.java diff --git a/algorithms-module/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/quicksort/DNFThreeWayQuickSortUnitTest.java b/algorithms-modules/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/quicksort/DNFThreeWayQuickSortUnitTest.java similarity index 100% rename from algorithms-module/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/quicksort/DNFThreeWayQuickSortUnitTest.java rename to algorithms-modules/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/quicksort/DNFThreeWayQuickSortUnitTest.java diff --git a/algorithms-module/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/stringsort/AnagramValidatorUnitTest.java b/algorithms-modules/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/stringsort/AnagramValidatorUnitTest.java similarity index 100% rename from algorithms-module/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/stringsort/AnagramValidatorUnitTest.java rename to algorithms-modules/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/stringsort/AnagramValidatorUnitTest.java diff --git a/algorithms-module/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/stringsort/SortStringUnitTest.java b/algorithms-modules/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/stringsort/SortStringUnitTest.java similarity index 100% rename from algorithms-module/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/stringsort/SortStringUnitTest.java rename to algorithms-modules/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/stringsort/SortStringUnitTest.java diff --git a/algorithms-module/algorithms-sorting/.gitignore b/algorithms-modules/algorithms-sorting/.gitignore similarity index 100% rename from algorithms-module/algorithms-sorting/.gitignore rename to algorithms-modules/algorithms-sorting/.gitignore diff --git a/algorithms-module/algorithms-sorting/README.md b/algorithms-modules/algorithms-sorting/README.md similarity index 100% rename from algorithms-module/algorithms-sorting/README.md rename to algorithms-modules/algorithms-sorting/README.md diff --git a/algorithms-module/algorithms-sorting/pom.xml b/algorithms-modules/algorithms-sorting/pom.xml similarity index 100% rename from algorithms-module/algorithms-sorting/pom.xml rename to algorithms-modules/algorithms-sorting/pom.xml diff --git a/algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/bubblesort/BubbleSort.java b/algorithms-modules/algorithms-sorting/src/main/java/com/baeldung/algorithms/bubblesort/BubbleSort.java similarity index 100% rename from algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/bubblesort/BubbleSort.java rename to algorithms-modules/algorithms-sorting/src/main/java/com/baeldung/algorithms/bubblesort/BubbleSort.java diff --git a/algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/bucketsort/IntegerBucketSorter.java b/algorithms-modules/algorithms-sorting/src/main/java/com/baeldung/algorithms/bucketsort/IntegerBucketSorter.java similarity index 100% rename from algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/bucketsort/IntegerBucketSorter.java rename to algorithms-modules/algorithms-sorting/src/main/java/com/baeldung/algorithms/bucketsort/IntegerBucketSorter.java diff --git a/algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/bucketsort/Sorter.java b/algorithms-modules/algorithms-sorting/src/main/java/com/baeldung/algorithms/bucketsort/Sorter.java similarity index 100% rename from algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/bucketsort/Sorter.java rename to algorithms-modules/algorithms-sorting/src/main/java/com/baeldung/algorithms/bucketsort/Sorter.java diff --git a/algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/counting/CountingSort.java b/algorithms-modules/algorithms-sorting/src/main/java/com/baeldung/algorithms/counting/CountingSort.java similarity index 100% rename from algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/counting/CountingSort.java rename to algorithms-modules/algorithms-sorting/src/main/java/com/baeldung/algorithms/counting/CountingSort.java diff --git a/algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/heapsort/Heap.java b/algorithms-modules/algorithms-sorting/src/main/java/com/baeldung/algorithms/heapsort/Heap.java similarity index 100% rename from algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/heapsort/Heap.java rename to algorithms-modules/algorithms-sorting/src/main/java/com/baeldung/algorithms/heapsort/Heap.java diff --git a/algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/insertionsort/InsertionSort.java b/algorithms-modules/algorithms-sorting/src/main/java/com/baeldung/algorithms/insertionsort/InsertionSort.java similarity index 100% rename from algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/insertionsort/InsertionSort.java rename to algorithms-modules/algorithms-sorting/src/main/java/com/baeldung/algorithms/insertionsort/InsertionSort.java diff --git a/algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/mergesort/MergeSort.java b/algorithms-modules/algorithms-sorting/src/main/java/com/baeldung/algorithms/mergesort/MergeSort.java similarity index 100% rename from algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/mergesort/MergeSort.java rename to algorithms-modules/algorithms-sorting/src/main/java/com/baeldung/algorithms/mergesort/MergeSort.java diff --git a/algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/quicksort/QuickSort.java b/algorithms-modules/algorithms-sorting/src/main/java/com/baeldung/algorithms/quicksort/QuickSort.java similarity index 100% rename from algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/quicksort/QuickSort.java rename to algorithms-modules/algorithms-sorting/src/main/java/com/baeldung/algorithms/quicksort/QuickSort.java diff --git a/algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/quicksort/ThreeWayQuickSort.java b/algorithms-modules/algorithms-sorting/src/main/java/com/baeldung/algorithms/quicksort/ThreeWayQuickSort.java similarity index 100% rename from algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/quicksort/ThreeWayQuickSort.java rename to algorithms-modules/algorithms-sorting/src/main/java/com/baeldung/algorithms/quicksort/ThreeWayQuickSort.java diff --git a/algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/radixsort/RadixSort.java b/algorithms-modules/algorithms-sorting/src/main/java/com/baeldung/algorithms/radixsort/RadixSort.java similarity index 100% rename from algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/radixsort/RadixSort.java rename to algorithms-modules/algorithms-sorting/src/main/java/com/baeldung/algorithms/radixsort/RadixSort.java diff --git a/algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/selectionsort/SelectionSort.java b/algorithms-modules/algorithms-sorting/src/main/java/com/baeldung/algorithms/selectionsort/SelectionSort.java similarity index 100% rename from algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/selectionsort/SelectionSort.java rename to algorithms-modules/algorithms-sorting/src/main/java/com/baeldung/algorithms/selectionsort/SelectionSort.java diff --git a/algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/shellsort/ShellSort.java b/algorithms-modules/algorithms-sorting/src/main/java/com/baeldung/algorithms/shellsort/ShellSort.java similarity index 100% rename from algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/shellsort/ShellSort.java rename to algorithms-modules/algorithms-sorting/src/main/java/com/baeldung/algorithms/shellsort/ShellSort.java diff --git a/algorithms-module/algorithms-sorting/src/main/resources/logback.xml b/algorithms-modules/algorithms-sorting/src/main/resources/logback.xml similarity index 100% rename from algorithms-module/algorithms-sorting/src/main/resources/logback.xml rename to algorithms-modules/algorithms-sorting/src/main/resources/logback.xml diff --git a/algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/bubblesort/BubbleSortUnitTest.java b/algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/bubblesort/BubbleSortUnitTest.java similarity index 100% rename from algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/bubblesort/BubbleSortUnitTest.java rename to algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/bubblesort/BubbleSortUnitTest.java diff --git a/algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/bucketsort/IntegerBucketSorterUnitTest.java b/algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/bucketsort/IntegerBucketSorterUnitTest.java similarity index 100% rename from algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/bucketsort/IntegerBucketSorterUnitTest.java rename to algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/bucketsort/IntegerBucketSorterUnitTest.java diff --git a/algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/counting/CountingSortUnitTest.java b/algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/counting/CountingSortUnitTest.java similarity index 100% rename from algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/counting/CountingSortUnitTest.java rename to algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/counting/CountingSortUnitTest.java diff --git a/algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/heapsort/HeapUnitTest.java b/algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/heapsort/HeapUnitTest.java similarity index 100% rename from algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/heapsort/HeapUnitTest.java rename to algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/heapsort/HeapUnitTest.java diff --git a/algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/insertionsort/InsertionSortUnitTest.java b/algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/insertionsort/InsertionSortUnitTest.java similarity index 100% rename from algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/insertionsort/InsertionSortUnitTest.java rename to algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/insertionsort/InsertionSortUnitTest.java diff --git a/algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/mergesort/MergeSortUnitTest.java b/algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/mergesort/MergeSortUnitTest.java similarity index 100% rename from algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/mergesort/MergeSortUnitTest.java rename to algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/mergesort/MergeSortUnitTest.java diff --git a/algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/quicksort/QuickSortUnitTest.java b/algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/quicksort/QuickSortUnitTest.java similarity index 100% rename from algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/quicksort/QuickSortUnitTest.java rename to algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/quicksort/QuickSortUnitTest.java diff --git a/algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/quicksort/ThreeWayQuickSortUnitTest.java b/algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/quicksort/ThreeWayQuickSortUnitTest.java similarity index 100% rename from algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/quicksort/ThreeWayQuickSortUnitTest.java rename to algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/quicksort/ThreeWayQuickSortUnitTest.java diff --git a/algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/radixsort/RadixSortUnitTest.java b/algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/radixsort/RadixSortUnitTest.java similarity index 100% rename from algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/radixsort/RadixSortUnitTest.java rename to algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/radixsort/RadixSortUnitTest.java diff --git a/algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/selectionsort/SelectionSortUnitTest.java b/algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/selectionsort/SelectionSortUnitTest.java similarity index 100% rename from algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/selectionsort/SelectionSortUnitTest.java rename to algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/selectionsort/SelectionSortUnitTest.java diff --git a/algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/shellsort/ShellSortUnitTest.java b/algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/shellsort/ShellSortUnitTest.java similarity index 100% rename from algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/shellsort/ShellSortUnitTest.java rename to algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/shellsort/ShellSortUnitTest.java diff --git a/algorithms-modules/pom.xml b/algorithms-modules/pom.xml new file mode 100644 index 0000000000..4ba819cfe3 --- /dev/null +++ b/algorithms-modules/pom.xml @@ -0,0 +1,29 @@ + + + 4.0.0 + algorithms-modules + algorithms-modules + pom + + + com.baeldung + parent-modules + 1.0.0-SNAPSHOT + + + + algorithms-genetic + algorithms-miscellaneous-1 + algorithms-miscellaneous-2 + algorithms-miscellaneous-3 + algorithms-miscellaneous-4 + algorithms-miscellaneous-5 + algorithms-miscellaneous-6 + algorithms-searching + algorithms-sorting + algorithms-sorting-2 + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index a8bd79f3f5..5919a930f0 100644 --- a/pom.xml +++ b/pom.xml @@ -333,16 +333,7 @@ akka-http akka-streams - algorithms-genetic - algorithms-miscellaneous-1 - algorithms-miscellaneous-2 - algorithms-miscellaneous-3 - algorithms-miscellaneous-4 - algorithms-miscellaneous-5 - algorithms-miscellaneous-6 - algorithms-searching - algorithms-sorting - algorithms-sorting-2 + algorithms-modules annotations antlr @@ -803,16 +794,7 @@ akka-http akka-streams - algorithms-genetic - algorithms-miscellaneous-1 - algorithms-miscellaneous-2 - algorithms-miscellaneous-3 - algorithms-miscellaneous-4 - algorithms-miscellaneous-5 - algorithms-miscellaneous-6 - algorithms-searching - algorithms-sorting - algorithms-sorting-2 + algorithms-modules annotations antlr From 22f01e2188427bd4cbe5612c2e194dbe9124485b Mon Sep 17 00:00:00 2001 From: Ulisses Lima Date: Fri, 20 May 2022 14:09:36 -0300 Subject: [PATCH 057/100] isolating application repositories --- .../collection/name/SpringBootCollectionNameApplication.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/SpringBootCollectionNameApplication.java b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/SpringBootCollectionNameApplication.java index 0a5c36db29..e4157b6a53 100644 --- a/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/SpringBootCollectionNameApplication.java +++ b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/collection/name/SpringBootCollectionNameApplication.java @@ -4,9 +4,11 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.PropertySource; +import org.springframework.data.mongodb.repository.config.EnableMongoRepositories; @SpringBootApplication @PropertySource("classpath:boot.collection.name/app.properties") +@EnableMongoRepositories(basePackages = { "com.baeldung.boot.collection.name" }) public class SpringBootCollectionNameApplication { public static void main(String... args) { SpringApplication.run(SpringBootCollectionNameApplication.class, args); From 2ea0db57d60b2f497e2082223ff0aa09b103463f Mon Sep 17 00:00:00 2001 From: Haroon Khan Date: Sat, 21 May 2022 01:19:50 +0100 Subject: [PATCH 058/100] [JAVA-11789] Add generated classes --- .../java/com/baeldung/schema/Employee.java | 517 ++++++++++++++++++ .../java/com/baeldung/schema/EmployeeKey.java | 307 +++++++++++ 2 files changed, 824 insertions(+) create mode 100644 spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/schema/Employee.java create mode 100644 spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/schema/EmployeeKey.java diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/schema/Employee.java b/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/schema/Employee.java new file mode 100644 index 0000000000..a805491cea --- /dev/null +++ b/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/schema/Employee.java @@ -0,0 +1,517 @@ +/** + * Autogenerated by Avro + * + * DO NOT EDIT DIRECTLY + */ +package com.baeldung.schema; + +import org.apache.avro.specific.SpecificData; +import org.apache.avro.message.BinaryMessageEncoder; +import org.apache.avro.message.BinaryMessageDecoder; +import org.apache.avro.message.SchemaStore; + +@SuppressWarnings("all") +@org.apache.avro.specific.AvroGenerated +public class Employee extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord { + private static final long serialVersionUID = 7340575283344282036L; + public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"Employee\",\"namespace\":\"com.baeldung.schema\",\"fields\":[{\"name\":\"id\",\"type\":\"int\"},{\"name\":\"firstName\",\"type\":\"string\"},{\"name\":\"lastName\",\"type\":\"string\"},{\"name\":\"department\",\"type\":\"string\",\"default\":\"IT \"},{\"name\":\"designation\",\"type\":\"string\",\"default\":\"Software Engineer\"}]}"); + public static org.apache.avro.Schema getClassSchema() { return SCHEMA$; } + + private static SpecificData MODEL$ = new SpecificData(); + + private static final BinaryMessageEncoder ENCODER = + new BinaryMessageEncoder(MODEL$, SCHEMA$); + + private static final BinaryMessageDecoder DECODER = + new BinaryMessageDecoder(MODEL$, SCHEMA$); + + /** + * Return the BinaryMessageDecoder instance used by this class. + */ + public static BinaryMessageDecoder getDecoder() { + return DECODER; + } + + /** + * Create a new BinaryMessageDecoder instance for this class that uses the specified {@link SchemaStore}. + * @param resolver a {@link SchemaStore} used to find schemas by fingerprint + */ + public static BinaryMessageDecoder createDecoder(SchemaStore resolver) { + return new BinaryMessageDecoder(MODEL$, SCHEMA$, resolver); + } + + /** Serializes this Employee to a ByteBuffer. */ + public java.nio.ByteBuffer toByteBuffer() throws java.io.IOException { + return ENCODER.encode(this); + } + + /** Deserializes a Employee from a ByteBuffer. */ + public static Employee fromByteBuffer( + java.nio.ByteBuffer b) throws java.io.IOException { + return DECODER.decode(b); + } + + @Deprecated public int id; + @Deprecated public java.lang.CharSequence firstName; + @Deprecated public java.lang.CharSequence lastName; + @Deprecated public java.lang.CharSequence department; + @Deprecated public java.lang.CharSequence designation; + + /** + * Default constructor. Note that this does not initialize fields + * to their default values from the schema. If that is desired then + * one should use newBuilder(). + */ + public Employee() {} + + /** + * All-args constructor. + * @param id The new value for id + * @param firstName The new value for firstName + * @param lastName The new value for lastName + * @param department The new value for department + * @param designation The new value for designation + */ + public Employee(java.lang.Integer id, java.lang.CharSequence firstName, java.lang.CharSequence lastName, java.lang.CharSequence department, java.lang.CharSequence designation) { + this.id = id; + this.firstName = firstName; + this.lastName = lastName; + this.department = department; + this.designation = designation; + } + + public org.apache.avro.Schema getSchema() { return SCHEMA$; } + // Used by DatumWriter. Applications should not call. + public java.lang.Object get(int field$) { + switch (field$) { + case 0: return id; + case 1: return firstName; + case 2: return lastName; + case 3: return department; + case 4: return designation; + default: throw new org.apache.avro.AvroRuntimeException("Bad index"); + } + } + + // Used by DatumReader. Applications should not call. + @SuppressWarnings(value="unchecked") + public void put(int field$, java.lang.Object value$) { + switch (field$) { + case 0: id = (java.lang.Integer)value$; break; + case 1: firstName = (java.lang.CharSequence)value$; break; + case 2: lastName = (java.lang.CharSequence)value$; break; + case 3: department = (java.lang.CharSequence)value$; break; + case 4: designation = (java.lang.CharSequence)value$; break; + default: throw new org.apache.avro.AvroRuntimeException("Bad index"); + } + } + + /** + * Gets the value of the 'id' field. + * @return The value of the 'id' field. + */ + public java.lang.Integer getId() { + return id; + } + + /** + * Sets the value of the 'id' field. + * @param value the value to set. + */ + public void setId(java.lang.Integer value) { + this.id = value; + } + + /** + * Gets the value of the 'firstName' field. + * @return The value of the 'firstName' field. + */ + public java.lang.CharSequence getFirstName() { + return firstName; + } + + /** + * Sets the value of the 'firstName' field. + * @param value the value to set. + */ + public void setFirstName(java.lang.CharSequence value) { + this.firstName = value; + } + + /** + * Gets the value of the 'lastName' field. + * @return The value of the 'lastName' field. + */ + public java.lang.CharSequence getLastName() { + return lastName; + } + + /** + * Sets the value of the 'lastName' field. + * @param value the value to set. + */ + public void setLastName(java.lang.CharSequence value) { + this.lastName = value; + } + + /** + * Gets the value of the 'department' field. + * @return The value of the 'department' field. + */ + public java.lang.CharSequence getDepartment() { + return department; + } + + /** + * Sets the value of the 'department' field. + * @param value the value to set. + */ + public void setDepartment(java.lang.CharSequence value) { + this.department = value; + } + + /** + * Gets the value of the 'designation' field. + * @return The value of the 'designation' field. + */ + public java.lang.CharSequence getDesignation() { + return designation; + } + + /** + * Sets the value of the 'designation' field. + * @param value the value to set. + */ + public void setDesignation(java.lang.CharSequence value) { + this.designation = value; + } + + /** + * Creates a new Employee RecordBuilder. + * @return A new Employee RecordBuilder + */ + public static com.baeldung.schema.Employee.Builder newBuilder() { + return new com.baeldung.schema.Employee.Builder(); + } + + /** + * Creates a new Employee RecordBuilder by copying an existing Builder. + * @param other The existing builder to copy. + * @return A new Employee RecordBuilder + */ + public static com.baeldung.schema.Employee.Builder newBuilder(com.baeldung.schema.Employee.Builder other) { + return new com.baeldung.schema.Employee.Builder(other); + } + + /** + * Creates a new Employee RecordBuilder by copying an existing Employee instance. + * @param other The existing instance to copy. + * @return A new Employee RecordBuilder + */ + public static com.baeldung.schema.Employee.Builder newBuilder(com.baeldung.schema.Employee other) { + return new com.baeldung.schema.Employee.Builder(other); + } + + /** + * RecordBuilder for Employee instances. + */ + public static class Builder extends org.apache.avro.specific.SpecificRecordBuilderBase + implements org.apache.avro.data.RecordBuilder { + + private int id; + private java.lang.CharSequence firstName; + private java.lang.CharSequence lastName; + private java.lang.CharSequence department; + private java.lang.CharSequence designation; + + /** Creates a new Builder */ + private Builder() { + super(SCHEMA$); + } + + /** + * Creates a Builder by copying an existing Builder. + * @param other The existing Builder to copy. + */ + private Builder(com.baeldung.schema.Employee.Builder other) { + super(other); + if (isValidValue(fields()[0], other.id)) { + this.id = data().deepCopy(fields()[0].schema(), other.id); + fieldSetFlags()[0] = true; + } + if (isValidValue(fields()[1], other.firstName)) { + this.firstName = data().deepCopy(fields()[1].schema(), other.firstName); + fieldSetFlags()[1] = true; + } + if (isValidValue(fields()[2], other.lastName)) { + this.lastName = data().deepCopy(fields()[2].schema(), other.lastName); + fieldSetFlags()[2] = true; + } + if (isValidValue(fields()[3], other.department)) { + this.department = data().deepCopy(fields()[3].schema(), other.department); + fieldSetFlags()[3] = true; + } + if (isValidValue(fields()[4], other.designation)) { + this.designation = data().deepCopy(fields()[4].schema(), other.designation); + fieldSetFlags()[4] = true; + } + } + + /** + * Creates a Builder by copying an existing Employee instance + * @param other The existing instance to copy. + */ + private Builder(com.baeldung.schema.Employee other) { + super(SCHEMA$); + if (isValidValue(fields()[0], other.id)) { + this.id = data().deepCopy(fields()[0].schema(), other.id); + fieldSetFlags()[0] = true; + } + if (isValidValue(fields()[1], other.firstName)) { + this.firstName = data().deepCopy(fields()[1].schema(), other.firstName); + fieldSetFlags()[1] = true; + } + if (isValidValue(fields()[2], other.lastName)) { + this.lastName = data().deepCopy(fields()[2].schema(), other.lastName); + fieldSetFlags()[2] = true; + } + if (isValidValue(fields()[3], other.department)) { + this.department = data().deepCopy(fields()[3].schema(), other.department); + fieldSetFlags()[3] = true; + } + if (isValidValue(fields()[4], other.designation)) { + this.designation = data().deepCopy(fields()[4].schema(), other.designation); + fieldSetFlags()[4] = true; + } + } + + /** + * Gets the value of the 'id' field. + * @return The value. + */ + public java.lang.Integer getId() { + return id; + } + + /** + * Sets the value of the 'id' field. + * @param value The value of 'id'. + * @return This builder. + */ + public com.baeldung.schema.Employee.Builder setId(int value) { + validate(fields()[0], value); + this.id = value; + fieldSetFlags()[0] = true; + return this; + } + + /** + * Checks whether the 'id' field has been set. + * @return True if the 'id' field has been set, false otherwise. + */ + public boolean hasId() { + return fieldSetFlags()[0]; + } + + + /** + * Clears the value of the 'id' field. + * @return This builder. + */ + public com.baeldung.schema.Employee.Builder clearId() { + fieldSetFlags()[0] = false; + return this; + } + + /** + * Gets the value of the 'firstName' field. + * @return The value. + */ + public java.lang.CharSequence getFirstName() { + return firstName; + } + + /** + * Sets the value of the 'firstName' field. + * @param value The value of 'firstName'. + * @return This builder. + */ + public com.baeldung.schema.Employee.Builder setFirstName(java.lang.CharSequence value) { + validate(fields()[1], value); + this.firstName = value; + fieldSetFlags()[1] = true; + return this; + } + + /** + * Checks whether the 'firstName' field has been set. + * @return True if the 'firstName' field has been set, false otherwise. + */ + public boolean hasFirstName() { + return fieldSetFlags()[1]; + } + + + /** + * Clears the value of the 'firstName' field. + * @return This builder. + */ + public com.baeldung.schema.Employee.Builder clearFirstName() { + firstName = null; + fieldSetFlags()[1] = false; + return this; + } + + /** + * Gets the value of the 'lastName' field. + * @return The value. + */ + public java.lang.CharSequence getLastName() { + return lastName; + } + + /** + * Sets the value of the 'lastName' field. + * @param value The value of 'lastName'. + * @return This builder. + */ + public com.baeldung.schema.Employee.Builder setLastName(java.lang.CharSequence value) { + validate(fields()[2], value); + this.lastName = value; + fieldSetFlags()[2] = true; + return this; + } + + /** + * Checks whether the 'lastName' field has been set. + * @return True if the 'lastName' field has been set, false otherwise. + */ + public boolean hasLastName() { + return fieldSetFlags()[2]; + } + + + /** + * Clears the value of the 'lastName' field. + * @return This builder. + */ + public com.baeldung.schema.Employee.Builder clearLastName() { + lastName = null; + fieldSetFlags()[2] = false; + return this; + } + + /** + * Gets the value of the 'department' field. + * @return The value. + */ + public java.lang.CharSequence getDepartment() { + return department; + } + + /** + * Sets the value of the 'department' field. + * @param value The value of 'department'. + * @return This builder. + */ + public com.baeldung.schema.Employee.Builder setDepartment(java.lang.CharSequence value) { + validate(fields()[3], value); + this.department = value; + fieldSetFlags()[3] = true; + return this; + } + + /** + * Checks whether the 'department' field has been set. + * @return True if the 'department' field has been set, false otherwise. + */ + public boolean hasDepartment() { + return fieldSetFlags()[3]; + } + + + /** + * Clears the value of the 'department' field. + * @return This builder. + */ + public com.baeldung.schema.Employee.Builder clearDepartment() { + department = null; + fieldSetFlags()[3] = false; + return this; + } + + /** + * Gets the value of the 'designation' field. + * @return The value. + */ + public java.lang.CharSequence getDesignation() { + return designation; + } + + /** + * Sets the value of the 'designation' field. + * @param value The value of 'designation'. + * @return This builder. + */ + public com.baeldung.schema.Employee.Builder setDesignation(java.lang.CharSequence value) { + validate(fields()[4], value); + this.designation = value; + fieldSetFlags()[4] = true; + return this; + } + + /** + * Checks whether the 'designation' field has been set. + * @return True if the 'designation' field has been set, false otherwise. + */ + public boolean hasDesignation() { + return fieldSetFlags()[4]; + } + + + /** + * Clears the value of the 'designation' field. + * @return This builder. + */ + public com.baeldung.schema.Employee.Builder clearDesignation() { + designation = null; + fieldSetFlags()[4] = false; + return this; + } + + @Override + @SuppressWarnings("unchecked") + public Employee build() { + try { + Employee record = new Employee(); + record.id = fieldSetFlags()[0] ? this.id : (java.lang.Integer) defaultValue(fields()[0]); + record.firstName = fieldSetFlags()[1] ? this.firstName : (java.lang.CharSequence) defaultValue(fields()[1]); + record.lastName = fieldSetFlags()[2] ? this.lastName : (java.lang.CharSequence) defaultValue(fields()[2]); + record.department = fieldSetFlags()[3] ? this.department : (java.lang.CharSequence) defaultValue(fields()[3]); + record.designation = fieldSetFlags()[4] ? this.designation : (java.lang.CharSequence) defaultValue(fields()[4]); + return record; + } catch (java.lang.Exception e) { + throw new org.apache.avro.AvroRuntimeException(e); + } + } + } + + @SuppressWarnings("unchecked") + private static final org.apache.avro.io.DatumWriter + WRITER$ = (org.apache.avro.io.DatumWriter)MODEL$.createDatumWriter(SCHEMA$); + + @Override public void writeExternal(java.io.ObjectOutput out) + throws java.io.IOException { + WRITER$.write(this, SpecificData.getEncoder(out)); + } + + @SuppressWarnings("unchecked") + private static final org.apache.avro.io.DatumReader + READER$ = (org.apache.avro.io.DatumReader)MODEL$.createDatumReader(SCHEMA$); + + @Override public void readExternal(java.io.ObjectInput in) + throws java.io.IOException { + READER$.read(this, SpecificData.getDecoder(in)); + } + +} diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/schema/EmployeeKey.java b/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/schema/EmployeeKey.java new file mode 100644 index 0000000000..bfd87751a4 --- /dev/null +++ b/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/schema/EmployeeKey.java @@ -0,0 +1,307 @@ +/** + * Autogenerated by Avro + * + * DO NOT EDIT DIRECTLY + */ +package com.baeldung.schema; + +import org.apache.avro.specific.SpecificData; +import org.apache.avro.message.BinaryMessageEncoder; +import org.apache.avro.message.BinaryMessageDecoder; +import org.apache.avro.message.SchemaStore; + +@SuppressWarnings("all") +@org.apache.avro.specific.AvroGenerated +public class EmployeeKey extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord { + private static final long serialVersionUID = 5288483459411046896L; + public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"EmployeeKey\",\"namespace\":\"com.baeldung.schema\",\"fields\":[{\"name\":\"id\",\"type\":\"int\"},{\"name\":\"departmentName\",\"type\":\"string\"}]}"); + public static org.apache.avro.Schema getClassSchema() { return SCHEMA$; } + + private static SpecificData MODEL$ = new SpecificData(); + + private static final BinaryMessageEncoder ENCODER = + new BinaryMessageEncoder(MODEL$, SCHEMA$); + + private static final BinaryMessageDecoder DECODER = + new BinaryMessageDecoder(MODEL$, SCHEMA$); + + /** + * Return the BinaryMessageDecoder instance used by this class. + */ + public static BinaryMessageDecoder getDecoder() { + return DECODER; + } + + /** + * Create a new BinaryMessageDecoder instance for this class that uses the specified {@link SchemaStore}. + * @param resolver a {@link SchemaStore} used to find schemas by fingerprint + */ + public static BinaryMessageDecoder createDecoder(SchemaStore resolver) { + return new BinaryMessageDecoder(MODEL$, SCHEMA$, resolver); + } + + /** Serializes this EmployeeKey to a ByteBuffer. */ + public java.nio.ByteBuffer toByteBuffer() throws java.io.IOException { + return ENCODER.encode(this); + } + + /** Deserializes a EmployeeKey from a ByteBuffer. */ + public static EmployeeKey fromByteBuffer( + java.nio.ByteBuffer b) throws java.io.IOException { + return DECODER.decode(b); + } + + @Deprecated public int id; + @Deprecated public java.lang.CharSequence departmentName; + + /** + * Default constructor. Note that this does not initialize fields + * to their default values from the schema. If that is desired then + * one should use newBuilder(). + */ + public EmployeeKey() {} + + /** + * All-args constructor. + * @param id The new value for id + * @param departmentName The new value for departmentName + */ + public EmployeeKey(java.lang.Integer id, java.lang.CharSequence departmentName) { + this.id = id; + this.departmentName = departmentName; + } + + public org.apache.avro.Schema getSchema() { return SCHEMA$; } + // Used by DatumWriter. Applications should not call. + public java.lang.Object get(int field$) { + switch (field$) { + case 0: return id; + case 1: return departmentName; + default: throw new org.apache.avro.AvroRuntimeException("Bad index"); + } + } + + // Used by DatumReader. Applications should not call. + @SuppressWarnings(value="unchecked") + public void put(int field$, java.lang.Object value$) { + switch (field$) { + case 0: id = (java.lang.Integer)value$; break; + case 1: departmentName = (java.lang.CharSequence)value$; break; + default: throw new org.apache.avro.AvroRuntimeException("Bad index"); + } + } + + /** + * Gets the value of the 'id' field. + * @return The value of the 'id' field. + */ + public java.lang.Integer getId() { + return id; + } + + /** + * Sets the value of the 'id' field. + * @param value the value to set. + */ + public void setId(java.lang.Integer value) { + this.id = value; + } + + /** + * Gets the value of the 'departmentName' field. + * @return The value of the 'departmentName' field. + */ + public java.lang.CharSequence getDepartmentName() { + return departmentName; + } + + /** + * Sets the value of the 'departmentName' field. + * @param value the value to set. + */ + public void setDepartmentName(java.lang.CharSequence value) { + this.departmentName = value; + } + + /** + * Creates a new EmployeeKey RecordBuilder. + * @return A new EmployeeKey RecordBuilder + */ + public static com.baeldung.schema.EmployeeKey.Builder newBuilder() { + return new com.baeldung.schema.EmployeeKey.Builder(); + } + + /** + * Creates a new EmployeeKey RecordBuilder by copying an existing Builder. + * @param other The existing builder to copy. + * @return A new EmployeeKey RecordBuilder + */ + public static com.baeldung.schema.EmployeeKey.Builder newBuilder(com.baeldung.schema.EmployeeKey.Builder other) { + return new com.baeldung.schema.EmployeeKey.Builder(other); + } + + /** + * Creates a new EmployeeKey RecordBuilder by copying an existing EmployeeKey instance. + * @param other The existing instance to copy. + * @return A new EmployeeKey RecordBuilder + */ + public static com.baeldung.schema.EmployeeKey.Builder newBuilder(com.baeldung.schema.EmployeeKey other) { + return new com.baeldung.schema.EmployeeKey.Builder(other); + } + + /** + * RecordBuilder for EmployeeKey instances. + */ + public static class Builder extends org.apache.avro.specific.SpecificRecordBuilderBase + implements org.apache.avro.data.RecordBuilder { + + private int id; + private java.lang.CharSequence departmentName; + + /** Creates a new Builder */ + private Builder() { + super(SCHEMA$); + } + + /** + * Creates a Builder by copying an existing Builder. + * @param other The existing Builder to copy. + */ + private Builder(com.baeldung.schema.EmployeeKey.Builder other) { + super(other); + if (isValidValue(fields()[0], other.id)) { + this.id = data().deepCopy(fields()[0].schema(), other.id); + fieldSetFlags()[0] = true; + } + if (isValidValue(fields()[1], other.departmentName)) { + this.departmentName = data().deepCopy(fields()[1].schema(), other.departmentName); + fieldSetFlags()[1] = true; + } + } + + /** + * Creates a Builder by copying an existing EmployeeKey instance + * @param other The existing instance to copy. + */ + private Builder(com.baeldung.schema.EmployeeKey other) { + super(SCHEMA$); + if (isValidValue(fields()[0], other.id)) { + this.id = data().deepCopy(fields()[0].schema(), other.id); + fieldSetFlags()[0] = true; + } + if (isValidValue(fields()[1], other.departmentName)) { + this.departmentName = data().deepCopy(fields()[1].schema(), other.departmentName); + fieldSetFlags()[1] = true; + } + } + + /** + * Gets the value of the 'id' field. + * @return The value. + */ + public java.lang.Integer getId() { + return id; + } + + /** + * Sets the value of the 'id' field. + * @param value The value of 'id'. + * @return This builder. + */ + public com.baeldung.schema.EmployeeKey.Builder setId(int value) { + validate(fields()[0], value); + this.id = value; + fieldSetFlags()[0] = true; + return this; + } + + /** + * Checks whether the 'id' field has been set. + * @return True if the 'id' field has been set, false otherwise. + */ + public boolean hasId() { + return fieldSetFlags()[0]; + } + + + /** + * Clears the value of the 'id' field. + * @return This builder. + */ + public com.baeldung.schema.EmployeeKey.Builder clearId() { + fieldSetFlags()[0] = false; + return this; + } + + /** + * Gets the value of the 'departmentName' field. + * @return The value. + */ + public java.lang.CharSequence getDepartmentName() { + return departmentName; + } + + /** + * Sets the value of the 'departmentName' field. + * @param value The value of 'departmentName'. + * @return This builder. + */ + public com.baeldung.schema.EmployeeKey.Builder setDepartmentName(java.lang.CharSequence value) { + validate(fields()[1], value); + this.departmentName = value; + fieldSetFlags()[1] = true; + return this; + } + + /** + * Checks whether the 'departmentName' field has been set. + * @return True if the 'departmentName' field has been set, false otherwise. + */ + public boolean hasDepartmentName() { + return fieldSetFlags()[1]; + } + + + /** + * Clears the value of the 'departmentName' field. + * @return This builder. + */ + public com.baeldung.schema.EmployeeKey.Builder clearDepartmentName() { + departmentName = null; + fieldSetFlags()[1] = false; + return this; + } + + @Override + @SuppressWarnings("unchecked") + public EmployeeKey build() { + try { + EmployeeKey record = new EmployeeKey(); + record.id = fieldSetFlags()[0] ? this.id : (java.lang.Integer) defaultValue(fields()[0]); + record.departmentName = fieldSetFlags()[1] ? this.departmentName : (java.lang.CharSequence) defaultValue(fields()[1]); + return record; + } catch (java.lang.Exception e) { + throw new org.apache.avro.AvroRuntimeException(e); + } + } + } + + @SuppressWarnings("unchecked") + private static final org.apache.avro.io.DatumWriter + WRITER$ = (org.apache.avro.io.DatumWriter)MODEL$.createDatumWriter(SCHEMA$); + + @Override public void writeExternal(java.io.ObjectOutput out) + throws java.io.IOException { + WRITER$.write(this, SpecificData.getEncoder(out)); + } + + @SuppressWarnings("unchecked") + private static final org.apache.avro.io.DatumReader + READER$ = (org.apache.avro.io.DatumReader)MODEL$.createDatumReader(SCHEMA$); + + @Override public void readExternal(java.io.ObjectInput in) + throws java.io.IOException { + READER$.read(this, SpecificData.getDecoder(in)); + } + +} From d46b2d068414fb3bfd85260f836556b07d4dda08 Mon Sep 17 00:00:00 2001 From: anuragkumawat Date: Sat, 21 May 2022 17:33:00 +0530 Subject: [PATCH 059/100] JAVA-11421 Update article - RegEx for matching Date Pattern in Java --- .../regexp/datepattern/gregorian/February29thMatcher.java | 2 +- .../regexp/datepattern/gregorian/GregorianDateMatcher.java | 2 +- .../gregorian/testhelper/GregorianDateTestHelper.java | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/core-java-modules/core-java-datetime-string/src/main/java/com/baeldung/regexp/datepattern/gregorian/February29thMatcher.java b/core-java-modules/core-java-datetime-string/src/main/java/com/baeldung/regexp/datepattern/gregorian/February29thMatcher.java index b0243ae48f..629f15b2dd 100644 --- a/core-java-modules/core-java-datetime-string/src/main/java/com/baeldung/regexp/datepattern/gregorian/February29thMatcher.java +++ b/core-java-modules/core-java-datetime-string/src/main/java/com/baeldung/regexp/datepattern/gregorian/February29thMatcher.java @@ -7,7 +7,7 @@ import java.util.regex.Pattern; public class February29thMatcher implements DateMatcher { private static final Pattern DATE_PATTERN = Pattern.compile( - "^((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)$"); + "^((2000|2400|2800|(19|2[0-9])(0[48]|[2468][048]|[13579][26]))-02-29)$"); @Override public boolean matches(String date) { diff --git a/core-java-modules/core-java-datetime-string/src/main/java/com/baeldung/regexp/datepattern/gregorian/GregorianDateMatcher.java b/core-java-modules/core-java-datetime-string/src/main/java/com/baeldung/regexp/datepattern/gregorian/GregorianDateMatcher.java index fc8abdb201..13be452910 100644 --- a/core-java-modules/core-java-datetime-string/src/main/java/com/baeldung/regexp/datepattern/gregorian/GregorianDateMatcher.java +++ b/core-java-modules/core-java-datetime-string/src/main/java/com/baeldung/regexp/datepattern/gregorian/GregorianDateMatcher.java @@ -7,7 +7,7 @@ import java.util.regex.Pattern; class GregorianDateMatcher implements DateMatcher { private static final Pattern DATE_PATTERN = Pattern.compile( - "^((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)$" + "^((2000|2400|2800|(19|2[0-9])(0[48]|[2468][048]|[13579][26]))-02-29)$" + "|^(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))$" + "|^(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))$" + "|^(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30))$"); diff --git a/core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/regexp/datepattern/gregorian/testhelper/GregorianDateTestHelper.java b/core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/regexp/datepattern/gregorian/testhelper/GregorianDateTestHelper.java index 6429e4fe2d..b7fb267077 100644 --- a/core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/regexp/datepattern/gregorian/testhelper/GregorianDateTestHelper.java +++ b/core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/regexp/datepattern/gregorian/testhelper/GregorianDateTestHelper.java @@ -37,6 +37,8 @@ public class GregorianDateTestHelper { } public void assertFebruary29th() { + Assert.assertTrue(matcher.matches("1904-02-29")); + Assert.assertTrue(matcher.matches("1996-02-29")); Assert.assertTrue(matcher.matches("2000-02-29")); Assert.assertTrue(matcher.matches("2400-02-29")); Assert.assertTrue(matcher.matches("2800-02-29")); @@ -44,6 +46,8 @@ public class GregorianDateTestHelper { Assert.assertTrue(matcher.matches("2024-02-29")); Assert.assertTrue(matcher.matches("2028-02-29")); + Assert.assertFalse(matcher.matches("1900-02-29")); + Assert.assertFalse(matcher.matches("1999-02-29")); Assert.assertFalse(matcher.matches("2017-02-29")); Assert.assertFalse(matcher.matches("2018-02-29")); Assert.assertFalse(matcher.matches("2019-02-29")); From 296b77b90951c8324d9593e99492f51b771df6f7 Mon Sep 17 00:00:00 2001 From: etrandafir93 <75391049+etrandafir93@users.noreply.github.com> Date: Sat, 21 May 2022 21:47:49 +0200 Subject: [PATCH 060/100] BAEL-4605: code and tests for composing constraints (#12180) * BAEL-4605: code and tests for composing constraints * BAEL-4605: small fix and formatted the code * BAEL-4605: code review --- .../constraint/composition/Account.java | 37 +++++++++ .../composition/AccountService.java | 19 +++++ .../composition/AlphanumericReturnValue.java | 36 +++++++++ .../ConstraintCompositionConfig.java | 21 +++++ .../composition/ValidAlphanumeric.java | 37 +++++++++ .../ValidAlphanumericWithSingleViolation.java | 38 +++++++++ .../ValidLengthOrNumericCharacter.java | 34 ++++++++ .../ConstraintCompositionUnitTest.java | 80 +++++++++++++++++++ 8 files changed, 302 insertions(+) create mode 100644 javaxval/src/main/java/com/baeldung/javaxval/constraint/composition/Account.java create mode 100644 javaxval/src/main/java/com/baeldung/javaxval/constraint/composition/AccountService.java create mode 100644 javaxval/src/main/java/com/baeldung/javaxval/constraint/composition/AlphanumericReturnValue.java create mode 100644 javaxval/src/main/java/com/baeldung/javaxval/constraint/composition/ConstraintCompositionConfig.java create mode 100644 javaxval/src/main/java/com/baeldung/javaxval/constraint/composition/ValidAlphanumeric.java create mode 100644 javaxval/src/main/java/com/baeldung/javaxval/constraint/composition/ValidAlphanumericWithSingleViolation.java create mode 100644 javaxval/src/main/java/com/baeldung/javaxval/constraint/composition/ValidLengthOrNumericCharacter.java create mode 100644 javaxval/src/test/java/com/baeldung/javaxval/constraint/composition/ConstraintCompositionUnitTest.java diff --git a/javaxval/src/main/java/com/baeldung/javaxval/constraint/composition/Account.java b/javaxval/src/main/java/com/baeldung/javaxval/constraint/composition/Account.java new file mode 100644 index 0000000000..b47a47ec81 --- /dev/null +++ b/javaxval/src/main/java/com/baeldung/javaxval/constraint/composition/Account.java @@ -0,0 +1,37 @@ +package com.baeldung.javaxval.constraint.composition; + +public class Account { + + @ValidAlphanumeric + private String username; + + @ValidAlphanumericWithSingleViolation + private String password; + + @ValidLengthOrNumericCharacter + private String nickname; + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getNickname() { + return nickname; + } + + public void setNickname(String nickname) { + this.nickname = nickname; + } +} diff --git a/javaxval/src/main/java/com/baeldung/javaxval/constraint/composition/AccountService.java b/javaxval/src/main/java/com/baeldung/javaxval/constraint/composition/AccountService.java new file mode 100644 index 0000000000..f76fed8f04 --- /dev/null +++ b/javaxval/src/main/java/com/baeldung/javaxval/constraint/composition/AccountService.java @@ -0,0 +1,19 @@ +package com.baeldung.javaxval.constraint.composition; + +import org.springframework.stereotype.Component; +import org.springframework.validation.annotation.Validated; + +@Component +@Validated +public class AccountService { + + @AlphanumericReturnValue + public String getAnInvalidAlphanumericValue() { + return "john"; + } + + @AlphanumericReturnValue + public String getValidAlphanumericValue() { + return "johnDoe1234"; + } +} diff --git a/javaxval/src/main/java/com/baeldung/javaxval/constraint/composition/AlphanumericReturnValue.java b/javaxval/src/main/java/com/baeldung/javaxval/constraint/composition/AlphanumericReturnValue.java new file mode 100644 index 0000000000..6e3408712b --- /dev/null +++ b/javaxval/src/main/java/com/baeldung/javaxval/constraint/composition/AlphanumericReturnValue.java @@ -0,0 +1,36 @@ +package com.baeldung.javaxval.constraint.composition; + +import org.hibernate.validator.constraints.Length; + +import javax.validation.Constraint; +import javax.validation.Payload; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; +import javax.validation.constraintvalidation.SupportedValidationTarget; +import javax.validation.constraintvalidation.ValidationTarget; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +@NotNull +@Pattern(regexp = ".*\\d.*", message = "must contain at least one numeric character") +@Length(min = 6, max = 32, message = "must have between 6 and 32 characters") +@Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER }) +@Retention(RUNTIME) +@Documented +@Constraint(validatedBy = {}) +@SupportedValidationTarget(ValidationTarget.ANNOTATED_ELEMENT) +public @interface AlphanumericReturnValue { + + String message() default "method return value should have a valid length and contain numeric character(s)."; + + Class[] groups() default {}; + + Class[] payload() default {}; + +} + diff --git a/javaxval/src/main/java/com/baeldung/javaxval/constraint/composition/ConstraintCompositionConfig.java b/javaxval/src/main/java/com/baeldung/javaxval/constraint/composition/ConstraintCompositionConfig.java new file mode 100644 index 0000000000..ac0ec81ab2 --- /dev/null +++ b/javaxval/src/main/java/com/baeldung/javaxval/constraint/composition/ConstraintCompositionConfig.java @@ -0,0 +1,21 @@ +package com.baeldung.javaxval.constraint.composition; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; +import org.springframework.validation.beanvalidation.MethodValidationPostProcessor; + +@Configuration +@ComponentScan({ "com.baeldung.javaxval.constraint.composition" }) +public class ConstraintCompositionConfig { + + @Bean + public MethodValidationPostProcessor methodValidationPostProcessor() { + return new MethodValidationPostProcessor(); + } + + @Bean + public AccountService accountService() { + return new AccountService(); + } +} \ No newline at end of file diff --git a/javaxval/src/main/java/com/baeldung/javaxval/constraint/composition/ValidAlphanumeric.java b/javaxval/src/main/java/com/baeldung/javaxval/constraint/composition/ValidAlphanumeric.java new file mode 100644 index 0000000000..916b4e36a4 --- /dev/null +++ b/javaxval/src/main/java/com/baeldung/javaxval/constraint/composition/ValidAlphanumeric.java @@ -0,0 +1,37 @@ +package com.baeldung.javaxval.constraint.composition; + +import static java.lang.annotation.ElementType.ANNOTATION_TYPE; +import static java.lang.annotation.ElementType.CONSTRUCTOR; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.validation.Constraint; +import javax.validation.Payload; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; + +import org.hibernate.validator.constraints.Length; + +@NotNull +@Pattern(regexp = ".*\\d.*", message = "must contain at least one numeric character") +@Length(min = 6, max = 32, message = "must have between 6 and 32 characters") +@Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER }) +@Retention(RUNTIME) +@Documented +@Constraint(validatedBy = {}) +public @interface ValidAlphanumeric { + + String message() default "field should have a valid length and contain numeric character(s)."; + + Class[] groups() default {}; + + Class[] payload() default {}; + +} + diff --git a/javaxval/src/main/java/com/baeldung/javaxval/constraint/composition/ValidAlphanumericWithSingleViolation.java b/javaxval/src/main/java/com/baeldung/javaxval/constraint/composition/ValidAlphanumericWithSingleViolation.java new file mode 100644 index 0000000000..edc5b6af3e --- /dev/null +++ b/javaxval/src/main/java/com/baeldung/javaxval/constraint/composition/ValidAlphanumericWithSingleViolation.java @@ -0,0 +1,38 @@ +package com.baeldung.javaxval.constraint.composition; + +import static java.lang.annotation.ElementType.ANNOTATION_TYPE; +import static java.lang.annotation.ElementType.CONSTRUCTOR; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.validation.Constraint; +import javax.validation.Payload; +import javax.validation.ReportAsSingleViolation; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; + +import org.hibernate.validator.constraints.Length; + +@NotNull +@Pattern(regexp = ".*\\d.*", message = "must contain at least one numeric character") +@Length(min = 6, max = 32, message = "must have between 6 and 32 characters") +@Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER }) +@Retention(RUNTIME) +@Documented +@Constraint(validatedBy = {}) +@ReportAsSingleViolation +public @interface ValidAlphanumericWithSingleViolation { + + String message() default "field should have a valid length and contain numeric character(s)."; + + Class[] groups() default {}; + + Class[] payload() default {}; + +} \ No newline at end of file diff --git a/javaxval/src/main/java/com/baeldung/javaxval/constraint/composition/ValidLengthOrNumericCharacter.java b/javaxval/src/main/java/com/baeldung/javaxval/constraint/composition/ValidLengthOrNumericCharacter.java new file mode 100644 index 0000000000..444cb4a63a --- /dev/null +++ b/javaxval/src/main/java/com/baeldung/javaxval/constraint/composition/ValidLengthOrNumericCharacter.java @@ -0,0 +1,34 @@ +package com.baeldung.javaxval.constraint.composition; + +import org.hibernate.validator.constraints.CompositionType; +import org.hibernate.validator.constraints.ConstraintComposition; +import org.hibernate.validator.constraints.Length; + +import javax.validation.Constraint; +import javax.validation.Payload; +import javax.validation.constraints.Pattern; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +@Pattern(regexp = ".*\\d.*", message = "must contain at least one numeric character") +@Length(min = 6, max = 32, message = "must have between 6 and 32 characters") +@Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER }) +@Retention(RUNTIME) +@Documented +@Constraint(validatedBy = {}) +@ConstraintComposition(CompositionType.OR) +public @interface ValidLengthOrNumericCharacter { + + String message() default "field should have a valid length or contain numeric character(s)."; + + Class[] groups() default {}; + + Class[] payload() default {}; + +} + diff --git a/javaxval/src/test/java/com/baeldung/javaxval/constraint/composition/ConstraintCompositionUnitTest.java b/javaxval/src/test/java/com/baeldung/javaxval/constraint/composition/ConstraintCompositionUnitTest.java new file mode 100644 index 0000000000..6c2b8f801c --- /dev/null +++ b/javaxval/src/test/java/com/baeldung/javaxval/constraint/composition/ConstraintCompositionUnitTest.java @@ -0,0 +1,80 @@ +package com.baeldung.javaxval.constraint.composition; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +import java.util.Set; + +import javax.validation.ConstraintViolation; +import javax.validation.ConstraintViolationException; +import javax.validation.Validation; +import javax.validation.Validator; +import javax.validation.ValidatorFactory; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.support.AnnotationConfigContextLoader; + +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration(classes = { ConstraintCompositionConfig.class }, loader = AnnotationConfigContextLoader.class) +public class ConstraintCompositionUnitTest { + + @Autowired + private AccountService accountService; + + private Validator validator; + + @Before + public void setup() { + ValidatorFactory factory = Validation.buildDefaultValidatorFactory(); + validator = factory.getValidator(); + } + + @Test + public void whenUsernameIsInvalid_validationShouldReturnTwoViolations() { + Account account = new Account(); + account.setNickname("valid_nickname123"); + account.setPassword("valid_password123"); + account.setUsername("john"); + + Set> violations = validator.validate(account); + + assertThat(violations).hasSize(2); + } + + @Test + public void whenPasswordIsInvalid_validationShouldReturnSingleViolation() { + Account account = new Account(); + account.setUsername("valid_username123"); + account.setNickname("valid_nickname123"); + account.setPassword("john"); + + Set> violations = validator.validate(account); + + assertThat(violations).hasSize(1); + } + + @Test + public void whenNicknameIsTooShortButContainsNumericCharacter_validationShouldPass() { + Account account = new Account(); + account.setUsername("valid_username123"); + account.setPassword("valid_password123"); + account.setNickname("doe1"); + + Set> violations = validator.validate(account); + + assertThat(violations).isEmpty(); + } + + @Test + public void whenMethodReturnValuesIsInvalid_validationShouldFail() { + assertThatThrownBy(() -> accountService.getAnInvalidAlphanumericValue()).isInstanceOf(ConstraintViolationException.class) + .hasMessageContaining("must contain at least one numeric character") + .hasMessageContaining("must have between 6 and 32 characters"); + } + +} \ No newline at end of file From 1efe19f3833a83fab78136070696fedf5ce3a610 Mon Sep 17 00:00:00 2001 From: Haroon Khan Date: Sat, 21 May 2022 20:22:05 +0100 Subject: [PATCH 061/100] [JAVA-11892] Logging clean up --- .../cipher/AvailableCiphersUnitTest.java | 4 ++-- .../src/test/resources/logback.xml | 13 +++++++++++ .../src/main/resources/log4j.xml | 22 +++++++++++++++++++ .../resources/hibernate-namedquery.properties | 5 ++++- .../hibernate-pessimistic-locking.properties | 4 +++- .../src/test/resources/hibernate.properties | 5 ++++- .../src/main/resources/log4j.xml | 22 +++++++++++++++++++ .../src/main/resources/logback.xml | 2 +- .../hibernate-customtypes.properties | 3 ++- .../resources/hibernate-namedquery.properties | 3 ++- .../src/test/resources/hibernate.properties | 3 ++- .../src/test/resources/log4j.xml | 22 +++++++++++++++++++ .../baeldung/jpa/enums/ArticleUnitTest.java | 5 +++-- .../src/test/resources/persistence.xml | 4 ++-- 14 files changed, 104 insertions(+), 13 deletions(-) create mode 100644 core-java-modules/core-java-security-algorithms/src/test/resources/logback.xml create mode 100644 persistence-modules/hibernate-jpa/src/main/resources/log4j.xml create mode 100644 persistence-modules/hibernate-queries/src/main/resources/log4j.xml create mode 100644 persistence-modules/hibernate-queries/src/test/resources/log4j.xml diff --git a/core-java-modules/core-java-security-algorithms/src/test/java/com/baeldung/cipher/AvailableCiphersUnitTest.java b/core-java-modules/core-java-security-algorithms/src/test/java/com/baeldung/cipher/AvailableCiphersUnitTest.java index fa38aca272..5653f47734 100644 --- a/core-java-modules/core-java-security-algorithms/src/test/java/com/baeldung/cipher/AvailableCiphersUnitTest.java +++ b/core-java-modules/core-java-security-algorithms/src/test/java/com/baeldung/cipher/AvailableCiphersUnitTest.java @@ -17,7 +17,7 @@ public class AvailableCiphersUnitTest { public void whenGetServices_thenGetAllCipherAlgorithms() { for (Provider provider : Security.getProviders()) { for (Provider.Service service : provider.getServices()) { - logger.info(service.getAlgorithm()); + logger.debug(service.getAlgorithm()); } } } @@ -30,6 +30,6 @@ public class AvailableCiphersUnitTest { .map(Provider.Service::getAlgorithm) .collect(Collectors.toList()); - algorithms.forEach(logger::info); + algorithms.forEach(logger::debug); } } diff --git a/core-java-modules/core-java-security-algorithms/src/test/resources/logback.xml b/core-java-modules/core-java-security-algorithms/src/test/resources/logback.xml new file mode 100644 index 0000000000..7d900d8ea8 --- /dev/null +++ b/core-java-modules/core-java-security-algorithms/src/test/resources/logback.xml @@ -0,0 +1,13 @@ + + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + \ No newline at end of file diff --git a/persistence-modules/hibernate-jpa/src/main/resources/log4j.xml b/persistence-modules/hibernate-jpa/src/main/resources/log4j.xml new file mode 100644 index 0000000000..f58dbdc514 --- /dev/null +++ b/persistence-modules/hibernate-jpa/src/main/resources/log4j.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/persistence-modules/hibernate-jpa/src/test/resources/hibernate-namedquery.properties b/persistence-modules/hibernate-jpa/src/test/resources/hibernate-namedquery.properties index 457f965347..2f05e32a30 100644 --- a/persistence-modules/hibernate-jpa/src/test/resources/hibernate-namedquery.properties +++ b/persistence-modules/hibernate-jpa/src/test/resources/hibernate-namedquery.properties @@ -5,5 +5,8 @@ hibernate.connection.autocommit=true jdbc.password= hibernate.dialect=org.hibernate.dialect.H2Dialect -hibernate.show_sql=true + +# enable to see Hibernate generated SQL +hibernate.show_sql=false + hibernate.hbm2ddl.auto=create-drop \ No newline at end of file diff --git a/persistence-modules/hibernate-jpa/src/test/resources/hibernate-pessimistic-locking.properties b/persistence-modules/hibernate-jpa/src/test/resources/hibernate-pessimistic-locking.properties index 342f7b0bf5..da6ab4d68a 100644 --- a/persistence-modules/hibernate-jpa/src/test/resources/hibernate-pessimistic-locking.properties +++ b/persistence-modules/hibernate-jpa/src/test/resources/hibernate-pessimistic-locking.properties @@ -4,5 +4,7 @@ hibernate.connection.username=sa hibernate.connection.autocommit=true hibernate.dialect=org.hibernate.dialect.H2Dialect -hibernate.show_sql=true +# enable to see Hibernate generated SQL +hibernate.show_sql=false + hibernate.hbm2ddl.auto=create-drop \ No newline at end of file diff --git a/persistence-modules/hibernate-jpa/src/test/resources/hibernate.properties b/persistence-modules/hibernate-jpa/src/test/resources/hibernate.properties index c14782ce0f..20197700a1 100644 --- a/persistence-modules/hibernate-jpa/src/test/resources/hibernate.properties +++ b/persistence-modules/hibernate-jpa/src/test/resources/hibernate.properties @@ -5,7 +5,10 @@ hibernate.connection.autocommit=true jdbc.password= hibernate.dialect=org.hibernate.dialect.H2Dialect -hibernate.show_sql=true + +# enable to see Hibernate generated SQL +hibernate.show_sql=false + hibernate.hbm2ddl.auto=create-drop hibernate.c3p0.min_size=5 diff --git a/persistence-modules/hibernate-queries/src/main/resources/log4j.xml b/persistence-modules/hibernate-queries/src/main/resources/log4j.xml new file mode 100644 index 0000000000..f58dbdc514 --- /dev/null +++ b/persistence-modules/hibernate-queries/src/main/resources/log4j.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/persistence-modules/hibernate-queries/src/main/resources/logback.xml b/persistence-modules/hibernate-queries/src/main/resources/logback.xml index 612296c6ce..56af2d397e 100644 --- a/persistence-modules/hibernate-queries/src/main/resources/logback.xml +++ b/persistence-modules/hibernate-queries/src/main/resources/logback.xml @@ -12,7 +12,7 @@ - + diff --git a/persistence-modules/hibernate-queries/src/test/resources/hibernate-customtypes.properties b/persistence-modules/hibernate-queries/src/test/resources/hibernate-customtypes.properties index c14782ce0f..c202f59f82 100644 --- a/persistence-modules/hibernate-queries/src/test/resources/hibernate-customtypes.properties +++ b/persistence-modules/hibernate-queries/src/test/resources/hibernate-customtypes.properties @@ -5,7 +5,8 @@ hibernate.connection.autocommit=true jdbc.password= hibernate.dialect=org.hibernate.dialect.H2Dialect -hibernate.show_sql=true +# enable to see Hibernate generated SQL +hibernate.show_sql=false hibernate.hbm2ddl.auto=create-drop hibernate.c3p0.min_size=5 diff --git a/persistence-modules/hibernate-queries/src/test/resources/hibernate-namedquery.properties b/persistence-modules/hibernate-queries/src/test/resources/hibernate-namedquery.properties index 457f965347..120212070a 100644 --- a/persistence-modules/hibernate-queries/src/test/resources/hibernate-namedquery.properties +++ b/persistence-modules/hibernate-queries/src/test/resources/hibernate-namedquery.properties @@ -5,5 +5,6 @@ hibernate.connection.autocommit=true jdbc.password= hibernate.dialect=org.hibernate.dialect.H2Dialect -hibernate.show_sql=true +# enable to see Hibernate generated SQL +hibernate.show_sql=false hibernate.hbm2ddl.auto=create-drop \ No newline at end of file diff --git a/persistence-modules/hibernate-queries/src/test/resources/hibernate.properties b/persistence-modules/hibernate-queries/src/test/resources/hibernate.properties index c14782ce0f..c202f59f82 100644 --- a/persistence-modules/hibernate-queries/src/test/resources/hibernate.properties +++ b/persistence-modules/hibernate-queries/src/test/resources/hibernate.properties @@ -5,7 +5,8 @@ hibernate.connection.autocommit=true jdbc.password= hibernate.dialect=org.hibernate.dialect.H2Dialect -hibernate.show_sql=true +# enable to see Hibernate generated SQL +hibernate.show_sql=false hibernate.hbm2ddl.auto=create-drop hibernate.c3p0.min_size=5 diff --git a/persistence-modules/hibernate-queries/src/test/resources/log4j.xml b/persistence-modules/hibernate-queries/src/test/resources/log4j.xml new file mode 100644 index 0000000000..f58dbdc514 --- /dev/null +++ b/persistence-modules/hibernate-queries/src/test/resources/log4j.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/enums/ArticleUnitTest.java b/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/enums/ArticleUnitTest.java index 9d98d6b86f..36a7cb1002 100644 --- a/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/enums/ArticleUnitTest.java +++ b/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/enums/ArticleUnitTest.java @@ -22,8 +22,9 @@ public class ArticleUnitTest { @BeforeClass public static void setup() { Map properties = new HashMap<>(); - properties.put("hibernate.show_sql", "true"); - properties.put("hibernate.format_sql", "true"); + // set these to true to see Hibernate SQL + properties.put("hibernate.show_sql", "false"); + properties.put("hibernate.format_sql", "false"); emFactory = Persistence.createEntityManagerFactory("jpa-h2", properties); em = emFactory.createEntityManager(); } diff --git a/persistence-modules/java-jpa/src/test/resources/persistence.xml b/persistence-modules/java-jpa/src/test/resources/persistence.xml index c902e0a320..e9b5ebbbcf 100644 --- a/persistence-modules/java-jpa/src/test/resources/persistence.xml +++ b/persistence-modules/java-jpa/src/test/resources/persistence.xml @@ -14,7 +14,7 @@ - + @@ -28,7 +28,7 @@ - + From 147d60e5285008765e38286398b3a90217daf124 Mon Sep 17 00:00:00 2001 From: anuragkumawat Date: Sun, 22 May 2022 12:46:31 +0530 Subject: [PATCH 062/100] JAVA-11422 Update article - A Guide To Java Regular Expressions API --- .../src/test/java/com/baeldung/regex/RegexUnitTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core-java-modules/core-java-regex/src/test/java/com/baeldung/regex/RegexUnitTest.java b/core-java-modules/core-java-regex/src/test/java/com/baeldung/regex/RegexUnitTest.java index 77052b79ac..f6c5f35f37 100644 --- a/core-java-modules/core-java-regex/src/test/java/com/baeldung/regex/RegexUnitTest.java +++ b/core-java-modules/core-java-regex/src/test/java/com/baeldung/regex/RegexUnitTest.java @@ -104,7 +104,7 @@ public class RegexUnitTest { @Test public void givenNumberRange_whenMatchesAccurately_thenCorrect2() { - int matches = runTest("[30-35]", "Two Uppercase alphabets 34 overall"); + int matches = runTest("3[0-5]", "Two Uppercase alphabets 34 overall"); assertTrue(matches > 0); assertEquals(matches, 1); } From 5ab2b9b8e4be3293bc096a6fccf53444e20bfbad Mon Sep 17 00:00:00 2001 From: Haroon Khan Date: Sun, 22 May 2022 11:44:39 +0100 Subject: [PATCH 063/100] [JAVA-12011] Remove redundant comments from pom files --- persistence-modules/pom.xml | 2 +- spring-boot-modules/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/persistence-modules/pom.xml b/persistence-modules/pom.xml index 7be71ad215..41396e81c6 100644 --- a/persistence-modules/pom.xml +++ b/persistence-modules/pom.xml @@ -15,7 +15,7 @@ activejdbc - apache-bookkeeper + apache-bookkeeper apache-cayenne apache-derby core-java-persistence diff --git a/spring-boot-modules/pom.xml b/spring-boot-modules/pom.xml index 63f11a4a76..29685b0eb8 100644 --- a/spring-boot-modules/pom.xml +++ b/spring-boot-modules/pom.xml @@ -44,7 +44,7 @@ spring-boot-groovy spring-boot-jasypt - spring-boot-keycloak + spring-boot-keycloak spring-boot-libraries spring-boot-libraries-2 spring-boot-libraries-comparison From ac5dbbc5da40106ea68a2e1b309af5169d3ed78b Mon Sep 17 00:00:00 2001 From: Thiago dos Santos Hora Date: Mon, 23 May 2022 08:09:09 +0200 Subject: [PATCH 064/100] [BAEL-4120] Read-only transactions samples (#11841) * [BAEL-4120] Read-only transactions samples * Extract query runner jobs logic * Apply test name standards * Fix code standards * Use pom properties to define versions * Rename main package * Rename generics * Code clean up * Code clean up on lambdas * Add debug logs * Fix format issues * Rename entity --- persistence-modules/pom.xml | 1 + .../read-only-transactions/README.md | 8 ++ .../read-only-transactions/create.sql | 43 +++++++ .../docker-compose-mysql.yml | 15 +++ .../read-only-transactions/pom.xml | 89 +++++++++++++++ .../readonlytransactions/h2/Book.java | 44 ++++++++ .../readonlytransactions/h2/BookService.java | 24 ++++ .../readonlytransactions/h2/Config.java | 54 +++++++++ .../h2/TransactionConfig.java | 21 ++++ .../mysql/dao/BaseRepo.java | 29 +++++ .../mysql/dao/MyRepoJPA.java | 36 ++++++ .../mysql/dao/MyRepoJdbc.java | 71 ++++++++++++ .../mysql/dao/MyRepoSpring.java | 22 ++++ .../mysql/entities/Book.java | 44 ++++++++ .../mysql/spring/Config.java | 77 +++++++++++++ .../mysql/spring/ReadOnlyContext.java | 26 +++++ .../mysql/spring/ReadOnlyInterception.java | 29 +++++ .../mysql/spring/ReaderDS.java | 10 ++ .../mysql/spring/RoutingDS.java | 35 ++++++ .../mysql/spring/entities/BookEntity.java | 45 ++++++++ .../spring/repositories/BookRepository.java | 21 ++++ .../utils/ExecutorUtils.java | 16 +++ .../main/resources/META-INF/persistence.xml | 23 ++++ .../src/main/resources/logback.xml | 18 +++ .../JPATransactionIntegrationTest.java | 77 +++++++++++++ ...ingTransactionReadOnlyIntegrationTest.java | 72 ++++++++++++ .../TransactionSetupIntegrationTest.java | 106 ++++++++++++++++++ 27 files changed, 1056 insertions(+) create mode 100644 persistence-modules/read-only-transactions/README.md create mode 100644 persistence-modules/read-only-transactions/create.sql create mode 100644 persistence-modules/read-only-transactions/docker-compose-mysql.yml create mode 100644 persistence-modules/read-only-transactions/pom.xml create mode 100644 persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/h2/Book.java create mode 100644 persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/h2/BookService.java create mode 100644 persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/h2/Config.java create mode 100644 persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/h2/TransactionConfig.java create mode 100644 persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/dao/BaseRepo.java create mode 100644 persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/dao/MyRepoJPA.java create mode 100644 persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/dao/MyRepoJdbc.java create mode 100644 persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/dao/MyRepoSpring.java create mode 100644 persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/entities/Book.java create mode 100644 persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/spring/Config.java create mode 100644 persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/spring/ReadOnlyContext.java create mode 100644 persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/spring/ReadOnlyInterception.java create mode 100644 persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/spring/ReaderDS.java create mode 100644 persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/spring/RoutingDS.java create mode 100644 persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/spring/entities/BookEntity.java create mode 100644 persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/spring/repositories/BookRepository.java create mode 100644 persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/utils/ExecutorUtils.java create mode 100644 persistence-modules/read-only-transactions/src/main/resources/META-INF/persistence.xml create mode 100644 persistence-modules/read-only-transactions/src/main/resources/logback.xml create mode 100644 persistence-modules/read-only-transactions/src/test/java/com/baeldung/readonlytransactions/JPATransactionIntegrationTest.java create mode 100644 persistence-modules/read-only-transactions/src/test/java/com/baeldung/readonlytransactions/SpringTransactionReadOnlyIntegrationTest.java create mode 100644 persistence-modules/read-only-transactions/src/test/java/com/baeldung/readonlytransactions/TransactionSetupIntegrationTest.java diff --git a/persistence-modules/pom.xml b/persistence-modules/pom.xml index 7be71ad215..23d29de1e8 100644 --- a/persistence-modules/pom.xml +++ b/persistence-modules/pom.xml @@ -52,6 +52,7 @@ persistence-libraries querydsl r2dbc + read-only-transactions redis solr diff --git a/persistence-modules/read-only-transactions/README.md b/persistence-modules/read-only-transactions/README.md new file mode 100644 index 0000000000..90a86e551e --- /dev/null +++ b/persistence-modules/read-only-transactions/README.md @@ -0,0 +1,8 @@ +### Relevant Articles: +- + +### Instructions +To run the `com.baeldung.read_only_transactions.TransactionSetupIntegrationTest` first follow the steps described next: +- run the command `docker-compose -f docker-compose-mysql.yml up` +- Open a SQL client of your preference and execute the `create.sql` script. +- You can check the mysql logs using `tail -f mysql/${name of de log file created}.log` \ No newline at end of file diff --git a/persistence-modules/read-only-transactions/create.sql b/persistence-modules/read-only-transactions/create.sql new file mode 100644 index 0000000000..0ba60be150 --- /dev/null +++ b/persistence-modules/read-only-transactions/create.sql @@ -0,0 +1,43 @@ +create table book ( + id bigint(20) AUTO_INCREMENT primary key, + name varchar(255) not null, + uuid varchar(40) +); + + +DELIMITER ;; +DROP PROCEDURE IF EXISTS populate; +create procedure populate() +BEGIN + SET @name1='Josh purchase'; + SET @name2='Henry purchase'; + SET @name3='Betty purchase'; + SET @name4='Kate purchase'; + SET @name5='Mari purchase'; + SET @name=''; + SET @counter=0; + + START TRANSACTION; + + while @counter < 1000000 do + SET @name = case + when MOD(@counter, 5) = 0 THEN @name5 + when MOD(@counter, 3) = 0 THEN @name3 + when MOD(@counter, 4) = 0 THEN @name4 + when MOD(@counter, 2) = 0 THEN @name2 + else @name1 + end; + + insert into book(name, uuid) values(@name, uuid()); + SET @counter=@counter+1; + end while; + + COMMIT; + +END;; + +DELIMITER ; + +CALL populate(); + + diff --git a/persistence-modules/read-only-transactions/docker-compose-mysql.yml b/persistence-modules/read-only-transactions/docker-compose-mysql.yml new file mode 100644 index 0000000000..a922fabbd8 --- /dev/null +++ b/persistence-modules/read-only-transactions/docker-compose-mysql.yml @@ -0,0 +1,15 @@ +version: "3.9" # optional since v1.27.0 +services: + mysql: + build: . + restart: always + ports: + - "3306:3306" + environment: + MYSQL_PASSWORD: "baeldung" + MYSQL_USER: "baeldung" + MYSQL_DATABASE: "baeldung" + MYSQL_ROOT_PASSWORD: "baeldung" + command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --innodb_buffer_pool_size=3G --innodb_adaptive_hash_index=off --query_cache_size=0 --query_cache_type=0 --log_output=FILE --general_log=1 + volumes: + - ./mysql:/var/lib/mysql/ \ No newline at end of file diff --git a/persistence-modules/read-only-transactions/pom.xml b/persistence-modules/read-only-transactions/pom.xml new file mode 100644 index 0000000000..d3822f8e58 --- /dev/null +++ b/persistence-modules/read-only-transactions/pom.xml @@ -0,0 +1,89 @@ + + + + 4.0.0 + read-only-transactions + 0.0.1-SNAPSHOT + read-only-transactions + + + com.baeldung + persistence-modules + 1.0.0-SNAPSHOT + + + + + + org.springframework.boot + spring-boot-starter-data-jpa + ${spring-boot.version} + + + com.zaxxer + HikariCP + + + + + + org.springframework.boot + spring-boot-starter-test + ${spring-boot.version} + test + + + + org.springframework + spring-test + ${spring-test.version} + test + + + + mysql + mysql-connector-java + ${mysql.version} + + + + org.hibernate + hibernate-core + ${hibernate.version} + + + + com.zaxxer + HikariCP + ${hikari.version} + + + + org.junit.jupiter + junit-jupiter-engine + ${junit-jupiter.version} + test + + + + com.h2database + h2 + ${h2.version} + runtime + + + + + + + 8.0.21 + 4.0.3 + 5.6.1.Final + 2.6.1 + 5.3.13 + 5.8.2 + 1.4.200 + + \ No newline at end of file diff --git a/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/h2/Book.java b/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/h2/Book.java new file mode 100644 index 0000000000..000859a201 --- /dev/null +++ b/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/h2/Book.java @@ -0,0 +1,44 @@ +package com.baeldung.readonlytransactions.h2; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; + +@Entity +@Table(name = "book") +public class Book { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + private String name; + + private String uuid; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getUuid() { + return uuid; + } + + public void setUuid(String uuid) { + this.uuid = uuid; + } +} diff --git a/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/h2/BookService.java b/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/h2/BookService.java new file mode 100644 index 0000000000..0ecbc4a0d4 --- /dev/null +++ b/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/h2/BookService.java @@ -0,0 +1,24 @@ +package com.baeldung.readonlytransactions.h2; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.persistence.EntityManagerFactory; + +@Service +public class BookService { + + private EntityManagerFactory entityManagerFactory; + + public BookService(@Autowired @Qualifier("h2EntityManagerFactory") EntityManagerFactory entityManagerFactory) { + this.entityManagerFactory = entityManagerFactory; + } + + @Transactional(readOnly = true) + public Book getBookById(long id) { + return entityManagerFactory.createEntityManager() + .find(Book.class, id); + } +} diff --git a/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/h2/Config.java b/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/h2/Config.java new file mode 100644 index 0000000000..241dad417b --- /dev/null +++ b/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/h2/Config.java @@ -0,0 +1,54 @@ +package com.baeldung.readonlytransactions.h2; + +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; +import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter; + +import com.zaxxer.hikari.HikariConfig; +import com.zaxxer.hikari.HikariDataSource; + +import java.util.Properties; + +import javax.persistence.EntityManagerFactory; +import javax.sql.DataSource; + +@Configuration +public class Config { + + @Bean("h2DataSource") + public DataSource dataSource() { + HikariConfig config = new HikariConfig(); + config.setJdbcUrl("jdbc:h2:mem:mydb"); + config.setUsername("sa"); + config.setPassword(""); + config.setDriverClassName("org.h2.Driver"); + return new HikariDataSource(config); + } + + @Bean("h2EntityManagerFactory") + public EntityManagerFactory entityManagerFactory(@Qualifier("h2DataSource") DataSource dataSource) { + HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter(); + vendorAdapter.setGenerateDdl(false); + + LocalContainerEntityManagerFactoryBean managerFactoryBean = new LocalContainerEntityManagerFactoryBean(); + managerFactoryBean.setJpaVendorAdapter(vendorAdapter); + managerFactoryBean.setPackagesToScan(Config.class.getPackage() + .getName()); + managerFactoryBean.setDataSource(dataSource); + + Properties properties = new Properties(); + + properties.setProperty("hibernate.dialect", "org.hibernate.dialect.H2Dialect"); + properties.setProperty("hibernate.hbm2ddl.auto", "create-drop"); + + properties.setProperty("hibernate.show_sql", "true"); + properties.setProperty("hibernate.format_sql", "true"); + + managerFactoryBean.setJpaProperties(properties); + managerFactoryBean.afterPropertiesSet(); + + return managerFactoryBean.getObject(); + } +} diff --git a/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/h2/TransactionConfig.java b/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/h2/TransactionConfig.java new file mode 100644 index 0000000000..62abb85edd --- /dev/null +++ b/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/h2/TransactionConfig.java @@ -0,0 +1,21 @@ +package com.baeldung.readonlytransactions.h2; + +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.orm.jpa.JpaTransactionManager; +import org.springframework.transaction.PlatformTransactionManager; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +import javax.persistence.EntityManagerFactory; + +@Configuration +@EnableTransactionManagement +public class TransactionConfig { + + @Bean + public PlatformTransactionManager transactionManager(@Qualifier("h2EntityManagerFactory") EntityManagerFactory entityManagerFactory) { + return new JpaTransactionManager(entityManagerFactory); + } + +} diff --git a/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/dao/BaseRepo.java b/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/dao/BaseRepo.java new file mode 100644 index 0000000000..81ff78efb2 --- /dev/null +++ b/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/dao/BaseRepo.java @@ -0,0 +1,29 @@ +package com.baeldung.readonlytransactions.mysql.dao; + +import com.baeldung.readonlytransactions.utils.ExecutorUtils; + +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicLong; +import java.util.function.Consumer; + +public abstract class BaseRepo { + + protected long execQuery(Consumer function) { + AtomicLong count = new AtomicLong(0); + + ExecutorService executor = ExecutorUtils.createExecutor(10, 10); + ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor(); + + scheduler.schedule(executor::shutdownNow, 5L, TimeUnit.SECONDS); + scheduler.shutdown(); + + while (!executor.isShutdown()) { + executor.execute(() -> function.accept(count)); + } + + return count.get(); + } +} diff --git a/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/dao/MyRepoJPA.java b/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/dao/MyRepoJPA.java new file mode 100644 index 0000000000..727e88219f --- /dev/null +++ b/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/dao/MyRepoJPA.java @@ -0,0 +1,36 @@ +package com.baeldung.readonlytransactions.mysql.dao; + +import org.hibernate.Session; + +import com.baeldung.readonlytransactions.mysql.entities.Book; + +import java.util.SplittableRandom; +import java.util.concurrent.atomic.AtomicLong; + +import javax.persistence.EntityManager; +import javax.persistence.EntityManagerFactory; +import javax.persistence.Persistence; + +public class MyRepoJPA extends BaseRepo { + + private EntityManagerFactory entityManagerFactory = Persistence.createEntityManagerFactory("jpa-unit"); + private SplittableRandom random = new SplittableRandom(); + + public long runQuery() { + return execQuery(this::runSql); + } + + private void runSql(AtomicLong count) { + if (Thread.interrupted()) { + return; + } + + EntityManager entityManager = entityManagerFactory.createEntityManager(); + Session session = entityManager.unwrap(Session.class); + session.setDefaultReadOnly(true); + entityManager.find(Book.class, 1L + random.nextLong(0, 1000000)); + count.incrementAndGet(); + entityManager.clear(); + } + +} diff --git a/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/dao/MyRepoJdbc.java b/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/dao/MyRepoJdbc.java new file mode 100644 index 0000000000..306bfd5f0c --- /dev/null +++ b/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/dao/MyRepoJdbc.java @@ -0,0 +1,71 @@ +package com.baeldung.readonlytransactions.mysql.dao; + +import com.zaxxer.hikari.HikariConfig; +import com.zaxxer.hikari.HikariDataSource; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.SplittableRandom; +import java.util.concurrent.atomic.AtomicLong; + +public class MyRepoJdbc extends BaseRepo { + + static { + try { + Class.forName("com.mysql.cj.jdbc.Driver"); + } catch (ClassNotFoundException e) { + throw new RuntimeException(e); + } + } + + private HikariDataSource ds; + private SplittableRandom random = new SplittableRandom(); + + public MyRepoJdbc(boolean readOnly, boolean autocommit) { + HikariConfig config = new HikariConfig(); + config.setJdbcUrl("jdbc:mysql://localhost/baeldung?useUnicode=true&characterEncoding=UTF-8"); + config.setUsername("baeldung"); + config.setPassword("baeldung"); + config.setReadOnly(readOnly); + config.setAutoCommit(autocommit); + ds = new HikariDataSource(config); + } + + private Connection getConnection() throws SQLException { + return ds.getConnection(); + } + + public long runQuery(Boolean autoCommit, Boolean readOnly) { + try { + return execQuery(count -> runSql(count, autoCommit, readOnly)); + } finally { + ds.close(); + } + } + + private void runSql(AtomicLong count, Boolean autoCommit, Boolean readOnly) { + if (Thread.interrupted()) { + return; + } + + try (Connection connect = getConnection(); PreparedStatement statement = connect.prepareStatement("select * from transactions where id = ?")) { + if (autoCommit != null) + connect.setAutoCommit(autoCommit); + + if (readOnly != null) + connect.setReadOnly(readOnly); + + statement.setLong(1, 1L + random.nextLong(0, 100000)); + ResultSet resultSet = statement.executeQuery(); + + if (autoCommit != null && !autoCommit) + connect.commit(); + + count.incrementAndGet(); + resultSet.close(); + } catch (Exception ignored) { + } + } +} \ No newline at end of file diff --git a/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/dao/MyRepoSpring.java b/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/dao/MyRepoSpring.java new file mode 100644 index 0000000000..387f5ec722 --- /dev/null +++ b/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/dao/MyRepoSpring.java @@ -0,0 +1,22 @@ +package com.baeldung.readonlytransactions.mysql.dao; + +import com.baeldung.readonlytransactions.mysql.spring.repositories.BookRepository; + +import java.util.SplittableRandom; + +public class MyRepoSpring extends BaseRepo { + + private SplittableRandom random = new SplittableRandom(); + private BookRepository repository; + + public MyRepoSpring(BookRepository repository) { + this.repository = repository; + } + + public long runQuery() { + return execQuery(count -> { + repository.get(1L + random.nextLong(0, 1000000)); + count.incrementAndGet(); + }); + } +} diff --git a/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/entities/Book.java b/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/entities/Book.java new file mode 100644 index 0000000000..405cc9c2c2 --- /dev/null +++ b/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/entities/Book.java @@ -0,0 +1,44 @@ +package com.baeldung.readonlytransactions.mysql.entities; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; + +@Entity +@Table(name = "book") +public class Book { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + private String name; + + private String uuid; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getUuid() { + return uuid; + } + + public void setUuid(String uuid) { + this.uuid = uuid; + } +} diff --git a/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/spring/Config.java b/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/spring/Config.java new file mode 100644 index 0000000000..abaa63b197 --- /dev/null +++ b/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/spring/Config.java @@ -0,0 +1,77 @@ +package com.baeldung.readonlytransactions.mysql.spring; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.EnableAspectJAutoProxy; +import org.springframework.data.jpa.repository.config.EnableJpaRepositories; +import org.springframework.orm.jpa.JpaTransactionManager; +import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; +import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter; +import org.springframework.transaction.PlatformTransactionManager; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +import com.baeldung.readonlytransactions.mysql.dao.MyRepoSpring; +import com.baeldung.readonlytransactions.mysql.spring.entities.BookEntity; +import com.baeldung.readonlytransactions.mysql.spring.repositories.BookRepository; +import com.zaxxer.hikari.HikariConfig; +import com.zaxxer.hikari.HikariDataSource; + +import java.util.Properties; + +import javax.persistence.EntityManagerFactory; +import javax.sql.DataSource; + +@Configuration +@EnableJpaRepositories(basePackageClasses = Config.class, enableDefaultTransactions = false) +@EnableTransactionManagement +@EnableAspectJAutoProxy +public class Config { + + @Bean + public MyRepoSpring repoSpring(BookRepository repository) { + return new MyRepoSpring(repository); + } + + private DataSource dataSource(boolean readOnly, boolean isAutoCommit) { + HikariConfig config = new HikariConfig(); + config.setJdbcUrl("jdbc:mysql://localhost/baeldung?useUnicode=true&characterEncoding=UTF-8"); + config.setUsername("baeldung"); + config.setPassword("baeldung"); + config.setReadOnly(readOnly); + config.setAutoCommit(isAutoCommit); + return new HikariDataSource(config); + } + + @Bean + public DataSource dataSource() { + return new RoutingDS(dataSource(false, false), dataSource(true, true)); + } + + @Bean + public EntityManagerFactory entityManagerFactory(DataSource dataSource) { + HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter(); + vendorAdapter.setGenerateDdl(false); + + LocalContainerEntityManagerFactoryBean managerFactoryBean = new LocalContainerEntityManagerFactoryBean(); + managerFactoryBean.setJpaVendorAdapter(vendorAdapter); + managerFactoryBean.setPackagesToScan(BookEntity.class.getPackage() + .getName()); + managerFactoryBean.setDataSource(dataSource); + + Properties properties = new Properties(); + + properties.setProperty("hibernate.dialect", "org.hibernate.dialect.MySQL5Dialect"); + properties.setProperty("hibernate.hbm2ddl.auto", "validate"); + + managerFactoryBean.setJpaProperties(properties); + managerFactoryBean.afterPropertiesSet(); + + return managerFactoryBean.getObject(); + } + + @Bean + public PlatformTransactionManager transactionManager(EntityManagerFactory entityManagerFactory) { + return new JpaTransactionManager(entityManagerFactory); + } + +} diff --git a/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/spring/ReadOnlyContext.java b/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/spring/ReadOnlyContext.java new file mode 100644 index 0000000000..2933c8c4a9 --- /dev/null +++ b/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/spring/ReadOnlyContext.java @@ -0,0 +1,26 @@ +package com.baeldung.readonlytransactions.mysql.spring; + +import java.util.concurrent.atomic.AtomicInteger; + +public class ReadOnlyContext { + + private static final ThreadLocal READ_ONLY_LEVEL = ThreadLocal.withInitial(() -> new AtomicInteger(0)); + + private ReadOnlyContext() { + } + + public static boolean isReadOnly() { + return READ_ONLY_LEVEL.get() + .get() > 0; + } + + public static void enter() { + READ_ONLY_LEVEL.get() + .incrementAndGet(); + } + + public static void exit() { + READ_ONLY_LEVEL.get() + .decrementAndGet(); + } +} diff --git a/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/spring/ReadOnlyInterception.java b/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/spring/ReadOnlyInterception.java new file mode 100644 index 0000000000..30488970a8 --- /dev/null +++ b/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/spring/ReadOnlyInterception.java @@ -0,0 +1,29 @@ +package com.baeldung.readonlytransactions.mysql.spring; + +import org.aspectj.lang.ProceedingJoinPoint; +import org.aspectj.lang.annotation.Around; +import org.aspectj.lang.annotation.Aspect; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +@Aspect +@Component +public class ReadOnlyInterception { + + private static final Logger logger = LoggerFactory.getLogger(ReadOnlyInterception.class); + + @Around("@annotation(com.baeldung.readonlytransactions.mysql.spring.ReaderDS)") + public Object aroundMethod(ProceedingJoinPoint joinPoint) throws Throwable { + try { + ReadOnlyContext.enter(); + //Debug data source switch + logger.debug("-----------------------------Entering read only zone-----------------------------"); + return joinPoint.proceed(); + } finally { + logger.debug("-----------------------------Leaving read only zone------------------------------"); + ReadOnlyContext.exit(); + } + } + +} diff --git a/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/spring/ReaderDS.java b/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/spring/ReaderDS.java new file mode 100644 index 0000000000..312c65b3cf --- /dev/null +++ b/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/spring/ReaderDS.java @@ -0,0 +1,10 @@ +package com.baeldung.readonlytransactions.mysql.spring; + +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +@Inherited +@Retention(RetentionPolicy.RUNTIME) +public @interface ReaderDS { +} diff --git a/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/spring/RoutingDS.java b/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/spring/RoutingDS.java new file mode 100644 index 0000000000..36ce8a16e6 --- /dev/null +++ b/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/spring/RoutingDS.java @@ -0,0 +1,35 @@ +package com.baeldung.readonlytransactions.mysql.spring; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource; + +import java.util.HashMap; +import java.util.Map; + +import javax.sql.DataSource; + +public class RoutingDS extends AbstractRoutingDataSource { + + private static final Logger logger = LoggerFactory.getLogger(RoutingDS.class); + + RoutingDS(DataSource writer, DataSource reader) { + + Map dataSources = new HashMap<>(); + dataSources.put("writer", writer); + dataSources.put("reader", reader); + + setTargetDataSources(dataSources); + } + + @Override + protected Object determineCurrentLookupKey() { + String dataSourceMode = ReadOnlyContext.isReadOnly() ? "reader" : "writer"; + + // Testing data source switch + logger.debug("-----------------------------Datasource: {} ---------------------------------", dataSourceMode); + + return dataSourceMode; + } + +} diff --git a/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/spring/entities/BookEntity.java b/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/spring/entities/BookEntity.java new file mode 100644 index 0000000000..87c8988a8d --- /dev/null +++ b/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/spring/entities/BookEntity.java @@ -0,0 +1,45 @@ +package com.baeldung.readonlytransactions.mysql.spring.entities; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; + +@Entity +@Table(name = "book") +public class BookEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + private String name; + + private String uuid; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getUuid() { + return uuid; + } + + public void setUuid(String uuid) { + this.uuid = uuid; + } +} + diff --git a/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/spring/repositories/BookRepository.java b/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/spring/repositories/BookRepository.java new file mode 100644 index 0000000000..2cc61c016d --- /dev/null +++ b/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/spring/repositories/BookRepository.java @@ -0,0 +1,21 @@ +package com.baeldung.readonlytransactions.mysql.spring.repositories; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; + +import com.baeldung.readonlytransactions.mysql.spring.ReaderDS; +import com.baeldung.readonlytransactions.mysql.spring.entities.BookEntity; + +import javax.transaction.Transactional; + +public interface BookRepository extends JpaRepository { + + @ReaderDS + @Query("Select 1 from BookEntity t where t.id = ?1") + Long get(Long id); + + @Transactional + default BookEntity persist(BookEntity book) { + return this.save(book); + } +} diff --git a/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/utils/ExecutorUtils.java b/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/utils/ExecutorUtils.java new file mode 100644 index 0000000000..60c306b3b8 --- /dev/null +++ b/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/utils/ExecutorUtils.java @@ -0,0 +1,16 @@ +package com.baeldung.readonlytransactions.utils; + +import java.util.concurrent.ExecutorService; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; + +public class ExecutorUtils { + + private ExecutorUtils() { + } + + public static ExecutorService createExecutor(int corePoolSize, int maximumPoolSize) { + return new ThreadPoolExecutor(corePoolSize, maximumPoolSize, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>(), new ThreadPoolExecutor.DiscardOldestPolicy()); + } +} diff --git a/persistence-modules/read-only-transactions/src/main/resources/META-INF/persistence.xml b/persistence-modules/read-only-transactions/src/main/resources/META-INF/persistence.xml new file mode 100644 index 0000000000..37fb45ed49 --- /dev/null +++ b/persistence-modules/read-only-transactions/src/main/resources/META-INF/persistence.xml @@ -0,0 +1,23 @@ + + + + + org.hibernate.jpa.HibernatePersistenceProvider + com.baeldung.readonlytransactions.mysql.entities.Book + true + + + + + + + + + + + + diff --git a/persistence-modules/read-only-transactions/src/main/resources/logback.xml b/persistence-modules/read-only-transactions/src/main/resources/logback.xml new file mode 100644 index 0000000000..5d331c64b3 --- /dev/null +++ b/persistence-modules/read-only-transactions/src/main/resources/logback.xml @@ -0,0 +1,18 @@ + + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - + %msg%n + + + + + + + + + + + \ No newline at end of file diff --git a/persistence-modules/read-only-transactions/src/test/java/com/baeldung/readonlytransactions/JPATransactionIntegrationTest.java b/persistence-modules/read-only-transactions/src/test/java/com/baeldung/readonlytransactions/JPATransactionIntegrationTest.java new file mode 100644 index 0000000000..a15651b273 --- /dev/null +++ b/persistence-modules/read-only-transactions/src/test/java/com/baeldung/readonlytransactions/JPATransactionIntegrationTest.java @@ -0,0 +1,77 @@ +package com.baeldung.readonlytransactions; + +import static org.junit.jupiter.api.Assertions.assertNotNull; + +import org.hibernate.Session; +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.beans.factory.annotation.Qualifier; +import org.springframework.context.ApplicationContextInitializer; +import org.springframework.context.annotation.AnnotatedBeanDefinitionReader; +import org.springframework.context.support.GenericApplicationContext; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; +import org.springframework.test.context.support.AnnotationConfigContextLoader; + +import com.baeldung.readonlytransactions.h2.Config; +import com.baeldung.readonlytransactions.h2.Book; +import com.baeldung.readonlytransactions.mysql.spring.ReadOnlyInterception; + +import java.util.UUID; + +import javax.persistence.EntityManager; +import javax.persistence.EntityManagerFactory; + +@ExtendWith(SpringExtension.class) +@ContextConfiguration(loader = AnnotationConfigContextLoader.class, initializers = JPATransactionIntegrationTest.TestConfig.class, classes = { ReadOnlyInterception.class }) +class JPATransactionIntegrationTest { + + static class TestConfig implements ApplicationContextInitializer { + @Override + public void initialize(GenericApplicationContext applicationContext) { + new AnnotatedBeanDefinitionReader(applicationContext).register(Config.class); + } + } + + @Autowired + @Qualifier("h2EntityManagerFactory") + private EntityManagerFactory entityManagerFactory; + + @BeforeEach + void setUp() { + EntityManager entityManager = entityManagerFactory.createEntityManager(); + entityManager.getTransaction() + .begin(); + entityManager.createQuery("DELETE FROM Book") + .executeUpdate(); + + Book book = new Book(); + book.setName("Test 1"); + book.setUuid(UUID.randomUUID() + .toString()); + + entityManager.merge(book); + entityManager.getTransaction() + .commit(); + } + + @Test + void givenAEntityManagerDefinedAsReadOnly_whenCreatingATransaction_thenAReadOnlyTransactionShouldBeCreated() { + EntityManager entityManager = entityManagerFactory.createEntityManager(); + + entityManager.unwrap(Session.class) + .setDefaultReadOnly(true); + entityManager.getTransaction() + .begin(); + Book book = entityManager.find(Book.class, 1L); + entityManager.getTransaction() + .commit(); + entityManager.unwrap(Session.class) + .setDefaultReadOnly(false); + + assertNotNull(book); + } + +} diff --git a/persistence-modules/read-only-transactions/src/test/java/com/baeldung/readonlytransactions/SpringTransactionReadOnlyIntegrationTest.java b/persistence-modules/read-only-transactions/src/test/java/com/baeldung/readonlytransactions/SpringTransactionReadOnlyIntegrationTest.java new file mode 100644 index 0000000000..2f5fd66140 --- /dev/null +++ b/persistence-modules/read-only-transactions/src/test/java/com/baeldung/readonlytransactions/SpringTransactionReadOnlyIntegrationTest.java @@ -0,0 +1,72 @@ +package com.baeldung.readonlytransactions; + +import static org.junit.jupiter.api.Assertions.assertNotNull; + +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.beans.factory.annotation.Qualifier; +import org.springframework.context.ApplicationContextInitializer; +import org.springframework.context.annotation.AnnotatedBeanDefinitionReader; +import org.springframework.context.support.GenericApplicationContext; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; +import org.springframework.test.context.support.AnnotationConfigContextLoader; + +import com.baeldung.readonlytransactions.h2.Config; +import com.baeldung.readonlytransactions.h2.Book; +import com.baeldung.readonlytransactions.h2.TransactionConfig; +import com.baeldung.readonlytransactions.h2.BookService; + +import java.util.UUID; + +import javax.persistence.EntityManager; +import javax.persistence.EntityManagerFactory; + +@ExtendWith(SpringExtension.class) +@ContextConfiguration(loader = AnnotationConfigContextLoader.class, initializers = SpringTransactionReadOnlyIntegrationTest.TestConfig.class, classes = { BookService.class }) +class SpringTransactionReadOnlyIntegrationTest { + + static class TestConfig implements ApplicationContextInitializer { + @Override + public void initialize(GenericApplicationContext applicationContext) { + AnnotatedBeanDefinitionReader beanDefinitionReader = new AnnotatedBeanDefinitionReader(applicationContext); + + beanDefinitionReader.register(Config.class); + beanDefinitionReader.register(TransactionConfig.class); + } + } + + @Autowired + @Qualifier("h2EntityManagerFactory") + private EntityManagerFactory entityManagerFactory; + + @Autowired + private BookService service; + + @BeforeEach + void setUp() { + EntityManager entityManager = entityManagerFactory.createEntityManager(); + entityManager.getTransaction() + .begin(); + entityManager.createQuery("DELETE FROM Book") + .executeUpdate(); + + Book book = new Book(); + book.setName("Test 1"); + book.setUuid(UUID.randomUUID() + .toString()); + + entityManager.merge(book); + entityManager.getTransaction() + .commit(); + } + + @Test + void givenThatSpringTransactionManagementIsEnabled_whenAMethodIsAnnotatedAsTransactionalReadOnly_thenSpringShouldTakeCareOfTheTransaction() { + Book book = service.getBookById(1L); + + assertNotNull(book); + } +} diff --git a/persistence-modules/read-only-transactions/src/test/java/com/baeldung/readonlytransactions/TransactionSetupIntegrationTest.java b/persistence-modules/read-only-transactions/src/test/java/com/baeldung/readonlytransactions/TransactionSetupIntegrationTest.java new file mode 100644 index 0000000000..9cbc22afe3 --- /dev/null +++ b/persistence-modules/read-only-transactions/src/test/java/com/baeldung/readonlytransactions/TransactionSetupIntegrationTest.java @@ -0,0 +1,106 @@ +package com.baeldung.readonlytransactions; + +import static java.util.stream.Collectors.toList; +import static org.junit.jupiter.api.Assertions.assertNotNull; + +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContextInitializer; +import org.springframework.context.annotation.AnnotatedBeanDefinitionReader; +import org.springframework.context.support.GenericApplicationContext; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; +import org.springframework.test.context.support.AnnotationConfigContextLoader; + +import com.baeldung.readonlytransactions.mysql.dao.MyRepoJPA; +import com.baeldung.readonlytransactions.mysql.dao.MyRepoJdbc; +import com.baeldung.readonlytransactions.mysql.dao.MyRepoSpring; +import com.baeldung.readonlytransactions.mysql.spring.Config; +import com.baeldung.readonlytransactions.mysql.spring.ReadOnlyInterception; +import com.baeldung.readonlytransactions.mysql.spring.entities.BookEntity; +import com.baeldung.readonlytransactions.mysql.spring.repositories.BookRepository; + +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.UUID; +import java.util.function.Supplier; +import java.util.stream.Stream; + +// Needs to be run with Docker look at the readme file. +@Disabled +@ExtendWith(SpringExtension.class) +@ContextConfiguration(loader = AnnotationConfigContextLoader.class, initializers = TransactionSetupIntegrationTest.TestConfig.class, classes = { ReadOnlyInterception.class }) +class TransactionSetupIntegrationTest { + + static class TestConfig implements ApplicationContextInitializer { + @Override + public void initialize(GenericApplicationContext applicationContext) { + new AnnotatedBeanDefinitionReader(applicationContext).register(Config.class); + } + } + + private static final Logger logger = LoggerFactory.getLogger(TransactionSetupIntegrationTest.class); + + @Autowired + private MyRepoSpring repoSpring; + + @Autowired + private BookRepository repository; + + @Test + void givenTheDifferentTransactionSetup_whenRunningAThroughputTest_thenWeCanObserveTheSystem() { + Map> jdbcConfigurations = new LinkedHashMap<>(); + + jdbcConfigurations.put("JPA: Session read only true and autocommit disabled", () -> new MyRepoJPA().runQuery()); + + jdbcConfigurations.put("Spring: Session read only and autocommit true", () -> repoSpring.runQuery()); + + jdbcConfigurations.put("JDBC: Global read only and autocommit enabled", () -> new MyRepoJdbc(true, true).runQuery(null, null)); + jdbcConfigurations.put("JDBC: Global read only false and autocommit enabled", () -> new MyRepoJdbc(false, true).runQuery(null, null)); + jdbcConfigurations.put("JDBC: Global read only true and autocommit disabled", () -> new MyRepoJdbc(true, false).runQuery(null, null)); + + jdbcConfigurations.put("JDBC: Session read only and autocommit disabled", () -> new MyRepoJdbc(false, false).runQuery(false, false)); + jdbcConfigurations.put("JDBC: Session read only and autocommit enabled", () -> new MyRepoJdbc(false, false).runQuery(true, true)); + jdbcConfigurations.put("JDBC: Session read only false and autocommit enabled", () -> new MyRepoJdbc(false, false).runQuery(false, true)); + jdbcConfigurations.put("JDBC: Session read only true and autocommit disabled", () -> new MyRepoJdbc(false, false).runQuery(true, false)); + + jdbcConfigurations.entrySet() + .stream() + .flatMap(entry -> { + Stream.Builder builder = Stream.builder(); + return builder.add(entry.getKey() + " Total: " + entry.getValue() + .get()) + .add(entry.getKey() + " Total: " + entry.getValue() + .get()) + .add(entry.getKey() + " Total: " + entry.getValue() + .get()) + .build(); + }) + .collect(toList()) + .stream() + .peek(o -> logger.info("--------------------------------------------------")) + .forEach(logger::info); + } + + @Test + void givenThatSpringTransactionManagementIsEnabled_whenAMethodIsAnnotatedAsTransactionalReadOnly_thenSpringShouldTakeCareOfTheTransaction() { + Long id = repository.get(2L); + + assertNotNull(id); + } + + @Test + void givenThatSpringTransactionManagementIsEnabled_whenAMethodIsAnnotatedAsTransactional_thenSpringShouldTakeCareOfTheTransaction() { + BookEntity book = new BookEntity(); + book.setName("Persistence test"); + book.setUuid(UUID.randomUUID() + .toString()); + book = repository.persist(book); + + assertNotNull(book.getId()); + } +} \ No newline at end of file From e37a0e7b94146727655e846350cf7b03d0c5d5e8 Mon Sep 17 00:00:00 2001 From: Loredana Crusoveanu Date: Mon, 23 May 2022 10:12:24 +0300 Subject: [PATCH 065/100] Create README.md --- maven-modules/maven-simple/README.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 maven-modules/maven-simple/README.md diff --git a/maven-modules/maven-simple/README.md b/maven-modules/maven-simple/README.md new file mode 100644 index 0000000000..01ae4387ad --- /dev/null +++ b/maven-modules/maven-simple/README.md @@ -0,0 +1,8 @@ +### Maven Articles that are also part of the e-book + +This module contains articles about Maven that are also part of an Ebook. + + +### NOTE: + +Since this is a module tied to an e-book, it should **not** be moved or used to store the code for any further article. From 37fe7442f8551338e07deabe7b25754d26d44953 Mon Sep 17 00:00:00 2001 From: Asjad J <97493880+Asjad-J@users.noreply.github.com> Date: Mon, 23 May 2022 16:30:02 +0500 Subject: [PATCH 066/100] Updated README.md added link back to the article: https://www.baeldung.com/java-jdbc-convert-resultset-to-json --- persistence-modules/core-java-persistence-2/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/persistence-modules/core-java-persistence-2/README.md b/persistence-modules/core-java-persistence-2/README.md index 6622f9733f..4bc7d8b663 100644 --- a/persistence-modules/core-java-persistence-2/README.md +++ b/persistence-modules/core-java-persistence-2/README.md @@ -7,3 +7,4 @@ - [A Guide to Auto-Commit in JDBC](https://www.baeldung.com/java-jdbc-auto-commit) - [JDBC Connection Status](https://www.baeldung.com/jdbc-connection-status) - [Get the Number of Rows in a ResultSet](https://www.baeldung.com/java-resultset-number-of-rows) +- [Converting a JDBC ResultSet to JSON in Java](https://www.baeldung.com/java-jdbc-convert-resultset-to-json) From fe2f7ca04c07f0e787e3091fdfb5fe9f6643f06a Mon Sep 17 00:00:00 2001 From: Asjad J <97493880+Asjad-J@users.noreply.github.com> Date: Mon, 23 May 2022 16:42:16 +0500 Subject: [PATCH 067/100] Updated README.md added link back to the article: https://www.baeldung.com/java-scanner-usedelimiter --- core-java-modules/core-java-9/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/core-java-modules/core-java-9/README.md b/core-java-modules/core-java-9/README.md index 8203755417..0fe2b857a4 100644 --- a/core-java-modules/core-java-9/README.md +++ b/core-java-modules/core-java-9/README.md @@ -11,3 +11,4 @@ This module contains articles about Java 9 core features - [Immutable ArrayList in Java](https://www.baeldung.com/java-immutable-list) - [Easy Ways to Write a Java InputStream to an OutputStream](https://www.baeldung.com/java-inputstream-to-outputstream) - [Private Methods in Java Interfaces](https://www.baeldung.com/java-interface-private-methods) +- [Java Scanner useDelimiter with Examples](https://www.baeldung.com/java-scanner-usedelimiter) From 14f0910339129197c15f853a0fa7ed3e1a9991d2 Mon Sep 17 00:00:00 2001 From: Asjad J <97493880+Asjad-J@users.noreply.github.com> Date: Mon, 23 May 2022 16:48:34 +0500 Subject: [PATCH 068/100] Updated README.md added link back to the article: https://www.baeldung.com/spring-jpa-joining-tables --- persistence-modules/spring-data-jpa-query-3/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/persistence-modules/spring-data-jpa-query-3/README.md b/persistence-modules/spring-data-jpa-query-3/README.md index 920ec40965..268bce96ca 100644 --- a/persistence-modules/spring-data-jpa-query-3/README.md +++ b/persistence-modules/spring-data-jpa-query-3/README.md @@ -5,6 +5,7 @@ This module contains articles about querying data using Spring Data JPA. ### Relevant Articles: - [Query Entities by Dates and Times with Spring Data JPA](https://www.baeldung.com/spring-data-jpa-query-by-date) - [JPA and Hibernate – Criteria vs. JPQL vs. HQL Query](https://www.baeldung.com/jpql-hql-criteria-query) +- [Joining Tables With Spring Data JPA Specifications](https://www.baeldung.com/spring-jpa-joining-tables) - More articles: [[<-- prev]](../spring-data-jpa-query-2) ### Eclipse Config From 44a0ff9d9bf04235e8f4a22b70bd730b311c9c06 Mon Sep 17 00:00:00 2001 From: Asjad J <97493880+Asjad-J@users.noreply.github.com> Date: Mon, 23 May 2022 16:52:12 +0500 Subject: [PATCH 069/100] Updated README.md added link back to the article: https://www.baeldung.com/java-files-match-wildcard-strings --- core-java-modules/core-java-nio-2/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/core-java-modules/core-java-nio-2/README.md b/core-java-modules/core-java-nio-2/README.md index c405cb7c77..527600779a 100644 --- a/core-java-modules/core-java-nio-2/README.md +++ b/core-java-modules/core-java-nio-2/README.md @@ -13,4 +13,5 @@ This module contains articles about core Java non-blocking input and output (IO) - [Java – Path vs File](https://www.baeldung.com/java-path-vs-file) - [What Is the Difference Between NIO and NIO.2?](https://www.baeldung.com/java-nio-vs-nio-2) - [Guide to ByteBuffer](https://www.baeldung.com/java-bytebuffer) +- [Find Files that Match Wildcard Strings in Java](https://www.baeldung.com/java-files-match-wildcard-strings) - [[<-- Prev]](/core-java-modules/core-java-nio) From 429fb3c660e2474b8a6c2d28bb4bc9727d8d4a7e Mon Sep 17 00:00:00 2001 From: Asjad J <97493880+Asjad-J@users.noreply.github.com> Date: Mon, 23 May 2022 17:07:54 +0500 Subject: [PATCH 070/100] Updated README.md added link back to the article: https://www.baeldung.com/spring-keycloak-get-user-id --- spring-boot-modules/spring-boot-keycloak/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/spring-boot-modules/spring-boot-keycloak/README.md b/spring-boot-modules/spring-boot-keycloak/README.md index 7a1323d10e..cde11df0fa 100644 --- a/spring-boot-modules/spring-boot-keycloak/README.md +++ b/spring-boot-modules/spring-boot-keycloak/README.md @@ -9,3 +9,4 @@ This module contains articles about Keycloak in Spring Boot projects. - [Keycloak User Self-Registration](https://www.baeldung.com/keycloak-user-registration) - [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) From e8de750d9747efa13e37bb61efce5ca53e7dfd5f Mon Sep 17 00:00:00 2001 From: Asjad J <97493880+Asjad-J@users.noreply.github.com> Date: Mon, 23 May 2022 17:12:20 +0500 Subject: [PATCH 071/100] Updated README.md added link back to the article: https://www.baeldung.com/spring-data-mongodb-collection-name --- .../spring-boot-persistence-mongodb-2/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/persistence-modules/spring-boot-persistence-mongodb-2/README.md b/persistence-modules/spring-boot-persistence-mongodb-2/README.md index 9169e09813..ba27436109 100644 --- a/persistence-modules/spring-boot-persistence-mongodb-2/README.md +++ b/persistence-modules/spring-boot-persistence-mongodb-2/README.md @@ -1,4 +1,5 @@ # Relevant Articles - [Logging MongoDB Queries with Spring Boot](https://www.baeldung.com/spring-boot-mongodb-logging) -- More articles: [[<--prev]](../spring-boot-persistence-mongodb) \ No newline at end of file +- [Configure MongoDB Collection Name for a Class in Spring Data](https://www.baeldung.com/spring-data-mongodb-collection-name) +- More articles: [[<--prev]](../spring-boot-persistence-mongodb) From d8adffdbb248c22b9b3e7ebd63e38fcd4613ba06 Mon Sep 17 00:00:00 2001 From: Asjad J <97493880+Asjad-J@users.noreply.github.com> Date: Mon, 23 May 2022 17:15:39 +0500 Subject: [PATCH 072/100] Updated README.md added link back to the article: https://www.baeldung.com/jdk-com-sun-proxy --- core-java-modules/core-java-reflection-2/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/core-java-modules/core-java-reflection-2/README.md b/core-java-modules/core-java-reflection-2/README.md index c1966dd63d..a3c9d00b0a 100644 --- a/core-java-modules/core-java-reflection-2/README.md +++ b/core-java-modules/core-java-reflection-2/README.md @@ -7,3 +7,4 @@ - [Invoking a Private Method in Java](https://www.baeldung.com/java-call-private-method) - [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) From d34be2d6b747ddfd48f4f43d89aee0d5ece213ac Mon Sep 17 00:00:00 2001 From: Asjad J <97493880+Asjad-J@users.noreply.github.com> Date: Mon, 23 May 2022 17:25:29 +0500 Subject: [PATCH 073/100] Updated README.md added link back to the article: https://www.baeldung.com/java-bean-validation-constraint-composition --- javaxval/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/javaxval/README.md b/javaxval/README.md index 24c2cf98c5..8fc5b07ccf 100644 --- a/javaxval/README.md +++ b/javaxval/README.md @@ -12,3 +12,4 @@ This module contains articles about Bean Validation. - [Validations for Enum Types](https://www.baeldung.com/javax-validations-enums) - [Guide to ParameterMessageInterpolator](https://www.baeldung.com/hibernate-parametermessageinterpolator) - [Hibernate Validator Annotation Processor in Depth](https://www.baeldung.com/hibernate-validator-annotation-processor) +- [Constraint Composition with Bean Validation](https://www.baeldung.com/java-bean-validation-constraint-composition) From b208b9650597c3636ce0e6abe2e39b12cdbed0f2 Mon Sep 17 00:00:00 2001 From: Asjad J <97493880+Asjad-J@users.noreply.github.com> Date: Mon, 23 May 2022 17:30:29 +0500 Subject: [PATCH 074/100] Updated README.md added link back to the article: https://www.baeldung.com/java-domain-name-from-url --- core-java-modules/core-java-networking-3/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/core-java-modules/core-java-networking-3/README.md b/core-java-modules/core-java-networking-3/README.md index 21f939b43e..03c2dcfa89 100644 --- a/core-java-modules/core-java-networking-3/README.md +++ b/core-java-modules/core-java-networking-3/README.md @@ -11,4 +11,5 @@ This module contains articles about networking in Java - [Find the IP Address of a Client Connected to a Server](https://www.baeldung.com/java-client-get-ip-address) - [Unix Domain Socket in Java 16](https://www.baeldung.com/java-unix-domain-socket) - [Get the IP Address of the Current Machine Using Java](https://www.baeldung.com/java-get-ip-address) +- [Get Domain Name From Given URL in Java](https://www.baeldung.com/java-domain-name-from-url) - [[<-- Prev]](/core-java-modules/core-java-networking-2) From 1abbf7083d137567d40a32367d0cb2e5030ecdef Mon Sep 17 00:00:00 2001 From: Asjad J <97493880+Asjad-J@users.noreply.github.com> Date: Mon, 23 May 2022 17:32:59 +0500 Subject: [PATCH 075/100] Updated README.md added link back to the article: https://www.baeldung.com/java-check-character-vowel --- core-java-modules/core-java-string-operations-4/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/core-java-modules/core-java-string-operations-4/README.md b/core-java-modules/core-java-string-operations-4/README.md index 0e6c9e7e2c..ff6d887154 100644 --- a/core-java-modules/core-java-string-operations-4/README.md +++ b/core-java-modules/core-java-string-operations-4/README.md @@ -6,4 +6,5 @@ - [Split a String Every n Characters in Java](https://www.baeldung.com/java-string-split-every-n-characters) - [String equals() Vs contentEquals() in Java](https://www.baeldung.com/java-string-equals-vs-contentequals) - [Check if a String Ends with a Certain Pattern in Java](https://www.baeldung.com/java-string-ends-pattern) +- [Check if a Character is a Vowel in Java](https://www.baeldung.com/java-check-character-vowel) From 10bc54e7d6233eb1111fb908ee58e81eb20054cf Mon Sep 17 00:00:00 2001 From: Asjad J <97493880+Asjad-J@users.noreply.github.com> Date: Mon, 23 May 2022 17:35:17 +0500 Subject: [PATCH 076/100] Updated README.md added link back to the article: https://www.baeldung.com/spring-transactions-read-only --- persistence-modules/read-only-transactions/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/persistence-modules/read-only-transactions/README.md b/persistence-modules/read-only-transactions/README.md index 90a86e551e..8f3898f217 100644 --- a/persistence-modules/read-only-transactions/README.md +++ b/persistence-modules/read-only-transactions/README.md @@ -1,8 +1,8 @@ ### Relevant Articles: -- +- [Using Transactions for Read-Only Operations](https://www.baeldung.com/spring-transactions-read-only) ### Instructions To run the `com.baeldung.read_only_transactions.TransactionSetupIntegrationTest` first follow the steps described next: - run the command `docker-compose -f docker-compose-mysql.yml up` - Open a SQL client of your preference and execute the `create.sql` script. -- You can check the mysql logs using `tail -f mysql/${name of de log file created}.log` \ No newline at end of file +- You can check the mysql logs using `tail -f mysql/${name of de log file created}.log` From fb9f92629e98c7e92e5eee96dc03d276674033ed Mon Sep 17 00:00:00 2001 From: kwoyke Date: Mon, 23 May 2022 17:49:01 +0200 Subject: [PATCH 077/100] JAVA-12009: Upgrade Spring to 5.3.20 (#12251) --- parent-spring-5/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent-spring-5/pom.xml b/parent-spring-5/pom.xml index b2d581c9c1..dfdfa77d36 100644 --- a/parent-spring-5/pom.xml +++ b/parent-spring-5/pom.xml @@ -24,7 +24,7 @@ - 5.3.16 + 5.3.20 5.6.0 1.5.10.RELEASE From 8f54543306578e62d539fdc0811fdd4044d1732e Mon Sep 17 00:00:00 2001 From: Harry9656 Date: Mon, 23 May 2022 18:27:46 +0200 Subject: [PATCH 078/100] JAVA-5484: Added Java Http Request Timeout (#12248) Co-authored-by: Harpal Singh --- ...ClientTimeoutOnRequestIntegrationTest.java | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 core-java-modules/core-java-networking-3/src/test/java/com/baeldung/http/JavaHttpClientTimeoutOnRequestIntegrationTest.java diff --git a/core-java-modules/core-java-networking-3/src/test/java/com/baeldung/http/JavaHttpClientTimeoutOnRequestIntegrationTest.java b/core-java-modules/core-java-networking-3/src/test/java/com/baeldung/http/JavaHttpClientTimeoutOnRequestIntegrationTest.java new file mode 100644 index 0000000000..d693b9075c --- /dev/null +++ b/core-java-modules/core-java-networking-3/src/test/java/com/baeldung/http/JavaHttpClientTimeoutOnRequestIntegrationTest.java @@ -0,0 +1,51 @@ +package com.baeldung.http; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import java.net.URI; +import java.net.http.HttpClient; +import java.net.http.HttpConnectTimeoutException; +import java.net.http.HttpRequest; +import java.net.http.HttpResponse; +import java.time.Duration; +import java.time.LocalTime; + +import static com.baeldung.http.JavaHttpClientTimeout.getHttpClientWithTimeout; +import static java.time.LocalTime.now; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +public class JavaHttpClientTimeoutOnRequestIntegrationTest { + + private HttpClient httpClient; + private HttpRequest httpRequest; + + @BeforeEach + public void setUp() { + httpClient = getHttpClientWithTimeout(3); + httpClient.connectTimeout().map(Duration::toSeconds) + .ifPresent(sec -> System.out.println("Timeout in seconds: " + sec)); + + httpRequest = HttpRequest.newBuilder() + .uri(URI.create("http://10.255.255.1")) + .timeout(Duration.ofSeconds(1)) + .GET() + .build(); + } + + @Test + void shouldThrowExceptionWhithin1SecondWhenMakingSyncCall() { + LocalTime beforeHttpCall = now(); + HttpConnectTimeoutException thrown = assertThrows( + HttpConnectTimeoutException.class, + () -> httpClient.send(httpRequest, HttpResponse.BodyHandlers.ofString()), + "Expected doThing() to throw, but it didn't" + ); + LocalTime afterHttpCall = now(); + assertTrue(thrown.getMessage().contains("timed out")); + assertEquals(1, Duration.between(beforeHttpCall, afterHttpCall).getSeconds()); + } + +} From c4b76701ebf7debd388e2bb4fe553729ca38ac00 Mon Sep 17 00:00:00 2001 From: Yavuz Tas <12643010+yavuztas@users.noreply.github.com> Date: Mon, 23 May 2022 22:01:34 +0200 Subject: [PATCH 079/100] BAEL-5452 sample docker and docker compose files for the article. (#12115) Co-authored-by: Yavuz Tas --- docker/docker-spring-boot/pom.xml | 7 +++++++ .../src/main/docker/springprofile/Dockerfile | 11 +++++++++++ .../main/docker/springprofile/docker-compose-prod.yml | 6 ++++++ .../main/docker/springprofile/docker-compose-test.yml | 6 ++++++ 4 files changed, 30 insertions(+) create mode 100644 docker/docker-spring-boot/src/main/docker/springprofile/Dockerfile create mode 100644 docker/docker-spring-boot/src/main/docker/springprofile/docker-compose-prod.yml create mode 100644 docker/docker-spring-boot/src/main/docker/springprofile/docker-compose-test.yml diff --git a/docker/docker-spring-boot/pom.xml b/docker/docker-spring-boot/pom.xml index c42f7602b4..69d25e374b 100644 --- a/docker/docker-spring-boot/pom.xml +++ b/docker/docker-spring-boot/pom.xml @@ -42,6 +42,13 @@ ${project.basedir}/src/layers.xml + + + + repackage + + + diff --git a/docker/docker-spring-boot/src/main/docker/springprofile/Dockerfile b/docker/docker-spring-boot/src/main/docker/springprofile/Dockerfile new file mode 100644 index 0000000000..f06f08cff6 --- /dev/null +++ b/docker/docker-spring-boot/src/main/docker/springprofile/Dockerfile @@ -0,0 +1,11 @@ +# To build and run docker-with-spring-profile: +# +# docker build -f src/main/docker/springprofile/Dockerfile --tag=docker-with-spring-profile:latest . +# docker run docker-with-spring-profile:latest +# +# To run with profiles: +# docker run -e "SPRING_PROFILES_ACTIVE=test1,test2,test3" docker-with-spring-profile:latest + +FROM openjdk:11 +COPY target/*.jar app.jar +ENTRYPOINT ["java", "-jar", "/app.jar"] diff --git a/docker/docker-spring-boot/src/main/docker/springprofile/docker-compose-prod.yml b/docker/docker-spring-boot/src/main/docker/springprofile/docker-compose-prod.yml new file mode 100644 index 0000000000..1892a38ae6 --- /dev/null +++ b/docker/docker-spring-boot/src/main/docker/springprofile/docker-compose-prod.yml @@ -0,0 +1,6 @@ +version: "3.5" +services: + docker-with-spring-profile: + image: docker-with-spring-profile:latest + environment: + - "SPRING_PROFILES_ACTIVE=prod" diff --git a/docker/docker-spring-boot/src/main/docker/springprofile/docker-compose-test.yml b/docker/docker-spring-boot/src/main/docker/springprofile/docker-compose-test.yml new file mode 100644 index 0000000000..780ebcb63f --- /dev/null +++ b/docker/docker-spring-boot/src/main/docker/springprofile/docker-compose-test.yml @@ -0,0 +1,6 @@ +version: "3.5" +services: + docker-with-spring-profile: + image: docker-with-spring-profile:latest + environment: + - "SPRING_PROFILES_ACTIVE=test" From d330c8a991c2723a8d328616cadbc1d52d5e7fcc Mon Sep 17 00:00:00 2001 From: Loredana Crusoveanu Date: Tue, 24 May 2022 11:02:46 +0300 Subject: [PATCH 080/100] Update README.md --- spring-security-modules/spring-security-core/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/spring-security-modules/spring-security-core/README.md b/spring-security-modules/spring-security-core/README.md index 1949b5a929..9f8e4dda53 100644 --- a/spring-security-modules/spring-security-core/README.md +++ b/spring-security-modules/spring-security-core/README.md @@ -10,7 +10,6 @@ This module contains articles about core Spring Security - [Deny Access on Missing @PreAuthorize to Spring Controller Methods](https://www.baeldung.com/spring-deny-access) - [Spring Security: Check If a User Has a Role in Java](https://www.baeldung.com/spring-security-check-user-role) - [Filtering Jackson JSON Output Based on Spring Security Role](https://www.baeldung.com/spring-security-role-filter-json) -- [Handle Spring Security Exceptions](https://www.baeldung.com/spring-security-exceptions) ### Build the Project From 4696d0b54e92ed5e0567352ec6346aacfa02b860 Mon Sep 17 00:00:00 2001 From: Krzysiek Date: Tue, 24 May 2022 10:22:37 +0200 Subject: [PATCH 081/100] JAVA-12100: Rename ddd-modules -> ddd-contexts --- {ddd-modules => ddd-contexts}/README.md | 0 .../infrastructure/pom.xml | 12 ++++++------ .../infrastructure/db/InMemoryOrderStore.java | 12 ++++++------ .../infrastructure/events/SimpleEventBus.java | 8 ++++---- .../src/main/java/module-info.java | 14 ++++++++++++++ {ddd-modules => ddd-contexts}/mainapp/pom.xml | 8 ++++---- .../dddcontexts}/mainapp/Application.java | 16 ++++++++-------- .../mainapp/src/main/java/module-info.java | 8 ++++++++ .../ordercontext/pom.xml | 8 ++++---- .../ordercontext/model/CustomerOrder.java | 2 +- .../ordercontext/model/OrderItem.java | 2 +- .../repository/CustomerOrderRepository.java | 7 +++++++ .../service/CustomerOrderService.java | 10 +++++----- .../ordercontext/service/OrderService.java | 11 +++++++++++ .../ordercontext/src/main/java/module-info.java | 8 ++++++++ {ddd-modules => ddd-contexts}/pom.xml | 6 +++--- .../sharedkernel/pom.xml | 6 +++--- .../sharedkernel/events/ApplicationEvent.java | 2 +- .../sharedkernel/events/EventBus.java | 2 +- .../sharedkernel/events/EventSubscriber.java | 2 +- .../sharedkernel/service/ApplicationService.java | 8 ++++---- .../sharedkernel/src/main/java/module-info.java | 4 ++++ .../shippingcontext/pom.xml | 8 ++++---- .../shippingcontext/model/PackageItem.java | 2 +- .../shippingcontext/model/Parcel.java | 2 +- .../shippingcontext/model/ShippableOrder.java | 2 +- .../repository/ShippingOrderRepository.java | 4 ++-- .../service/ParcelShippingService.java | 14 +++++++------- .../shippingcontext/service/ShippingService.java | 8 ++++---- .../src/main/java/module-info.java | 8 ++++++++ .../mainapp/src/main/java/module-info.java | 8 -------- .../repository/CustomerOrderRepository.java | 7 ------- .../ordercontext/service/OrderService.java | 11 ----------- .../ordercontext/src/main/java/module-info.java | 8 -------- .../sharedkernel/src/main/java/module-info.java | 4 ---- .../src/main/java/module-info.java | 8 -------- 36 files changed, 132 insertions(+), 118 deletions(-) rename {ddd-modules => ddd-contexts}/README.md (100%) rename {ddd-modules => ddd-contexts}/infrastructure/pom.xml (79%) rename {ddd-modules/infrastructure/src/main/java/com/baeldung/dddmodules => ddd-contexts/infrastructure/src/main/java/com/baeldung/dddcontexts}/infrastructure/db/InMemoryOrderStore.java (85%) rename {ddd-modules/infrastructure/src/main/java/com/baeldung/dddmodules => ddd-contexts/infrastructure/src/main/java/com/baeldung/dddcontexts}/infrastructure/events/SimpleEventBus.java (82%) create mode 100644 ddd-contexts/infrastructure/src/main/java/module-info.java rename {ddd-modules => ddd-contexts}/mainapp/pom.xml (86%) rename {ddd-modules/mainapp/src/main/java/com/baeldung/dddmodules => ddd-contexts/mainapp/src/main/java/com/baeldung/dddcontexts}/mainapp/Application.java (80%) create mode 100644 ddd-contexts/mainapp/src/main/java/module-info.java rename {ddd-modules => ddd-contexts}/ordercontext/pom.xml (84%) rename {ddd-modules/ordercontext/src/main/java/com/baeldung/dddmodules => ddd-contexts/ordercontext/src/main/java/com/baeldung/dddcontexts}/ordercontext/model/CustomerOrder.java (95%) rename {ddd-modules/ordercontext/src/main/java/com/baeldung/dddmodules => ddd-contexts/ordercontext/src/main/java/com/baeldung/dddcontexts}/ordercontext/model/OrderItem.java (95%) create mode 100644 ddd-contexts/ordercontext/src/main/java/com/baeldung/dddcontexts/ordercontext/repository/CustomerOrderRepository.java rename {ddd-modules/ordercontext/src/main/java/com/baeldung/dddmodules => ddd-contexts/ordercontext/src/main/java/com/baeldung/dddcontexts}/ordercontext/service/CustomerOrderService.java (76%) create mode 100644 ddd-contexts/ordercontext/src/main/java/com/baeldung/dddcontexts/ordercontext/service/OrderService.java create mode 100644 ddd-contexts/ordercontext/src/main/java/module-info.java rename {ddd-modules => ddd-contexts}/pom.xml (94%) rename {ddd-modules => ddd-contexts}/sharedkernel/pom.xml (85%) rename {ddd-modules/sharedkernel/src/main/java/com/baeldung/dddmodules => ddd-contexts/sharedkernel/src/main/java/com/baeldung/dddcontexts}/sharedkernel/events/ApplicationEvent.java (88%) rename {ddd-modules/sharedkernel/src/main/java/com/baeldung/dddmodules => ddd-contexts/sharedkernel/src/main/java/com/baeldung/dddcontexts}/sharedkernel/events/EventBus.java (83%) rename {ddd-modules/sharedkernel/src/main/java/com/baeldung/dddmodules => ddd-contexts/sharedkernel/src/main/java/com/baeldung/dddcontexts}/sharedkernel/events/EventSubscriber.java (63%) rename {ddd-modules/sharedkernel/src/main/java/com/baeldung/dddmodules => ddd-contexts/sharedkernel/src/main/java/com/baeldung/dddcontexts}/sharedkernel/service/ApplicationService.java (76%) create mode 100644 ddd-contexts/sharedkernel/src/main/java/module-info.java rename {ddd-modules => ddd-contexts}/shippingcontext/pom.xml (82%) rename {ddd-modules/shippingcontext/src/main/java/com/baeldung/dddmodules => ddd-contexts/shippingcontext/src/main/java/com/baeldung/dddcontexts}/shippingcontext/model/PackageItem.java (93%) rename {ddd-modules/shippingcontext/src/main/java/com/baeldung/dddmodules => ddd-contexts/shippingcontext/src/main/java/com/baeldung/dddcontexts}/shippingcontext/model/Parcel.java (95%) rename {ddd-modules/shippingcontext/src/main/java/com/baeldung/dddmodules => ddd-contexts/shippingcontext/src/main/java/com/baeldung/dddcontexts}/shippingcontext/model/ShippableOrder.java (93%) rename {ddd-modules/shippingcontext/src/main/java/com/baeldung/dddmodules => ddd-contexts/shippingcontext/src/main/java/com/baeldung/dddcontexts}/shippingcontext/repository/ShippingOrderRepository.java (51%) rename {ddd-modules/shippingcontext/src/main/java/com/baeldung/dddmodules => ddd-contexts/shippingcontext/src/main/java/com/baeldung/dddcontexts}/shippingcontext/service/ParcelShippingService.java (78%) rename {ddd-modules/shippingcontext/src/main/java/com/baeldung/dddmodules => ddd-contexts/shippingcontext/src/main/java/com/baeldung/dddcontexts}/shippingcontext/service/ShippingService.java (50%) create mode 100644 ddd-contexts/shippingcontext/src/main/java/module-info.java delete mode 100644 ddd-modules/mainapp/src/main/java/module-info.java delete mode 100644 ddd-modules/ordercontext/src/main/java/com/baeldung/dddmodules/ordercontext/repository/CustomerOrderRepository.java delete mode 100644 ddd-modules/ordercontext/src/main/java/com/baeldung/dddmodules/ordercontext/service/OrderService.java delete mode 100644 ddd-modules/ordercontext/src/main/java/module-info.java delete mode 100644 ddd-modules/sharedkernel/src/main/java/module-info.java delete mode 100644 ddd-modules/shippingcontext/src/main/java/module-info.java diff --git a/ddd-modules/README.md b/ddd-contexts/README.md similarity index 100% rename from ddd-modules/README.md rename to ddd-contexts/README.md diff --git a/ddd-modules/infrastructure/pom.xml b/ddd-contexts/infrastructure/pom.xml similarity index 79% rename from ddd-modules/infrastructure/pom.xml rename to ddd-contexts/infrastructure/pom.xml index 232e5ff4b4..6107991ceb 100644 --- a/ddd-modules/infrastructure/pom.xml +++ b/ddd-contexts/infrastructure/pom.xml @@ -3,31 +3,31 @@ 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 - com.baeldung.dddmodules.infrastructure + com.baeldung.dddcontexts.infrastructure infrastructure 1.0 jar - com.baeldung.dddmodules - ddd-modules + com.baeldung.dddcontexts + ddd-contexts 1.0 ../ - com.baeldung.dddmodules.shippingcontext + com.baeldung.dddcontexts.shippingcontext shippingcontext ${appmodules.version} - com.baeldung.dddmodules.ordercontext + com.baeldung.dddcontexts.ordercontext ordercontext ${appmodules.version} - com.baeldung.dddmodules.sharedkernel + com.baeldung.dddcontexts.sharedkernel sharedkernel ${appmodules.version} diff --git a/ddd-modules/infrastructure/src/main/java/com/baeldung/dddmodules/infrastructure/db/InMemoryOrderStore.java b/ddd-contexts/infrastructure/src/main/java/com/baeldung/dddcontexts/infrastructure/db/InMemoryOrderStore.java similarity index 85% rename from ddd-modules/infrastructure/src/main/java/com/baeldung/dddmodules/infrastructure/db/InMemoryOrderStore.java rename to ddd-contexts/infrastructure/src/main/java/com/baeldung/dddcontexts/infrastructure/db/InMemoryOrderStore.java index 13deb2471e..8424afff79 100644 --- a/ddd-modules/infrastructure/src/main/java/com/baeldung/dddmodules/infrastructure/db/InMemoryOrderStore.java +++ b/ddd-contexts/infrastructure/src/main/java/com/baeldung/dddcontexts/infrastructure/db/InMemoryOrderStore.java @@ -1,10 +1,10 @@ -package com.baeldung.dddmodules.infrastructure.db; +package com.baeldung.dddcontexts.infrastructure.db; -import com.baeldung.dddmodules.ordercontext.model.CustomerOrder; -import com.baeldung.dddmodules.ordercontext.repository.CustomerOrderRepository; -import com.baeldung.dddmodules.shippingcontext.model.PackageItem; -import com.baeldung.dddmodules.shippingcontext.model.ShippableOrder; -import com.baeldung.dddmodules.shippingcontext.repository.ShippingOrderRepository; +import com.baeldung.dddcontexts.ordercontext.model.CustomerOrder; +import com.baeldung.dddcontexts.ordercontext.repository.CustomerOrderRepository; +import com.baeldung.dddcontexts.shippingcontext.model.PackageItem; +import com.baeldung.dddcontexts.shippingcontext.model.ShippableOrder; +import com.baeldung.dddcontexts.shippingcontext.repository.ShippingOrderRepository; import java.util.HashMap; import java.util.List; diff --git a/ddd-modules/infrastructure/src/main/java/com/baeldung/dddmodules/infrastructure/events/SimpleEventBus.java b/ddd-contexts/infrastructure/src/main/java/com/baeldung/dddcontexts/infrastructure/events/SimpleEventBus.java similarity index 82% rename from ddd-modules/infrastructure/src/main/java/com/baeldung/dddmodules/infrastructure/events/SimpleEventBus.java rename to ddd-contexts/infrastructure/src/main/java/com/baeldung/dddcontexts/infrastructure/events/SimpleEventBus.java index 6aea7ff6e9..1cbcf13749 100644 --- a/ddd-modules/infrastructure/src/main/java/com/baeldung/dddmodules/infrastructure/events/SimpleEventBus.java +++ b/ddd-contexts/infrastructure/src/main/java/com/baeldung/dddcontexts/infrastructure/events/SimpleEventBus.java @@ -1,8 +1,8 @@ -package com.baeldung.dddmodules.infrastructure.events; +package com.baeldung.dddcontexts.infrastructure.events; -import com.baeldung.dddmodules.sharedkernel.events.ApplicationEvent; -import com.baeldung.dddmodules.sharedkernel.events.EventBus; -import com.baeldung.dddmodules.sharedkernel.events.EventSubscriber; +import com.baeldung.dddcontexts.sharedkernel.events.ApplicationEvent; +import com.baeldung.dddcontexts.sharedkernel.events.EventBus; +import com.baeldung.dddcontexts.sharedkernel.events.EventSubscriber; import java.util.Map; import java.util.Set; diff --git a/ddd-contexts/infrastructure/src/main/java/module-info.java b/ddd-contexts/infrastructure/src/main/java/module-info.java new file mode 100644 index 0000000000..1387de16c2 --- /dev/null +++ b/ddd-contexts/infrastructure/src/main/java/module-info.java @@ -0,0 +1,14 @@ +import com.baeldung.dddcontexts.infrastructure.db.InMemoryOrderStore; +import com.baeldung.dddcontexts.infrastructure.events.SimpleEventBus; + +module com.baeldung.dddcontexts.infrastructure { + requires transitive com.baeldung.dddcontexts.sharedkernel; + requires transitive com.baeldung.dddcontexts.ordercontext; + requires transitive com.baeldung.dddcontexts.shippingcontext; + provides com.baeldung.dddcontexts.sharedkernel.events.EventBus + with SimpleEventBus; + provides com.baeldung.dddcontexts.ordercontext.repository.CustomerOrderRepository + with InMemoryOrderStore; + provides com.baeldung.dddcontexts.shippingcontext.repository.ShippingOrderRepository + with InMemoryOrderStore; +} diff --git a/ddd-modules/mainapp/pom.xml b/ddd-contexts/mainapp/pom.xml similarity index 86% rename from ddd-modules/mainapp/pom.xml rename to ddd-contexts/mainapp/pom.xml index a2d3b8f3ea..8046ae4e7d 100644 --- a/ddd-modules/mainapp/pom.xml +++ b/ddd-contexts/mainapp/pom.xml @@ -3,21 +3,21 @@ 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 - com.baeldung.dddmodules.mainapp + com.baeldung.dddcontexts.mainapp mainapp 1.0 jar - com.baeldung.dddmodules - ddd-modules + com.baeldung.dddcontexts + ddd-contexts 1.0 ../ - com.baeldung.dddmodules.infrastructure + com.baeldung.dddcontexts.infrastructure infrastructure ${appmodules.version} diff --git a/ddd-modules/mainapp/src/main/java/com/baeldung/dddmodules/mainapp/Application.java b/ddd-contexts/mainapp/src/main/java/com/baeldung/dddcontexts/mainapp/Application.java similarity index 80% rename from ddd-modules/mainapp/src/main/java/com/baeldung/dddmodules/mainapp/Application.java rename to ddd-contexts/mainapp/src/main/java/com/baeldung/dddcontexts/mainapp/Application.java index 05e27abe30..ff866e49dd 100644 --- a/ddd-modules/mainapp/src/main/java/com/baeldung/dddmodules/mainapp/Application.java +++ b/ddd-contexts/mainapp/src/main/java/com/baeldung/dddcontexts/mainapp/Application.java @@ -1,12 +1,12 @@ -package com.baeldung.dddmodules.mainapp; +package com.baeldung.dddcontexts.mainapp; -import com.baeldung.dddmodules.ordercontext.model.CustomerOrder; -import com.baeldung.dddmodules.ordercontext.model.OrderItem; -import com.baeldung.dddmodules.ordercontext.repository.CustomerOrderRepository; -import com.baeldung.dddmodules.ordercontext.service.OrderService; -import com.baeldung.dddmodules.sharedkernel.events.EventBus; -import com.baeldung.dddmodules.shippingcontext.repository.ShippingOrderRepository; -import com.baeldung.dddmodules.shippingcontext.service.ShippingService; +import com.baeldung.dddcontexts.ordercontext.model.CustomerOrder; +import com.baeldung.dddcontexts.ordercontext.model.OrderItem; +import com.baeldung.dddcontexts.ordercontext.repository.CustomerOrderRepository; +import com.baeldung.dddcontexts.ordercontext.service.OrderService; +import com.baeldung.dddcontexts.sharedkernel.events.EventBus; +import com.baeldung.dddcontexts.shippingcontext.repository.ShippingOrderRepository; +import com.baeldung.dddcontexts.shippingcontext.service.ShippingService; import java.util.*; diff --git a/ddd-contexts/mainapp/src/main/java/module-info.java b/ddd-contexts/mainapp/src/main/java/module-info.java new file mode 100644 index 0000000000..b71e474111 --- /dev/null +++ b/ddd-contexts/mainapp/src/main/java/module-info.java @@ -0,0 +1,8 @@ +module com.baeldung.dddcontexts.mainapp { + uses com.baeldung.dddcontexts.sharedkernel.events.EventBus; + uses com.baeldung.dddcontexts.ordercontext.service.OrderService; + uses com.baeldung.dddcontexts.ordercontext.repository.CustomerOrderRepository; + uses com.baeldung.dddcontexts.shippingcontext.repository.ShippingOrderRepository; + uses com.baeldung.dddcontexts.shippingcontext.service.ShippingService; + requires transitive com.baeldung.dddcontexts.infrastructure; +} \ No newline at end of file diff --git a/ddd-modules/ordercontext/pom.xml b/ddd-contexts/ordercontext/pom.xml similarity index 84% rename from ddd-modules/ordercontext/pom.xml rename to ddd-contexts/ordercontext/pom.xml index eaf44badd3..e29f109b71 100644 --- a/ddd-modules/ordercontext/pom.xml +++ b/ddd-contexts/ordercontext/pom.xml @@ -3,20 +3,20 @@ 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 - com.baeldung.dddmodules.ordercontext + com.baeldung.dddcontexts.ordercontext ordercontext 1.0 jar - com.baeldung.dddmodules - ddd-modules + com.baeldung.dddcontexts + ddd-contexts 1.0 - com.baeldung.dddmodules.sharedkernel + com.baeldung.dddcontexts.sharedkernel sharedkernel ${appmodules.version} diff --git a/ddd-modules/ordercontext/src/main/java/com/baeldung/dddmodules/ordercontext/model/CustomerOrder.java b/ddd-contexts/ordercontext/src/main/java/com/baeldung/dddcontexts/ordercontext/model/CustomerOrder.java similarity index 95% rename from ddd-modules/ordercontext/src/main/java/com/baeldung/dddmodules/ordercontext/model/CustomerOrder.java rename to ddd-contexts/ordercontext/src/main/java/com/baeldung/dddcontexts/ordercontext/model/CustomerOrder.java index ee87de56bd..8a69e8b805 100644 --- a/ddd-modules/ordercontext/src/main/java/com/baeldung/dddmodules/ordercontext/model/CustomerOrder.java +++ b/ddd-contexts/ordercontext/src/main/java/com/baeldung/dddcontexts/ordercontext/model/CustomerOrder.java @@ -1,4 +1,4 @@ -package com.baeldung.dddmodules.ordercontext.model; +package com.baeldung.dddcontexts.ordercontext.model; import java.util.List; diff --git a/ddd-modules/ordercontext/src/main/java/com/baeldung/dddmodules/ordercontext/model/OrderItem.java b/ddd-contexts/ordercontext/src/main/java/com/baeldung/dddcontexts/ordercontext/model/OrderItem.java similarity index 95% rename from ddd-modules/ordercontext/src/main/java/com/baeldung/dddmodules/ordercontext/model/OrderItem.java rename to ddd-contexts/ordercontext/src/main/java/com/baeldung/dddcontexts/ordercontext/model/OrderItem.java index aaad0777e4..87b8fea260 100644 --- a/ddd-modules/ordercontext/src/main/java/com/baeldung/dddmodules/ordercontext/model/OrderItem.java +++ b/ddd-contexts/ordercontext/src/main/java/com/baeldung/dddcontexts/ordercontext/model/OrderItem.java @@ -1,4 +1,4 @@ -package com.baeldung.dddmodules.ordercontext.model; +package com.baeldung.dddcontexts.ordercontext.model; public class OrderItem { private int productId; diff --git a/ddd-contexts/ordercontext/src/main/java/com/baeldung/dddcontexts/ordercontext/repository/CustomerOrderRepository.java b/ddd-contexts/ordercontext/src/main/java/com/baeldung/dddcontexts/ordercontext/repository/CustomerOrderRepository.java new file mode 100644 index 0000000000..15d1e70981 --- /dev/null +++ b/ddd-contexts/ordercontext/src/main/java/com/baeldung/dddcontexts/ordercontext/repository/CustomerOrderRepository.java @@ -0,0 +1,7 @@ +package com.baeldung.dddcontexts.ordercontext.repository; + +import com.baeldung.dddcontexts.ordercontext.model.CustomerOrder; + +public interface CustomerOrderRepository { + void saveCustomerOrder(CustomerOrder order); +} diff --git a/ddd-modules/ordercontext/src/main/java/com/baeldung/dddmodules/ordercontext/service/CustomerOrderService.java b/ddd-contexts/ordercontext/src/main/java/com/baeldung/dddcontexts/ordercontext/service/CustomerOrderService.java similarity index 76% rename from ddd-modules/ordercontext/src/main/java/com/baeldung/dddmodules/ordercontext/service/CustomerOrderService.java rename to ddd-contexts/ordercontext/src/main/java/com/baeldung/dddcontexts/ordercontext/service/CustomerOrderService.java index b9d26e6212..c017f36ca5 100644 --- a/ddd-modules/ordercontext/src/main/java/com/baeldung/dddmodules/ordercontext/service/CustomerOrderService.java +++ b/ddd-contexts/ordercontext/src/main/java/com/baeldung/dddcontexts/ordercontext/service/CustomerOrderService.java @@ -1,9 +1,9 @@ -package com.baeldung.dddmodules.ordercontext.service; +package com.baeldung.dddcontexts.ordercontext.service; -import com.baeldung.dddmodules.ordercontext.model.CustomerOrder; -import com.baeldung.dddmodules.ordercontext.repository.CustomerOrderRepository; -import com.baeldung.dddmodules.sharedkernel.events.ApplicationEvent; -import com.baeldung.dddmodules.sharedkernel.events.EventBus; +import com.baeldung.dddcontexts.ordercontext.model.CustomerOrder; +import com.baeldung.dddcontexts.ordercontext.repository.CustomerOrderRepository; +import com.baeldung.dddcontexts.sharedkernel.events.ApplicationEvent; +import com.baeldung.dddcontexts.sharedkernel.events.EventBus; import java.util.HashMap; import java.util.Map; diff --git a/ddd-contexts/ordercontext/src/main/java/com/baeldung/dddcontexts/ordercontext/service/OrderService.java b/ddd-contexts/ordercontext/src/main/java/com/baeldung/dddcontexts/ordercontext/service/OrderService.java new file mode 100644 index 0000000000..94e9dcc7fc --- /dev/null +++ b/ddd-contexts/ordercontext/src/main/java/com/baeldung/dddcontexts/ordercontext/service/OrderService.java @@ -0,0 +1,11 @@ +package com.baeldung.dddcontexts.ordercontext.service; + +import com.baeldung.dddcontexts.ordercontext.model.CustomerOrder; +import com.baeldung.dddcontexts.ordercontext.repository.CustomerOrderRepository; +import com.baeldung.dddcontexts.sharedkernel.service.ApplicationService; + +public interface OrderService extends ApplicationService { + void placeOrder(CustomerOrder order); + + void setOrderRepository(CustomerOrderRepository orderRepository); +} diff --git a/ddd-contexts/ordercontext/src/main/java/module-info.java b/ddd-contexts/ordercontext/src/main/java/module-info.java new file mode 100644 index 0000000000..681565ab4d --- /dev/null +++ b/ddd-contexts/ordercontext/src/main/java/module-info.java @@ -0,0 +1,8 @@ +module com.baeldung.dddcontexts.ordercontext { + requires com.baeldung.dddcontexts.sharedkernel; + exports com.baeldung.dddcontexts.ordercontext.service; + exports com.baeldung.dddcontexts.ordercontext.model; + exports com.baeldung.dddcontexts.ordercontext.repository; + provides com.baeldung.dddcontexts.ordercontext.service.OrderService + with com.baeldung.dddcontexts.ordercontext.service.CustomerOrderService; +} \ No newline at end of file diff --git a/ddd-modules/pom.xml b/ddd-contexts/pom.xml similarity index 94% rename from ddd-modules/pom.xml rename to ddd-contexts/pom.xml index d2932ee515..1a764a65b9 100644 --- a/ddd-modules/pom.xml +++ b/ddd-contexts/pom.xml @@ -3,10 +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 - com.baeldung.dddmodules - ddd-modules + com.baeldung.dddcontexts + ddd-contexts 1.0 - ddd-modules + ddd-contexts pom diff --git a/ddd-modules/sharedkernel/pom.xml b/ddd-contexts/sharedkernel/pom.xml similarity index 85% rename from ddd-modules/sharedkernel/pom.xml rename to ddd-contexts/sharedkernel/pom.xml index 3966e1c26e..5d31973c92 100644 --- a/ddd-modules/sharedkernel/pom.xml +++ b/ddd-contexts/sharedkernel/pom.xml @@ -3,14 +3,14 @@ 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 - com.baeldung.dddmodules.sharedkernel + com.baeldung.dddcontexts.sharedkernel sharedkernel 1.0 jar - com.baeldung.dddmodules - ddd-modules + com.baeldung.dddcontexts + ddd-contexts 1.0 diff --git a/ddd-modules/sharedkernel/src/main/java/com/baeldung/dddmodules/sharedkernel/events/ApplicationEvent.java b/ddd-contexts/sharedkernel/src/main/java/com/baeldung/dddcontexts/sharedkernel/events/ApplicationEvent.java similarity index 88% rename from ddd-modules/sharedkernel/src/main/java/com/baeldung/dddmodules/sharedkernel/events/ApplicationEvent.java rename to ddd-contexts/sharedkernel/src/main/java/com/baeldung/dddcontexts/sharedkernel/events/ApplicationEvent.java index e3c3ebaf0e..7db89e36e0 100644 --- a/ddd-modules/sharedkernel/src/main/java/com/baeldung/dddmodules/sharedkernel/events/ApplicationEvent.java +++ b/ddd-contexts/sharedkernel/src/main/java/com/baeldung/dddcontexts/sharedkernel/events/ApplicationEvent.java @@ -1,4 +1,4 @@ -package com.baeldung.dddmodules.sharedkernel.events; +package com.baeldung.dddcontexts.sharedkernel.events; import java.util.Map; diff --git a/ddd-modules/sharedkernel/src/main/java/com/baeldung/dddmodules/sharedkernel/events/EventBus.java b/ddd-contexts/sharedkernel/src/main/java/com/baeldung/dddcontexts/sharedkernel/events/EventBus.java similarity index 83% rename from ddd-modules/sharedkernel/src/main/java/com/baeldung/dddmodules/sharedkernel/events/EventBus.java rename to ddd-contexts/sharedkernel/src/main/java/com/baeldung/dddcontexts/sharedkernel/events/EventBus.java index b128b959e9..be95de674d 100644 --- a/ddd-modules/sharedkernel/src/main/java/com/baeldung/dddmodules/sharedkernel/events/EventBus.java +++ b/ddd-contexts/sharedkernel/src/main/java/com/baeldung/dddcontexts/sharedkernel/events/EventBus.java @@ -1,4 +1,4 @@ -package com.baeldung.dddmodules.sharedkernel.events; +package com.baeldung.dddcontexts.sharedkernel.events; public interface EventBus { void publish(E event); diff --git a/ddd-modules/sharedkernel/src/main/java/com/baeldung/dddmodules/sharedkernel/events/EventSubscriber.java b/ddd-contexts/sharedkernel/src/main/java/com/baeldung/dddcontexts/sharedkernel/events/EventSubscriber.java similarity index 63% rename from ddd-modules/sharedkernel/src/main/java/com/baeldung/dddmodules/sharedkernel/events/EventSubscriber.java rename to ddd-contexts/sharedkernel/src/main/java/com/baeldung/dddcontexts/sharedkernel/events/EventSubscriber.java index 0d6d48cc33..f941514024 100644 --- a/ddd-modules/sharedkernel/src/main/java/com/baeldung/dddmodules/sharedkernel/events/EventSubscriber.java +++ b/ddd-contexts/sharedkernel/src/main/java/com/baeldung/dddcontexts/sharedkernel/events/EventSubscriber.java @@ -1,4 +1,4 @@ -package com.baeldung.dddmodules.sharedkernel.events; +package com.baeldung.dddcontexts.sharedkernel.events; public interface EventSubscriber { void onEvent(E event); diff --git a/ddd-modules/sharedkernel/src/main/java/com/baeldung/dddmodules/sharedkernel/service/ApplicationService.java b/ddd-contexts/sharedkernel/src/main/java/com/baeldung/dddcontexts/sharedkernel/service/ApplicationService.java similarity index 76% rename from ddd-modules/sharedkernel/src/main/java/com/baeldung/dddmodules/sharedkernel/service/ApplicationService.java rename to ddd-contexts/sharedkernel/src/main/java/com/baeldung/dddcontexts/sharedkernel/service/ApplicationService.java index 5ef57ae269..a9f4488d90 100644 --- a/ddd-modules/sharedkernel/src/main/java/com/baeldung/dddmodules/sharedkernel/service/ApplicationService.java +++ b/ddd-contexts/sharedkernel/src/main/java/com/baeldung/dddcontexts/sharedkernel/service/ApplicationService.java @@ -1,8 +1,8 @@ -package com.baeldung.dddmodules.sharedkernel.service; +package com.baeldung.dddcontexts.sharedkernel.service; -import com.baeldung.dddmodules.sharedkernel.events.ApplicationEvent; -import com.baeldung.dddmodules.sharedkernel.events.EventBus; -import com.baeldung.dddmodules.sharedkernel.events.EventSubscriber; +import com.baeldung.dddcontexts.sharedkernel.events.ApplicationEvent; +import com.baeldung.dddcontexts.sharedkernel.events.EventBus; +import com.baeldung.dddcontexts.sharedkernel.events.EventSubscriber; public interface ApplicationService { diff --git a/ddd-contexts/sharedkernel/src/main/java/module-info.java b/ddd-contexts/sharedkernel/src/main/java/module-info.java new file mode 100644 index 0000000000..f093924aed --- /dev/null +++ b/ddd-contexts/sharedkernel/src/main/java/module-info.java @@ -0,0 +1,4 @@ +module com.baeldung.dddcontexts.sharedkernel { + exports com.baeldung.dddcontexts.sharedkernel.events; + exports com.baeldung.dddcontexts.sharedkernel.service; +} diff --git a/ddd-modules/shippingcontext/pom.xml b/ddd-contexts/shippingcontext/pom.xml similarity index 82% rename from ddd-modules/shippingcontext/pom.xml rename to ddd-contexts/shippingcontext/pom.xml index a6e6167b69..2fb9e83645 100644 --- a/ddd-modules/shippingcontext/pom.xml +++ b/ddd-contexts/shippingcontext/pom.xml @@ -3,20 +3,20 @@ 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 - com.baeldung.dddmodules.shippingcontext + com.baeldung.dddcontexts.shippingcontext shippingcontext 1.0 jar - com.baeldung.dddmodules - ddd-modules + com.baeldung.dddcontexts + ddd-contexts 1.0 - com.baeldung.dddmodules.sharedkernel + com.baeldung.dddcontexts.sharedkernel sharedkernel ${appmodules.version} diff --git a/ddd-modules/shippingcontext/src/main/java/com/baeldung/dddmodules/shippingcontext/model/PackageItem.java b/ddd-contexts/shippingcontext/src/main/java/com/baeldung/dddcontexts/shippingcontext/model/PackageItem.java similarity index 93% rename from ddd-modules/shippingcontext/src/main/java/com/baeldung/dddmodules/shippingcontext/model/PackageItem.java rename to ddd-contexts/shippingcontext/src/main/java/com/baeldung/dddcontexts/shippingcontext/model/PackageItem.java index ed09a0f2a2..0e4da42cec 100644 --- a/ddd-modules/shippingcontext/src/main/java/com/baeldung/dddmodules/shippingcontext/model/PackageItem.java +++ b/ddd-contexts/shippingcontext/src/main/java/com/baeldung/dddcontexts/shippingcontext/model/PackageItem.java @@ -1,4 +1,4 @@ -package com.baeldung.dddmodules.shippingcontext.model; +package com.baeldung.dddcontexts.shippingcontext.model; public class PackageItem { private int productId; diff --git a/ddd-modules/shippingcontext/src/main/java/com/baeldung/dddmodules/shippingcontext/model/Parcel.java b/ddd-contexts/shippingcontext/src/main/java/com/baeldung/dddcontexts/shippingcontext/model/Parcel.java similarity index 95% rename from ddd-modules/shippingcontext/src/main/java/com/baeldung/dddmodules/shippingcontext/model/Parcel.java rename to ddd-contexts/shippingcontext/src/main/java/com/baeldung/dddcontexts/shippingcontext/model/Parcel.java index 70c4f06ac6..ee24818fb0 100644 --- a/ddd-modules/shippingcontext/src/main/java/com/baeldung/dddmodules/shippingcontext/model/Parcel.java +++ b/ddd-contexts/shippingcontext/src/main/java/com/baeldung/dddcontexts/shippingcontext/model/Parcel.java @@ -1,4 +1,4 @@ -package com.baeldung.dddmodules.shippingcontext.model; +package com.baeldung.dddcontexts.shippingcontext.model; import java.util.List; diff --git a/ddd-modules/shippingcontext/src/main/java/com/baeldung/dddmodules/shippingcontext/model/ShippableOrder.java b/ddd-contexts/shippingcontext/src/main/java/com/baeldung/dddcontexts/shippingcontext/model/ShippableOrder.java similarity index 93% rename from ddd-modules/shippingcontext/src/main/java/com/baeldung/dddmodules/shippingcontext/model/ShippableOrder.java rename to ddd-contexts/shippingcontext/src/main/java/com/baeldung/dddcontexts/shippingcontext/model/ShippableOrder.java index afeea2f472..97daaf681e 100644 --- a/ddd-modules/shippingcontext/src/main/java/com/baeldung/dddmodules/shippingcontext/model/ShippableOrder.java +++ b/ddd-contexts/shippingcontext/src/main/java/com/baeldung/dddcontexts/shippingcontext/model/ShippableOrder.java @@ -1,4 +1,4 @@ -package com.baeldung.dddmodules.shippingcontext.model; +package com.baeldung.dddcontexts.shippingcontext.model; import java.util.List; diff --git a/ddd-modules/shippingcontext/src/main/java/com/baeldung/dddmodules/shippingcontext/repository/ShippingOrderRepository.java b/ddd-contexts/shippingcontext/src/main/java/com/baeldung/dddcontexts/shippingcontext/repository/ShippingOrderRepository.java similarity index 51% rename from ddd-modules/shippingcontext/src/main/java/com/baeldung/dddmodules/shippingcontext/repository/ShippingOrderRepository.java rename to ddd-contexts/shippingcontext/src/main/java/com/baeldung/dddcontexts/shippingcontext/repository/ShippingOrderRepository.java index b1a643f989..ba01d8e39c 100644 --- a/ddd-modules/shippingcontext/src/main/java/com/baeldung/dddmodules/shippingcontext/repository/ShippingOrderRepository.java +++ b/ddd-contexts/shippingcontext/src/main/java/com/baeldung/dddcontexts/shippingcontext/repository/ShippingOrderRepository.java @@ -1,6 +1,6 @@ -package com.baeldung.dddmodules.shippingcontext.repository; +package com.baeldung.dddcontexts.shippingcontext.repository; -import com.baeldung.dddmodules.shippingcontext.model.ShippableOrder; +import com.baeldung.dddcontexts.shippingcontext.model.ShippableOrder; import java.util.Optional; diff --git a/ddd-modules/shippingcontext/src/main/java/com/baeldung/dddmodules/shippingcontext/service/ParcelShippingService.java b/ddd-contexts/shippingcontext/src/main/java/com/baeldung/dddcontexts/shippingcontext/service/ParcelShippingService.java similarity index 78% rename from ddd-modules/shippingcontext/src/main/java/com/baeldung/dddmodules/shippingcontext/service/ParcelShippingService.java rename to ddd-contexts/shippingcontext/src/main/java/com/baeldung/dddcontexts/shippingcontext/service/ParcelShippingService.java index 05f261612e..70c0970e8b 100644 --- a/ddd-modules/shippingcontext/src/main/java/com/baeldung/dddmodules/shippingcontext/service/ParcelShippingService.java +++ b/ddd-contexts/shippingcontext/src/main/java/com/baeldung/dddcontexts/shippingcontext/service/ParcelShippingService.java @@ -1,11 +1,11 @@ -package com.baeldung.dddmodules.shippingcontext.service; +package com.baeldung.dddcontexts.shippingcontext.service; -import com.baeldung.dddmodules.sharedkernel.events.ApplicationEvent; -import com.baeldung.dddmodules.sharedkernel.events.EventBus; -import com.baeldung.dddmodules.sharedkernel.events.EventSubscriber; -import com.baeldung.dddmodules.shippingcontext.model.Parcel; -import com.baeldung.dddmodules.shippingcontext.model.ShippableOrder; -import com.baeldung.dddmodules.shippingcontext.repository.ShippingOrderRepository; +import com.baeldung.dddcontexts.sharedkernel.events.ApplicationEvent; +import com.baeldung.dddcontexts.sharedkernel.events.EventBus; +import com.baeldung.dddcontexts.sharedkernel.events.EventSubscriber; +import com.baeldung.dddcontexts.shippingcontext.model.Parcel; +import com.baeldung.dddcontexts.shippingcontext.model.ShippableOrder; +import com.baeldung.dddcontexts.shippingcontext.repository.ShippingOrderRepository; import java.util.HashMap; import java.util.Map; diff --git a/ddd-modules/shippingcontext/src/main/java/com/baeldung/dddmodules/shippingcontext/service/ShippingService.java b/ddd-contexts/shippingcontext/src/main/java/com/baeldung/dddcontexts/shippingcontext/service/ShippingService.java similarity index 50% rename from ddd-modules/shippingcontext/src/main/java/com/baeldung/dddmodules/shippingcontext/service/ShippingService.java rename to ddd-contexts/shippingcontext/src/main/java/com/baeldung/dddcontexts/shippingcontext/service/ShippingService.java index a2f0095c43..b78a0f9fb2 100644 --- a/ddd-modules/shippingcontext/src/main/java/com/baeldung/dddmodules/shippingcontext/service/ShippingService.java +++ b/ddd-contexts/shippingcontext/src/main/java/com/baeldung/dddcontexts/shippingcontext/service/ShippingService.java @@ -1,8 +1,8 @@ -package com.baeldung.dddmodules.shippingcontext.service; +package com.baeldung.dddcontexts.shippingcontext.service; -import com.baeldung.dddmodules.sharedkernel.service.ApplicationService; -import com.baeldung.dddmodules.shippingcontext.model.Parcel; -import com.baeldung.dddmodules.shippingcontext.repository.ShippingOrderRepository; +import com.baeldung.dddcontexts.sharedkernel.service.ApplicationService; +import com.baeldung.dddcontexts.shippingcontext.model.Parcel; +import com.baeldung.dddcontexts.shippingcontext.repository.ShippingOrderRepository; import java.util.Optional; diff --git a/ddd-contexts/shippingcontext/src/main/java/module-info.java b/ddd-contexts/shippingcontext/src/main/java/module-info.java new file mode 100644 index 0000000000..c53cbedf8a --- /dev/null +++ b/ddd-contexts/shippingcontext/src/main/java/module-info.java @@ -0,0 +1,8 @@ +module com.baeldung.dddcontexts.shippingcontext { + requires com.baeldung.dddcontexts.sharedkernel; + exports com.baeldung.dddcontexts.shippingcontext.service; + exports com.baeldung.dddcontexts.shippingcontext.model; + exports com.baeldung.dddcontexts.shippingcontext.repository; + provides com.baeldung.dddcontexts.shippingcontext.service.ShippingService + with com.baeldung.dddcontexts.shippingcontext.service.ParcelShippingService; +} diff --git a/ddd-modules/mainapp/src/main/java/module-info.java b/ddd-modules/mainapp/src/main/java/module-info.java deleted file mode 100644 index 356b03731c..0000000000 --- a/ddd-modules/mainapp/src/main/java/module-info.java +++ /dev/null @@ -1,8 +0,0 @@ -module com.baeldung.dddmodules.mainapp { - uses com.baeldung.dddmodules.sharedkernel.events.EventBus; - uses com.baeldung.dddmodules.ordercontext.service.OrderService; - uses com.baeldung.dddmodules.ordercontext.repository.CustomerOrderRepository; - uses com.baeldung.dddmodules.shippingcontext.repository.ShippingOrderRepository; - uses com.baeldung.dddmodules.shippingcontext.service.ShippingService; - requires transitive com.baeldung.dddmodules.infrastructure; -} \ No newline at end of file diff --git a/ddd-modules/ordercontext/src/main/java/com/baeldung/dddmodules/ordercontext/repository/CustomerOrderRepository.java b/ddd-modules/ordercontext/src/main/java/com/baeldung/dddmodules/ordercontext/repository/CustomerOrderRepository.java deleted file mode 100644 index 771bbf3301..0000000000 --- a/ddd-modules/ordercontext/src/main/java/com/baeldung/dddmodules/ordercontext/repository/CustomerOrderRepository.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.baeldung.dddmodules.ordercontext.repository; - -import com.baeldung.dddmodules.ordercontext.model.CustomerOrder; - -public interface CustomerOrderRepository { - void saveCustomerOrder(CustomerOrder order); -} diff --git a/ddd-modules/ordercontext/src/main/java/com/baeldung/dddmodules/ordercontext/service/OrderService.java b/ddd-modules/ordercontext/src/main/java/com/baeldung/dddmodules/ordercontext/service/OrderService.java deleted file mode 100644 index 1bbb8b8398..0000000000 --- a/ddd-modules/ordercontext/src/main/java/com/baeldung/dddmodules/ordercontext/service/OrderService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.baeldung.dddmodules.ordercontext.service; - -import com.baeldung.dddmodules.ordercontext.model.CustomerOrder; -import com.baeldung.dddmodules.ordercontext.repository.CustomerOrderRepository; -import com.baeldung.dddmodules.sharedkernel.service.ApplicationService; - -public interface OrderService extends ApplicationService { - void placeOrder(CustomerOrder order); - - void setOrderRepository(CustomerOrderRepository orderRepository); -} diff --git a/ddd-modules/ordercontext/src/main/java/module-info.java b/ddd-modules/ordercontext/src/main/java/module-info.java deleted file mode 100644 index e9b7cf9535..0000000000 --- a/ddd-modules/ordercontext/src/main/java/module-info.java +++ /dev/null @@ -1,8 +0,0 @@ -module com.baeldung.dddmodules.ordercontext { - requires com.baeldung.dddmodules.sharedkernel; - exports com.baeldung.dddmodules.ordercontext.service; - exports com.baeldung.dddmodules.ordercontext.model; - exports com.baeldung.dddmodules.ordercontext.repository; - provides com.baeldung.dddmodules.ordercontext.service.OrderService - with com.baeldung.dddmodules.ordercontext.service.CustomerOrderService; -} \ No newline at end of file diff --git a/ddd-modules/sharedkernel/src/main/java/module-info.java b/ddd-modules/sharedkernel/src/main/java/module-info.java deleted file mode 100644 index aeb64f52c9..0000000000 --- a/ddd-modules/sharedkernel/src/main/java/module-info.java +++ /dev/null @@ -1,4 +0,0 @@ -module com.baeldung.dddmodules.sharedkernel { - exports com.baeldung.dddmodules.sharedkernel.events; - exports com.baeldung.dddmodules.sharedkernel.service; -} diff --git a/ddd-modules/shippingcontext/src/main/java/module-info.java b/ddd-modules/shippingcontext/src/main/java/module-info.java deleted file mode 100644 index a5ec1ca435..0000000000 --- a/ddd-modules/shippingcontext/src/main/java/module-info.java +++ /dev/null @@ -1,8 +0,0 @@ -module com.baeldung.dddmodules.shippingcontext { - requires com.baeldung.dddmodules.sharedkernel; - exports com.baeldung.dddmodules.shippingcontext.service; - exports com.baeldung.dddmodules.shippingcontext.model; - exports com.baeldung.dddmodules.shippingcontext.repository; - provides com.baeldung.dddmodules.shippingcontext.service.ShippingService - with com.baeldung.dddmodules.shippingcontext.service.ParcelShippingService; -} From b01bfd8c5cfb197a25e11431cd53852ce6c2d0d2 Mon Sep 17 00:00:00 2001 From: Krzysiek Date: Tue, 24 May 2022 10:39:18 +0200 Subject: [PATCH 082/100] JAVA-12100: Delete left ddd-modules file --- .../infrastructure/src/main/java/module-info.java | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 ddd-modules/infrastructure/src/main/java/module-info.java diff --git a/ddd-modules/infrastructure/src/main/java/module-info.java b/ddd-modules/infrastructure/src/main/java/module-info.java deleted file mode 100644 index 19f7b36548..0000000000 --- a/ddd-modules/infrastructure/src/main/java/module-info.java +++ /dev/null @@ -1,11 +0,0 @@ -module com.baeldung.dddmodules.infrastructure { - requires transitive com.baeldung.dddmodules.sharedkernel; - requires transitive com.baeldung.dddmodules.ordercontext; - requires transitive com.baeldung.dddmodules.shippingcontext; - provides com.baeldung.dddmodules.sharedkernel.events.EventBus - with com.baeldung.dddmodules.infrastructure.events.SimpleEventBus; - provides com.baeldung.dddmodules.ordercontext.repository.CustomerOrderRepository - with com.baeldung.dddmodules.infrastructure.db.InMemoryOrderStore; - provides com.baeldung.dddmodules.shippingcontext.repository.ShippingOrderRepository - with com.baeldung.dddmodules.infrastructure.db.InMemoryOrderStore; -} From 4f615e380a801afabd31619fa49b30d26b3d8b90 Mon Sep 17 00:00:00 2001 From: Krzysiek Date: Tue, 24 May 2022 11:09:48 +0200 Subject: [PATCH 083/100] JAVA-12100: Update main pom.xml --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 5919a930f0..7cd2bbe3d1 100644 --- a/pom.xml +++ b/pom.xml @@ -1300,7 +1300,7 @@ core-java-modules/multimodulemavenproject core-java-modules/core-java-strings core-java-modules/core-java-httpclient - ddd-modules + ddd-contexts docker apache-httpclient-2 libraries-concurrency @@ -1368,7 +1368,7 @@ core-java-modules/core-java-networking-3 core-java-modules/multimodulemavenproject core-java-modules/core-java-strings - ddd-modules + ddd-contexts docker apache-httpclient-2 libraries-concurrency From d24c84be8e02351ad3adf42ca1911eb0b80752c8 Mon Sep 17 00:00:00 2001 From: anuragkumawat Date: Tue, 24 May 2022 22:11:03 +0530 Subject: [PATCH 084/100] JAVA-9808 Fix integration test in spring-state-machine --- spring-state-machine/pom.xml | 2 +- .../SimpleStateMachineConfiguration.java | 2 +- .../StateMachineIntegrationTest.java | 27 +++++++++++-------- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/spring-state-machine/pom.xml b/spring-state-machine/pom.xml index 741361b3fa..0e930d6ff1 100644 --- a/spring-state-machine/pom.xml +++ b/spring-state-machine/pom.xml @@ -39,7 +39,7 @@ 3.2.0 5.3.19 - 4.3.7.RELEASE + 5.3.19 1.7.0 diff --git a/spring-state-machine/src/main/java/com/baeldung/spring/statemachine/config/SimpleStateMachineConfiguration.java b/spring-state-machine/src/main/java/com/baeldung/spring/statemachine/config/SimpleStateMachineConfiguration.java index 0c392c2c35..bdb488c354 100644 --- a/spring-state-machine/src/main/java/com/baeldung/spring/statemachine/config/SimpleStateMachineConfiguration.java +++ b/spring-state-machine/src/main/java/com/baeldung/spring/statemachine/config/SimpleStateMachineConfiguration.java @@ -38,7 +38,7 @@ public class SimpleStateMachineConfiguration extends StateMachineConfigurerAdapt .stateEntry("S3", entryAction()) .stateExit("S3", exitAction()) .state("S4", executeAction(), errorAction()) - .stateDo("S5", executeAction()); + .stateDo("S5", executeAction(), errorAction()); } diff --git a/spring-state-machine/src/test/java/com/baeldung/spring/statemachine/StateMachineIntegrationTest.java b/spring-state-machine/src/test/java/com/baeldung/spring/statemachine/StateMachineIntegrationTest.java index 5909340a82..ac2d6a22c2 100644 --- a/spring-state-machine/src/test/java/com/baeldung/spring/statemachine/StateMachineIntegrationTest.java +++ b/spring-state-machine/src/test/java/com/baeldung/spring/statemachine/StateMachineIntegrationTest.java @@ -1,32 +1,37 @@ package com.baeldung.spring.statemachine; -import com.baeldung.spring.statemachine.config.SimpleStateMachineConfiguration; -import org.junit.After; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; +import org.junit.jupiter.api.Order; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.statemachine.StateMachine; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; + +import com.baeldung.spring.statemachine.config.SimpleStateMachineConfiguration; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = SimpleStateMachineConfiguration.class) +@TestMethodOrder(OrderAnnotation.class) public class StateMachineIntegrationTest { @Autowired private StateMachine stateMachine; - @Before + @BeforeEach public void setUp() { stateMachine.start(); } @Test + @Order(1) public void whenSimpleStringStateMachineEvents_thenEndState() { assertEquals("SI", stateMachine.getState().getId()); @@ -37,8 +42,8 @@ public class StateMachineIntegrationTest { assertEquals("S2", stateMachine.getState().getId()); } - @Ignore("Fixing in JAVA-9808") @Test + @Order(2) public void whenSimpleStringMachineActionState_thenActionExecuted() { stateMachine.sendEvent("E3"); @@ -58,7 +63,7 @@ public class StateMachineIntegrationTest { assertEquals(2, stateMachine.getExtendedState().getVariables().get("approvalCount")); } - @After + @AfterEach public void tearDown() { stateMachine.stop(); } From 4977a58de10522c509d479f21bc10cca4ab97924 Mon Sep 17 00:00:00 2001 From: anuragkumawat Date: Wed, 25 May 2022 20:16:11 +0530 Subject: [PATCH 085/100] JAVA-9808 Fix integration test in spring-state-machine --- .../statemachine/config/SimpleStateMachineConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-state-machine/src/main/java/com/baeldung/spring/statemachine/config/SimpleStateMachineConfiguration.java b/spring-state-machine/src/main/java/com/baeldung/spring/statemachine/config/SimpleStateMachineConfiguration.java index bdb488c354..8c95e9d843 100644 --- a/spring-state-machine/src/main/java/com/baeldung/spring/statemachine/config/SimpleStateMachineConfiguration.java +++ b/spring-state-machine/src/main/java/com/baeldung/spring/statemachine/config/SimpleStateMachineConfiguration.java @@ -38,7 +38,7 @@ public class SimpleStateMachineConfiguration extends StateMachineConfigurerAdapt .stateEntry("S3", entryAction()) .stateExit("S3", exitAction()) .state("S4", executeAction(), errorAction()) - .stateDo("S5", executeAction(), errorAction()); + .state("S5", executeAction(), errorAction()); } From 4188ab68b37cca0768ea17dc765c00112af88e7e Mon Sep 17 00:00:00 2001 From: Haroon Khan Date: Wed, 25 May 2022 17:48:48 +0100 Subject: [PATCH 086/100] [JAVA-8153] Code clean up for reactive error handling --- .../ErrorHandlingApplication.java | 19 +- .../errorhandling/GlobalErrorAttributes.java | 36 +-- .../reactive/errorhandling/Handler.java | 67 +++++ .../reactive/errorhandling/Router.java | 26 ++ .../errorhandling/handlers/Handler1.java | 28 --- .../errorhandling/handlers/Handler2.java | 37 --- .../errorhandling/handlers/Handler3.java | 33 --- .../errorhandling/handlers/Handler4.java | 29 --- .../errorhandling/handlers/Handler5.java | 21 -- .../errorhandling/routers/Router1.java | 21 -- .../errorhandling/routers/Router2.java | 21 -- .../errorhandling/routers/Router3.java | 21 -- .../errorhandling/routers/Router4.java | 21 -- .../errorhandling/routers/Router5.java | 21 -- .../ErrorHandlingIntegrationTest.java | 235 +++++++----------- 15 files changed, 195 insertions(+), 441 deletions(-) create mode 100644 spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/Handler.java create mode 100644 spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/Router.java delete mode 100644 spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/handlers/Handler1.java delete mode 100644 spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/handlers/Handler2.java delete mode 100644 spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/handlers/Handler3.java delete mode 100644 spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/handlers/Handler4.java delete mode 100644 spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/handlers/Handler5.java delete mode 100644 spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/routers/Router1.java delete mode 100644 spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/routers/Router2.java delete mode 100644 spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/routers/Router3.java delete mode 100644 spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/routers/Router4.java delete mode 100644 spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/routers/Router5.java diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/ErrorHandlingApplication.java b/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/ErrorHandlingApplication.java index c40db74003..50579d8721 100644 --- a/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/ErrorHandlingApplication.java +++ b/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/ErrorHandlingApplication.java @@ -3,23 +3,16 @@ package com.baeldung.reactive.errorhandling; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.mongo.MongoReactiveAutoConfiguration; -import org.springframework.context.annotation.Bean; -import org.springframework.security.config.web.server.ServerHttpSecurity; -import org.springframework.security.web.server.SecurityWebFilterChain; +import org.springframework.boot.autoconfigure.security.reactive.ReactiveSecurityAutoConfiguration; +import org.springframework.boot.autoconfigure.security.reactive.ReactiveUserDetailsServiceAutoConfiguration; -@SpringBootApplication(exclude = MongoReactiveAutoConfiguration.class) +@SpringBootApplication(exclude = { + MongoReactiveAutoConfiguration.class, + ReactiveSecurityAutoConfiguration.class, + ReactiveUserDetailsServiceAutoConfiguration.class }) public class ErrorHandlingApplication { public static void main(String[] args) { SpringApplication.run(ErrorHandlingApplication.class, args); } - - @Bean - public SecurityWebFilterChain securityWebFilterChain(ServerHttpSecurity http) { - http.authorizeExchange() - .anyExchange() - .permitAll(); - http.csrf().disable(); - return http.build(); - } } diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/GlobalErrorAttributes.java b/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/GlobalErrorAttributes.java index 0a96a8593c..3458a175e4 100644 --- a/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/GlobalErrorAttributes.java +++ b/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/GlobalErrorAttributes.java @@ -9,44 +9,14 @@ import org.springframework.web.reactive.function.server.ServerRequest; import java.util.Map; @Component -public class GlobalErrorAttributes extends DefaultErrorAttributes{ - - private HttpStatus status = HttpStatus.BAD_REQUEST; - private String message = "please provide a name"; +public class GlobalErrorAttributes extends DefaultErrorAttributes { @Override public Map getErrorAttributes(ServerRequest request, ErrorAttributeOptions options) { Map map = super.getErrorAttributes(request, options); - map.put("status", getStatus()); - map.put("message", getMessage()); + map.put("status", HttpStatus.BAD_REQUEST); + map.put("message", "please provide a name"); return map; } - /** - * @return the status - */ - public HttpStatus getStatus() { - return status; - } - - /** - * @param status the status to set - */ - public void setStatus(HttpStatus status) { - this.status = status; - } - - /** - * @return the message - */ - public String getMessage() { - return message; - } - - /** - * @param message the message to set - */ - public void setMessage(String message) { - this.message = message; - } } diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/Handler.java b/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/Handler.java new file mode 100644 index 0000000000..d49d9b4be2 --- /dev/null +++ b/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/Handler.java @@ -0,0 +1,67 @@ +package com.baeldung.reactive.errorhandling; + +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.stereotype.Component; +import org.springframework.web.reactive.function.server.ServerRequest; +import org.springframework.web.reactive.function.server.ServerResponse; +import reactor.core.publisher.Mono; + +@Component +public class Handler { + + public Mono handleWithErrorReturn(ServerRequest request) { + return sayHello(request) + .onErrorReturn("Hello, Stranger") + .flatMap(s -> ServerResponse.ok() + .contentType(MediaType.TEXT_PLAIN) + .bodyValue(s)); + } + + public Mono handleWithErrorResumeAndDynamicFallback(ServerRequest request) { + return sayHello(request) + .flatMap(s -> ServerResponse.ok() + .contentType(MediaType.TEXT_PLAIN) + .bodyValue(s)) + .onErrorResume(e -> (Mono.just("Hi, I looked around for your name but found: " + e.getMessage())) + .flatMap(s -> ServerResponse.ok() + .contentType(MediaType.TEXT_PLAIN) + .bodyValue(s))); + } + + public Mono handleWithErrorResumeAndFallbackMethod(ServerRequest request) { + return sayHello(request) + .flatMap(s -> ServerResponse.ok() + .contentType(MediaType.TEXT_PLAIN) + .bodyValue(s)) + .onErrorResume(e -> sayHelloFallback() + .flatMap(s -> ServerResponse.ok() + .contentType(MediaType.TEXT_PLAIN) + .bodyValue(s))); + } + + public Mono handleWithErrorResumeAndCustomException(ServerRequest request) { + return ServerResponse.ok() + .body(sayHello(request) + .onErrorResume(e -> Mono.error(new NameRequiredException( + HttpStatus.BAD_REQUEST, + "please provide a name", e))), String.class); + } + + public Mono handleWithGlobalErrorHandler(ServerRequest request) { + return ServerResponse.ok() + .body(sayHello(request), String.class); + } + + private Mono sayHello(ServerRequest request) { + try { + return Mono.just("Hello, " + request.queryParam("name").get()); + } catch (Exception e) { + return Mono.error(e); + } + } + + private Mono sayHelloFallback() { + return Mono.just("Hello, Stranger"); + } +} diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/Router.java b/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/Router.java new file mode 100644 index 0000000000..5f130ec035 --- /dev/null +++ b/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/Router.java @@ -0,0 +1,26 @@ +package com.baeldung.reactive.errorhandling; + +import org.springframework.context.annotation.Bean; +import org.springframework.stereotype.Component; +import org.springframework.web.reactive.function.server.RouterFunction; +import org.springframework.web.reactive.function.server.RouterFunctions; +import org.springframework.web.reactive.function.server.ServerResponse; + +import static org.springframework.http.MediaType.TEXT_PLAIN; +import static org.springframework.web.reactive.function.server.RequestPredicates.GET; +import static org.springframework.web.reactive.function.server.RequestPredicates.accept; + +@Component +public class Router { + + @Bean + public RouterFunction routes(Handler handler) { + return RouterFunctions + .route(GET("/api/endpoint1").and(accept(TEXT_PLAIN)), handler::handleWithErrorReturn) + .andRoute(GET("/api/endpoint2").and(accept(TEXT_PLAIN)), handler::handleWithErrorResumeAndFallbackMethod) + .andRoute(GET("/api/endpoint3").and(accept(TEXT_PLAIN)), handler::handleWithErrorResumeAndDynamicFallback) + .andRoute(GET("/api/endpoint4").and(accept(TEXT_PLAIN)), handler::handleWithErrorResumeAndCustomException) + .andRoute(GET("/api/endpoint5").and(accept(TEXT_PLAIN)), handler::handleWithGlobalErrorHandler); + } + +} diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/handlers/Handler1.java b/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/handlers/Handler1.java deleted file mode 100644 index 32f2f1c3a2..0000000000 --- a/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/handlers/Handler1.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.baeldung.reactive.errorhandling.handlers; - -import org.springframework.http.MediaType; -import org.springframework.stereotype.Component; -import org.springframework.web.reactive.function.server.ServerRequest; -import org.springframework.web.reactive.function.server.ServerResponse; -import reactor.core.publisher.Mono; - -@Component -public class Handler1 { - - public Mono handleRequest1(ServerRequest request) { - return sayHello(request).onErrorReturn("Hello, Stranger") - .flatMap(s -> ServerResponse.ok() - .contentType(MediaType.TEXT_PLAIN) - .bodyValue(s)); - } - - private Mono sayHello(ServerRequest request) { - try { - return Mono.just("Hello, " + request.queryParam("name") - .get()); - } catch (Exception e) { - return Mono.error(e); - } - } - -} diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/handlers/Handler2.java b/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/handlers/Handler2.java deleted file mode 100644 index 093120c92b..0000000000 --- a/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/handlers/Handler2.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.baeldung.reactive.errorhandling.handlers; - -import org.springframework.http.MediaType; -import org.springframework.stereotype.Component; -import org.springframework.web.reactive.function.server.ServerRequest; -import org.springframework.web.reactive.function.server.ServerResponse; -import reactor.core.publisher.Mono; - -@Component -public class Handler2 { - -public Mono handleRequest2(ServerRequest request) { - return - sayHello(request) - .flatMap(s -> ServerResponse.ok() - .contentType(MediaType.TEXT_PLAIN) - .bodyValue(s)) - .onErrorResume(e -> sayHelloFallback() - .flatMap(s -> ServerResponse.ok() - .contentType(MediaType.TEXT_PLAIN) - .bodyValue(s))); -} - - private Mono sayHello(ServerRequest request) { - try { - return Mono.just("Hello, " + request.queryParam("name") - .get()); - } catch (Exception e) { - return Mono.error(e); - } - } - - private Mono sayHelloFallback() { - return Mono.just("Hello, Stranger"); - } - -} diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/handlers/Handler3.java b/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/handlers/Handler3.java deleted file mode 100644 index 44842e0539..0000000000 --- a/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/handlers/Handler3.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.baeldung.reactive.errorhandling.handlers; - -import org.springframework.http.MediaType; -import org.springframework.stereotype.Component; -import org.springframework.web.reactive.function.server.ServerRequest; -import org.springframework.web.reactive.function.server.ServerResponse; -import reactor.core.publisher.Mono; - -@Component -public class Handler3 { - - public Mono handleRequest3(ServerRequest request) { - return - sayHello(request) - .flatMap(s -> ServerResponse.ok() - .contentType(MediaType.TEXT_PLAIN) - .bodyValue(s)) - .onErrorResume(e -> (Mono.just("Hi, I looked around for your name but found: " + - e.getMessage())).flatMap(s -> ServerResponse.ok() - .contentType(MediaType.TEXT_PLAIN) - .bodyValue(s))); - } - - private Mono sayHello(ServerRequest request) { - try { - return Mono.just("Hello, " + request.queryParam("name") - .get()); - } catch (Exception e) { - return Mono.error(e); - } - } - -} diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/handlers/Handler4.java b/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/handlers/Handler4.java deleted file mode 100644 index 2d391a42a7..0000000000 --- a/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/handlers/Handler4.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.baeldung.reactive.errorhandling.handlers; - -import com.baeldung.reactive.errorhandling.NameRequiredException; -import org.springframework.http.HttpStatus; -import org.springframework.stereotype.Component; -import org.springframework.web.reactive.function.server.ServerRequest; -import org.springframework.web.reactive.function.server.ServerResponse; -import reactor.core.publisher.Mono; - -@Component -public class Handler4 { - -public Mono handleRequest4(ServerRequest request) { - return ServerResponse.ok() - .body(sayHello(request) - .onErrorResume(e -> - Mono.error(new NameRequiredException( - HttpStatus.BAD_REQUEST, "please provide a name", e))), String.class); -} - - private Mono sayHello(ServerRequest request) { - try { - return Mono.just("Hello, " + request.queryParam("name").get()); - } catch (Exception e) { - return Mono.error(e); - } - } - -} diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/handlers/Handler5.java b/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/handlers/Handler5.java deleted file mode 100644 index a466982865..0000000000 --- a/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/handlers/Handler5.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.baeldung.reactive.errorhandling.handlers; - -import org.springframework.stereotype.Component; -import org.springframework.web.reactive.function.server.ServerRequest; -import org.springframework.web.reactive.function.server.ServerResponse; -import reactor.core.publisher.Mono; - -@Component -public class Handler5 { - - public Mono handleRequest5(ServerRequest request) { - return ServerResponse.ok() - .body(sayHello(request), String.class); - - } - - private Mono sayHello(ServerRequest request) { - return Mono.just("Hello, " + request.queryParam("name").get()); - } - -} diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/routers/Router1.java b/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/routers/Router1.java deleted file mode 100644 index caf779b456..0000000000 --- a/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/routers/Router1.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.baeldung.reactive.errorhandling.routers; - -import com.baeldung.reactive.errorhandling.handlers.Handler1; -import org.springframework.context.annotation.Bean; -import org.springframework.http.MediaType; -import org.springframework.stereotype.Component; -import org.springframework.web.reactive.function.server.RequestPredicates; -import org.springframework.web.reactive.function.server.RouterFunction; -import org.springframework.web.reactive.function.server.RouterFunctions; -import org.springframework.web.reactive.function.server.ServerResponse; - -@Component -public class Router1 { - - @Bean - public RouterFunction routeRequest1(Handler1 handler) { - return RouterFunctions.route(RequestPredicates.GET("/api/endpoint1") - .and(RequestPredicates.accept(MediaType.TEXT_PLAIN)), handler::handleRequest1); - } - -} diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/routers/Router2.java b/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/routers/Router2.java deleted file mode 100644 index b965257c30..0000000000 --- a/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/routers/Router2.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.baeldung.reactive.errorhandling.routers; - -import com.baeldung.reactive.errorhandling.handlers.Handler2; -import org.springframework.context.annotation.Bean; -import org.springframework.http.MediaType; -import org.springframework.stereotype.Component; -import org.springframework.web.reactive.function.server.RequestPredicates; -import org.springframework.web.reactive.function.server.RouterFunction; -import org.springframework.web.reactive.function.server.RouterFunctions; -import org.springframework.web.reactive.function.server.ServerResponse; - -@Component -public class Router2 { - - @Bean - public RouterFunction routeRequest2(Handler2 handler) { - return RouterFunctions.route(RequestPredicates.GET("/api/endpoint2") - .and(RequestPredicates.accept(MediaType.TEXT_PLAIN)), handler::handleRequest2); - } - -} diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/routers/Router3.java b/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/routers/Router3.java deleted file mode 100644 index b8f7f983cc..0000000000 --- a/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/routers/Router3.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.baeldung.reactive.errorhandling.routers; - -import com.baeldung.reactive.errorhandling.handlers.Handler3; -import org.springframework.context.annotation.Bean; -import org.springframework.http.MediaType; -import org.springframework.stereotype.Component; -import org.springframework.web.reactive.function.server.RequestPredicates; -import org.springframework.web.reactive.function.server.RouterFunction; -import org.springframework.web.reactive.function.server.RouterFunctions; -import org.springframework.web.reactive.function.server.ServerResponse; - -@Component -public class Router3 { - - @Bean - public RouterFunction routeRequest3(Handler3 handler) { - return RouterFunctions.route(RequestPredicates.GET("/api/endpoint3") - .and(RequestPredicates.accept(MediaType.TEXT_PLAIN)), handler::handleRequest3); - } - -} diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/routers/Router4.java b/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/routers/Router4.java deleted file mode 100644 index 03c65fec67..0000000000 --- a/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/routers/Router4.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.baeldung.reactive.errorhandling.routers; - -import com.baeldung.reactive.errorhandling.handlers.Handler4; -import org.springframework.context.annotation.Bean; -import org.springframework.http.MediaType; -import org.springframework.stereotype.Component; -import org.springframework.web.reactive.function.server.RequestPredicates; -import org.springframework.web.reactive.function.server.RouterFunction; -import org.springframework.web.reactive.function.server.RouterFunctions; -import org.springframework.web.reactive.function.server.ServerResponse; - -@Component -public class Router4 { - - @Bean - public RouterFunction routeRequest4(Handler4 handler) { - return RouterFunctions.route(RequestPredicates.GET("/api/endpoint4") - .and(RequestPredicates.accept(MediaType.TEXT_PLAIN)), handler::handleRequest4); - } - -} diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/routers/Router5.java b/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/routers/Router5.java deleted file mode 100644 index c68e04659f..0000000000 --- a/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/routers/Router5.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.baeldung.reactive.errorhandling.routers; - -import com.baeldung.reactive.errorhandling.handlers.Handler5; -import org.springframework.context.annotation.Bean; -import org.springframework.http.MediaType; -import org.springframework.stereotype.Component; -import org.springframework.web.reactive.function.server.RequestPredicates; -import org.springframework.web.reactive.function.server.RouterFunction; -import org.springframework.web.reactive.function.server.RouterFunctions; -import org.springframework.web.reactive.function.server.ServerResponse; - -@Component -public class Router5 { - - @Bean - public RouterFunction routeRequest5(Handler5 handler) { - return RouterFunctions.route(RequestPredicates.GET("/api/endpoint5") - .and(RequestPredicates.accept(MediaType.TEXT_PLAIN)), handler::handleRequest5); - } - -} diff --git a/spring-reactive/src/test/java/com/baeldung/reactive/errorhandling/ErrorHandlingIntegrationTest.java b/spring-reactive/src/test/java/com/baeldung/reactive/errorhandling/ErrorHandlingIntegrationTest.java index 1167792542..bbcab179eb 100644 --- a/spring-reactive/src/test/java/com/baeldung/reactive/errorhandling/ErrorHandlingIntegrationTest.java +++ b/spring-reactive/src/test/java/com/baeldung/reactive/errorhandling/ErrorHandlingIntegrationTest.java @@ -7,19 +7,13 @@ import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWeb import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.http.MediaType; -import org.springframework.security.test.context.support.WithMockUser; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.web.reactive.server.WebTestClient; -import java.io.IOException; - -import static org.junit.Assert.assertEquals; - @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) @DirtiesContext -@WithMockUser @AutoConfigureWebTestClient(timeout = "10000") public class ErrorHandlingIntegrationTest { @@ -27,150 +21,107 @@ public class ErrorHandlingIntegrationTest { private WebTestClient webTestClient; @Test - public void givenErrorReturn_whenUsernamePresent_thenOk() throws IOException { - - String s = webTestClient.get() - .uri("/api/endpoint1?name={username}", "Tony") - .accept(MediaType.TEXT_PLAIN) - .exchange() - .returnResult(String.class) - .getResponseBody() - .blockFirst(); - - assertEquals("Hello, Tony", s); - - } - - @Test - public void givenErrorReturn_whenNoUsername_thenOk() throws IOException { - - String s = webTestClient.get() - .uri("/api/endpoint1") - .accept(MediaType.TEXT_PLAIN) - .exchange() - .returnResult(String.class) - .getResponseBody() - .blockFirst(); - - assertEquals("Hello, Stranger", s); - } - - @Test - public void givenResumeFallback_whenUsernamePresent_thenOk() throws IOException { - - String s = webTestClient.get() - .uri("/api/endpoint2?name={username}", "Tony") - .accept(MediaType.TEXT_PLAIN) - .exchange() - .returnResult(String.class) - .getResponseBody() - .blockFirst(); - - assertEquals("Hello, Tony", s); - } - - @Test - public void givenResumeFallback_whenNoUsername_thenOk() throws IOException { - String s = webTestClient.get() - .uri("/api/endpoint2") - .accept(MediaType.TEXT_PLAIN) - .exchange() - .returnResult(String.class) - .getResponseBody() - .blockFirst(); - - assertEquals("Hello, Stranger", s); - - } - - @Test - public void givenResumeDynamicValue_whenUsernamePresent_thenOk() throws IOException { - - String s = webTestClient.get() - .uri("/api/endpoint3?name={username}", "Tony") - .accept(MediaType.TEXT_PLAIN) - .exchange() - .returnResult(String.class) - .getResponseBody() - .blockFirst(); - - assertEquals("Hello, Tony", s); - } - - @Test - public void givenResumeDynamicValue_whenNoUsername_thenOk() throws IOException { - String s = webTestClient.get() - .uri("/api/endpoint3") - .accept(MediaType.TEXT_PLAIN) - .exchange() - .returnResult(String.class) - .getResponseBody() - .blockFirst(); - - assertEquals("Hi, I looked around for your name but found: No value present", s); - } - - @Test - public void givenResumeRethrow_whenUsernamePresent_thenOk() throws IOException { - String s = webTestClient.get() - .uri("/api/endpoint4?name={username}", "Tony") - .accept(MediaType.TEXT_PLAIN) - .exchange() - .returnResult(String.class) - .getResponseBody() - .blockFirst(); - - assertEquals("Hello, Tony", s); - } - - @Test - public void givenResumeRethrow_whenNoUsername_thenOk() throws IOException { + public void givenErrorReturn_whenUsernamePresent_thenOk() { webTestClient.get() - .uri("/api/endpoint4") - .accept(MediaType.TEXT_PLAIN) - .exchange() - .expectStatus() - .isBadRequest() - .expectHeader() - .contentType(MediaType.APPLICATION_JSON) - .expectBody() - .jsonPath("$.message") - .isNotEmpty() - .jsonPath("$.message") - .isEqualTo("please provide a name"); + .uri("/api/endpoint1?name={username}", "Tony") + .accept(MediaType.TEXT_PLAIN) + .exchange() + .expectBody(String.class).isEqualTo("Hello, Tony"); } @Test - public void givenGlobalErrorHandling_whenUsernamePresent_thenOk() throws IOException { + public void givenErrorReturn_whenNoUsername_thenOk() { - String s = webTestClient.get() - .uri("/api/endpoint5?name={username}", "Tony") - .accept(MediaType.TEXT_PLAIN) - .exchange() - .returnResult(String.class) - .getResponseBody() - .blockFirst(); - - assertEquals("Hello, Tony", s); - } - - @Test - public void givenGlobalErrorHandling_whenNoUsername_thenOk() throws IOException { webTestClient.get() - .uri("/api/endpoint5") - .accept(MediaType.TEXT_PLAIN) - .exchange() - .expectStatus() - .isBadRequest() - .expectHeader() - .contentType(MediaType.APPLICATION_JSON) - .expectBody() - .jsonPath("$.message") - .isNotEmpty() - .jsonPath("$.message") - .isEqualTo("please provide a name"); + .uri("/api/endpoint1") + .accept(MediaType.TEXT_PLAIN) + .exchange() + .expectBody(String.class).isEqualTo("Hello, Stranger"); + } + @Test + public void givenResumeFallback_whenUsernamePresent_thenOk() { + + webTestClient.get() + .uri("/api/endpoint2?name={username}", "Tony") + .accept(MediaType.TEXT_PLAIN) + .exchange() + .expectBody(String.class).isEqualTo("Hello, Tony"); + } + + @Test + public void givenResumeFallback_whenNoUsername_thenOk() { + + webTestClient.get() + .uri("/api/endpoint2") + .accept(MediaType.TEXT_PLAIN) + .exchange() + .expectBody(String.class).isEqualTo("Hello, Stranger"); + } + + @Test + public void givenResumeDynamicValue_whenUsernamePresent_thenOk() { + + webTestClient.get() + .uri("/api/endpoint3?name={username}", "Tony") + .accept(MediaType.TEXT_PLAIN) + .exchange() + .expectBody(String.class).isEqualTo("Hello, Tony"); + } + + @Test + public void givenResumeDynamicValue_whenNoUsername_thenOk() { + + webTestClient.get() + .uri("/api/endpoint3") + .accept(MediaType.TEXT_PLAIN) + .exchange() + .expectBody(String.class).isEqualTo("Hi, I looked around for your name but found: No value present"); + } + + @Test + public void givenResumeRethrow_whenUsernamePresent_thenOk() { + + webTestClient.get() + .uri("/api/endpoint4?name={username}", "Tony") + .accept(MediaType.TEXT_PLAIN) + .exchange() + .expectBody(String.class).isEqualTo("Hello, Tony"); + } + + @Test + public void givenResumeRethrow_whenNoUsername_thenOk() { + + webTestClient.get() + .uri("/api/endpoint4") + .accept(MediaType.TEXT_PLAIN) + .exchange() + .expectStatus().isBadRequest() + .expectHeader().contentType(MediaType.APPLICATION_JSON) + .expectBody().jsonPath("$.message").isEqualTo("please provide a name"); + } + + @Test + public void givenGlobalErrorHandling_whenUsernamePresent_thenOk() { + + webTestClient.get() + .uri("/api/endpoint5?name={username}", "Tony") + .accept(MediaType.TEXT_PLAIN) + .exchange() + .expectBody(String.class).isEqualTo("Hello, Tony"); + } + + @Test + public void givenGlobalErrorHandling_whenNoUsername_thenOk() { + + webTestClient.get() + .uri("/api/endpoint5") + .accept(MediaType.TEXT_PLAIN) + .exchange() + .expectStatus().isBadRequest() + .expectHeader().contentType(MediaType.APPLICATION_JSON) + .expectBody().jsonPath("$.message").isEqualTo("please provide a name"); } } From 863356b4bcfb5273ab9140c68fa19c2682f2a200 Mon Sep 17 00:00:00 2001 From: keerthigadde Date: Thu, 26 May 2022 15:38:47 +1000 Subject: [PATCH 087/100] JAVA-9556 added try-with-resources for resultset --- .../jdbcmetadata/MetadataExtractor.java | 96 ++++++++++--------- 1 file changed, 49 insertions(+), 47 deletions(-) diff --git a/persistence-modules/core-java-persistence/src/main/java/com/baeldung/jdbcmetadata/MetadataExtractor.java b/persistence-modules/core-java-persistence/src/main/java/com/baeldung/jdbcmetadata/MetadataExtractor.java index 27c615aebc..e9618836e9 100644 --- a/persistence-modules/core-java-persistence/src/main/java/com/baeldung/jdbcmetadata/MetadataExtractor.java +++ b/persistence-modules/core-java-persistence/src/main/java/com/baeldung/jdbcmetadata/MetadataExtractor.java @@ -14,65 +14,66 @@ public class MetadataExtractor { } public void extractTableInfo() throws SQLException { - ResultSet resultSet = databaseMetaData.getTables(null, null, "CUST%", new String[] { "TABLE" }); - while (resultSet.next()) { - // Print the names of existing tables - System.out.println(resultSet.getString("TABLE_NAME")); - System.out.println(resultSet.getString("REMARKS")); + try (ResultSet resultSet = databaseMetaData.getTables(null, null, "CUST%", new String[] { "TABLE" })) { + while (resultSet.next()) { + // Print the names of existing tables + System.out.println(resultSet.getString("TABLE_NAME")); + System.out.println(resultSet.getString("REMARKS")); + } } } public void extractSystemTables() throws SQLException { - ResultSet resultSet = databaseMetaData.getTables(null, null, null, new String[] { "SYSTEM TABLE" }); - while (resultSet.next()) { - // Print the names of system tables - System.out.println(resultSet.getString("TABLE_NAME")); + try (ResultSet resultSet = databaseMetaData.getTables(null, null, null, new String[] { "SYSTEM TABLE" })) { + while (resultSet.next()) { + // Print the names of system tables + System.out.println(resultSet.getString("TABLE_NAME")); + } } } public void extractViews() throws SQLException { - ResultSet resultSet = databaseMetaData.getTables(null, null, null, new String[] { "VIEW" }); - while (resultSet.next()) { - // Print the names of existing views - System.out.println(resultSet.getString("TABLE_NAME")); - } + try(ResultSet resultSet = databaseMetaData.getTables(null, null, null, new String[] { "VIEW" })) { + while (resultSet.next()) { + // Print the names of existing views + System.out.println(resultSet.getString("TABLE_NAME")); + } + } } public void extractColumnInfo(String tableName) throws SQLException { - ResultSet columns = databaseMetaData.getColumns(null, null, tableName, null); - - while (columns.next()) { - String columnName = columns.getString("COLUMN_NAME"); - String columnSize = columns.getString("COLUMN_SIZE"); - String datatype = columns.getString("DATA_TYPE"); - String isNullable = columns.getString("IS_NULLABLE"); - String isAutoIncrement = columns.getString("IS_AUTOINCREMENT"); - System.out.println(String.format("ColumnName: %s, columnSize: %s, datatype: %s, isColumnNullable: %s, isAutoIncrementEnabled: %s", columnName, columnSize, datatype, isNullable, isAutoIncrement)); - } + try(ResultSet columns = databaseMetaData.getColumns(null, null, tableName, null)) { + while (columns.next()) { + String columnName = columns.getString("COLUMN_NAME"); + String columnSize = columns.getString("COLUMN_SIZE"); + String datatype = columns.getString("DATA_TYPE"); + String isNullable = columns.getString("IS_NULLABLE"); + String isAutoIncrement = columns.getString("IS_AUTOINCREMENT"); + System.out.println(String.format("ColumnName: %s, columnSize: %s, datatype: %s, isColumnNullable: %s, isAutoIncrementEnabled: %s", columnName, columnSize, datatype, isNullable, isAutoIncrement)); + } + } } public void extractPrimaryKeys(String tableName) throws SQLException { - ResultSet primaryKeys = databaseMetaData.getPrimaryKeys(null, null, tableName); - while (primaryKeys.next()) { - String primaryKeyColumnName = primaryKeys.getString("COLUMN_NAME"); - String primaryKeyName = primaryKeys.getString("PK_NAME"); - System.out.println(String.format("columnName:%s, pkName:%s", primaryKeyColumnName, primaryKeyName)); - } - } - - public void fun() throws SQLException { - + try(ResultSet primaryKeys = databaseMetaData.getPrimaryKeys(null, null, tableName)) { + while (primaryKeys.next()) { + String primaryKeyColumnName = primaryKeys.getString("COLUMN_NAME"); + String primaryKeyName = primaryKeys.getString("PK_NAME"); + System.out.println(String.format("columnName:%s, pkName:%s", primaryKeyColumnName, primaryKeyName)); + } + } } public void extractForeignKeys(String tableName) throws SQLException { - ResultSet foreignKeys = databaseMetaData.getImportedKeys(null, null, tableName); - while (foreignKeys.next()) { - String pkTableName = foreignKeys.getString("PKTABLE_NAME"); - String fkTableName = foreignKeys.getString("FKTABLE_NAME"); - String pkColumnName = foreignKeys.getString("PKCOLUMN_NAME"); - String fkColumnName = foreignKeys.getString("FKCOLUMN_NAME"); - System.out.println(String.format("pkTableName:%s, fkTableName:%s, pkColumnName:%s, fkColumnName:%s", pkTableName, fkTableName, pkColumnName, fkColumnName)); - } + try(ResultSet foreignKeys = databaseMetaData.getImportedKeys(null, null, tableName)) { + while (foreignKeys.next()) { + String pkTableName = foreignKeys.getString("PKTABLE_NAME"); + String fkTableName = foreignKeys.getString("FKTABLE_NAME"); + String pkColumnName = foreignKeys.getString("PKCOLUMN_NAME"); + String fkColumnName = foreignKeys.getString("FKCOLUMN_NAME"); + System.out.println(String.format("pkTableName:%s, fkTableName:%s, pkColumnName:%s, fkColumnName:%s", pkTableName, fkTableName, pkColumnName, fkColumnName)); + } + } } public void extractDatabaseInfo() throws SQLException { @@ -89,11 +90,12 @@ public class MetadataExtractor { public void extractUserName() throws SQLException { String userName = databaseMetaData.getUserName(); System.out.println(userName); - ResultSet schemas = databaseMetaData.getSchemas(); - while (schemas.next()) { - String table_schem = schemas.getString("TABLE_SCHEM"); - String table_catalog = schemas.getString("TABLE_CATALOG"); - System.out.println(String.format("Table_schema:%s, Table_catalog:%s", table_schem, table_catalog)); + try(ResultSet schemas = databaseMetaData.getSchemas()) { + while (schemas.next()) { + String table_schem = schemas.getString("TABLE_SCHEM"); + String table_catalog = schemas.getString("TABLE_CATALOG"); + System.out.println(String.format("Table_schema:%s, Table_catalog:%s", table_schem, table_catalog)); + } } } From 2a854383caf9f552420f2ab1ead72f23c17d4906 Mon Sep 17 00:00:00 2001 From: Haroon Khan Date: Thu, 26 May 2022 11:17:52 +0100 Subject: [PATCH 088/100] [JAVA-8154] Code clean up for reactive security --- .../reactive/security/GreetController.java | 37 ------------------ .../reactive/security/GreetingController.java | 37 ++++++++++++++++++ ...GreetService.java => GreetingService.java} | 2 +- .../reactive/security/SecurityConfig.java | 39 +++++++++---------- .../security/SecurityIntegrationTest.java | 19 ++++++--- 5 files changed, 70 insertions(+), 64 deletions(-) delete mode 100644 spring-reactive/src/main/java/com/baeldung/reactive/security/GreetController.java create mode 100644 spring-reactive/src/main/java/com/baeldung/reactive/security/GreetingController.java rename spring-reactive/src/main/java/com/baeldung/reactive/security/{GreetService.java => GreetingService.java} (91%) 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/main/java/com/baeldung/reactive/security/GreetingController.java b/spring-reactive/src/main/java/com/baeldung/reactive/security/GreetingController.java new file mode 100644 index 0000000000..10d6cf4df7 --- /dev/null +++ b/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-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-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-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-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-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/test/java/com/baeldung/reactive/security/SecurityIntegrationTest.java b/spring-reactive/src/test/java/com/baeldung/reactive/security/SecurityIntegrationTest.java index 06644fbf77..0ef828df5a 100644 --- a/spring-reactive/src/test/java/com/baeldung/reactive/security/SecurityIntegrationTest.java +++ b/spring-reactive/src/test/java/com/baeldung/reactive/security/SecurityIntegrationTest.java @@ -15,23 +15,32 @@ import org.springframework.test.web.reactive.server.WebTestClient; public class SecurityIntegrationTest { @Autowired - ApplicationContext context; + private ApplicationContext context; - private WebTestClient rest; + private WebTestClient webTestClient; @BeforeEach public void setup() { - this.rest = WebTestClient.bindToApplicationContext(this.context).configureClient().build(); + webTestClient = WebTestClient.bindToApplicationContext(context) + .configureClient() + .build(); } @Test public void whenNoCredentials_thenRedirectToLogin() { - this.rest.get().uri("/").exchange().expectStatus().is3xxRedirection(); + webTestClient.get() + .uri("/") + .exchange() + .expectStatus().is3xxRedirection(); } @Test @WithMockUser public void whenHasCredentials_thenSeesGreeting() { - this.rest.get().uri("/").exchange().expectStatus().isOk().expectBody(String.class).isEqualTo("Hello, user"); + webTestClient.get() + .uri("/") + .exchange() + .expectStatus().isOk() + .expectBody(String.class).isEqualTo("Hello, user"); } } From 4b36bbf0b776f83227225034048d1dbfa2108acb Mon Sep 17 00:00:00 2001 From: Saikat Chakraborty <40471715+saikatcse03@users.noreply.github.com> Date: Fri, 27 May 2022 13:58:56 +0530 Subject: [PATCH 089/100] Bael 5296: Added Http Request Header using the Feign Client (#12201) * Implemented cassandra batch query * Added netty version param * Reformatted correctly * Reformatted correctly * Reformatted correctly * Formatting fix resolved * Formatting fix resolved * Removed unused method * Refactored method for better readability * tab spaces corrected * Added http headers in feign * Updated code * Updated code * Removed unused code * Removed unused logger code * Implemented Interceptor and logging related code review * Added AuthService Code * Removed toString method * Removed unnecessary declaration * Removed new line * Added feign headers log as well * Moved to Authorisation package for better naming * spaces removed * @Override included Co-authored-by: saikat chakraborty --- .../builder/BookFeignClientBuilder.java | 34 ++++++++++++ .../header/dynamicheader/BookClient.java | 17 ++++++ .../header/staticheader/BookClient.java | 18 +++++++ .../parameterized/BookClient.java | 16 ++++++ .../ApiAuthorisationService.java | 11 ++++ .../authorisation/AuthorisationService.java | 7 +++ .../interceptor/AuthRequestInterceptor.java | 22 ++++++++ feign/src/main/resources/logback.xml | 3 +- .../dynamicheader/BookClientLiveTest.java | 38 ++++++++++++++ .../interceptor/BookClientLiveTest.java | 52 +++++++++++++++++++ .../staticheader/BookClientLiveTest.java | 45 ++++++++++++++++ .../parameterized/BookClientLiveTest.java | 31 +++++++++++ 12 files changed, 293 insertions(+), 1 deletion(-) create mode 100644 feign/src/main/java/com/baeldung/feign/clients/builder/BookFeignClientBuilder.java create mode 100644 feign/src/main/java/com/baeldung/feign/clients/header/dynamicheader/BookClient.java create mode 100644 feign/src/main/java/com/baeldung/feign/clients/header/staticheader/BookClient.java create mode 100644 feign/src/main/java/com/baeldung/feign/clients/header/staticheader/parameterized/BookClient.java create mode 100644 feign/src/main/java/com/baeldung/feign/header/authorisation/ApiAuthorisationService.java create mode 100644 feign/src/main/java/com/baeldung/feign/header/authorisation/AuthorisationService.java create mode 100644 feign/src/main/java/com/baeldung/feign/header/interceptor/AuthRequestInterceptor.java create mode 100644 feign/src/test/java/com/baeldung/feign/clients/header/dynamicheader/BookClientLiveTest.java create mode 100644 feign/src/test/java/com/baeldung/feign/clients/header/interceptor/BookClientLiveTest.java create mode 100644 feign/src/test/java/com/baeldung/feign/clients/header/staticheader/BookClientLiveTest.java create mode 100644 feign/src/test/java/com/baeldung/feign/clients/header/staticheader/parameterized/BookClientLiveTest.java diff --git a/feign/src/main/java/com/baeldung/feign/clients/builder/BookFeignClientBuilder.java b/feign/src/main/java/com/baeldung/feign/clients/builder/BookFeignClientBuilder.java new file mode 100644 index 0000000000..70a574ed81 --- /dev/null +++ b/feign/src/main/java/com/baeldung/feign/clients/builder/BookFeignClientBuilder.java @@ -0,0 +1,34 @@ +package com.baeldung.feign.clients.builder; + +import com.baeldung.feign.header.authorisation.ApiAuthorisationService; +import com.baeldung.feign.header.interceptor.AuthRequestInterceptor; + + +import feign.Feign; +import feign.Logger; +import feign.gson.GsonDecoder; +import feign.gson.GsonEncoder; +import feign.slf4j.Slf4jLogger; + + +public class BookFeignClientBuilder { + + public static T createClient(Class type, String uri) { + return Feign.builder() + .encoder(new GsonEncoder()) + .decoder(new GsonDecoder()) + .logger(new Slf4jLogger(type)) + .logLevel(Logger.Level.HEADERS) + .target(type, uri); + } + + public static T createClientWithInterceptor(Class type, String uri) { + return Feign.builder() + .requestInterceptor(new AuthRequestInterceptor(new ApiAuthorisationService())) + .encoder(new GsonEncoder()) + .decoder(new GsonDecoder()) + .logger(new Slf4jLogger(type)) + .logLevel(Logger.Level.HEADERS) + .target(type, uri); + } +} diff --git a/feign/src/main/java/com/baeldung/feign/clients/header/dynamicheader/BookClient.java b/feign/src/main/java/com/baeldung/feign/clients/header/dynamicheader/BookClient.java new file mode 100644 index 0000000000..2148a90120 --- /dev/null +++ b/feign/src/main/java/com/baeldung/feign/clients/header/dynamicheader/BookClient.java @@ -0,0 +1,17 @@ +package com.baeldung.feign.clients.header.dynamicheader; + +import com.baeldung.feign.models.Book; + +import feign.HeaderMap; +import feign.Headers; +import feign.RequestLine; + +import java.util.Map; + +@Headers("Content-Type: application/json") +public interface BookClient { + + @RequestLine("POST") + void create(@HeaderMap Map headers, Book book); + +} diff --git a/feign/src/main/java/com/baeldung/feign/clients/header/staticheader/BookClient.java b/feign/src/main/java/com/baeldung/feign/clients/header/staticheader/BookClient.java new file mode 100644 index 0000000000..cbd2622f9b --- /dev/null +++ b/feign/src/main/java/com/baeldung/feign/clients/header/staticheader/BookClient.java @@ -0,0 +1,18 @@ +package com.baeldung.feign.clients.header.staticheader; + +import com.baeldung.feign.models.Book; +import com.baeldung.feign.models.BookResource; +import feign.Headers; +import feign.Param; +import feign.RequestLine; + +@Headers("Accept-Language: en-US") +public interface BookClient { + + @RequestLine("GET /{isbn}") + BookResource findByIsbn(@Param("isbn") String isbn); + + @RequestLine("POST") + @Headers("Content-Type: application/json") + void create(Book book); +} diff --git a/feign/src/main/java/com/baeldung/feign/clients/header/staticheader/parameterized/BookClient.java b/feign/src/main/java/com/baeldung/feign/clients/header/staticheader/parameterized/BookClient.java new file mode 100644 index 0000000000..83a273893c --- /dev/null +++ b/feign/src/main/java/com/baeldung/feign/clients/header/staticheader/parameterized/BookClient.java @@ -0,0 +1,16 @@ +package com.baeldung.feign.clients.header.staticheader.parameterized; + +import com.baeldung.feign.models.BookResource; + +import feign.Headers; +import feign.Param; +import feign.RequestLine; + + +@Headers("x-requester-id: {requester}") +public interface BookClient { + + @RequestLine("GET /{isbn}") + BookResource findByIsbn(@Param("requester") String requestorId, @Param("isbn") String isbn); + +} diff --git a/feign/src/main/java/com/baeldung/feign/header/authorisation/ApiAuthorisationService.java b/feign/src/main/java/com/baeldung/feign/header/authorisation/ApiAuthorisationService.java new file mode 100644 index 0000000000..1a23f968ac --- /dev/null +++ b/feign/src/main/java/com/baeldung/feign/header/authorisation/ApiAuthorisationService.java @@ -0,0 +1,11 @@ +package com.baeldung.feign.header.authorisation; + +import java.util.UUID; + +public class ApiAuthorisationService implements AuthorisationService { + + @Override + public String getAuthToken() { + return "Bearer " + UUID.randomUUID(); + } +} diff --git a/feign/src/main/java/com/baeldung/feign/header/authorisation/AuthorisationService.java b/feign/src/main/java/com/baeldung/feign/header/authorisation/AuthorisationService.java new file mode 100644 index 0000000000..12e6d59bcc --- /dev/null +++ b/feign/src/main/java/com/baeldung/feign/header/authorisation/AuthorisationService.java @@ -0,0 +1,7 @@ +package com.baeldung.feign.header.authorisation; + +public interface AuthorisationService { + + String getAuthToken(); + +} diff --git a/feign/src/main/java/com/baeldung/feign/header/interceptor/AuthRequestInterceptor.java b/feign/src/main/java/com/baeldung/feign/header/interceptor/AuthRequestInterceptor.java new file mode 100644 index 0000000000..eda428de1a --- /dev/null +++ b/feign/src/main/java/com/baeldung/feign/header/interceptor/AuthRequestInterceptor.java @@ -0,0 +1,22 @@ +package com.baeldung.feign.header.interceptor; + +import com.baeldung.feign.header.authorisation.AuthorisationService; +import feign.RequestInterceptor; +import feign.RequestTemplate; + + +public class AuthRequestInterceptor implements RequestInterceptor { + + private AuthorisationService authTokenService; + + public AuthRequestInterceptor(AuthorisationService authTokenService) { + this.authTokenService = authTokenService; + } + + @Override + public void apply(RequestTemplate template) { + template.header("Authorisation", authTokenService.getAuthToken()); + } +} + + \ No newline at end of file diff --git a/feign/src/main/resources/logback.xml b/feign/src/main/resources/logback.xml index 7d900d8ea8..e5e962c8e0 100644 --- a/feign/src/main/resources/logback.xml +++ b/feign/src/main/resources/logback.xml @@ -5,9 +5,10 @@ %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + - + \ No newline at end of file diff --git a/feign/src/test/java/com/baeldung/feign/clients/header/dynamicheader/BookClientLiveTest.java b/feign/src/test/java/com/baeldung/feign/clients/header/dynamicheader/BookClientLiveTest.java new file mode 100644 index 0000000000..6e78ba03a6 --- /dev/null +++ b/feign/src/test/java/com/baeldung/feign/clients/header/dynamicheader/BookClientLiveTest.java @@ -0,0 +1,38 @@ +package com.baeldung.feign.clients.header.dynamicheader; + +import com.baeldung.feign.clients.builder.BookFeignClientBuilder; +import com.baeldung.feign.models.Book; +import org.junit.Before; +import org.junit.Test; + +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + +/** + * Consumes https://github.com/Baeldung/spring-hypermedia-api + */ +public class BookClientLiveTest { + + private BookClient bookClient; + + @Before + public void setup() { + bookClient = BookFeignClientBuilder.createClient(BookClient.class, "http://localhost:8081/api/books"); + } + + @Test + public void givenBookClient_shouldPostBook() throws Exception { + String isbn = UUID.randomUUID() + .toString(); + + Book book = new Book(isbn, "Me", "It's me!", null, null); + + Map headerMap = new HashMap<>(); + + headerMap.put("metadata-key1", "metadata-value1"); + headerMap.put("metadata-key2", "metadata-value2"); + + bookClient.create(headerMap, book); + } +} diff --git a/feign/src/test/java/com/baeldung/feign/clients/header/interceptor/BookClientLiveTest.java b/feign/src/test/java/com/baeldung/feign/clients/header/interceptor/BookClientLiveTest.java new file mode 100644 index 0000000000..2062b86791 --- /dev/null +++ b/feign/src/test/java/com/baeldung/feign/clients/header/interceptor/BookClientLiveTest.java @@ -0,0 +1,52 @@ +package com.baeldung.feign.clients.header.interceptor; + +import com.baeldung.feign.clients.builder.BookFeignClientBuilder; +import com.baeldung.feign.clients.header.staticheader.BookClient; +import com.baeldung.feign.models.Book; +import org.junit.Before; +import org.junit.Test; + +import java.util.UUID; + +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertThat; + +/** + * Consumes https://github.com/Baeldung/spring-hypermedia-api + */ +public class BookClientLiveTest { + + private BookClient bookClient; + + @Before + public void setup() { + bookClient = BookFeignClientBuilder.createClientWithInterceptor(BookClient.class, "http://localhost:8081/api/books"); + } + + @Test + public void givenBookClient_shouldFindOneBook() throws Exception { + Book book = bookClient.findByIsbn("0151072558") + .getBook(); + assertThat(book.getAuthor(), containsString("Orwell")); + } + + @Test + public void givenBookClient2_shouldFindOneBook() throws Exception { + Book book = bookClient.findByIsbn("0151072558") + .getBook(); + assertThat(book.getAuthor(), containsString("Orwell")); + } + + @Test + public void givenBookClient_shouldPostBook() throws Exception { + String isbn = UUID.randomUUID() + .toString(); + Book book = new Book(isbn, "Me", "It's me!", null, null); + bookClient.create(book); + + book = bookClient.findByIsbn(isbn) + .getBook(); + assertThat(book.getAuthor(), is("Me")); + } +} diff --git a/feign/src/test/java/com/baeldung/feign/clients/header/staticheader/BookClientLiveTest.java b/feign/src/test/java/com/baeldung/feign/clients/header/staticheader/BookClientLiveTest.java new file mode 100644 index 0000000000..08b8461fb5 --- /dev/null +++ b/feign/src/test/java/com/baeldung/feign/clients/header/staticheader/BookClientLiveTest.java @@ -0,0 +1,45 @@ +package com.baeldung.feign.clients.header.staticheader; + +import com.baeldung.feign.clients.builder.BookFeignClientBuilder; +import com.baeldung.feign.models.Book; +import org.junit.Before; +import org.junit.Test; + +import java.util.UUID; + +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertThat; + +/** + * Consumes https://github.com/Baeldung/spring-hypermedia-api + */ +public class BookClientLiveTest { + + private BookClient bookClient; + + @Before + public void setup() { + bookClient = BookFeignClientBuilder.createClient(BookClient.class, "http://localhost:8081/api/books"); + } + + @Test + public void givenBookClient_shouldFindOneBook() throws Exception { + Book book = bookClient.findByIsbn("0151072558") + .getBook(); + assertThat(book.getAuthor(), containsString("Orwell")); + } + + @Test + public void givenBookClient_shouldPostBook() throws Exception { + String isbn = UUID.randomUUID() + .toString(); + Book book = new Book(isbn, "Me", "It's me!", null, null); + + bookClient.create(book); + + book = bookClient.findByIsbn(isbn) + .getBook(); + assertThat(book.getAuthor(), is("Me")); + } +} diff --git a/feign/src/test/java/com/baeldung/feign/clients/header/staticheader/parameterized/BookClientLiveTest.java b/feign/src/test/java/com/baeldung/feign/clients/header/staticheader/parameterized/BookClientLiveTest.java new file mode 100644 index 0000000000..94e91b539c --- /dev/null +++ b/feign/src/test/java/com/baeldung/feign/clients/header/staticheader/parameterized/BookClientLiveTest.java @@ -0,0 +1,31 @@ +package com.baeldung.feign.clients.header.staticheader.parameterized; + +import com.baeldung.feign.clients.builder.BookFeignClientBuilder; +import com.baeldung.feign.models.Book; +import org.junit.Before; +import org.junit.Test; + +import static org.hamcrest.CoreMatchers.containsString; +import static org.junit.Assert.assertThat; + +/** + * Consumes https://github.com/Baeldung/spring-hypermedia-api + */ +public class BookClientLiveTest { + + private BookClient bookClient; + + private String requester = "test"; + + @Before + public void setup() { + bookClient = BookFeignClientBuilder.createClient(BookClient.class, "http://localhost:8081/api/books"); + } + + @Test + public void givenBookClient_shouldFindOneBook() throws Exception { + Book book = bookClient.findByIsbn(requester, "0151072558") + .getBook(); + assertThat(book.getAuthor(), containsString("Orwell")); + } +} From 9c40bfe2974f0d0b499d965c6c6a3dd14212c005 Mon Sep 17 00:00:00 2001 From: vunamtien Date: Fri, 27 May 2022 18:48:42 +0700 Subject: [PATCH 090/100] BAEL-5487-java-httpclient-custom-header (#12269) Co-authored-by: tienvn4 --- .../baeldung/httpclient/HttpClientHeader.java | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 core-java-modules/core-java-httpclient/src/main/java/com/baeldung/httpclient/HttpClientHeader.java diff --git a/core-java-modules/core-java-httpclient/src/main/java/com/baeldung/httpclient/HttpClientHeader.java b/core-java-modules/core-java-httpclient/src/main/java/com/baeldung/httpclient/HttpClientHeader.java new file mode 100644 index 0000000000..43e6587ed4 --- /dev/null +++ b/core-java-modules/core-java-httpclient/src/main/java/com/baeldung/httpclient/HttpClientHeader.java @@ -0,0 +1,46 @@ +package com.baeldung.httpclient; + +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.http.HttpClient; +import java.net.http.HttpRequest; +import java.net.http.HttpResponse; + +public class HttpClientHeader { + + public static HttpResponse callWithCustomHeader(String url) throws URISyntaxException, IOException, InterruptedException { + HttpClient httpClient = HttpClient.newHttpClient(); + + HttpRequest request = HttpRequest.newBuilder() + .header("X-Our-Header-1", "value1") + .header("X-Our-Header-1", "value2") + .header("X-Our-Header-2", "value2") + .uri(new URI(url)).build(); + + return httpClient.send(request, HttpResponse.BodyHandlers.ofString()); + } + + public static HttpResponse callWithCustomHeaderV2(String url) throws URISyntaxException, IOException, InterruptedException { + HttpClient httpClient = HttpClient.newHttpClient(); + + HttpRequest request = HttpRequest.newBuilder() + .headers("X-Our-Header-1", "value1", "X-Our-Header-1", "value2") + .uri(new URI(url)).build(); + + return httpClient.send(request, HttpResponse.BodyHandlers.ofString()); + } + + public static HttpResponse callWithCustomHeaderV3(String url) throws URISyntaxException, IOException, InterruptedException { + HttpClient httpClient = HttpClient.newHttpClient(); + + HttpRequest request = HttpRequest.newBuilder() + .setHeader("X-Our-Header-1", "value1") + .setHeader("X-Our-Header-1", "value2") + .uri(new URI(url)).build(); + + return httpClient.send(request, HttpResponse.BodyHandlers.ofString()); + } + + +} From 26224e4686630f32bf790576ca898f46c05592dd Mon Sep 17 00:00:00 2001 From: Mayank Aggarwal Date: Fri, 27 May 2022 20:37:59 +0530 Subject: [PATCH 091/100] BAEL-5558 (#12222) * [BAEL-5438] Added Criteria Queries for Employee * [BAEL-5558] Sorting By Date in Java * BAEL-5558: Added and refactored tests name * [BAEL-5558] Refactored the code. * [BAEL-5558] Resolved PMD violation. * [BAEL-5558] Indented with 4 spaces * Refactored the Employee class Co-authored-by: Mayank Agarwal --- .../core-java-collections-4/pom.xml | 1 - .../collections/sorting/Employee.java | 93 ++++---- .../EmployeeSortingByDateUnitTest.java | 201 +++++++++--------- 3 files changed, 136 insertions(+), 159 deletions(-) diff --git a/core-java-modules/core-java-collections-4/pom.xml b/core-java-modules/core-java-collections-4/pom.xml index aaf63a2b2a..8060e4f606 100644 --- a/core-java-modules/core-java-collections-4/pom.xml +++ b/core-java-modules/core-java-collections-4/pom.xml @@ -25,5 +25,4 @@ 2.2 - \ No newline at end of file diff --git a/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/collections/sorting/Employee.java b/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/collections/sorting/Employee.java index d41ad54295..a9e7bc8a38 100644 --- a/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/collections/sorting/Employee.java +++ b/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/collections/sorting/Employee.java @@ -4,69 +4,48 @@ import java.util.Date; public class Employee implements Comparable{ - private String name; - private int age; - private double salary; - private Date joiningDate; + private String name; + private Date joiningDate; - public Employee(String name, int age, double salary, Date joiningDate) { - this.name = name; - this.age = age; - this.salary = salary; - this.joiningDate = joiningDate; - } + public Employee(String name, Date joiningDate) { + this.name = name; + this.joiningDate = joiningDate; + } - public String getName() { - return name; - } + public String getName() { + return name; + } - public void setName(String name) { - this.name = name; - } + public void setName(String name) { + this.name = name; + } - public int getAge() { - return age; - } + public Date getJoiningDate() { + return joiningDate; + } - public void setAge(int age) { - this.age = age; - } + public void setJoiningDate(Date joiningDate) { + this.joiningDate = joiningDate; + } - public double getSalary() { - return salary; - } + @Override + public boolean equals(Object obj) { + return ((Employee) obj).getName() + .equals(getName()); + } - public void setSalary(double salary) { - this.salary = salary; - } + @Override + public String toString() { + return new StringBuffer().append("(") + .append(getName()) + .append(",") + .append(getJoiningDate()) + .append(")") + .toString(); + } - public Date getJoiningDate() { - return joiningDate; - } - - public void setJoiningDate(Date joiningDate) { - this.joiningDate = joiningDate; - } - - @Override - public boolean equals(Object obj) { - return ((Employee) obj).getName() - .equals(getName()); - } - - @Override - public String toString() { - return new StringBuffer().append("(") - .append(getName()).append(",") - .append(getAge()) - .append(",") - .append(getSalary()).append(",").append(getJoiningDate()) - .append(")") - .toString(); - } - - @Override - public int compareTo(Employee employee) { - return getJoiningDate().compareTo(employee.getJoiningDate()); - } + @Override + public int compareTo(Employee employee) { + return getJoiningDate().compareTo(employee.getJoiningDate()); + } } diff --git a/core-java-modules/core-java-collections-4/src/test/java/com/baeldung/collections/sorting/EmployeeSortingByDateUnitTest.java b/core-java-modules/core-java-collections-4/src/test/java/com/baeldung/collections/sorting/EmployeeSortingByDateUnitTest.java index b8acb789a6..250fb7b62b 100644 --- a/core-java-modules/core-java-collections-4/src/test/java/com/baeldung/collections/sorting/EmployeeSortingByDateUnitTest.java +++ b/core-java-modules/core-java-collections-4/src/test/java/com/baeldung/collections/sorting/EmployeeSortingByDateUnitTest.java @@ -14,133 +14,132 @@ import org.junit.Test; public class EmployeeSortingByDateUnitTest { - private List employees = new ArrayList<>(); - private List employeesSortedByDateAsc = new ArrayList<>(); - private List employeesSortedByDateDesc = new ArrayList<>(); + private List employees = new ArrayList<>(); + private List employeesSortedByDateAsc = new ArrayList<>(); + private List employeesSortedByDateDesc = new ArrayList<>(); - @Before - public void initVariables() { + @Before + public void initVariables() { - Collections.addAll(employees, - new Employee("Earl", 43, 10000, DateUtils.addMonths(new Date(), -2)), - new Employee("Frank", 33, 7000, DateUtils.addDays(new Date(), -20)), - new Employee("Steve", 26, 6000, DateUtils.addDays(new Date(), -10)), - new Employee("Jessica", 23, 4000, DateUtils.addMonths(new Date(), -6)), - new Employee("Pearl", 33, 6000, DateUtils.addYears(new Date(), -1)), - new Employee("John", 23, 5000, new Date()) - ); + Collections.addAll(employees, + new Employee("Earl", DateUtils.addMonths(new Date(), -2)), + new Employee("Frank", DateUtils.addDays(new Date(), -20)), + new Employee("Steve", DateUtils.addDays(new Date(), -10)), + new Employee("Jessica", DateUtils.addMonths(new Date(), -6)), + new Employee("Pearl", DateUtils.addYears(new Date(), -1)), + new Employee("John", new Date()) + ); - Collections.addAll(employeesSortedByDateDesc, - new Employee("John", 23, 5000, new Date()), - new Employee("Steve", 26, 6000, DateUtils.addDays(new Date(), -10)), - new Employee("Frank", 33, 7000, DateUtils.addDays(new Date(), -20)), - new Employee("Earl", 43, 10000, DateUtils.addMonths(new Date(), -2)), - new Employee("Jessica", 23, 4000, DateUtils.addMonths(new Date(), -6)), - new Employee("Pearl", 33, 6000, DateUtils.addYears(new Date(), -1)) - ); + Collections.addAll(employeesSortedByDateDesc, + new Employee("John", new Date()), + new Employee("Steve", DateUtils.addDays(new Date(), -10)), + new Employee("Frank", DateUtils.addDays(new Date(), -20)), + new Employee("Earl", DateUtils.addMonths(new Date(), -2)), + new Employee("Jessica", DateUtils.addMonths(new Date(), -6)), + new Employee("Pearl", DateUtils.addYears(new Date(), -1)) + ); - Collections.addAll(employeesSortedByDateAsc, - new Employee("Pearl", 33, 6000, DateUtils.addYears(new Date(), -1)), - new Employee("Jessica", 23, 4000, DateUtils.addMonths(new Date(), -6)), - new Employee("Earl", 43, 10000, DateUtils.addMonths(new Date(), -2)), - new Employee("Frank", 33, 7000, DateUtils.addDays(new Date(), -20)), - new Employee("Steve", 26, 6000, DateUtils.addDays(new Date(), -10)), - new Employee("John", 23, 5000, new Date()) - ); - } + Collections.addAll(employeesSortedByDateAsc, + new Employee("Pearl", DateUtils.addYears(new Date(), -1)), + new Employee("Jessica", DateUtils.addMonths(new Date(), -6)), + new Employee("Earl", DateUtils.addMonths(new Date(), -2)), + new Employee("Frank", DateUtils.addDays(new Date(), -20)), + new Employee("Steve", DateUtils.addDays(new Date(), -10)), + new Employee("John", new Date()) + ); + } - @Test - public void givenEmpList_SortEmpList_thenSortedListinNaturalOrder() { - Collections.sort(employees); + @Test + public void givenEmpList_SortEmpList_thenSortedListinNaturalOrder() { + Collections.sort(employees); + System.out.println(employees); - assertEquals(employees, employeesSortedByDateAsc); - } + assertEquals(employees, employeesSortedByDateAsc); + } - @Test - public void givenEmpList_SortEmpList_thenCheckSortedList() { + @Test + public void givenEmpList_SortEmpList_thenCheckSortedList() { - Collections.sort(employees, new Comparator() { - public int compare(Employee o1, Employee o2) { - return o1.getJoiningDate().compareTo(o2.getJoiningDate()); - } - }); + Collections.sort(employees, new Comparator() { + public int compare(Employee o1, Employee o2) { + return o1.getJoiningDate().compareTo(o2.getJoiningDate()); + } + }); - assertEquals(employees, employeesSortedByDateAsc); - } + assertEquals(employees, employeesSortedByDateAsc); + } - @Test - public void givenEmpList_SortEmpList_thenCheckSortedListV1() { + @Test + public void givenEmpList_SortEmpList_thenCheckSortedListV1() { - Collections.sort(employees, new Comparator() { - public int compare(Employee emp1, Employee emp2) { - if (emp1.getJoiningDate() == null || emp2.getJoiningDate() == null) - return 0; - return emp1.getJoiningDate().compareTo(emp2.getJoiningDate()); - } - }); + Collections.sort(employees, new Comparator() { + public int compare(Employee emp1, Employee emp2) { + if (emp1.getJoiningDate() == null || emp2.getJoiningDate() == null) + return 0; + return emp1.getJoiningDate().compareTo(emp2.getJoiningDate()); + } + }); - assertEquals(employees, employeesSortedByDateAsc); - } + assertEquals(employees, employeesSortedByDateAsc); + } - @Test - public void givenEmpList_SortEmpList_thenSortedListinAscOrder() { - Collections.sort(employees, Collections.reverseOrder()); + @Test + public void givenEmpList_SortEmpList_thenSortedListinDescOrder() { + Collections.sort(employees, Collections.reverseOrder()); - assertEquals(employees, employeesSortedByDateDesc); - } + assertEquals(employees, employeesSortedByDateDesc); + } - @Test - public void givenEmpList_SortEmpList_thenCheckSortedListAsc() { + @Test + public void givenEmpList_SortEmpList_thenCheckSortedListAsc() { - Collections.sort(employees, new Comparator() { - public int compare(Employee emp1, Employee emp2) { - return emp2.getJoiningDate().compareTo(emp1.getJoiningDate()); - } - }); + Collections.sort(employees, new Comparator() { + public int compare(Employee emp1, Employee emp2) { + return emp2.getJoiningDate().compareTo(emp1.getJoiningDate()); + } + }); - assertEquals(employees, employeesSortedByDateDesc); - } + assertEquals(employees, employeesSortedByDateDesc); + } - @Test - public void givenEmpList_SortEmpList_thenCheckSortedListAscV1() { + @Test + public void givenEmpList_SortEmpList_thenCheckSortedListDescV1() { - Collections.sort(employees, new Comparator() { - public int compare(Employee emp1, Employee emp2) { - if (emp1.getJoiningDate() == null || emp2.getJoiningDate() == null) - return 0; - return emp2.getJoiningDate().compareTo(emp1.getJoiningDate()); - } - }); + Collections.sort(employees, new Comparator() { + public int compare(Employee emp1, Employee emp2) { + return emp2.getJoiningDate().compareTo(emp1.getJoiningDate()); + } + }); - assertEquals(employees, employeesSortedByDateDesc); - } + assertEquals(employees, employeesSortedByDateDesc); + } - @Test - public void givenEmpList_SortEmpList_thenCheckSortedListDescLambda() { + @Test + public void givenEmpList_SortEmpList_thenCheckSortedListDescLambda() { - Collections.sort(employees, - (emp1, emp2) -> emp2.getJoiningDate().compareTo(emp1.getJoiningDate())); + Collections.sort(employees, + (emp1, emp2) -> emp2.getJoiningDate().compareTo(emp1.getJoiningDate())); - assertEquals(employees, employeesSortedByDateDesc); - } + assertEquals(employees, employeesSortedByDateDesc); + } - @Test - public void givenEmpList_SortEmpList_thenCheckSortedListDescLambdaV1() { + @Test + public void givenEmpList_SortEmpList_thenCheckSortedListDescLambdaV1() { - Collections.sort(employees, (emp1, emp2) -> { - if (emp1.getJoiningDate() == null || emp2.getJoiningDate() == null) - return 0; - return emp2.getJoiningDate().compareTo(emp1.getJoiningDate()); - }); + Collections.sort(employees, (emp1, emp2) -> { + if (emp1.getJoiningDate() == null || emp2.getJoiningDate() == null) + return 0; + return emp2.getJoiningDate().compareTo(emp1.getJoiningDate()); + }); - assertEquals(employees, employeesSortedByDateDesc); - } + assertEquals(employees, employeesSortedByDateDesc); + } - @Test - public void givenEmpList_SortEmpList_thenCheckSortedListAscLambda() { - Collections.sort(employees, - Comparator.comparing(Employee::getJoiningDate)); - assertEquals(employees, employeesSortedByDateAsc); - } + @Test + public void givenEmpList_SortEmpList_thenCheckSortedListAscLambda() { + Collections.sort(employees, + Comparator.comparing(Employee::getJoiningDate)); + assertEquals(employees, employeesSortedByDateAsc); + } } From 62ac9611910d7db2e6e46443a301505f6f93dfe3 Mon Sep 17 00:00:00 2001 From: sachin <56427366+sachin071287@users.noreply.github.com> Date: Sat, 28 May 2022 08:48:22 +0530 Subject: [PATCH 092/100] BAEL-4292:Play sound in java (#12004) * BAEL-4292:Play sound in java * BAEL-4292:Play sound in java * BAEL-4292: Play sound in java * BAEL-4292:Play sound in java * BAEL-4292:Play sound in java * BAEL-4292:Play sound in java * fix for spaces Co-authored-by: Sachin kumar --- javax-sound/pom.xml | 37 +++++++++ .../com/baeldung/SoundPlayerUsingClip.java | 77 ++++++++++++++++++ .../com/baeldung/SoundPlayerUsingJavaFx.java | 39 +++++++++ .../baeldung/SoundPlayerUsingJavaZoom.java | 30 +++++++ .../SoundPlayerUsingSourceDataLine.java | 59 ++++++++++++++ .../main/resources/AudioFileWithMp3Format.mp3 | Bin 0 -> 37450 bytes pom.xml | 2 + 7 files changed, 244 insertions(+) create mode 100644 javax-sound/pom.xml create mode 100644 javax-sound/src/main/java/com/baeldung/SoundPlayerUsingClip.java create mode 100644 javax-sound/src/main/java/com/baeldung/SoundPlayerUsingJavaFx.java create mode 100644 javax-sound/src/main/java/com/baeldung/SoundPlayerUsingJavaZoom.java create mode 100644 javax-sound/src/main/java/com/baeldung/SoundPlayerUsingSourceDataLine.java create mode 100644 javax-sound/src/main/resources/AudioFileWithMp3Format.mp3 diff --git a/javax-sound/pom.xml b/javax-sound/pom.xml new file mode 100644 index 0000000000..7b5fabb9a7 --- /dev/null +++ b/javax-sound/pom.xml @@ -0,0 +1,37 @@ + + + 4.0.0 + com.baeldung.javax-sound + javax-sound + 1.0-SNAPSHOT + javax-sound + jar + + com.baeldung + parent-modules + 1.0.0-SNAPSHOT + + + + javazoom + jlayer + ${javazoom.jlayer.version} + + + org.openjfx + javafx-controls + ${org.openjfx.version} + + + org.openjfx + javafx-media + ${org.openjfx.version} + + + + 11.0.2 + 1.0.1 + + \ No newline at end of file diff --git a/javax-sound/src/main/java/com/baeldung/SoundPlayerUsingClip.java b/javax-sound/src/main/java/com/baeldung/SoundPlayerUsingClip.java new file mode 100644 index 0000000000..6f7ec4013f --- /dev/null +++ b/javax-sound/src/main/java/com/baeldung/SoundPlayerUsingClip.java @@ -0,0 +1,77 @@ +package com.baeldung; + +import java.io.IOException; +import java.io.InputStream; + +import javax.sound.sampled.AudioFormat; +import javax.sound.sampled.AudioInputStream; +import javax.sound.sampled.AudioSystem; +import javax.sound.sampled.Clip; +import javax.sound.sampled.DataLine; +import javax.sound.sampled.LineEvent; +import javax.sound.sampled.LineListener; +import javax.sound.sampled.LineUnavailableException; +import javax.sound.sampled.UnsupportedAudioFileException; + +public class SoundPlayerUsingClip implements LineListener { + + boolean isPlaybackCompleted; + + @Override + public void update(LineEvent event) { + + if (LineEvent.Type.START == event.getType()) { + System.out.println("Playback started."); + } else if (LineEvent.Type.STOP == event.getType()) { + isPlaybackCompleted = true; + System.out.println("Playback completed."); + } + } + + /** + * + * Play a given audio file. + * @param audioFilePath Path of the audio file. + * + */ + void play(String audioFilePath) { + try { + InputStream inputStream = getClass().getClassLoader() + .getResourceAsStream(audioFilePath); + AudioInputStream audioStream = AudioSystem.getAudioInputStream(inputStream); + + AudioFormat format = audioStream.getFormat(); + DataLine.Info info = new DataLine.Info(Clip.class, format); + + Clip audioClip = (Clip) AudioSystem.getLine(info); + audioClip.addLineListener(this); + audioClip.open(audioStream); + audioClip.start(); + while (!isPlaybackCompleted) { + try { + Thread.sleep(1000); + } catch (InterruptedException ex) { + ex.printStackTrace(); + } + } + audioClip.close(); + audioStream.close(); + + } catch (UnsupportedAudioFileException | LineUnavailableException | IOException ex) { + System.out.println("Error occured during playback process:"+ ex.getMessage()); + } + + } + + public static void main(String[] args) { + String audioFilePath = "AudioFileWithWavFormat.wav"; + + // Clip can not play mpeg/mp3 format audio. We'll get exception if we run with below commented mp3 and mpeg format audio. + // String audioFilePath = "AudioFileWithMpegFormat.mpeg"; + // String audioFilePath = "AudioFileWithMp3Format.mp3"; + + SoundPlayerUsingClip player = new SoundPlayerUsingClip(); + player.play(audioFilePath); + } + +} \ No newline at end of file diff --git a/javax-sound/src/main/java/com/baeldung/SoundPlayerUsingJavaFx.java b/javax-sound/src/main/java/com/baeldung/SoundPlayerUsingJavaFx.java new file mode 100644 index 0000000000..523376936d --- /dev/null +++ b/javax-sound/src/main/java/com/baeldung/SoundPlayerUsingJavaFx.java @@ -0,0 +1,39 @@ +package com.baeldung; + +import javafx.scene.media.Media; +import javafx.scene.media.MediaPlayer; + +public class SoundPlayerUsingJavaFx { + + public static void main(String[] args) { + + // String audioFilePath = "AudioFileWithWavFormat.wav"; + // String audioFilePath = "AudioFileWithMpegFormat.mpeg"; + String audioFilePath = "AudioFileWithMp3Format.mp3"; + SoundPlayerUsingJavaFx soundPlayerWithJavaFx = new SoundPlayerUsingJavaFx(); + + try { + com.sun.javafx.application.PlatformImpl.startup(() -> { + }); + + Media media = new Media(soundPlayerWithJavaFx.getClass() + .getClassLoader() + .getResource(audioFilePath) + .toExternalForm()); + + MediaPlayer mp3Player = new MediaPlayer(media); + mp3Player.setOnPlaying(new Runnable() { + @Override + public void run() { + System.out.println("Playback started"); + } + }); + + mp3Player.play(); + + } catch (Exception ex) { + System.out.println("Error occured during playback process:" + ex.getMessage()); + } + + } +} diff --git a/javax-sound/src/main/java/com/baeldung/SoundPlayerUsingJavaZoom.java b/javax-sound/src/main/java/com/baeldung/SoundPlayerUsingJavaZoom.java new file mode 100644 index 0000000000..a7174b29a1 --- /dev/null +++ b/javax-sound/src/main/java/com/baeldung/SoundPlayerUsingJavaZoom.java @@ -0,0 +1,30 @@ +package com.baeldung; + +import java.io.BufferedInputStream; + +import javazoom.jl.player.Player; + +public class SoundPlayerUsingJavaZoom { + + public static void main(String[] args) { + + // javazoom Player doesn't work with wav audio format. + // String audioFilePath = "AudioFileWithWavFormat.wav"; + + // It works with below audio formats. + // String audioFilePath = "AudioFileWithMpegFormat.mpeg"; + String audioFilePath = "AudioFileWithMp3Format.mp3"; + SoundPlayerUsingJavaZoom player = new SoundPlayerUsingJavaZoom(); + + try { + BufferedInputStream buffer = new BufferedInputStream(player.getClass() + .getClassLoader() + .getResourceAsStream(audioFilePath)); + Player mp3Player = new Player(buffer); + mp3Player.play(); + + } catch (Exception ex) { + System.out.println("Error occured during playback process:" + ex.getMessage()); + } + } +} diff --git a/javax-sound/src/main/java/com/baeldung/SoundPlayerUsingSourceDataLine.java b/javax-sound/src/main/java/com/baeldung/SoundPlayerUsingSourceDataLine.java new file mode 100644 index 0000000000..2b589554c2 --- /dev/null +++ b/javax-sound/src/main/java/com/baeldung/SoundPlayerUsingSourceDataLine.java @@ -0,0 +1,59 @@ +package com.baeldung; + +import java.io.IOException; +import java.io.InputStream; + +import javax.sound.sampled.AudioFormat; +import javax.sound.sampled.AudioInputStream; +import javax.sound.sampled.AudioSystem; +import javax.sound.sampled.DataLine; +import javax.sound.sampled.LineUnavailableException; +import javax.sound.sampled.SourceDataLine; +import javax.sound.sampled.UnsupportedAudioFileException; + +public class SoundPlayerUsingSourceDataLine { + + private static final int BUFFER_SIZE = 4096; + + void play(String soundFilePath) { + try { + InputStream inputStream = getClass().getClassLoader() + .getResourceAsStream(soundFilePath); + AudioInputStream audioStream = AudioSystem.getAudioInputStream(inputStream); + + AudioFormat audioFormat = audioStream.getFormat(); + DataLine.Info info = new DataLine.Info(SourceDataLine.class, audioFormat); + SourceDataLine sourceDataLine = (SourceDataLine) AudioSystem.getLine(info); + sourceDataLine.open(audioFormat); + sourceDataLine.start(); + + System.out.println("Playback Started."); + + byte[] bufferBytes = new byte[BUFFER_SIZE]; + int readBytes = -1; + while ((readBytes = audioStream.read(bufferBytes)) != -1) { + sourceDataLine.write(bufferBytes, 0, readBytes); + } + sourceDataLine.drain(); + sourceDataLine.close(); + audioStream.close(); + + System.out.println("Playback has been finished."); + + } catch (UnsupportedAudioFileException | LineUnavailableException | IOException ex) { + System.out.println("Error occured during playback process:" + ex.getMessage()); + } + } + + public static void main(String[] args) { + String audioFilePath = "AudioFileWithWavFormat.wav"; + + // Clip can not play mpeg/mp3 format audio. We'll get exception if we run with below commented mp3 and mpeg format audio. + // String audioFilePath = "AudioFileWithMpegFormat.mpeg"; + // String audioFilePath = "AudioFileWithMp3Format.mp3"; + + SoundPlayerUsingSourceDataLine player = new SoundPlayerUsingSourceDataLine(); + player.play(audioFilePath); + } + +} diff --git a/javax-sound/src/main/resources/AudioFileWithMp3Format.mp3 b/javax-sound/src/main/resources/AudioFileWithMp3Format.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..53dbb249fa1585a53eaffc1fadba43dc91a64dec GIT binary patch literal 37450 zcmbrmcV81v)c?Jy1PBnSp$MTD5kiw9O6a|J1WjlHA{_)#N$6dQKxj&nj&u}6B{Zqh zQ52LeU9h4kx#4?V*Y643^Uu!g?7nv1dp2ig&Sxh2T5?d}B!L;M?Ck7LGAsZ9xk>Qy z4Y=kUK=5$|jOEoa!2i}UpVoQ$oYaN51q6Ef`T*GftHPXAx%l4nBLsOmd%OM5y@CJT zeA7=})-%xe=Koz8adM@nRj`kxv6%*d!TxXhpNx_`_J1;RN{aul>f{PJ8LXW0|2y&j zGXq#zT56w=GMzNUh!Enga6w8&K}rTIdvfmo67>kz^?&*QchvWB_dO|`+y^uQK)M_N zrJ+SKGP81^xp^^y!eSEVrDYWql~vU=v~={1Ow258>>Zr&E^gPoZu!r|KQN*_|){<_X{7FRzGiT?;U*qad>om`tXxR zx|}vr?zHfKN$CGF>2j zR4GFYXNlgB8x-Rh?!|W5bgRzHhCF3inRV{Gl$STZD$Bhn-zieTdYfx7qVO;$de8$o zdLZQA>xz;B_{{(Zn*brnlCUCmjr2XVwF@7 zWH1-{0%LI{8bk+iXQeIaU7k4$^r7HJ2(OOyc<(tLkH-#+4)8^rX6L&%?p+N0-B@_r zomVQvc%Z4zy_!!8{|D6%?h?S`MPIY=HxUl0p9Qti*9Ahr&NvPJB&n|VAzQPdQ&lH0*1vY?U28``+7{ef8;hd(TDU zolVva8UR8=WQ9iU1BFJXKyZj5K9I*WSa|SOstarn)A0|b_Zk>@QvjYGBOZ?V6(BVb zHc{~!OPJ0gdk}rOq_obRWRC(IGFy*=VR+QqHd0haIKvU%?9LA*4oqn(OVzwjz4puY z$~OV8;C7ovnJ5eZ1kbi#88ywvwkhQ@GH%jI2*f-Wqs?#|%)P+7j)xG8%6HI+)8zyi23 zyecG?x9Ew_9uj^EL=$BgPvDUDhf$Ikmt%Izp2^pUS@SjDsAWiNll5!qxexJ4prh+o zV(H^i}1{PehOET)(0&nwk>tGV4z+>mP*A^h@K%T4wcn!&f~pfh1-t!MctrM z{}kYhAW`a41U;ek?{s#AJtsIxpweG9M!oqS6wB=rt|Y-qE=~g$DHbCIV!hC7F^WN1}=3 zt|GJ%9WC&`76R@*_L@8uCd0-rI--xMu0IN7cuRbCPfdhC4yd!LF1p>8? zGIJ$k0ZuG;77jtzg+{>Po-27;CF1s6;D(OdT|5|O zkY&%Dq+Mio;uCL)L1=HdWUilyk4i$6>NAFv`_Gxj{`^&^o3hEMmgbkF! zLN@}?Fl1h2Bp^qo3ymu2CQ%(ji*{lP+O|#;%mz~X{F{z+ZUPzC5^g?uiELksDl9nn z6chi=^IO^G<13s~Od@seOXt{bXm4K`hqQQ3eh{w)8FT?26gLdz-N(k-e%b&14dHVn zeAZ}5S`2HWJDi+WAI!RX%{PV&=Rf%s^c>VKtvQOjG~k~!a#mKyB7}O?1je+Tk3t^m z5z5C$+Z%c9b8nFzZu(o_uJO{7O3gLSb|%bLhpO-R$?x%l9YFvI4MKy#b1@CRfaZLc z9dTDXFtFl{v@&LzKZGkpto~hOLjB30SGWMF^{)RLf&k8^ zyUmlQP$xuB$=w9#NAfRwvzF*HLiOy5kYcONB6{TWm1*108BT$?qYN1r(GAWr0_vHF zr*|zLtEz_U^iwEIaj*| z#1gw^mY-(@`Z=+(c?07EH;n}7%Vz!ojk*VDjGjdiR93UZsclc9MX{=S+p31Mq-}M? zDJQmj@ep6VaW^P}TDtwVslMakZp0snt{cZUaR3ne8Z3jr2T+80owy}Zpx3}6j9DX# zk)p_=FY~GX=psszn~F((d>~tl6pVRuPVVhjv5#u_9G1>( zy1qO*qBCH^0Zl%ONPUP*&VY}-Q5kvfk<5~SYzHPzfs}{_L|<)Vx24~5i9#t0tK)D@ zSunzIoB<*~G&Mm0oY@@`k~SUt6ry+ zbAdrb0S$pNziFs70FBg*tn}W%OrM*T^L{G%EV9Y^nrFynYVR?moV2+iLBi@HlMb>SUu#PwHdE#KC`6zxY_ zGJs@X@Rxn(Fu--arO-0l@_+I)YD{oy+Z|Jz`t<1X6F`wp*6^geRja3#5#@1dWZ78e z?14eDb)tP`r8~Mfl5pSSZf-AO7&pscM?zpR&Gd(kU;V{O2lL*ET$sUxS*-i)eQ37G zyME>4_Vu44U;ac;Yp6TNDaSE0Qdv=?##126C<7%^j`QJo(xrrwzDFLY#AIIik%g>e z$*_?l(PX5UaV=l+ghph+Lf(0zqv2$1f1+`~xS)~9wrMtQ*50To&uh1Gc`@>SY2}wM z+1Fk>{hXrS`f>iljqkHvpqMU%igU46L`J`J*F(R9d!d8TzMShJGciyuzl8Wk4M$bV zVu?i+R7wEH7IAfVrzy8eJ;}eEb4ql2o2)2 z_bsD(S%&X;(^?6J4rSwW^cs1x0^+p~O; zXZsi-qd9?*5bO2P3}}0~+jFb_GlB5Q?PW)V&fcp}{~p$Gf7$bl$EBHZ$_lqDeYhiY zfJS~w)tnvmO+w}%h>^5J9DiI9U`NLVHB$EIf5Z%Y73)VE?gy^}upB!xPQ!Tae+fAM$DtzRe}aJl!VoD+Wm zj|Fr@FdZ&`#M~3zJqYiOdvF#>BBww;QG?&LS&-pHAoKVVjgEZ)x`ZYuA>ii4$u4#X zw-AV#l0D!|CALSFz>BabAQsjIiZaoKxN{sXGMaVxz|jboB0Hey7(*Er8ip=LFS$hK zFpf7z7)|!|>VF;5+GLlZ8Xxh~y#y=5-Tuf7AIFc;lM@f{ z?C7F$d@Dw*Zh1qxk2RG&mVAqv3xcv>NN0FDt(x50%`s zqxjiIl@q+~@P3z+`^V|9S0>`*e^X^*fGgtxxH>NDjr-59=3{EqKC6}pQHtQI!(!pI z^7%3v5Xp?479>O3cShfeYmYymlHC)@?T@-7~ab^s>?v2=hhQ97`H4^{<;rZYoe$q1>nV4W6 zCnL{2#nc{ecb$9+=L&fC-F5*k4>cb1NCM9B%e-$EY3(88>U{&JEM(dPcGbfBrbhhZ+OC-byE zQ^uE7KxTkcv3~!XG5JxaY?qE|S^xwfIkYHN?8&{FLcLBJ40^q*I1_h+se%A+0kt_Cl=>2FUA-nMz1!hM7L-n6nb&~9@=kl(=7l91f z^ba~sFQ@7Q#o6pp#W$%#&UhUafb6A`?>)$=ap`ObiCYcLX}X@5%uVKn@t`8-aG;8= zB#?9F-S=XcN!A%=XbLh4RGcCAS+lplY;#PM{*%0b1pwJI)SEf+rBtf15CFpaVVObu z2stz#eJ-g;C6A72DXZ%Vd6a`QMNB0Pf|#^4Lh@L7DtEKN4_hqjo)=fUlYyI&dNCsi z@PC8T0LYLkfy2~aR9~0A6tp0WexkP^G1Gr3-?~W7W#cGf!`y=r3V0yNP|#rVKor{K zOk*AH4EZ2xlaziQofGLFh2qKWR-)VKg^r*K-r)6~a!=yBx9LM$<0ice4Pt}6F;16Fq>-OZnx1|VYA{*emCEzt)v1N< zK@8aJIZQppD5lA!w7a?Dzlu(M3xfTu(9M1n0Ps(7B?0|{lB~KwtdMs`^eCgT+*bTz zW$CBU5%L{)44@HZ7#XeJ>a2%bo+A!Y(o27j$m*SgwB-rUNtRe+XMQT6C%h*TUM*$y zY%;@DSlkmg%k%Cw!s2NeUYSIbwdIqq(zXn}%}V?>Ib?`k;ddMxB{RyQZh1;Oj8T6d z7qLq%oo^iQn%O&U@UTyV2~`LYY1Rm?qb(ake!n0)kUMpCZZi=+LvE~-F{eNYM0&In z+Ij;3d!xl}DW`#*ARfvh8M-$+*6C)=I(A|%`fbJquQz;j3fbj)8nEYNH59ZPAY^>K z|Rhu(84DiqeeiKPw1}%e0Mv{e(aO=&agPHu$A}o27OZ zC|7u^bWv_Z#iMKsSI*2uM~9kQ{U6MKHD(E?2L(J`upSiuk(x+Qvi;Nmz6t;X^w!JQ z8Pv#UH~Svv4XX0UmgV)r$rvd#qbMkTHVT^KSj(7IiIkmk+I*EYrK)}kbdyNu{m9lS zi>PeEygoW#b}+a~=A?^L=Sf%J(Y(9w=J-dYzoa3@QK5xZv*;!eKj6zF!xGDMQHYMe z+@3!Ubxq_rtlTVV9T6{BjM#TA81pCs|JaBIw|p70`p)W{-EHA2&QCJwWt^&t*!tvA z|Fup&z1!JRh=t>j8H*T27|jF`70P*+HmnP{%c)w*yp;LUKgIlSN<{ z)@=JeU8^eFbJ5Qg&f0Ns`3gVZb?W+tp39&UHs?;UZ`+3ODYWew^8o;gqZ;3Z#%4pJ zKxqwFca)~Vx0~4O*k%l#A1eX{ffzBk{r*Icdk;KQWPi88ScKwA1opk-`vNdxvKGIt z%=*4ya>}rD!q=WK`GV*!OH4c?uK@F>nnR^8PJI(Mc5? z+(Z7>wfsx9HNw=odcOrUQ*0N7d0yPqu9OVdV|(~T(5d4`UtYmzXafx*+Ov$c*!J$u zO3;Fs7a9PCM4Lqm%M_H!sJ1IkXJBV3DxNQuYH`@QSupxvM5+dHkkw5XZW>^HYA{rq}V@asPQc>W?TurU~1qo+EVD(tlKjGgbW2XY=+~ z#oz97Cwq=J#X2Q(aIKJ@3UHKR9b48VQN_$54E)#VnNNYzqYRL~yrzVB%6Wzr{oSJd zu+E_O4yWQUG*0n!vd# zXlDJbYXz_-+_Cf4VZRr-6`7#gmCqBx&67}(CG0oJ0Qi5Ctj(O7O!xY6#mvlY{>!^X zxW-jMsM(u6tdLl#DKLk9${QsT`ACKp8VE_#mz!x;IRm3d>v`6D6gIw77rfvQG}OPT zTlxfJm1bA>HjKYwUB=eVz~@@|)7B|BRvBLIka#e_ zzMHdv>-9q~@Jkmq33o~Hk-MItC{UkXwh>GDx>*Y$%DD^LMW=!QogcpRK+ObbBG%jGPz6Ih)pRsLjddCvX;x zz%a5T%O`iR-q=l#xxg_}D*2-Ofl;4e=B?H9iHf)PlpT6(TVY)*vRi2BJ}rD?1h!f z=ci?TXykasFE{$z21?M-#pZ?TsW(Orp$AwLHB-)4$o<-arl@&Y%+AUEI-fn+ckyAB zca<8I`i~ut9DrJ>4jYcXA@&Xw%u(b&D#S0)h)wL{u?;e5x*hQpv_Ek+=9^8$@7Y!D zqZnZyfZLiD{Y(NagQoXUwVw6Fa1sK@E0 z_#&f0jnezfMi;=(CeTL4_R$XpXW&TnC_f5{jra`t*V6SJK>VNq!)P>N#FtY%O&si= z<3o9C46843WKCKGEEIfCpTm4ssd|&eQ0wt(YHI3%6S!(#f5j7v<5Yo1_Ak(pheO?# zJu}gkXxZwp0g!tDXNpL2nHW1L7CEAGAI8Vs{eAsIBGJkIoYYfDFQ2Cn>|2OH{;{2e zdEEU*1qQvo@7#vw>OcN{u}*38-*kJT`eVxT6le@$fUsnf3U^jVCzOz$?C4da-brOo z$r2V3U~n>sZv=y;G3oiG&w9~;HHSXXYbcX;$PDBRrqKah7;$pQ7=HoX%8rM_j_D;v z_rj1dNfJA(?jH)BU%#sh@9$2smKS{z=<(OiS&SNyc;&#N>L8xj?e<>&6lf_*zrm30{4Whs04;$s=3zG3)uq*ZB|1Fz z8684KF(Q_MDVC3w2g@`cOzp@P->p)*H>H>z`0C}YywBU4pE|}@+OMCurf`jN$45Y3dNAA(gjD`YxDKQcZ}%%VcYLivug z?4uI4>h7})EF}RoUai;7D#FiMu220q1=@-lxns=87#u zklL(e#4&NP^wI}?M$x~k>DdKg7rNfP0%tV+zIlH+|IN|0FHkVZ3(p0P1#klRR34q@ z{9AZ0jeg&57B5>uwgQ}w5ka&4td=d7_ML1ojN2^Zxh{zUxIJPSg59<0k^l=s%njJF zqr3*bzXC;l=lwTqa(8-y(V40ySFqV3S zk7lI|I#ytM56&*5?0(FbUO{<5BNaOsrZ>i=M-HTCq`~ebJ_Lp(LC~F^vv~8eBq2bf zOrQvDR_&LrpeuK7%22~LSV1rE9(E|sX(qZ0Qv{Doh@o8Jo;8_E>P+ShN=ta0AWRmj zYEQ(N#{k~*8Yu|xG3^n@(1DkfuU^iw@Vsu#RJw+~w^nor_Nd*-mct>arnG`{{F~ir zUdQlx`XH;0GZM5XFP$5G`9HVa5@}%Pui~@Omy1t(T(yU3R8H^^I-AhUpY_|0?|vk< z7{tj$Ck9ZDVIr7A|NS~K}G^E94>~5`^eaBm`x4j>E%h^XVJEl+Dx&0ZY2|fyh*^IMSvm% zeqB?9TWo|N@zQ->^SkTL86AkAGhqa-1Hl;KYoTyD9NU#l0MCPEq2*sB2mx+3(y%o@ zDG#CWuQt2+R;j;Kj{Y2eqDrBr5RX3%jtO_1Oaf@3kunWL06-c*Q~P&%y$R#}2hT+O z$An3bNaSeIQ=l%0A=V#l>QAF?k6fXx_hwco^OiBvlHJ*s4H|>SYV-(jrqIXw6pJ{g zV8j4E^)Px2LqRlz38F{3>?7F(=z!w87G0arpfkfe-x=n*dMS%CWJd^zKw#P{m)Al{ zfH=%HAqWuB4D|1>JKWpAB{`Dy5w*yK=W-zR7WFM}Yy{Qeq^Zy)MQ;6*BLp^DDreRV z?{{HcI6z;<=gqq1N#bk^1vu!q;yjTeQXK1&@WrJQ5sfh_nzAKwCQU7lZQJGJ81*Siuv z9IX(H8xOBx)@0ehZYodnUf*X=^f8ayta!@#_Qy;GY7`kAM}uMGXuJ@e$}7>J|BAZX zBX_U+F*boM%^pAS!MV=fd70HDtPzx6Ko#3~UR=C; zKg9iRV3xUc#}$*#;RX9EL$qq;l?DsQU`@dp*onN+)iotHsGa&Zt;cdwA1| zGJ)*84s9`C!hS7JN`d7xPFTqFx9n<3Xu`}YcijaI@fvAFKDfepq0819^8?saQw*g;q*^&g^{U` z3N!%V!Hk9xnTh+#u*e52BE&TYg>s}N^J7V6heZp$#mX!tG~$(b8J(-%1Cb(0JDDCD zhWF8fZa#JP?8se6qtw$ue=`5vMAB4}*m{i3hz-sU-NnJdf%blQ$6_wNGS)ynuPJ_z z{A>n&2$~?`g~00eagju8bzQ*9gGoSQU`uHDoTh-L%h5R&rH>V8h4I2W7hLN88~PMR z8Sq$3-uwmC*Gv^km~Z5~wzWDIWKwrYTLq2-K>x5bAVDa=CmYSI2_tmMRIvrxLmaWU z1LU$CFTG<5{oA_;;-epB5i4ZA&Y>~javtuBX3Uej&3V^D_#?4gySnDL zf*ZS(qyQ7~$yfkGMRIEbal=u-#)cab(Ddg zFUHjS`k+S2s__`M>W@Dn+5K{Xj>mR^^A0bZmDGSg;96UX$$DT(R%aI6+=$tgvDb1f zRooJv7O2hevY-wg)K$H?(Y}(+-Tvbiwvj-@TU6@^X2iLRyYo`YTZLn@wOrwcIkGAiCK{XCw zv3OAl0B_TlX`$PyNc1<+$~~{BrZbzlWH-hVBv+76%6NiW&pFXK*FNlEpU!B55`o*aVEvuN85aEi-ghYSkp$) zEiUCo;lxy(ZF37Ygh2^9J<9CX#b&OG9~z<~cX1iyoe>-7S=;Ror$D_B14$RO$&r@6 zH0_H1Cy#_T1B$547qNE!AEOEPaOE}F2QJ4F?r)tNoa1?P@WnbFhU?0XfwjOy6gxZm zyo@1=E6+R?ohybJ2oFHfDS6X2NIX!s@ybq>+FH9m-~Q5e6sA>oi@HUnUi%Y%elv{& zm5yJ=eq{)JwK|G@W^3uwjF1I!$uX?bUslRIQo8W#0EM10Pp8SnPy8$p3r&`UmP|eG zCk@$Zo~NsQB_m4Oy!ol}fi$;D3B5_PZRvup*V3P$z1IRSuC;cY0!;x1syB3NU&#B* zCZFg-$OC~6M!je&vfzEt*t0gWkj(GQMs2inrh3xk0uKz6d^l5XQJf6a< zUBBsHud?4Od$2g^!U0J^oE3K|X0Q6ys#mxit>8U7d(`GtzIY0>6lH)m=Q0fxqIlAk z#MFDEGVeN500yWfJt=JCDz+wQp+6)T!Hs8|2-CFPsvLSOz`v zMm;HE0B_=Xk*pxAQ9o8AhIGGvq~1v9XhF{a+K35g==uv9q3?3+Vgnm7;_$8@9nu{h zI=NlHX&t&a=b6{}`VW2(uM7T=?2{>b_BoYB)#~dz-Qj?9tKTob$}@S9e|7ka&T-Zr z0K=JOvW}O@G{afx5nb(8m6N zkNXRtv9 z(kL=n{&(467Z6FxV!|)Eq#a-7wE+{8jN?z-6#hI|RSo^~(S>vREbAq~UiKe)(BCf_ zx6&MZnAp+%`16X;*OZ8xYIA=y0l-e!nqq#ZKONoe{JqC*{;;TQ`L*O+qY|aWv5Vy0 zgLy!~$nyZ1p!=G~QJ&~@9U;hq`AFFv}`b{if-xp)!I^#0O< zp>~lMMMd!qD2?B<)Mn}qm1;}58OT zC6*DvYF5ZfBZnt;mx5yCF+m+zyudC4v+(|;l|kW9h!9gDdH%|@$l02Lwi$KMxtk*X zj8|amBO(<^<F4PL^`C5@?>KAJnzz?Fe*`0q zm>Hu*IVm}WNKwu=qH}S1Qk*@t%o%_;`b-olC-kh@G!GYwZQUvOjI-fHI)7qTmBjUq zYZtlF^{#zxV-5KC?^nn;yVn&Sx2@5XJeFTvhz^oCK#;1r;86T# z)Ea-~^zURNzI5Oetv%sAKH=~ zA6u?u7vt1z6jjvJ;x=o=?%l*w11&&?*sgGxEQy085|%0RkJ0T)^>#xRFCVq1AoyUU zC|2#}Ip-Dj$f-L@4LM&Wlbv*F+pZ0~lr|iK>g~u<8(3)r*Yb~XSm)h_A9_#Gj*{1tT_rb#oRk%bB1RE1#6betE%U+H%zv6 z<&_s@KK_(_w&rcXYAo)w*V1_kvQe+=On+Ll;J&M(?w0+Snx!o$-bO}a_0ja(wjSTx>hBSHJqvn^C$&+uj z{?LxrA%?Y6a5}Vv&&M>()m~)~Zsv?+v8MWxS~he?%Y>GPf5$&dqq#3@fdXT73%33< zQv2kp?3&u=eCEYq7RtX5yn3fV%TYs%hA74(E%o>W0_BryeDFXGehQ520iV^4c3X-p z?sN&O&hY8e7mRnEc10}pSEHTy?5? zIp|KbFwJo}lwSca((Ck`0}#SVZ(%6*w9cT18)z7CAn!`QBAfi}3Iik=y5gz6 za*^0bct`OvMUe>5UMOu9e+_85eNX_x7B0@8==cM*(@bZSq%v;_v0HlMBbh_=_OdV< z{~D04D`OCR!D_kpLaZIJAUH8J8wLa6lDk*ZKDI~q9W*RMo()=iZyFRFkBVB|(8=ur zvnGh;;9R#u?w;cs*^U$j*_=V~$~yk(7QJa{aWDCHi9PkEKrE6| z#j2#QV$%gCWPHgd{uJmWiiNdgWc(tc?i624N!>st<*TwmAq;xWu7n;MwkU7fC}#60 zKpFA`7h1GyvYLXSO~IP6w9iRx&+()fx8e;p~Sn+C!=#WSqIZy9#ZG70e96% zr(y@62v|na(J&z2^cN^nA~oC;Yb?#?o@UE9RTtk%DsSobPQ9}@C43?fVZ}LYqBO-95KjueAfBJFLM8LOqSAOYfL{0gaSk&t>ry|cvgwLgDb zEUBBHUBrGlB$Go7f2F*4wq&OyWfJd|Di%1`!<8#08vf)4jn%jc9p)kf_ZhOd`2l}v z$yy9Cp4m7)t-pkH5e(l7Eh?yHZkc}74udj^ZDbH8@Ob|YZ>2K-fY=*iW&UyKfPQNN zn0e!dl@yjNc~r;PvZ#uA5ubFr&*DK=kGDlpHG9~+R z-mEYDCHrmu2WSMRj%3`714YFX)KgbcmlAG#&gv0{$p~qhT~-GBwd&73dn76E-Ie<| zsUL*pohtYlg@=*T*36PAWV$7b#&KjBl7cQh7xgY$JXW>(<8+pJkj3x{bJE<09{Q$( z*ew?8jfv$pkEvHqYTqCJwAYXYu|lC7UYDo*iW5ez6{wDKXH-K9qu^ltvlN`UdL&pd zlBBDNEYrJXDKF9xBwg!9u=g4yaea?}iYakswbz`a=UzXq;g}J~3aR>Wwaw%91}q~BqZEV)S)L0o2#U{kXJFt$cSZ({^E!fh@P!q;PtYi!7xb3Ri$q~(fmS>aDha!60 z)6!WCs^0Ij!3>Q}eOfTC@=xCM)zqOX|2*bs)7l&PG__GZkfq`Idm_L-I7o&=EB$tm zEsx}52~H_4{<~gSKb~icAkTFO>}0{huzSk@5Bmi#JZGFrLnw@`KqE~KUXx4 zem+Q|_iEwMjPgJd|A!y9R3X>@jop6rHRAAM$C2y5$GbT#^_W*5>|Y?m)_dmUsreez zh5wfNY(hp5_9%v5LL@>$F=bvDO`=f7t6~jwJ_Y4UrsDlLp9hIZR1>qxxdC+IeJxjX zJ*Y8-n?bWC&(bKzi!?NO(9Q||x~|66bXIA#Ua=}@YxC0|`iJJy!Iz?s;78B)YIQCA z87}>Ob?MW+(9fe@5{zIo4Ltd!M{c~{1@bf>Sq*_k2^J_k6wD>Y1)wCpz`1D~B(H`k z(-E3^XJ;Kcp4@6>wthdb>!R4O6w!7`axX8O^asq%U&Q;XV%K<}Jp0wPAUo{jnIG@J z+x?H18^&uR8QsJvcT4!y7uYtMsnn)D;jri~{vOEhsJJ*u1g}HKjb+a>j@VfH{UzqW zD@7Y;D=r3(uX)Tfo(SK@D!KV*jM~2^jEZ~?`||R^>-DBO?^0P!#ZTY9TW0=aP#em2 zH>n8Ey18yF&T0Ss{=vt+*4w3qb${jarO^ z=ESWltT}xG0quA1x%qk}MO;6&`W6&9*&E*R-L_y$lDFmXeT?z(hvRwAy!9Jj!l~*- z-%f$HPo_iKbc_VC!8-_k&`2()*4amrH6M?v>EJJmz@AO{K#zawFp%l_E@(ZK<=N{q z$Y>8guM3s*OX$+__)g}kdu##;$Whf?wXX_|w5TH&Pr>frHT#*{Yo%_e`TDW@Yjonp z5B(GFAFe%fu6sEhAXj--n%sm>+o-DEX?$xGwBmM3{xixth53ezR- zdUG*oDE1dKl!y?((fIIEV{U6b!s%KbHpKjU0lVxzqW)$`M7x8XK$5aTdqyVp zn!@2-7e)8K!E7!+zkL2mNBTT)Jo?ml@W`@^<;!zxTZ#BCTu%jTAd^OCR1W>&n+Yb6 z1KS%LXVYRm6Ew>1kKVn)JClKAq(;Ap4Nwau>pWt z!$#T9wotxcuz+kr_Nsn_Z0?z=MTz-}I)EQ4GkqCSy!^MnIOEUGyLsr9HP= z!UJ9AzkIGp zQE%@=jo5w!9Ve*7ijQoS>?fBCZ5b%Ci8bSnxsp-5FQD>O$I6#aek*0%1lbHXu$JFy zxMY;k(~>p%RX~o>Rrk)ilZwauShi(knq^G$&0XblWtoX;!-I5agodL&bN>oH#M57Gygh&H%fo^$D3-r`@~*x zdNZHArs1WKJ(7ZX!;(C%HSlZfpV7%ih(uz^pwH{2=Xm)us5cl|2G&PCUZPj)j&NZn z-LF3HPkvx949trT}{Jz4=(=|E=G1?y%}tU?Lv%j8Rj4gIoPG4Xvdwgy_S zt%v{o(Gz*>_MDEXNX3)!yQ4DGkC4WxcCyB|b*(FcFE+V9s|$15FXfB-?cHWBcys3S zgrs9&57QQtto#Lv81@qA);)jP)Bw*zUib83RJuJxAh|0OTxcwaaZ7rJ0TQk!!9tJv${H!3kbn`;99DDJSX7kd96^&Q943-<@}Z$xXj!F={@F}j#*{VvbQb+qLIK4p-Qhv!Z$FWdg&r*X zt>FCUpZu=>bj5$nE!vBWdLUPCzI8*Z?NOG1M5;rvRLcZw|26ZW9Lz?dfS1vA}#gws6-BV%Z3B zZgBGp--fw|1+|^u&Noc|=@$zHDx2Kt4d$0DIvEche1nxK(fRS64FI>WG$CWPF9teSno>WL3v%4VF}*{YW-X zPFNhV+7e%_I3IgY)5=il*VY?H1F@+=xCi% z&i@q2ZODj|I+PKAoz_vb81xWX+!#Th`QA0I&4&5CU)2|Jx9^4sF2OigZ;wd@G`94$ z5K&Nh-gA$>;o`G|yVZYt*HfCmTR!t)Qo7%s5kXpiGk@umOeS~1Zw~@ekJ(HhqI|hD7H_oIdqV z*FN?=vOuT4@J_dGrru>#|8n)ZKSOeye1&grLCXaL&%2@0*j9a`!bw9amzj5)`&_o> zUh(tOPi`49!mkf!@N=ao$MCDyVkw=UYfLW;-M*QXEpmL9`Aqsla%ewWLLYCab9uN} z#e0i|6E%yh@x0+~^rjo9gniv%+du(&7FKw!zN$*MvYJqy>gA<7@isUx*4yZbg-?!v zYO+f*`=E|8Z&qE!(Hj6afME1ilSH83qF0Uv4KtFi$u~f(LowDyuNh3(s~)fuQuDl5z5mvnfuw< znFj&sbT^Sau~#HKAsY``OK_saX_O)Z%cXH@8H=9NI@|KA-+D!Ia!IO(tH_xFb9CAV zC1y4{WhVaW7U)&msMgTlrmg$e>f<^!m#*0Ky>ZH3*D3gxWAt|mEWKPj_GvY{P)=aeg6B_yqq0ojc&27@zxG-|n9AwQln={Sc+&sj__Q zTv#sc#(#SXPrO|4B?NNEm2$JPh*XOlw}(ie#iu_cAO&iZx|z6ReBh>5-8m@73kt9w zBMC8rF#UKAgbSyenLFbe2X}%e6r$k!@9E?(t)dj;D0rFprh5q+DIug6ry077+ltYV zv_|fIc-E>DX{J8Hop_z`85Ee)07FKs^oH~pxE>5@ThskEwF55*Dc_JC2E$-B`Vtb| zWPc5_!M(%2Z8IYqCo5#h%myq_K2Ac`O@?x(1L^C5tVM`fI+R3hX1PLW(M5uh@ zDXHOnTgzAX9swum3?Od&?(o3gaiN9M@#I`N^sKq+%^8AM8qunke*JeVuDDAdfubzN zC5op%>T@sF&ebZ>lD6}RN#g#-6K9l$Vh2@Uc=&=aC{2wRQAJ}LJbH*O3K>Qww0bSY z#N1Mg6TzU})FEKOFvVSlX;M?|q^z%2!}5>7nLS;_KKPPpFIyY2&~@@Z3uswBbl&B{ zkW-+oNVSZbFOyr=(f>}S#t0Evk>pBWvE&)dK{$0e4mC<_+uOQ64!guUO#h-G31RKp(OE7Hk1<<{>JdoT9UsM?13MKr8?S44gHK zNl{S$5o*tF9H$-&m(o5?7^ugzeV`YXc1w&w0stfmz!y!t+tvZ)BpJj?+7=~d;D1pB z9vvf-Ol14!#;m!_WM4RPnl%>wtO}^@d^L_u?!rJ@9<8P2M=&~|(Zk;R_aD-nvY{UV z$T1nEF$N@&TFSj{$YRnWJ?aGmws063vfj(O9cPhKAG~@(<%KNbH+q^|C{a{Z_`(qE=9AkQ}_B4KADhq2(F7Q-F3QHW*)I zJkIYlK)bzfqHZkz$jN^AZf?EF#Q?v9cFVKlc$66iPjy@W_~7ucvdn}Hl};paZ6Y^_ zkp`GeUC%0Sel=Nm5sc^{E9>tG761z&(uZpkfjI5}-OnUra9nZ{z$>t+qN?ZJEr+Hx z((xec(d8hyZi98;+!3IsRD#(Ri8G--j9e(1(H#MKpdu+BhHOtfDPVK|{o&!?hItHB z6hNy1#dG$W1QMRG2@KeIQ;wOG#)bwO4j3A<6Vn5UoUTgc25`2B6}s9|r2A zt%*T$F&9lY{Vl|X(4GpkLgdRxm5j{a)L49xB449jCn1MkMteDN)?Dt+RmHGoa1kQ| z2B(t^?L`m&+&%)-O11p%!PFFz@G-aF_U~tZzZJ1zJ=b#cj{Uj5`(4Xd=5^lA;Wxl`+adsvP+^;^Xb)Ec`~|A+8`g`ku+Csh z=fdU8jQHiGDffMkRefxVh%#nPl*TouF^wV!R*xVrN%N9CYp2ax2hWAd#Ksi7gk6=Z z-ruoRB+c-hI0DoHvM{>A)aCY1B_^YdnYa4V&{V+QGCeTEB3Hph`Gm>qaS=8DgDN=p z6E+yi6LwFI93Q|Wt6857iUpM5U}#h*XpT2~LjY;CJ z<2x(H#Ewv6Xpu6)Zkho*Cf|R#J-Xxajz>He911%ApHx`?cptFT=o1 zX(s{K&=ghRaPJwT@avKw_JJ97+!Vr^#fSh8CcB26eu2amE9=<3rZglYi%(0;4>joc=atS#4v(hZKAE264cgHsh{oZw6+I+$cUo%)!j2?eO;Gi?U1IcA2^RPWp^?*+ETIa71cYk##dd2H?k>94^p6_x@ z57pU8p))=VBfW41uxI*coyN;3}PGl8z$G+z*9;8(&@Uhbtce zx&yKZx~+0)ec0UiwomG^BueohrSBoGSW@+Cj==D!bK2nHiP}rpRX$Ww|-OaU_>$^E^Q`_i}ULr}<=i~0OrYOWkO zM@!>P($~kIOILM7`OGRmLh%Gbb7(4xsZq6Kjj3tQD$fOo6FEH-KLu$Jb?7Z6 z7M2nPN@k%Zm)6r)PB&}$u1ylH$DUqCMhBm9Cs;hX8ZGL2VQVzC;R}x)0>hHW56ruN zvhZy@QaV5sZ7Qb7AyPb(r+Xq#S_DAN;s;2hB!C1K!C_nkyR4+%*)xzASmQ{iXe%D< zEk~=njN6^fYsW=5`QBX2HlF`z*3b$8hqt=#xJIC_hql{wb#)GWAeQ zx?Hf_uqpRi>VDZuo-6Na+?Hd3d2AAiR4%G_&$YB@gdHTRfl&puI$`RC?D=4+xpn;j z-*^4+Ku){L8;j)$XY-3WO+~zUPai0l9Zr4JS{>Cp{1bS0es^?xBUhm;hV2+MQfZQ) zkMsL^-sAXyn%kS@ohOIyjWZm%e7j8D^A~d0O>K+s}ph6iHT|{%pmTdt1cPd2dMCp|dygQAe;O z;e9<8Bl<^*#&yDZUkA<~d;8W#k~sYAEo1->^EJ|mtv#zjqXW8gO1Qdb+FLjk4@Zn* zi7HA}sXaq-in`(=&32xijv2t1wHTMMrz;s4+@#MIWr%a$brRFP+}Zoxw&_9g?&Uz| zPJuT!VV+WhEo^vMb$~|;?5&OJghaSBW&|6o9Uc>|c1FNbmVZ&^pTKK`NgTZ<@?)RG z!W4Mj(JKOg;H>+ES0Okd7z-zlb+jq|F*6QTLm5dtr21p z_vi{BaCJPyM)X52{(c9RHfsKcQQbK)wN;z1xwIpYnF^!Ld0!dyw zS<3i95Wn-`L0Ea+p!)9N)VIS!;}sx4O9(jG_y_r>lp`5&RwR|i7hj};kde_&Zq47~ zpyd=4n-@~@Bsp>&lbF6KH>4*bcW{h!_2vitH!@z23w z!^<5XvCDFdl}7rMS+7Ign_H7~YR4ceVmp@B?>af!=)*Vhv9(Hu(?3}kC5I}K#PzC# z(+zspDx6OF%_HN4mTE(z8=Gp*{hj~&ORszGFzfJVj+PPQ_`e8Mf-G#T5NED>;CN(?UwK>tfH>RTufMES4`&+oCJz6QRtSvApuSIepEHJrOxtFB!6UweNz{koMtHU% zHo_DW!-|1`FmM!1h*ZL@J5Rhh>1y)hRk*P>!uh25)|St-F-Q36&1huFgR6&4k;_hl zkDlgWCG$1n*Hsv!YL!$>C{W)5ukH{gBNzV!Pj&}i`q$-{TOVC}{*%E8K=ovF+%gtc zLjbXnV7ZERV2Ft?d%R}yDy=t&E1sPl@JeX!UKDJ8J8 zx^YLm@|6>9xT0FG@oJe>X{L5rVZm`WPVHxR!_UijF!zj=Tf^B~zo(f02+W_u!?G1_ zNfIIk#ysVGK*TUR7Yrt-^D-F4{0Gf}j(xfbWLzvco)H6={(L+7V!PBvM_Aoo zmzL9Cp8=f*-8K(JEO3v_92_~!0Kf{==O{3yfUEh&BDQ*5_BamFD8$0b1>#q_s`?n< zfhh{%XcnISX=u!x%`JZMiw|}EBIGyUS@g^Pux@BP<;JZnwhPs(Cq272`^X9eC}J=F*TCh^I_I9VEo0i<thQMk$Yf*dRgevlwgu>~>7_!Xcv*FXzqo1Y=Izm|iA9`` zo21l>TQW|CU+DPZbcGP|Zxmd_v?RHVwqi=~aGc&8&x35^$;2``BVux)XyBl)FQ@2* zFlxoRZ}d~4G9vGrFNcc@hc|TPgWD6qW-UdIw^g%6Pnwr(J-kf}`xK`?UDOm84t!lO z9O%3JhFKhk^F`?>4%aCPju-KT9U0dcSx~~=6d!UaFO(maVT=$3{V24HG!c=Zu*jbH zZhi2@KpU)DRAjm1vO7JLQJm_@Mc`EZ@I?0#!(!|f_BLt+

1$Z= z0QZ0(xOYdq6jc_QUZI@u?j0&V<+Yz}5=q2o8ZHyC?O6#C=S?IJA!ju@H|#~onMSOF zvOp2B3ccks6}5yySHmzyUODXfp%+zwlLX?R3Wgc*<}nvfcx)bL|FP#Yg|DUxRh08A z437Xc12{tlU76+sShMU(t1;-$ypt7UWH}MA+R52-Z6!1vTJwU!Lr2_n*l`JCj(m|w zFa7eY_4Zhemjh})zjX2pjZK3{MjXa(M1ZC2#5jyQ>t`WJB<7h52!w#DcT-)YfwFlh z9i9>ADZWo5Y^*{)cbZzGOuV%NDq!<>$i1;Vq`wOdH@_`CCA@QX)O$?*q~*f}0Et75 z0jSB9M=r!mF_dff-vaZe?)G9K@WxK_z2!qG+=W4Si8iyTdxLRqb$E)xF? zJUT%Z#01Qxm5bF_o{jNk)OLJWr{VD+#~*e#b8Rid#)0iyB;g1p1k=9>Pk7t+&ij%t zTY|omzmtFbZNA4r*RG{Z`U)B6(@7pSb|U;R`(nM7ZQxc{D{ zs@JNB{#p3@YxL@)!=Dpp`%h;f0l+2}u1&Ei*Kn2$ca_iVs%oCQ*jG*rnX8yAPJ#WH zpN*_UNi#1`UP+~;1c)$8m2F`+FX#bZ;+bd77psD!w7x8tH`#RuyjX1W&ijP=H5@E* z6roX&`R@c->#bovLtbg_{l?YXhgI?HxBw{IX8=kJqYW?wPUfiuf~i_rzSxTnR3xzt zGY6!C0M-~;76YO-1f&We%3y?mQMEC=n`OGdi8#T*a)P?84+yG5l(^W zxTQE^NQefIS*cYpGh&CGbe-E-KCjeBFd1^@#_!JcLy^H4me@&?x);$+ai!QB3 zzSKE5$!d*w(Vho*V1XoWuOK^9kq7glzU|Y;KVG`=bVhzzyces<*A)HH6l(%GIH-_6_>)v`p;~M^ zon_9cV-U_7>-Fk|6y0!UJ=)~&Cptki6%LEmV#zUTNVa}gBxdFFy3GK zdCGg(2AAmvEAvdL3uDp0Xn8*P?7Ai7g%!4+po0d)mw8ZpBl^2adJ=A{eR?OI)jYEC z2zymZ{8?=LnUxilCO`F}x}Dv*j4MjzUds;?fBIJ@Lyd#&_ zre?T`!JMEe&ZILiVq*pLbw-g9;X1S<;4COs1su<`Eh35l z`sfhiG>W*Af&q$b^G>%-%`Wr!p0F*kvF$yMGx&GkwM`uvGiMSS4ajB59^~bfp{wS( zssc|}h&z{sN3Z#W|40a(*t>M|LOgQk^^2j zJg=d^pJF4m$X4tY0Du5M*g?#J4)X!A!vryIAbOQmo(OAo+_09&1tDZIq%f}ogpgOH z9gCkG-D`lt@mlmT!8kzT;BR@taUh0HFd9PwiST+)#1x};e7MNA^m@lELYtlnS+t3@ zed>~RY5Su-PZisF*Q9Wv=wpwcJ}OXl`V4;Ft8ocKN8n#&`< zWkXfJHpa~b)lhx@@J<4aDsCe1yb?A7su%-*5yFhWiA&2twagL4jAAn;lWI(T)tX2IPVs9ru;r9Td4@Vlq znX2uQEDJPYUPb;UL|nY7gNUD~OU)*4q&>&RBPCnsr?~~rX)LnYsyq)qxxU6r@p<)~ z;41l0(Q9`QX zB=;B*e{wFCpTw*0(1T)267x|$)m}LLo!rz^Kb!kze@wo*bmqne4Kq@mX#S)u3QNH} z!<>`w@@nD3kZ?1%h*c^PEMD-puk|&gPEgeiRr&akauy*F?bNBGY}L1=k0R7YwXpG$yBy4(q|f7RzEAsv#GqL&)b}Sit+U4Qc?3sC zoNsYz98;c3{=Ja-NkJemj1zy8H<}<2r!~b0BbbZeUa#CBn6PQ}!K(?nKwbJ4*z}Js zi(0ZUhHEG?QL=HGtYM(sGwiOVuO^mqz6HKbIl~+9eb5&%MDxQ665sslvv8~z#CbsqZV-@Z-~Xn-{F*Rx#}Ow*y@*#Hn?;L zgHiBZ>#)7sat7&T?qWvU%9a4mo4y*YMHGGj`f}3&{Zp#o@&kC&MzGE$=2V!qV0&!SbDT49kpty z7tUYmulDvI?_!O@iAlgJ`^bb96ukR7j{H-#ssi&WP6n_5SWg2$P|&$ubiYHe%g~3* z0ets+=_C0~5EKf#a-Js8w(5>4nXHzH0&TO6j3onI&C6>_42`<%qi;|Dx*xMX;Cto^ zvDJU~hYOedg~Q)ATx|fz`8Hw1uRR^I0|6z(okXL}3qu9tjN;39Y=qlmo@y<3vzg^7 zTGYfCVzqx1qwWyDm3VVXe|`Db*O@ai(ETU2AmH@R+&h%gAGeKxz*FA=&?_QrY!}nP zjGq`7-#Z}->IYqc6;avx=W9zX;`$?+_4BNS7pJAjMbk^?l5 zDkkfh;_GA<|A4~A1Ms;Y^T7G$1yqKfMrf`M&zP_HqwP>{MZJr44K6=k9}ecuf4(nB443e z^^y_dUsIrP+9c^&>yC2hX3D1C&ui;O3KXWB3_y&9Y1{-85|n9XnQ@> zf8kWu-EUHNaq75CBRV9pZ`Pr2da)m07(S#pvV#y_w7N8PH|tfYtQ(uqg4jRVhu^w_=hy%$6~j9Hj^h9(x^s;=dP zsZ-MIQbo5wzip3wXQR{c4&0f!jR4$V1KWga^U3CS!d_e%Mhc;;aDQKy{sQe24)1cA zYyWEs6btZejlGC|hBn`(cvoI~fL`UXgH}TJ0D?@ki5ryxVPU*3I~=zZVu))QMcHT_EkR;SDqrW_;usUg_hvUq4x60;-D zk@n7qu3kauYef2c3ltOtgwlyZY!IU{?q4*+-o}Ym9-5NT*wC;lfuCiM0Y6AHfU|KE zZ1^xZo1SFMb-0-VhtmCT{^&kyO+_D{Vx*0+uXtX$uF#vgiiVtvJ8iC8p;!Oa&rd$P8IK-_SCCXt`S|^vDBb#h(JuUz`ovROXH|=8!-L zVk9R=iYBX&{C6m86}H(=gurk%OSeZGpIB@4Q)>*uqT43?;tn2gMRx^ih2oD?SubmGe!MMrRA=?U z34?G&RCTF&NH#qa}EGa>h~T+lh!Tz#y--5q-+I8;dS&xqy|8d0^rcRG^KR!vT`87Y!l++AM{glQ}O^E?!3w+NO@y*}_j= z^(1>Idy*f7KxUTR(jKn~fs}e#CJR*dVfH+*8I4mMAP@$JZ2``_kk(&T4KM?-u~-s< zP(3u$_)%W~#K2vo)r8_a($5ccxo&B`%w{6MIrjeZld8BGp>~N!x4r~NA4cD+eARy? zviT$c#NW$L*OihX_-QA?KfBwOp4^f<$|(*c>8^?F}eRE0ftIdv$P34S6uz_hYD;YO0G-b84UmjysM2F1zK*w14ScDjpZzI;hRI(3It_wQo-WuwaX_CD>G zS*`+Bm?Vx-EFGE;daC$b^>hM3g@^V|f*T@4o6kKn!YA3(nr-s0hNuJ^N0?$XjuFi9 z7SFVY_(}~~UeEz{ut9sloVd5sg2i3Men4r7@k5VUP4jzHCcxVYz~JhvaSqI`zhrQ>u;6D~ zbawu)(5umZlH96qNv!>>&UL(zs(=E=W8_o>1yecA2%2Ivgvi)sp))~3X?Fz)nJqk_ zfI&(=#=|+r3}k)@gF)3Giq-@{AUUDJt-E3trLi1yo+1BBxif%h5$pE~N$)abxVyG; z#E#uNi`NP~6PR9a03fot!IRh-#o@E}#HD-_2m)lYK4WVdF9XwqREhVa(R2qv{2NM% zq)q9J`1SHY!LKHvYwX7%>MAta$z`|4U7gaW9^5*NuD!B>s&DzvhsuJsIY z2;npaDqT9}j3TT`$9nwd>E0|0B>_DDGGqgQH;Kut@irCygu+8qd#R)xCNc7>9R^?4 z!x%n)-G{{1^;@QVn6~v8_i10nvn?= zRv4#Ypd@xHZ~ied&Y^cWfMC`u4d6IaToRk1jd)~4$h24r$vyuLin6+P@3bbXk5N3~ z=3S+i-8P)s-n?DbZyslODrQ(8+DAI}90s0yO+Es&3^Jee5>ei^G&e|Hvw9wsXp9Kr zieuOdkPUzG+MnR;b%+h~P{rumgIH}`RK$>L3LzK_3&0^e!AxJ5vU6&8bs=ow*+4yn z)86@Ai>&u}^=$I(vn{HTS*HpLrT^?5qi-!-Ov*05dyi=6xqE(6DOxN+7jVLud$?T| zbUVSlQr5r7QkyAZotTKp)Btn+)5z-$U2dm4YGyiMlg#vjGoEeVcKg^S-hKJ+n3 zF0z|*z9#>1F2oFMmU*F6mu&rE*&$T%WEvWl0GSKx;*95b z*}|ri7!ZV$;$zP`Emg{w+M9!$0pS)fnN~9!UfNo?=RGJ4{6`85K|&xx10Q}#2n>>)l^0i`2a3IT5J@{vaXx6q_Kzt)@JA@ zvu%GReLD!PHvO+b=mod9$5a~G;R;thPst2xnTDh7ri}2_G>_1l`!3%ywo-cXO<38F zdqD>xE%P8m&(M!~tg_i+NGjz@&!$3+0EZEJV?0plIv}i2!Sth7ukaz)x!4iqjjzh6 zKO%qkS^qp(_<8;J`J3%OuA^s>D0hK>%$QB;XrUzx%8U?&smpy6M52`rUa%LMXd%Q- z;+g|#EdIC`{-1FHTX`^PN{Jx%Z3&Lj69U8r__Z9v+lhvR0JfHsG;?wJDWf#nqWddO=4uv_TyaGv$YVmIT%%OESg!F02?~FK((-wy=OS z=b8vU3t`~}yW!;+r8+8*3*xtDn$c$>YkeXKD|RD-uVCp_{(WzrC;C~jwrhTTr(m9} z5~_v_KX%>j<8Dl{AtB8~@zLxtPjt$o1)k%LnSje)*U;~qC4e)&+@irRFV`SzC-IGt>#3K=XYf6;rWbMQYv9DP=B<EBoE} zff)Ek{dB4k@22^4u19>8F0@@*@s(G(x&f8NYZYf&FIsJUa^#m#+@=bO_sVCl<&&rG z_6=PAjf{2h-9e_({b#os{q^`r;sW~1)E!R6w7Q(PsVo57X;XDGOslkOM6?0utm>FH zx5S9;EcRtjmFwpq?EobMKEr=9R_4}+Xv)L$k;+Ip0<;H99I9630x}E>69~%15l*Q@n7&YJ?jqXo5Ce|wq4_}12L!DYT~^$mm1Q{b+%lwW-> z+L(4v1(E&46nKUpXY%Y(gqZFFdB!}@a3C-~shGT6wq<#zBhF#3nk5yleCNh&!@R+# zEF{UCX6HThGS;lfrbXv1}UHbh>JfE9!N8!8%pQik=3j^J=r`NmBwW}X?io9E^ z|GfQUF@3-i*Ss(RVCGg!P0%X+ZYO`QHTaKdhtbzJTWL#^4N zg?BopWzI#R$CD=8eBAgRqk}f>U=)-drJt08kx+D19kBvSiW+(JrryOHe^k^?8t{$F z%S)H=&f`$`?g|Wrzc7o)6&*ZnUqAjX@u|M$$ZOax8a;`Gp96yBZ^Xs*a9Buty;rGh z;v>cF;F_g9cBW^Cy5J?aP-}~4kYP^zvUIfq3G6d0; z)X&XiHdM<(`u26&1givQW!B(xGLyk+aJATaKLIJnIp z{c#PtfEf2by4)scRE_E25xUAWjgiEst|J-_-h2K%J$H?)DYEw9?vEUG?h^zt#UH!e63`_h+G5C?R;yOTd?x`V zfxG{ojv>(V#gopBDg!sW2fKBR%buFa_tP9obAXSWV_95UGr)~M+Ls2n@$fk)Bp^_B zh@h&bIQi=+Lc7$Fp(8+&}&S{phUGeWri++NQ2 z=R%iFgT=<_YYa0fyEH+MB6#sc4xteMuL5ZQ(5=BDL3u=;K>I3#*70h4VV3+)?e}aP z@s=zj-hHv01?*>|CmUfV{hxk(eRHejq|4_A_rhkA5f5M3k1hSVZnt3YxpV2}jxSG) zi_V=qnSUuq9aA)f@LY)>P8D7S_VSopZOcZ;A?<6`hsnSh8=JA2GN{oQ6eoq(8iV!n zUZ%_R!j*M(|1QuPSfg5QtTkj_Cuq}9u_6X3<^GhaDjRK->vk1@IQro(91krXdEh_Y zTJl#9VPDVBv|5t|i-__IvA7_k_&rt`#m}f`U?r$1iwS4DvI~*Rfo(ehC$)t`>GK_f$koX}u0J_#)e>`PrF)EVyDGU$oV(Z3$++(X0azKud-rH2`KgTd(Q(#<}# zQYg!}`D+(WpLnlm@BHgZ^M7A+GgeuA(XeAqBX4@pQaOg4Dk^;UDT0Zl*7#NH(5?7moMd|o7+RzE>!y!|?NlVoVE8N5MAd@G-POsH1 zUhOLUJ^x?!yT6Scy*H-2yU%xiK5>ux#Eu2%Pf}KwO}FpC&GEMZPZt^vSuaG@m29E- zCoTTh<;JAWilLl5K~7M`A26_zCHX!fkqu!ah%>*ys&RW8gr4|# zv4nKafyc+n@|xB5kWKQFjgDJ!RtnFE~;BtQn>fQXKej$xGG=(ck9~ zzJDXwYIkNKE^buoiq(F&--%J4{&!MA9~#dLAbCYkm5=%VD9rFQd2vP)S$1$f_@~?E z1KQ9LpndB24@WQ$w1sg_z8K$_+_qEC2e|z>AJ^`(0`B_*NL5qozthumY4*JI^E3PB z@r_X?Pyh3JklCNsqf~j{FH%*ic5QJ~MWtSJu4`D}iI%b1?91ld8Cj9d`I!Pk?QO#T zg${`c!sY=`@1@IsmDdg{U0=Yyfn% zRv8M+W}p8IL{L;!VVGh_#2ZRpc8-q*g}J)6v%Z?VVs;+y|4GH$=w{i;5VywyXtmYk z>eY~Sj!4y?UR*wWOwVyDF!egL2t{Y$SU~S>fxc8qKTCJjDLi}&0$E_CysfVj{NgFP#N16p|1xv1* z>WO-FaEyS38IGsFtJT~grK~flziTM|zrpY~mS4_k7)O3AUgcxxD|hI>%N5xu=0qdC z2G#UJtW}hSSfpHYT97{LZk^8H2w(m{% zKTpto3a6DO|2X(EzN4xLKfqm-N`a7ujr8Av`6DS81lR|ulz11;EbeTdw}qDug6C`R zTydM*zZ^9cK^7dH$TG0vx$FyxgTT>%$*9`aroXDCtZ12tW4S0TJ%@@xxXE{OT8}ghY42y zwE8>LG!92FcVie{Cri@2l*7}h?_-2YMArI@jy1Y!2G{oI3a}z{lcm3*e_Mk5RiM9- z=bnvJacuiFm0m1x-6Wa|6Ton9mK%x~pUrIb|8cIXSx={uBQXCiRzXNWJ|eHIpnYJB zA9gvd5^?_wop7QQ9hVCxY1rCQQD>1t4kpS*Uaj~wq+QK`p4m?S{dwI+-?Y{P)syWF zX!89F0eP8Id~Ndrucnba5?}bOuFq=OJVoX>K?edo_gUo=lRKLw4bNvOeiHui%>39< z32lQ$z55|n(t*rRlNOQhL)*R&J+(2CIi?hcvljcHU_c~F6%FtTv59hJO2OMa4U2sS zUsu0FQkO9n7aP$zuRfJ+o4oY^X_~T!!$XJszl|-&k=H#lssb!I;S7y|-{zT_W#_Y5 zi?SC(<4oA0A1gPXD!*{Q_i%mng5Mc+0E+dAHo-dG(@ufzfn$q5>ofBe*WMpU5vqHqMcqgC_OD#qaDIY!J*KDf&@w;dyK%Va z5ukO@NGKl!8st4pmLrnuXj8-5-_7!V>4XCKLHVi}^^?Ylu~H$oe}CKoTLKM=r&i5e z`by`97BM&zQ_pX*eDzPRLbVfWg#D9p$)lX(RJg_kQ7A&vqk3abOg)1q+~ z2WP!SmjRM7$j4Uo`7*lWsWtJDU2gBJ#o9lb9X`v*fBL3sJpB0*Z_MaTSFV%KQ|<5n zugQ(J8-lsleUt7omEe!LZMST?W5UjHrnVtTz8HCS0Yl~#J67~9;&B4!qe|K4^su^` z&Xnb}>bk1ubH*NGcPTq5b`>&HQ7>xkgXj2{3`VaF&yUqq1nqTPJ;}MA|GMUFD9gyz zWaG1cFU~Yxjauk_u%Yjq`zAt!(>Od@rrWp%utHLt6^tPSO#{txlPMYj7EI2k@Q9m( z&HPmH8<}nG?fHoyrw>Ij-&E|sp7efq=#%_qS^DwBeeZ{TKJTooo&P@IU8Q_ZmQPJN z0<=a+-p51ggS?Yy3Prst{y(BsJj_vxpeP@R{iq}3+-lyr9*$d>?!6}52_BO5r!5sE@eDk z{g#}!KC@1(RonY?c!<1(YyoTGTSx576QfXii#3qbk*`uf^L*GipRvSqRn{VLD2v&C z*|=lwX|pa}$<{(fqFL!PJCQ7C*$~EJf`O-A{C*Q$*<&BxOjYkdpNf|~(6x!+RpXLtYj`~LW>tNpp_?%aht|7wVZ zyV?~zj<9DKloYcTrIt=S{DpXax%;PI$KQRm!6ewjd4S|O3Q9Tu{wso3Z=Ffr>37xs zpWCJw@)_&+ws*3w$n!>lYMlycSDK$vks-^<*+hdB+k_L9Y^_RfcGp=CryQSi(Wg@?Ub)+G z+}n3}R;D?`9ugP(uIv;KL$FxtgewT9iSr{^%8MpTezG&`&?rcWCdDV8Al`7`xZC&C*7AqL~5^ z4>Ph8geRMu#hGQG1Ds;vwwOVYi&{ayb=|igeK;_U?w`Lr;uD@E^y5a?uVGeuQ{9S+ z`>1Yq*kUq7IK}p+hnHj}iO!Y~JHc--SZ=D`aM7OPUs>EZtq`3~PON!$r=~c%(w&m2 zi2Z2Dyqf0YZ(HEH2s_Mk1&+>}L}`U1FMhAcGz=e_emY>J(ze~b6B}~`Xbm*tC;)*b z1|%giw?3uZA*V5^BwTDrGD5rll*~_^03jO%Qq|{&o8<@%RCpjy5nAr+QZ3v($NcH9 zOv%0Q69{dg|KN9Z`DE-6)tQY+cE##tem;WdvcKf+8gLo=&xZPr6ytj(N9kgvm+~?y z0y#I22{i)|qQ|%{d#smvehPAFHrPgF>vM*Z8NXAG>)rz*%5rU|MvDqUF zbma5zza?D|PE3w1G&=Koh4>}1qqcb*09h1-&FgAx0}>=lmV|;a3?tN8i5aI%t*t}^ z|53hJOOKL*AiUfeU`^8J+Woa2AYY?f&}H2kW7&mR&l-rTTt41A zzi)Cf|K&~7;OTxroLQXHo6`k@H2k-<=iGe@D0faXymYEGwIU~fl2tnI@%!Y2oq{Uh z;2l3i5E+O)cx|R4gR!FZUnSkORl`Z4ex+F70}n={g!Nw&(PvoD?3}c%f}n@{ z60Uyj$#5lQE10NL9?kC^6c3fGsJh7>Dqm(M|Eb|wEgy9ySW=}9YuHKClEE}oC?ti@ z!_!0@EWM3|XK~n&$t>zzZ&%G+QJ>eXqWAX|yhTEwP_3>07{J*v$epVA!0HB-84qzs z!@v>>o|!2As`lQky2r(i)XQRA9S0xom-!MTNZI%Pv=WC{oJLq zTE)0pQjsc_+RSM3K5_hR*cANToQ224UE9iYm7iAkujKmqZACj!yHKykqfMFUNYUTb zA5)cHEW!k3>iOMF_UAa;A`POpY?u`yZUE7kJD_*Lk2$(Nt->p>x@UV6Z>qgGp4n9X zGQ-(lpq{x9|ASXOx!iImps?s7*4Dss>DK_SIiMsJA*`PpB97OdQQk=PuCfyO-i!1E zSS#e=bq8<@lJB`*Mq)DI$ud>t_Ey|<5|ttRZA|-}vB&csmeIS7=ZDD&jnf8iRTZ={ z5oZjfLs>OIj^7}3w99shb7 ze$xC(_qQ2fvCHwo(BNakM;h8A<9DUy+`e~?!Fg+LGVRBCPoOn36he$&^bcjW`oGXH z>=NVJ;;JdfJLC9(VDX^StIN>E8se#I+ZtL-lAN>xa$1S#WNlw&B7>yOtTKk!MFL;; z+jv#^FAoG>#0ETxX7xW|Q2Pc{WyPyJrlZ0>qsHpqx6GA3K2y>)!V?Q@RP*@gSY-T{ z!pq+J2m1}P644Q^UdN7fnp=tvOw~$6xAo?ck(L?$BOCERh=}*Wt2u)T#GQZbamR7@oQ8p}$<{^m)H!=a!e5hdhG#TF$ZMJ3SgFWn`L7koB++InL-8e`OIamCWCq}yr~61GNZ8l1-A*hh zLRC0NUhGELXqp!rWTqLG(o1ng7WV6yI(kW;MKb$jRoq_hi!T_CFvP*lzV1zCw$z_x zf6PLZ^M@>)Mi0hrvV4Wv6c_?Q)LP!7v*jM>7bet1)ZT0nXse4LTy$AfRU<*+;BHzTcL9 z;j7a0M25elPHEC$`tn<^#n*B*Z(1aB_Vojf?L??!k>>fxTW4QIh!uMG>5&>kvH$>Iefbj|ZYNKb zB*>UKWi&6z4F@c=JDb4kFD65&&FiXoW$M8=!}}T{3L{pxXTeOsl)kD z-}A~T#!Hr7Uj4>ob>m+@!7D&%MavD&PQA7h+a?E2FW#_)6i?VLTstcMp^e8nKVGy) z7rIYv>Up`Pa9LwrY1M>B9=|O5>}F-Fz-7`BaYMStU}eAcMoehwiX?8zG(bhOc6VmD z%g8)z@Sec~Kk+kpmu*I{e|9dmjJT2mFcK|KQW_9d7LBl0$Mzn6miD*$LLjAA!O3H=tL{ z5*9K%+ph|Gs;>K-{#8D-2*mU{04jVRwH2|UiaE-UPOz-<54Qa*zXJ*`&KZX$%#p5! z-?fWC*3e71jv?=)JKgfShxp?TJ-h-&_-4lOwXZX<^@yFO24)z|2sp|Flk+po(mPpW z_H9vyPlZ&~WAcM;@WL1%T?lhWv5BBTAxht#4Ki7EpTqZ=44BJUJkybLFL_*lHT@Xp z&?ZboMXIseACkQb7tIg?InAF#hkf9&3ABq>cCD8U^{gh-T8?UlyeiaUI0S^ppi_`M zx}!xUJ~;bOAm+a<_<<5LXi-orUZ`NJ{~txU=c&u)rhNE=`HcvGuqG?ReP~i{>2;i| zyb^qdx(!2Y7p>#ULtFpuB1n2n?@Fp{1&EY1vwbedl&g zwOy8VB=Z#Br?yL6YS~#MTZJZ#o~J82H65L_%f!tuKX~m3h7?@foG|;fDEO4q$5LE-6f-mcMmnJzZUP(Z;KemjU7yTPUZ+e~c%~n_4TEuJCMVydxvI7f7!sSgBj!;lJ1kbUX=fG=DyLX8Emq1f zk6-X_J&5t%2J|68YRvIRCBHKf&nn^HNKIGW+-yh7(oc`r8sfUbvSZ!n+HCw>Q=8NC(z_+B$WWQt7QR=%? zb>4I>zm>XzxTSMh1d4W$JF|E6o9{NDtw_PmSXB5m0bK+y5#CU~dUZDu0a7C(1Bl*a9)a&&K@|BB*hm#*p)G^b z$rV0=65>=4#mip-A0r_moLJ-Mp<3aEPo_)C`DE&kPN*8Udy!QjU8%-+xw%*+QiIE; z%&ibzmcG{TG2FG;ek5j&*Q5ln3t||t)O8ZY)O7;z9&E)@MfEWcCNZ5Es7Y0*CU`Al zv5=EV`4S|ZIwykSP%S7*K0java-websocket javax-servlets javax-servlets-2 + javax-sound javaxval jaxb jee-7 @@ -898,6 +899,7 @@ java-websocket javax-servlets javax-servlets-2 + javax-sound javaxval jaxb jee-7 From f8edd495bac3512646827398524b4f3b02dc26af Mon Sep 17 00:00:00 2001 From: Haroon Khan Date: Sat, 28 May 2022 04:27:51 +0100 Subject: [PATCH 093/100] [BAEL-5346] Code for @WebServiceServerTest article (#12229) --- .../spring-boot-testing-2/pom.xml | 39 ++++++++ .../webservice/InMemoryProductRepository.java | 15 ++++ .../baeldung/webservice/ProductEndpoint.java | 27 ++++++ .../webservice/ProductRepository.java | 9 ++ .../webservice/WebServiceApplication.java | 13 +++ .../webservice/config/WebServiceConfig.java | 44 +++++++++ .../generated/GetProductRequest.java | 64 +++++++++++++ .../generated/GetProductResponse.java | 64 +++++++++++++ .../webservice/generated/ObjectFactory.java | 56 ++++++++++++ .../webservice/generated/Product.java | 90 +++++++++++++++++++ .../webservice/generated/package-info.java | 2 + .../main/resources/webservice/products.xsd | 26 ++++++ .../ProductEndpointIntegrationTest.java | 69 ++++++++++++++ 13 files changed, 518 insertions(+) create mode 100644 spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/InMemoryProductRepository.java create mode 100644 spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/ProductEndpoint.java create mode 100644 spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/ProductRepository.java create mode 100644 spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/WebServiceApplication.java create mode 100644 spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/config/WebServiceConfig.java create mode 100644 spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/generated/GetProductRequest.java create mode 100644 spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/generated/GetProductResponse.java create mode 100644 spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/generated/ObjectFactory.java create mode 100644 spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/generated/Product.java create mode 100644 spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/generated/package-info.java create mode 100644 spring-boot-modules/spring-boot-testing-2/src/main/resources/webservice/products.xsd create mode 100644 spring-boot-modules/spring-boot-testing-2/src/test/java/com/baeldung/webservice/ProductEndpointIntegrationTest.java diff --git a/spring-boot-modules/spring-boot-testing-2/pom.xml b/spring-boot-modules/spring-boot-testing-2/pom.xml index dfe41d684d..556142b480 100644 --- a/spring-boot-modules/spring-boot-testing-2/pom.xml +++ b/spring-boot-modules/spring-boot-testing-2/pom.xml @@ -19,13 +19,52 @@ org.springframework.boot spring-boot-starter-web + + org.springframework.boot + spring-boot-starter-web-services + + + wsdl4j + wsdl4j + org.springframework.boot spring-boot-starter-test test + + org.springframework.ws + spring-ws-test + 3.1.3 + test + + + + + org.jvnet.jaxb2.maven2 + maven-jaxb2-plugin + 0.15.1 + + + xjc + + generate + + + ${project.basedir}/src/main/resources/webservice + ${project.basedir}/src/main/java + com.baeldung.webservice.generated + false + true + + + + + + + com.baeldung.boot.Application diff --git a/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/InMemoryProductRepository.java b/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/InMemoryProductRepository.java new file mode 100644 index 0000000000..be11426aca --- /dev/null +++ b/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/InMemoryProductRepository.java @@ -0,0 +1,15 @@ +package com.baeldung.webservice; + +import com.baeldung.webservice.generated.Product; +import org.springframework.stereotype.Component; + +@Component +public class InMemoryProductRepository implements ProductRepository { + + public Product findProduct(String id) { + Product product = new Product(); + product.setId(id); + product.setName("Product " + id); + return product; + } +} diff --git a/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/ProductEndpoint.java b/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/ProductEndpoint.java new file mode 100644 index 0000000000..c3ba5c04a8 --- /dev/null +++ b/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/ProductEndpoint.java @@ -0,0 +1,27 @@ +package com.baeldung.webservice; + +import com.baeldung.webservice.generated.GetProductRequest; +import com.baeldung.webservice.generated.GetProductResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.ws.server.endpoint.annotation.Endpoint; +import org.springframework.ws.server.endpoint.annotation.PayloadRoot; +import org.springframework.ws.server.endpoint.annotation.RequestPayload; +import org.springframework.ws.server.endpoint.annotation.ResponsePayload; + +@Endpoint +public class ProductEndpoint { + + private static final String NAMESPACE_URI = "http://baeldung.com/spring-boot-web-service"; + + @Autowired + private ProductRepository productRepository; + + + @PayloadRoot(namespace = NAMESPACE_URI, localPart = "getProductRequest") + @ResponsePayload + public GetProductResponse getProduct(@RequestPayload GetProductRequest request) { + GetProductResponse response = new GetProductResponse(); + response.setProduct(productRepository.findProduct(request.getId())); + return response; + } +} diff --git a/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/ProductRepository.java b/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/ProductRepository.java new file mode 100644 index 0000000000..35eb6fcb97 --- /dev/null +++ b/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/ProductRepository.java @@ -0,0 +1,9 @@ +package com.baeldung.webservice; + +import com.baeldung.webservice.generated.Product; + +public interface ProductRepository { + + Product findProduct(String id); + +} diff --git a/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/WebServiceApplication.java b/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/WebServiceApplication.java new file mode 100644 index 0000000000..305738dcf2 --- /dev/null +++ b/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/WebServiceApplication.java @@ -0,0 +1,13 @@ +package com.baeldung.webservice; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class WebServiceApplication { + + public static void main(String[] args) { + SpringApplication.run(WebServiceApplication.class, args); + } + +} diff --git a/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/config/WebServiceConfig.java b/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/config/WebServiceConfig.java new file mode 100644 index 0000000000..d444db09fb --- /dev/null +++ b/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/config/WebServiceConfig.java @@ -0,0 +1,44 @@ +package com.baeldung.webservice.config; + +import org.springframework.boot.web.servlet.ServletRegistrationBean; +import org.springframework.context.ApplicationContext; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.io.ClassPathResource; +import org.springframework.ws.config.annotation.EnableWs; +import org.springframework.ws.transport.http.MessageDispatcherServlet; +import org.springframework.ws.wsdl.wsdl11.DefaultWsdl11Definition; +import org.springframework.xml.xsd.SimpleXsdSchema; +import org.springframework.xml.xsd.XsdSchema; + +@EnableWs +@Configuration +public class WebServiceConfig { + + @Bean + public ServletRegistrationBean messageDispatcherServlet(ApplicationContext applicationContext) { + MessageDispatcherServlet servlet = new MessageDispatcherServlet(); + servlet.setApplicationContext(applicationContext); + servlet.setTransformWsdlLocations(true); + return new ServletRegistrationBean<>(servlet, "/ws/*"); + } + + @Bean(name = "products") + public DefaultWsdl11Definition defaultWsdl11Definition(XsdSchema productsSchema) { + DefaultWsdl11Definition wsdl11Definition = new DefaultWsdl11Definition(); + wsdl11Definition.setPortTypeName("ProductsPort"); + wsdl11Definition.setLocationUri("/ws"); + wsdl11Definition.setTargetNamespace("http://baeldung.com/spring-boot-web-service"); + wsdl11Definition.setSchema(productsSchema); + return wsdl11Definition; + } + + @Bean + public XsdSchema productsSchema() { + return new SimpleXsdSchema(new ClassPathResource("webservice/products.xsd")); + } + + + + +} diff --git a/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/generated/GetProductRequest.java b/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/generated/GetProductRequest.java new file mode 100644 index 0000000000..d04302456b --- /dev/null +++ b/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/generated/GetProductRequest.java @@ -0,0 +1,64 @@ + +package com.baeldung.webservice.generated; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="id" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "id" +}) +@XmlRootElement(name = "getProductRequest") +public class GetProductRequest { + + @XmlElement(required = true) + protected String id; + + /** + * Gets the value of the id property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getId() { + return id; + } + + /** + * Sets the value of the id property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setId(String value) { + this.id = value; + } + +} diff --git a/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/generated/GetProductResponse.java b/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/generated/GetProductResponse.java new file mode 100644 index 0000000000..f8fcaa094f --- /dev/null +++ b/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/generated/GetProductResponse.java @@ -0,0 +1,64 @@ + +package com.baeldung.webservice.generated; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="product" type="{http://baeldung.com/spring-boot-web-service}product"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "product" +}) +@XmlRootElement(name = "getProductResponse") +public class GetProductResponse { + + @XmlElement(required = true) + protected Product product; + + /** + * Gets the value of the product property. + * + * @return + * possible object is + * {@link Product } + * + */ + public Product getProduct() { + return product; + } + + /** + * Sets the value of the product property. + * + * @param value + * allowed object is + * {@link Product } + * + */ + public void setProduct(Product value) { + this.product = value; + } + +} diff --git a/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/generated/ObjectFactory.java b/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/generated/ObjectFactory.java new file mode 100644 index 0000000000..015ecc3f0a --- /dev/null +++ b/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/generated/ObjectFactory.java @@ -0,0 +1,56 @@ + +package com.baeldung.webservice.generated; + +import javax.xml.bind.annotation.XmlRegistry; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the com.baeldung.webservice.generated package. + *

An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.baeldung.webservice.generated + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link GetProductRequest } + * + */ + public GetProductRequest createGetProductRequest() { + return new GetProductRequest(); + } + + /** + * Create an instance of {@link GetProductResponse } + * + */ + public GetProductResponse createGetProductResponse() { + return new GetProductResponse(); + } + + /** + * Create an instance of {@link Product } + * + */ + public Product createProduct() { + return new Product(); + } + +} diff --git a/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/generated/Product.java b/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/generated/Product.java new file mode 100644 index 0000000000..5957aa44b4 --- /dev/null +++ b/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/generated/Product.java @@ -0,0 +1,90 @@ + +package com.baeldung.webservice.generated; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for product complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="product">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="id" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         <element name="name" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "product", propOrder = { + "id", + "name" +}) +public class Product { + + @XmlElement(required = true) + protected String id; + @XmlElement(required = true) + protected String name; + + /** + * Gets the value of the id property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getId() { + return id; + } + + /** + * Sets the value of the id property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setId(String value) { + this.id = value; + } + + /** + * Gets the value of the name property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setName(String value) { + this.name = value; + } + +} diff --git a/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/generated/package-info.java b/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/generated/package-info.java new file mode 100644 index 0000000000..298ae9374b --- /dev/null +++ b/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/generated/package-info.java @@ -0,0 +1,2 @@ +@javax.xml.bind.annotation.XmlSchema(namespace = "http://baeldung.com/spring-boot-web-service", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +package com.baeldung.webservice.generated; diff --git a/spring-boot-modules/spring-boot-testing-2/src/main/resources/webservice/products.xsd b/spring-boot-modules/spring-boot-testing-2/src/main/resources/webservice/products.xsd new file mode 100644 index 0000000000..3819b465be --- /dev/null +++ b/spring-boot-modules/spring-boot-testing-2/src/main/resources/webservice/products.xsd @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/spring-boot-modules/spring-boot-testing-2/src/test/java/com/baeldung/webservice/ProductEndpointIntegrationTest.java b/spring-boot-modules/spring-boot-testing-2/src/test/java/com/baeldung/webservice/ProductEndpointIntegrationTest.java new file mode 100644 index 0000000000..ea9924193b --- /dev/null +++ b/spring-boot-modules/spring-boot-testing-2/src/test/java/com/baeldung/webservice/ProductEndpointIntegrationTest.java @@ -0,0 +1,69 @@ +package com.baeldung.webservice; + +import com.baeldung.webservice.generated.Product; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.webservices.server.WebServiceServerTest; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.core.io.ClassPathResource; +import org.springframework.ws.test.server.MockWebServiceClient; +import org.springframework.xml.transform.StringSource; + +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + +import static org.mockito.Mockito.when; +import static org.springframework.ws.test.server.RequestCreators.withPayload; +import static org.springframework.ws.test.server.ResponseMatchers.noFault; +import static org.springframework.ws.test.server.ResponseMatchers.payload; +import static org.springframework.ws.test.server.ResponseMatchers.validPayload; +import static org.springframework.ws.test.server.ResponseMatchers.xpath; + +@WebServiceServerTest +class ProductEndpointIntegrationTest { + + private static final Map NAMESPACE_MAPPING = createMapping(); + + @Autowired + private MockWebServiceClient client; + + @MockBean + private ProductRepository productRepository; + + @Test + void givenXmlRequest_whenServiceInvoked_thenValidResponse() throws IOException { + Product product = new Product(); + product.setId("1"); + product.setName("Product 1"); + + when(productRepository.findProduct("1")).thenReturn(product); + + StringSource request = new StringSource( + "" + + "1" + + "" + ); + StringSource response = new StringSource( + "" + + "" + + "1" + + "Product 1" + + "" + + "" + ); + + client.sendRequest(withPayload(request)) + .andExpect(noFault()) + .andExpect(validPayload(new ClassPathResource("webservice/products.xsd"))) + .andExpect(xpath("/bd:getProductResponse/bd:product[1]/bd:name", NAMESPACE_MAPPING) + .evaluatesTo("Product 1")) + .andExpect(payload(response)); + } + + private static Map createMapping() { + Map mapping = new HashMap<>(); + mapping.put("bd", "http://baeldung.com/spring-boot-web-service"); + return mapping; + } +} From 8b9055c1692c722e3371dfe7e9056d3deae1bef4 Mon Sep 17 00:00:00 2001 From: kwoyke Date: Sun, 29 May 2022 09:34:45 +0200 Subject: [PATCH 094/100] JAVA-10134: Cleanup POM properties (#12272) * JAVA-10134: Cleanup POM properties * JAVA-10134: Fix POM properties * JAVA-10134: Fix hamcrest dependency in libraries-apache-commons-collections * JAVA-10134: Fix java-hamcrest dependency * JAVA-10134: Add maven.compiler properties --- libraries-apache-commons-collections/pom.xml | 7 ++----- libraries-data-io/pom.xml | 1 - libraries-primitive/pom.xml | 6 ------ libraries-testing/pom.xml | 13 ------------- metrics/pom.xml | 3 ++- netflix-modules/mantis/pom.xml | 9 +++++++-- patterns/cqrs-es/pom.xml | 6 ------ 7 files changed, 11 insertions(+), 34 deletions(-) diff --git a/libraries-apache-commons-collections/pom.xml b/libraries-apache-commons-collections/pom.xml index c1a158b16e..ac7a327ead 100644 --- a/libraries-apache-commons-collections/pom.xml +++ b/libraries-apache-commons-collections/pom.xml @@ -20,14 +20,11 @@ org.hamcrest - java-hamcrest - ${org.hamcrest.java-hamcrest.version} + hamcrest + ${hamcrest.version} test - - 2.0.0.0 - \ No newline at end of file diff --git a/libraries-data-io/pom.xml b/libraries-data-io/pom.xml index 713c4342d1..640bf1ba07 100644 --- a/libraries-data-io/pom.xml +++ b/libraries-data-io/pom.xml @@ -107,7 +107,6 @@ 3.3.5 2.1 2.8.7 - 2.12.3 1.15 0.14.2 3.17.3 diff --git a/libraries-primitive/pom.xml b/libraries-primitive/pom.xml index 7d12e9a436..badcfc443d 100644 --- a/libraries-primitive/pom.xml +++ b/libraries-primitive/pom.xml @@ -69,12 +69,6 @@ 8.2.2 10.0.0 - 1.8 - 1.8 - 1.28 - 1.28 - 5.8.1 - 2.22.2 \ No newline at end of file diff --git a/libraries-testing/pom.xml b/libraries-testing/pom.xml index 4bc6eba7fc..279cb20225 100644 --- a/libraries-testing/pom.xml +++ b/libraries-testing/pom.xml @@ -171,15 +171,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - ${maven-compiler-plugin.source} - ${maven-compiler-plugin.target} - - @@ -196,10 +187,6 @@ 4.1.1 2.0.0.0 2.7.0 - 3.14.0 - 1.8 - 1.8 - 3.8.1 0.14.1 1.0.0 diff --git a/metrics/pom.xml b/metrics/pom.xml index 37b10ef484..d3731242c4 100644 --- a/metrics/pom.xml +++ b/metrics/pom.xml @@ -78,7 +78,7 @@ com.netflix.spectator spectator-api - 1.0.11 + ${spectator-api.version} @@ -90,6 +90,7 @@ 2.0.7.RELEASE 1.1.0 + 1.0.11 \ No newline at end of file diff --git a/netflix-modules/mantis/pom.xml b/netflix-modules/mantis/pom.xml index 0bab944b8a..50d9e61d9e 100644 --- a/netflix-modules/mantis/pom.xml +++ b/netflix-modules/mantis/pom.xml @@ -23,7 +23,7 @@ io.mantisrx mantis-runtime - 1.2.63 + ${mantis-runtime.version} org.slf4j @@ -38,7 +38,7 @@ net.andreinc.mockneat mockneat - 0.4.2 + ${mockneat.version} org.projectlombok @@ -63,4 +63,9 @@ + + 1.2.63 + 0.4.2 + + \ No newline at end of file diff --git a/patterns/cqrs-es/pom.xml b/patterns/cqrs-es/pom.xml index 20eeb09e35..1bd7453ea1 100644 --- a/patterns/cqrs-es/pom.xml +++ b/patterns/cqrs-es/pom.xml @@ -25,10 +25,4 @@ - - 1.8 - 1.8 - 1.18.12 - - \ No newline at end of file From a7cae2e766f2603dc3d2629607848779985c7060 Mon Sep 17 00:00:00 2001 From: kwoyke Date: Sun, 29 May 2022 09:52:09 +0200 Subject: [PATCH 095/100] JAVA-9609: Create manual test for POSTing with HttpURLConnection (#12263) --- .../PostJSONWithHttpURLConnection.java | 46 ---------------- ...stJSONWithHttpURLConnectionManualTest.java | 52 +++++++++++++++++++ 2 files changed, 52 insertions(+), 46 deletions(-) delete mode 100644 core-java-modules/core-java-networking-2/src/main/java/com/baeldung/urlconnection/PostJSONWithHttpURLConnection.java create mode 100644 core-java-modules/core-java-networking-2/src/test/java/com/baeldung/urlconnection/PostJSONWithHttpURLConnectionManualTest.java diff --git a/core-java-modules/core-java-networking-2/src/main/java/com/baeldung/urlconnection/PostJSONWithHttpURLConnection.java b/core-java-modules/core-java-networking-2/src/main/java/com/baeldung/urlconnection/PostJSONWithHttpURLConnection.java deleted file mode 100644 index 38b4a0411d..0000000000 --- a/core-java-modules/core-java-networking-2/src/main/java/com/baeldung/urlconnection/PostJSONWithHttpURLConnection.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.baeldung.urlconnection; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.net.HttpURLConnection; -import java.net.URL; - -public class PostJSONWithHttpURLConnection { - - public static void main (String []args) throws IOException{ - //Change the URL with any other publicly accessible POST resource, which accepts JSON request body - URL url = new URL ("https://reqres.in/api/users"); - - HttpURLConnection con = (HttpURLConnection)url.openConnection(); - con.setRequestMethod("POST"); - - con.setRequestProperty("Content-Type", "application/json; utf-8"); - con.setRequestProperty("Accept", "application/json"); - - con.setDoOutput(true); - - //JSON String need to be constructed for the specific resource. - //We may construct complex JSON using any third-party JSON libraries such as jackson or org.json - String jsonInputString = "{\"name\": \"Upendra\", \"job\": \"Programmer\"}"; - - try(OutputStream os = con.getOutputStream()){ - byte[] input = jsonInputString.getBytes("utf-8"); - os.write(input, 0, input.length); - } - - int code = con.getResponseCode(); - System.out.println(code); - - try(BufferedReader br = new BufferedReader(new InputStreamReader(con.getInputStream(), "utf-8"))){ - StringBuilder response = new StringBuilder(); - String responseLine = null; - while ((responseLine = br.readLine()) != null) { - response.append(responseLine.trim()); - } - System.out.println(response.toString()); - } - } - -} diff --git a/core-java-modules/core-java-networking-2/src/test/java/com/baeldung/urlconnection/PostJSONWithHttpURLConnectionManualTest.java b/core-java-modules/core-java-networking-2/src/test/java/com/baeldung/urlconnection/PostJSONWithHttpURLConnectionManualTest.java new file mode 100644 index 0000000000..e1a73a8de9 --- /dev/null +++ b/core-java-modules/core-java-networking-2/src/test/java/com/baeldung/urlconnection/PostJSONWithHttpURLConnectionManualTest.java @@ -0,0 +1,52 @@ +package com.baeldung.urlconnection; + +import org.junit.Test; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.net.HttpURLConnection; +import java.net.URL; +import java.nio.charset.StandardCharsets; + +import static org.assertj.core.api.Assertions.assertThat; + +public class PostJSONWithHttpURLConnectionManualTest { + + @Test + public void givenValidURLAndPayload_whenPost_ThenSuccess() throws IOException { + //Change the URL with any other publicly accessible POST resource, which accepts JSON request body + URL url = new URL("https://reqres.in/api/users"); + + HttpURLConnection con = (HttpURLConnection) url.openConnection(); + con.setRequestMethod("POST"); + con.setRequestProperty("User-Agent", "AnyAgent"); + + con.setRequestProperty("Content-Type", "application/json"); + con.setRequestProperty("Accept", "application/json"); + + con.setDoOutput(true); + + //JSON String need to be constructed for the specific resource. + //We may construct complex JSON using any third-party JSON libraries such as jackson or org.json + String jsonInputString = "{\"name\": \"Upendra\", \"job\": \"Programmer\"}"; + + try (OutputStream os = con.getOutputStream()) { + byte[] input = jsonInputString.getBytes(StandardCharsets.UTF_8); + os.write(input, 0, input.length); + } + + assertThat(con.getResponseCode()).isEqualTo(201); + + try (BufferedReader br = new BufferedReader(new InputStreamReader(con.getInputStream(), StandardCharsets.UTF_8))) { + StringBuilder response = new StringBuilder(); + String responseLine = null; + while ((responseLine = br.readLine()) != null) { + response.append(responseLine.trim()); + } + assertThat(response).contains("createdAt"); + } + } + +} From 85d134952e4068bd14d27115b7c1e95669ad6f20 Mon Sep 17 00:00:00 2001 From: Dhawal Kapil Date: Sun, 29 May 2022 19:32:17 +0530 Subject: [PATCH 096/100] JAVA-11240 Moved spring-cloud to spring-cloud-modules --- pom.xml | 4 +- .../README.md | 0 .../pom.xml | 4 +- .../spring-cloud-archaius/README.md | 0 .../additional-sources-simple/pom.xml | 0 .../AdditionalSourcesSimpleApplication.java | 0 .../ApplicationPropertiesConfigurations.java | 0 .../ConfigPropertiesController.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/config.properties | 0 .../main/resources/other-config.properties | 0 .../ArchaiusAdditionalSourcesLiveTest.java | 0 .../additionalsources/SpringContextTest.java | 0 .../src/test/resources/logback-test.xml | 0 .../basic-config/pom.xml | 0 .../basic/BasicArchaiusApplication.java | 0 .../ConfigPropertiesController.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/config.properties | 0 .../src/main/resources/other.properties | 0 .../java/com/baeldung/SpringContextTest.java | 0 ...aiusBasicConfigurationIntegrationTest.java | 0 .../ArchaiusBasicConfigurationLiveTest.java | 0 .../archaius/basic/SpringContextTest.java | 0 .../src/test/resources/config.properties | 0 .../src/test/resources/logback-test.xml | 0 .../dynamodb-config/pom.xml | 0 .../DynamoSourcesApplication.java | 0 .../ApplicationPropertiesConfigurations.java | 0 .../config/DynamoDbConfiguration.java | 0 .../ConfigPropertiesController.java | 0 .../dynamodb/ArchaiusProperties.java | 0 .../ArchaiusPropertiesRepository.java | 0 .../src/main/resources/application.properties | 0 .../ArchaiusDynamoDbLiveTest.java | 0 .../dynamosources/SpringContextLiveTest.java | 0 .../extra-configs/pom.xml | 0 .../extraconfigs/ExtraConfigsApplication.java | 0 .../ConfigPropertiesController.java | 0 .../src/main/resources/application.properties | 0 .../other-config-dir/extra.properties | 0 .../src/main/resources/other.properties | 0 .../java/com/baeldung/SpringContextTest.java | 0 .../ArchaiusExtraConfigsLiveTest.java | 0 .../src/test/resources/logback-test.xml | 0 .../spring-cloud-archaius/jdbc-config/pom.xml | 0 .../jdbconfig/JdbcSourcesApplication.java | 0 .../ApplicationPropertiesConfigurations.java | 0 .../ConfigPropertiesController.java | 0 .../archaius/jdbconfig/jdbc/Properties.java | 0 .../src/main/resources/application.properties | 0 .../jdbc-config/src/main/resources/data.sql | 0 .../jdbconfig/ArchaiusJDBCSourceLiveTest.java | 0 .../archaius/jdbconfig/SpringContextTest.java | 0 .../src/test/resources/logback-test.xml | 0 .../spring-cloud-archaius/pom.xml | 2 +- .../zookeeper-config/pom.xml | 0 .../ZookeeperConfigApplication.java | 0 .../config/ZookeeperConfigsInitializer.java | 0 .../ConfigPropertiesController.java | 0 .../src/main/resources/application.properties | 0 .../ArchaiusZookeeperLiveTest.java | 0 .../SpringContextLiveTest.java | 0 .../spring-cloud-aws/README.md | 0 .../spring-cloud-aws/pom.xml | 2 +- .../aws/InstanceProfileAwsApplication.java | 0 .../cloud/aws/SpringCloudAwsApplication.java | 0 .../aws/config/SpringCloudAwsConfig.java | 0 .../cloud/aws/ec2/EC2EnableMetadata.java | 0 .../spring/cloud/aws/ec2/EC2Metadata.java | 0 .../spring/cloud/aws/s3/SpringCloudS3.java | 0 .../cloud/aws/s3/SpringCloudS3Service.java | 0 .../cloud/aws/sns/SNSEndpointController.java | 0 .../cloud/aws/sns/SNSMessageSender.java | 0 .../spring/cloud/aws/sqs/SpringCloudSQS.java | 0 .../resources/InstanceProfileFormation.yaml | 0 .../application-instance-profile.properties | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/aws-config.xml | 0 .../src/main/resources/logback.xml | 0 .../cloud/aws/SpringCloudAwsTestUtil.java | 0 .../cloud/aws/SpringContextLiveTest.java | 0 .../cloud/aws/ec2/EC2MetadataLiveTest.java | 0 .../cloud/aws/rds/SpringCloudRDSLiveTest.java | 0 .../cloud/aws/s3/SpringCloudS3LiveTest.java | 0 .../sns/SNSEndpointControllerUnitTest.java | 0 .../cloud/aws/sns/SpringCloudSNSLiveTest.java | 0 .../spring/cloud/aws/sqs/Greeting.java | 0 .../cloud/aws/sqs/SpringCloudSQSLiveTest.java | 0 .../resources/application-test.properties | 0 .../src/test/resources/test-file-upload.txt | 0 .../spring-cloud-bootstrap/README.md | 0 .../book-service.properties | 0 .../application-config/discovery.properties | 0 .../application-config/gateway.properties | 0 .../rating-service.properties | 0 .../application-config/zipkin.properties | 0 .../spring-cloud-bootstrap/config/pom.xml | 0 .../bootstrap/config/ConfigApplication.java | 0 .../bootstrap/config/SecurityConfig.java | 0 .../src/main/resources/application.properties | 0 .../config/src/main/resources/logback.xml | 0 .../java/com/baeldung/SpringContextTest.java | 0 .../customer-service/pom.xml | 0 .../baeldung/customerservice/Customer.java | 0 .../customerservice/CustomerApplication.java | 0 .../customerservice/CustomerService.java | 0 .../src/main/resources/application.properties | 0 .../src/test/resources/application.properties | 0 .../spring-cloud-bootstrap/discovery/pom.xml | 0 .../discovery/DiscoveryApplication.java | 0 .../bootstrap/discovery/SecurityConfig.java | 0 .../bootstrap/discovery/SessionConfig.java | 0 .../src/main/resources/bootstrap.properties | 0 .../discovery/src/main/resources/logback.xml | 0 .../com/baeldung/SpringContextLiveTest.java | 0 .../spring-cloud-bootstrap/gateway/pom.xml | 0 .../src/main/angular/ui/.angular-cli.json | 0 .../gateway/src/main/angular/ui/.editorconfig | 0 .../gateway/src/main/angular/ui/.gitignore | 0 .../gateway/src/main/angular/ui/README.md | 0 .../src/main/angular/ui/e2e/app.e2e-spec.ts | 0 .../gateway/src/main/angular/ui/e2e/app.po.ts | 0 .../src/main/angular/ui/e2e/tsconfig.e2e.json | 0 .../gateway/src/main/angular/ui/karma.conf.js | 0 .../gateway/src/main/angular/ui/package.json | 0 .../src/main/angular/ui/protractor.conf.js | 0 .../main/angular/ui/src/app/app.component.css | 0 .../angular/ui/src/app/app.component.html | 0 .../main/angular/ui/src/app/app.component.ts | 0 .../src/main/angular/ui/src/app/app.module.ts | 0 .../src/main/angular/ui/src/app/book.ts | 0 .../book-detail/book-detail.component.css | 0 .../book-detail/book-detail.component.html | 0 .../book/book-detail/book-detail.component.ts | 0 .../book/book-list/book-list.component.css | 0 .../book/book-list/book-list.component.html | 0 .../app/book/book-list/book-list.component.ts | 0 .../app/click-stop-propagation.directive.ts | 0 .../main/angular/ui/src/app/http.service.ts | 0 .../src/main/angular/ui/src/app/principal.ts | 0 .../src/main/angular/ui/src/app/rating.ts | 0 .../ui/src/app/rating/rating.component.css | 0 .../ui/src/app/rating/rating.component.html | 0 .../ui/src/app/rating/rating.component.ts | 0 .../src/main/angular/ui/src/assets/.gitkeep | 0 .../ui/src/environments/environment.prod.ts | 0 .../ui/src/environments/environment.ts | 0 .../src/main/angular/ui/src/favicon.ico | Bin .../src/main/angular/ui/src/index.html | 0 .../gateway/src/main/angular/ui/src/main.ts | 0 .../src/main/angular/ui/src/polyfills.ts | 0 .../src/main/angular/ui/src/styles.css | 0 .../gateway/src/main/angular/ui/src/test.ts | 0 .../src/main/angular/ui/src/tsconfig.app.json | 0 .../main/angular/ui/src/tsconfig.spec.json | 0 .../src/main/angular/ui/src/typings.d.ts | 0 .../gateway/src/main/angular/ui/tsconfig.json | 0 .../gateway/src/main/angular/ui/tslint.json | 0 .../gateway/AuthenticationController.java | 0 .../bootstrap/gateway/ErrorPageConfig.java | 0 .../bootstrap/gateway/GatewayApplication.java | 0 .../bootstrap/gateway/SecurityConfig.java | 0 .../bootstrap/gateway/SessionConfig.java | 0 .../bootstrap/gateway/client/book/Book.java | 0 .../gateway/client/book/BooksClient.java | 0 .../gateway/client/rating/Rating.java | 0 .../gateway/client/rating/RatingsClient.java | 0 .../controller/CombinedController.java | 0 .../filter/SessionSavingZuulPreFilter.java | 0 .../src/main/resources/bootstrap.properties | 0 .../gateway/src/main/resources/logback.xml | 0 .../main/resources/static/eureka/css/wro.css | 0 .../eureka/fonts/montserrat-webfont.eot | Bin .../eureka/fonts/montserrat-webfont.svg | 0 .../eureka/fonts/montserrat-webfont.ttf | Bin .../eureka/fonts/montserrat-webfont.woff | Bin .../eureka/fonts/varela_round-webfont.eot | Bin .../eureka/fonts/varela_round-webfont.svg | 0 .../eureka/fonts/varela_round-webfont.ttf | Bin .../eureka/fonts/varela_round-webfont.woff | Bin .../static/eureka/images/404-icon.png | Bin .../static/eureka/images/homepage-bg.jpg | Bin .../static/eureka/images/platform-bg.png | Bin .../eureka/images/platform-spring-xd.png | Bin .../images/spring-logo-eureka-mobile.png | Bin .../eureka/images/spring-logo-eureka.png | Bin .../main/resources/static/eureka/js/wro.js | 0 .../main/resources/static/home/favicon.ico | Bin .../src/main/resources/static/home/index.html | 0 .../resources/static/home/inline.bundle.js | 0 .../static/home/inline.bundle.js.map | 0 .../main/resources/static/home/main.bundle.js | 0 .../resources/static/home/main.bundle.js.map | 0 .../resources/static/home/polyfills.bundle.js | 0 .../static/home/polyfills.bundle.js.map | 0 .../resources/static/home/styles.bundle.js | 0 .../static/home/styles.bundle.js.map | 0 .../src/main/resources/static/index.html | 0 .../com/baeldung/SpringContextLiveTest.java | 0 .../cloud/bootstrap/gateway/LiveTest.java | 0 .../gateway/SpringContextLiveTest.java | 0 .../src/test/resources/bootstrap.properties | 0 .../order-service/order-client/pom.xml | 0 .../orderservice/client/OrderClient.java | 0 .../orderservice/client/OrderClientImpl.java | 0 .../orderservice/client/OrderDTO.java | 0 .../orderservice/client/OrderResponse.java | 0 .../src/main/resources/application.properties | 0 .../order-service/order-server/pom.xml | 0 .../java/com/baeldung/orderservice/Order.java | 0 .../orderservice/OrderApplication.java | 0 .../baeldung/orderservice/OrderService.java | 0 .../src/main/resources/application.properties | 0 .../order-service/pom.xml | 0 .../spring-cloud-bootstrap/pom.xml | 2 +- .../spring-cloud-bootstrap/svc-book/pom.xml | 0 .../svcbook/BookServiceApplication.java | 0 .../cloud/bootstrap/svcbook/DataLoader.java | 0 .../bootstrap/svcbook/SecurityConfig.java | 0 .../bootstrap/svcbook/SessionConfig.java | 0 .../cloud/bootstrap/svcbook/book/Book.java | 0 .../svcbook/book/BookController.java | 0 .../svcbook/book/BookNotFoundException.java | 0 .../svcbook/book/BookRepository.java | 0 .../bootstrap/svcbook/book/BookService.java | 0 .../src/main/resources/bootstrap.properties | 0 .../svc-book/src/main/resources/logback.xml | 0 .../com/baeldung/SpringContextLiveTest.java | 0 .../src/test/resources/bootstrap.properties | 0 .../spring-cloud-bootstrap/svc-rating/pom.xml | 0 .../cloud/bootstrap/svcrating/DataLoader.java | 0 .../svcrating/RatingServiceApplication.java | 0 .../bootstrap/svcrating/SecurityConfig.java | 0 .../bootstrap/svcrating/SessionConfig.java | 0 .../bootstrap/svcrating/rating/Rating.java | 0 .../rating/RatingCacheRepository.java | 0 .../svcrating/rating/RatingController.java | 0 .../rating/RatingNotFoundException.java | 0 .../svcrating/rating/RatingRepository.java | 0 .../svcrating/rating/RatingService.java | 0 .../src/main/resources/bootstrap.properties | 0 .../svc-rating/src/main/resources/logback.xml | 0 .../com/baeldung/SpringContextLiveTest.java | 0 .../src/test/resources/bootstrap.properties | 0 .../spring-cloud-bootstrap/zipkin/pom.xml | 0 .../bootstrap/zipkin/ZipkinApplication.java | 0 .../src/main/resources/bootstrap.properties | 0 .../zipkin/src/main/resources/logback.xml | 0 .../java/com/baeldung/SpringContextTest.java | 0 .../spring-cloud-circuit-breaker/README.md | 0 .../spring-cloud-circuit-breaker/pom.xml | 2 +- .../baeldung/circuitbreaker/AlbumService.java | 0 .../baeldung/circuitbreaker/Controller.java | 0 .../baeldung/circuitbreaker/SpringApp.java | 0 .../main/resources/fallback-album-list.json | 0 .../spring-cloud-config/README.md | 0 .../spring-cloud-config/client/pom.xml | 0 .../cloud/config/client/ConfigClient.java | 0 .../src/main/resources/application.properties | 0 .../config/client/SpringContextLiveTest.java | 0 .../config-client-development.properties | 0 .../config-client-production.properties | 0 .../spring-cloud-config/pom.xml | 2 +- .../spring-cloud-config/server/pom.xml | 0 .../cloud/config/server/ConfigServer.java | 0 .../config/server/SecurityConfiguration.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/config-server.jks | Bin .../config/server/SpringContextTest.java | 0 .../src/test/resources/application.properties | 0 .../spring-cloud-connectors-heroku/README.md | 0 .../spring-cloud-connectors-heroku/pom.xml | 2 +- .../heroku/ConnectorsHerokuApplication.java | 0 .../cloud/connectors/heroku/book/Book.java | 0 .../heroku/book/BookController.java | 0 .../heroku/book/BookRepository.java | 0 .../connectors/heroku/book/BookService.java | 0 .../connectors/heroku/product/Product.java | 0 .../heroku/product/ProductController.java | 0 .../heroku/product/ProductRepository.java | 0 .../heroku/product/ProductService.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/logback.xml | 0 .../connectors/heroku/SpringContextTest.java | 0 .../src/test/resources/application.properties | 0 .../spring-cloud-consul/README.md | 0 .../spring-cloud-consul/pom.xml | 2 +- .../discovery/DiscoveryClientApplication.java | 0 .../discovery/DiscoveryClientController.java | 0 .../health/ServiceDiscoveryApplication.java | 0 .../health/ServiceDiscoveryController.java | 0 .../consul/leadership/LeadershipElection.java | 0 .../DistributedPropertiesApplication.java | 0 .../DistributedPropertiesController.java | 0 .../cloud/consul/properties/MyProperties.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/bootstrap.yml | 0 .../src/main/resources/logback.xml | 0 .../cloud/consul/SpringContextLiveTest.java | 0 .../spring-cloud-contract/README.md | 0 .../spring-cloud-contract/pom.xml | 2 +- .../spring-cloud-contract-consumer/pom.xml | 0 ...pringCloudContractConsumerApplication.java | 0 .../controller/BasicMathController.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/logback.xml | 0 .../java/com/baeldung/SpringContextTest.java | 0 .../BasicMathControllerIntegrationTest.java | 0 .../spring-cloud-contract-producer/pom.xml | 0 ...pringCloudContractProducerApplication.java | 0 .../controller/EvenOddController.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/logback.xml | 0 .../java/com/baeldung/SpringContextTest.java | 0 .../BaseTestClass.java | 0 ...uldReturnEvenWhenRequestParamIsEven.groovy | 0 ...houldReturnOddWhenRequestParamIsOdd.groovy | 0 .../spring-cloud-dapr/README.md | 0 .../dapr-config/basic-config.yaml | 0 .../dapr-config/consul-config.yaml | 0 .../dapr-config/consul-zipkin-config.yaml | 0 .../spring-cloud-dapr/gateway/pom.xml | 0 .../java/com/baeldung/gateway/GatewayApp.java | 0 .../main/resources/application-no-dapr.yml | 0 .../main/resources/application-with-dapr.yml | 0 .../spring-cloud-dapr/greeting/pom.xml | 0 .../java/com/baeldung/hello/GreetingApp.java | 0 .../baeldung/hello/GreetingController.java | 0 .../src/main/resources/application.yml | 0 .../spring-cloud-dapr/pom.xml | 2 +- .../spring-cloud-docker/README.md | 0 .../docker-compose-scale.yml | 0 .../spring-cloud-docker/docker-compose.yml | 0 .../docker-message-server/Dockerfile | 0 .../docker-message-server/pom.xml | 0 .../docker/DockerMessageController.java | 0 .../cloud/config/docker/DockerServer.java | 0 .../src/main/resources/application.properties | 0 .../docker-product-server/Dockerfile | 0 .../docker-product-server/pom.xml | 0 .../docker/DockerProductController.java | 0 .../cloud/config/docker/DockerServer.java | 0 .../src/main/resources/application.properties | 0 .../spring-cloud-docker/pom.xml | 2 +- .../README.md | 0 .../pom.xml | 2 +- .../spring-cloud-eureka-client/pom.xml | 0 .../client/EurekaClientApplication.java | 0 .../src/main/resources/application.properties | 0 .../spring-cloud-eureka-server/pom.xml | 0 .../server/EurekaServerApplication.java | 0 .../src/main/resources/application.properties | 0 .../spring-cloud-eureka/README.md | 0 .../spring-cloud-eureka/pom.xml | 2 +- .../pom.xml | 0 .../client/EurekaClientApplication.java | 0 .../controller/HelloWorldController.java | 0 .../main/resources/application-dev.properties | 0 .../src/main/resources/application.properties | 0 .../eureka/client/SpringContextTest.java | 0 .../spring-cloud-eureka-client/pom.xml | 0 .../client/EurekaClientApplication.java | 0 .../eureka/client/GreetingController.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/logback.xml | 0 .../eureka/client/SpringContextTest.java | 0 .../pom.xml | 0 .../baeldung/spring/cloud/Application.java | 0 .../spring/cloud/client/BooksClient.java | 0 .../com/baeldung/spring/cloud/model/Book.java | 0 .../spring/cloud/client/BookMocks.java | 0 .../client/BooksClientIntegrationTest.java | 0 .../cloud/client/EurekaContainerConfig.java | 0 ...oadBalancerBooksClientIntegrationTest.java | 0 .../cloud/client/MockBookServiceConfig.java | 0 .../spring/cloud/client/RibbonTestConfig.java | 0 .../ServiceDiscoveryBooksClientLiveTest.java | 0 .../spring/cloud/client/WireMockConfig.java | 0 .../resources/application-eureka-test.yml | 0 .../resources/application-ribbon-test.yml | 0 .../src/test/resources/application-test.yml | 0 .../resources/payload/get-books-response.json | 0 .../spring-cloud-eureka-feign-client/pom.xml | 0 .../feign/client/FeignClientApplication.java | 0 .../cloud/feign/client/GreetingClient.java | 0 .../feign/client/NoFeignClientController.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/logback.xml | 0 .../resources/templates/greeting-view.html | 0 .../cloud/feign/client/SpringContextTest.java | 0 .../spring-cloud-eureka-server/pom.xml | 0 .../server/EurekaServerApplication.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/logback.xml | 0 .../eureka/server/SpringContextTest.java | 0 .../spring-cloud-functions/README.md | 0 .../spring-cloud-functions/pom.xml | 2 +- .../aws/CloudFunctionAwsApplication.java | 0 .../aws/StringReverseHandler.java | 0 .../cloudfunction/aws/functions/Greeter.java | 0 .../src/main/resources/application.properties | 0 .../aws/CloudFunctionApplicationUnitTest.java | 0 .../cloudfunction/aws/SpringContextTest.java | 0 .../src/test/resources/logback-test.xml | 0 .../spring-cloud-gateway/README-OAuth.md | 0 .../spring-cloud-gateway/README.md | 0 .../spring-cloud-gateway/baeldung-realm.json | 0 .../spring-cloud-gateway/pom.xml | 2 +- .../CustomFiltersGatewayApplication.java | 0 .../gatewayapp/config/WebClientConfig.java | 0 .../ChainRequestGatewayFilterFactory.java | 0 .../LoggingGatewayFilterFactory.java | 0 .../ModifyRequestGatewayFilterFactory.java | 0 .../ModifyResponseGatewayFilterFactory.java | 0 .../global/FirstPreLastPostGlobalFilter.java | 0 .../LoggingGlobalFiltersConfigurations.java | 0 .../global/LoggingGlobalPreFilter.java | 0 .../routes/ServiceRouteConfiguration.java | 0 .../SecondServiceApplication.java | 0 .../web/SecondServiceRestController.java | 0 .../service/ServiceApplication.java | 0 .../service/web/ServiceRestController.java | 0 .../CustomPredicatesApplication.java | 0 .../config/CustomPredicatesConfig.java | 0 .../GoldenCustomerRoutePredicateFactory.java | 0 .../service/GoldenCustomerService.java | 0 .../IntroductionGatewayApplication.java | 0 .../oauth/backend/QuotesApplication.java | 0 .../oauth/backend/domain/Quote.java | 0 .../oauth/backend/web/QuoteApi.java | 0 .../ResourceServerGatewayApplication.java | 0 .../KeycloakReactiveTokenInstrospector.java | 0 .../rewrite/URLRewriteGatewayApplication.java | 0 .../rewrite/routes/DynamicRewriteRoute.java | 0 .../WebFilterGatewayApplication.java | 0 .../config/ModifyBodyRouteConfig.java | 0 .../RequestRateLimiterResolverConfig.java | 0 .../resources/application-customroutes.yml | 0 .../main/resources/application-nosecurity.yml | 0 .../resources/application-oauth-client.yml | 0 .../resources/application-resource-server.yml | 0 .../resources/application-url-rewrite.yml | 0 .../main/resources/application-webfilters.yml | 0 .../src/main/resources/application.yml | 0 ...ustomfilters-global-application.properties | 0 .../introduction-application.properties | 0 .../src/main/resources/logback.xml | 0 .../resources/quotes-application.properties | 0 .../secondservice-application.properties | 0 .../resources/service-application.properties | 0 .../gatewayapp/CustomFiltersLiveTest.java | 0 .../gatewayapp/utils/LoggerListAppender.java | 0 .../SecondServiceIntegrationTest.java | 0 .../secondservice/SpringContextTest.java | 0 .../service/ServiceIntegrationTest.java | 0 .../service/SpringContextTest.java | 0 .../CustomPredicatesApplicationLiveTest.java | 0 .../introduction/SpringContextTest.java | 0 .../URLRewriteGatewayApplicationLiveTest.java | 0 .../RedisWebFilterFactoriesLiveTest.java | 0 .../WebFilterFactoriesLiveTest.java | 0 .../OAuth_Gateway.postman_collection.json | 0 .../src/test/resources/logback-test.xml | 0 .../spring-cloud-hystrix/README.md | 0 .../feign-rest-consumer/pom.xml | 0 .../hystrix/rest/consumer/GreetingClient.java | 0 .../rest/consumer/GreetingController.java | 0 .../RestConsumerFeignApplication.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/logback.xml | 0 .../resources/templates/greeting-view.html | 0 .../rest/consumer/SpringContextTest.java | 0 .../spring-cloud-hystrix/pom.xml | 2 +- .../rest-consumer/pom.xml | 0 .../rest/consumer/GreetingController.java | 0 .../rest/consumer/GreetingService.java | 0 .../consumer/RestConsumerApplication.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/logback.xml | 0 .../resources/templates/greeting-view.html | 0 .../rest/consumer/SpringContextTest.java | 0 .../rest-producer/pom.xml | 0 .../rest/producer/GreetingController.java | 0 .../rest/producer/GreetingControllerImpl.java | 0 .../producer/RestProducerApplication.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/logback.xml | 0 .../rest/producer/SpringContextTest.java | 0 .../spring-cloud-kubernetes/README.md | 0 .../client-service/.gitignore | 0 .../client-service/Dockerfile | 0 .../client-service/client-config.yaml | 0 .../client-service-deployment.yaml | 0 .../kubernetes-guide/client-service/pom.xml | 0 .../cloud/kubernetes/client/Application.java | 0 .../cloud/kubernetes/client/ClientConfig.java | 0 .../kubernetes/client/ClientController.java | 0 .../client/RibbonConfiguration.java | 0 .../client/TravelAgencyService.java | 0 .../src/main/resources/application.yaml | 0 .../src/main/resources/logback.xml | 0 .../java/com/baeldung/SpringContextTest.java | 0 .../deployment-travel-client.sh | 0 .../travel-agency-service/Dockerfile | 0 .../mongo-deployment.yaml | 0 .../travel-agency-service/pom.xml | 0 .../travel-agency-service/secret.yaml | 0 .../kubernetes/travelagency/Application.java | 0 .../controller/TravelAgencyController.java | 0 .../travelagency/model/TravelDeal.java | 0 .../repository/TravelDealRepository.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/logback-spring.xml | 0 .../src/main/resources/logback.xml | 0 .../travelagency/SpringContextTest.java | 0 .../travel-agency-deployment.yaml | 0 .../demo-backend/.gitignore | 0 .../demo-backend/Dockerfile | 0 .../kubernetes-minikube/demo-backend/pom.xml | 0 .../backend/KubernetesBackendApplication.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/logback.xml | 0 .../java/com/baeldung/SpringContextTest.java | 0 .../demo-frontend/.gitignore | 0 .../demo-frontend/Dockerfile | 0 .../kubernetes-minikube/demo-frontend/pom.xml | 0 .../KubernetesFrontendApplication.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/logback.xml | 0 .../java/com/baeldung/SpringContextTest.java | 0 .../backend-deployment.yaml | 0 .../frontend-deployment.yaml | 0 .../liveness-example/Dockerfile | 0 .../liveness-example/pom.xml | 0 .../com/baeldung/liveness/Application.java | 0 .../health/CustomHealthIndicator.java | 0 .../resources/application.properties | 0 .../src/main/resources/resources/logback.xml | 0 .../java/com/baeldung/SpringContextTest.java | 0 .../src/test/resources/logback-test.xml | 0 .../liveness-example-k8s-template.yaml | 0 .../readiness-example-k8s-template.yaml | 0 .../readiness-example/Dockerfile | 0 .../readiness-example/pom.xml | 0 .../com/baeldung/readiness/Application.java | 0 .../health/CustomHealthIndicator.java | 0 .../resources/application.properties | 0 .../src/main/resources/resources/logback.xml | 0 .../java/com/baeldung/SpringContextTest.java | 0 .../src/test/resources/logback-test.xml | 0 .../spring-cloud-kubernetes/pom.xml | 2 +- .../spring-cloud-loadbalancer/README.md | 0 .../spring-cloud-loadbalancer/pom.xml | 2 +- .../.gitignore | 0 .../.mvn/wrapper/MavenWrapperDownloader.java | 0 .../.mvn/wrapper/maven-wrapper.jar | Bin .../.mvn/wrapper/maven-wrapper.properties | 0 .../spring-cloud-loadbalancer-client/mvnw | 0 .../spring-cloud-loadbalancer-client/mvnw.cmd | 0 .../spring-cloud-loadbalancer-client/pom.xml | 0 .../client/ClientApplication.java | 0 .../src/main/resources/application.properties | 0 .../.gitignore | 0 .../.mvn/wrapper/MavenWrapperDownloader.java | 0 .../.mvn/wrapper/maven-wrapper.jar | Bin .../.mvn/wrapper/maven-wrapper.properties | 0 .../spring-cloud-loadbalancer-server/mvnw | 0 .../spring-cloud-loadbalancer-server/mvnw.cmd | 0 .../spring-cloud-loadbalancer-server/pom.xml | 0 .../server/ServerApplication.java | 0 .../src/main/resources/application.properties | 0 .../spring-cloud-netflix-feign/README.md | 0 .../spring-cloud-netflix-feign/pom.xml | 0 .../netflix/feign/ExampleApplication.java | 0 .../feign/client/JSONPlaceHolderClient.java | 0 .../feign/config/ClientConfiguration.java | 0 .../feign/config/CustomErrorDecoder.java | 0 .../feign/exception/BadRequestException.java | 0 .../feign/exception/NotFoundException.java | 0 .../hystrix/JSONPlaceHolderFallback.java | 0 .../cloud/netflix/feign/model/Post.java | 0 .../feign/service/JSONPlaceHolderService.java | 0 .../impl/JSONPlaceHolderServiceImpl.java | 0 .../src/main/resources/application.properties | 0 .../netflix/feign/NetflixFeignUnitTest.java | 0 .../README.md | 0 .../spring-cloud-open-service-broker/pom.xml | 2 +- .../ServiceBrokerApplication.java | 0 .../config/CatalogConfiguration.java | 0 .../mail/MailController.java | 0 .../openservicebroker/mail/MailService.java | 0 .../mail/MailServiceBinding.java | 0 .../mail/MailServiceInstance.java | 0 .../MailServiceInstanceBindingService.java | 0 .../services/MailServiceInstanceService.java | 0 .../src/main/resources/application.yml | 0 ...ServiceInstanceBindingServiceUnitTest.java | 0 .../MailServiceInstanceServiceUnitTest.java | 0 .../spring-cloud-openfeign/README.md | 0 .../spring-cloud-openfeign/pom.xml | 0 .../cloud/openfeign/ExampleApplication.java | 0 .../client/JSONPlaceHolderClient.java | 0 .../cloud/openfeign/client/PaymentClient.java | 0 .../cloud/openfeign/client/UserClient.java | 0 .../openfeign/config/ClientConfiguration.java | 0 .../openfeign/config/CustomErrorDecoder.java | 0 .../cloud/openfeign/config/FeignConfig.java | 0 .../controller/PaymentController.java | 0 .../exception/BadRequestException.java | 0 .../exception/NotFoundException.java | 0 .../fileupload/config/ExceptionMessage.java | 0 .../fileupload/config/FeignSupportConfig.java | 0 .../config/RetreiveMessageErrorDecoder.java | 0 .../fileupload/controller/FileController.java | 0 .../fileupload/service/UploadClient.java | 0 .../fileupload/service/UploadResource.java | 0 .../fileupload/service/UploadService.java | 0 .../hystrix/JSONPlaceHolderFallback.java | 0 .../cloud/openfeign/model/Payment.java | 0 .../baeldung/cloud/openfeign/model/Post.java | 0 .../OAuth2WebSecurityConfigurerAdapter.java | 0 .../OAuthClientCredentialsFeignManager.java | 0 .../oauthfeign/OAuthFeignConfig.java | 0 .../service/JSONPlaceHolderService.java | 0 .../impl/JSONPlaceHolderServiceImpl.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/fileupload.txt | 0 .../OpenFeignFileUploadLiveTest.java | 0 .../cloud/openfeign/OpenFeignManualTest.java | 0 .../openfeign/OpenFeignOAuth2ManualTest.java | 0 .../cloud/openfeign/SpringContextTest.java | 0 .../spring-cloud-rest/.gitignore | 0 .../spring-cloud-rest/README.md | 0 .../application-config/discovery.properties | 0 .../application-config/resource.properties | 0 .../spring-cloud-rest/pom.xml | 2 +- .../spring-cloud-rest-books-api/pom.xml | 0 .../com/baeldung/BooksApiApplication.java | 0 .../main/java/com/baeldung/SessionConfig.java | 0 .../persistence/dao/BookRepository.java | 0 .../com/baeldung/persistence/model/Book.java | 0 .../src/main/resources/bootstrap.properties | 0 .../src/main/resources/logback.xml | 0 .../com/baeldung/BooksApiIntegrationTest.java | 0 .../java/com/baeldung/RestApiLiveTest.java | 0 .../java/com/baeldung/SessionLiveTest.java | 0 .../com/baeldung/SpringContextLiveTest.java | 0 .../src/test/resources/application.properties | 0 .../.gitignore | 0 .../spring-cloud-rest-config-server/pom.xml | 0 .../SpringCloudRestConfigApplication.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/logback.xml | 0 .../java/com/baeldung/SpringContextTest.java | 0 .../.gitignore | 0 .../pom.xml | 0 .../main/java/com/baeldung/SessionConfig.java | 0 .../SpringCloudRestServerApplication.java | 0 .../src/main/resources/bootstrap.properties | 0 .../src/main/resources/logback.xml | 0 .../SpringCloudRestServerIntegrationTest.java | 0 .../com/baeldung/SpringContextLiveTest.java | 0 .../spring-cloud-rest-reviews-api/pom.xml | 0 .../baeldung/BookReviewsApiApplication.java | 0 .../main/java/com/baeldung/SessionConfig.java | 0 .../persistence/dao/BookReviewRepository.java | 0 .../persistence/model/BookReview.java | 0 .../src/main/resources/bootstrap.properties | 0 .../src/main/resources/logback.xml | 0 .../BookReviewsApiIntegrationTest.java | 0 .../java/com/baeldung/RestApiLiveTest.java | 0 .../com/baeldung/SpringContextLiveTest.java | 0 .../src/test/resources/application.properties | 0 .../spring-cloud-ribbon-client/README.md | 0 .../spring-cloud-ribbon-client/pom.xml | 2 +- .../client/RestTemplateConfiguration.java | 0 .../ribbon/client/RibbonConfiguration.java | 0 .../ribbon/client/ServerLocationApp.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/logback.xml | 0 .../java/com/baeldung/SpringContextTest.java | 0 .../ServerLocationAppIntegrationTest.java | 0 .../cloud/ribbon/client/TestConfig.java | 0 .../spring-cloud-ribbon-retry/README.md | 0 .../spring-cloud-ribbon-retry/pom.xml | 2 +- .../ribbon-client-service/pom.xml | 0 .../cloud/ribbon/retry/RibbonClientApp.java | 0 .../ExponentialBackoffRetryFactory.java | 0 .../ExponentialRandomBackoffRetryFactory.java | 0 .../backoff/FixedBackoffRetryFactory.java | 0 .../retry/config/RibbonConfiguration.java | 0 .../WeatherClientRibbonConfiguration.java | 0 .../controller/RibbonClientController.java | 0 .../src/main/resources/application.yml | 0 .../retry/RibbonRetryFailureManualTest.java | 0 .../retry/RibbonRetrySuccessManualTest.java | 0 .../ribbon-weather-service/pom.xml | 0 .../ribbon/retry/RibbonWeatherServiceApp.java | 0 .../cloud/ribbon/retry/WeatherController.java | 0 .../src/main/resources/application.properties | 0 .../spring-cloud-security/README.md | 0 .../spring-cloud-security/alias.rtf | 0 .../spring-cloud-security/auth-client/pom.xml | 0 .../src/main/java/com/baeldung/CloudSite.java | 0 .../config/SiteSecurityConfigurer.java | 0 .../controller/CloudSiteController.java | 0 .../com/baeldung/filters/SimpleFilter.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/logback.xml | 0 .../main/resources/templates/personinfo.html | 0 .../java/com/baeldung/SpringContextTest.java | 0 ...Springoath2ApplicationIntegrationTest.java | 0 .../auth-resource/pom.xml | 0 .../main/java/com/baeldung/Application.java | 0 .../baeldung/config/ResourceConfigurer.java | 0 .../controller/PersonInfoController.java | 0 .../controller/ResourceController.java | 0 .../main/java/com/baeldung/model/Person.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/logback.xml | 0 .../java/com/baeldung/SpringContextTest.java | 0 ...rsonserviceApplicationIntegrationTest.java | 0 .../spring-cloud-security/auth-server/pom.xml | 0 .../main/java/com/baeldung/AuthServer.java | 0 .../baeldung/config/AuthServerConfigurer.java | 0 .../com/baeldung/config/WebMvcConfig.java | 0 .../config/WebSecurityConfigurer.java | 0 .../src/main/resources/application.yml | 0 .../main/resources/certificate/mykeystore.jks | Bin .../src/main/resources/logback.xml | 0 .../src/main/resources/templates/login.html | 0 .../java/com/baeldung/SpringContextTest.java | 0 .../spring-cloud-security/mykeystore.jks | Bin .../spring-cloud-security/pom.xml | 2 +- .../spring-cloud-security/pubkey.txt | 0 .../spring-cloud-sentinel/README.md | 0 .../spring-cloud-sentinel/pom.xml | 2 +- .../cloud/sentinel/SentinelApplication.java | 0 .../config/SentinelAspectConfiguration.java | 0 .../controller/GreetingController.java | 0 .../sentinel/service/GreetingService.java | 0 .../spring-cloud-stream-starters/README.md | 0 .../bash/hadoop.sh | 0 .../hdfs/application.properties | 0 .../spring-cloud-stream-starters/hdfs/hdfs.sh | 0 .../twitter/application.properties | 0 .../twitter/twitter.sh | 0 .../twitterhdfs/.gitignore | 0 .../twitterhdfs/pom.xml | 0 .../twitterhdfs/aggregate/AggregateApp.java | 0 .../twitterhdfs/processor/ProcessorApp.java | 0 .../baeldung/twitterhdfs/sink/SinkApp.java | 0 .../twitterhdfs/source/SourceApp.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/logback.xml | 0 .../aggregate/SpringContextTest.java | 0 .../spring-cloud-stream/README.md | 0 .../spring-cloud-stream/pom.xml | 2 +- .../spring-cloud-stream-kafka/README.md | 0 .../spring-cloud-stream-kafka/pom.xml | 0 .../com/baeldung/AvroKafkaApplication.java | 0 .../baeldung/config/SchemRegistryConfig.java | 0 .../com/baeldung/consumer/AvroConsumer.java | 0 .../baeldung/controller/AvroController.java | 0 .../com/baeldung/producer/AvroProducer.java | 0 .../src/main/resources/application.yaml | 0 .../main/resources/employee-key-schema.avsc | 0 .../src/main/resources/employee-schema.avsc | 0 .../spring-cloud-stream-kinesis/pom.xml | 0 .../java/com/baeldung/KinesisApplication.java | 0 .../src/main/resources/application.properties | 0 .../KinesisApplicationIntegrationTest.java | 0 .../src/test/resources/application.properties | 0 .../spring-cloud-stream-rabbit/pom.xml | 0 .../MultipleOutputsServiceApplication.java | 0 ...tputsWithConditionsServiceApplication.java | 0 .../rabbit/MyLoggerServiceApplication.java | 0 .../messages/TextPlainMessageConverter.java | 0 .../cloud/stream/rabbit/model/LogMessage.java | 0 .../stream/rabbit/processor/MyProcessor.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/logback.xml | 0 .../java/com/baeldung/SpringContextTest.java | 0 ...putsServiceApplicationIntegrationTest.java | 0 ...sWithConditionsServiceIntegrationTest.java | 0 .../MyLoggerApplicationIntegrationTest.java | 0 .../spring-cloud-task/README.md | 0 .../spring-cloud-task/pom.xml | 2 +- .../springcloudtaskbatch/.gitignore | 0 .../springcloudtaskbatch/pom.xml | 0 .../task/HelloWorldTaskConfigurer.java | 0 .../com/baeldung/task/JobConfiguration.java | 0 .../main/java/com/baeldung/task/TaskDemo.java | 0 .../java/com/baeldung/task/TaskListener.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/logback.xml | 0 .../java/com/baeldung/SpringContextTest.java | 0 .../src/test/resources/application.yml | 0 .../springcloudtasksink/.gitignore | 0 .../springcloudtasksink/pom.xml | 0 .../SpringCloudTaskSinkApplication.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/logback.xml | 0 ...oudTaskSinkApplicationIntegrationTest.java | 0 .../TaskSinkConfiguration.java | 0 .../java/com/baeldung/SpringContextTest.java | 0 .../spring-cloud-vault/.gitignore | 0 .../spring-cloud-vault/README.md | 0 .../spring-cloud-vault/database-setup.sql | 0 .../spring-cloud-vault/pom.xml | 2 +- .../spring-cloud-vault/sample-policy.hcl | 0 .../spring/cloud/vaultsample/AccountRepo.java | 0 .../cloud/vaultsample/AccountResource.java | 0 .../cloud/vaultsample/SecretResource.java | 0 .../vaultsample/VaultSampleApplication.java | 0 .../cloud/vaultsample/domain/Account.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/vault.jks | Bin .../vaultsample/SpringContextLiveTest.java | 0 .../VaultSampleApplicationLiveTest.java | 0 .../src/test/resources/bootstrap.properties | 0 .../src/test/resources/vault.jks | Bin .../src/test/vault-config/localhost.cert | 0 .../src/test/vault-config/localhost.key | 0 .../src/test/vault-config/vault-test.hcl | 0 .../spring-cloud-vault/vault-cheatsheet.txt | 0 .../spring-cloud-vault/vault-env.bat | 0 .../spring-cloud-vault/vault-env.sh | 0 .../spring-cloud-vault/vault-start.bat | 0 .../spring-cloud-vault/vault-start.sh | 0 .../spring-cloud-vault/vault-unseal.bat | 0 .../spring-cloud-vault/vault-unseal.sh | 0 .../spring-cloud-zookeeper/Greeting/pom.xml | 0 .../cloud/greeting/GreetingApplication.java | 0 .../cloud/greeting/GreetingController.java | 0 .../cloud/greeting/HelloWorldClient.java | 0 .../src/main/resources/application.yml | 0 .../Greeting/src/main/resources/logback.xml | 0 .../resources/templates/greeting-view.html | 0 .../java/com/baeldung/SpringContextTest.java | 0 .../spring-cloud-zookeeper/HelloWorld/pom.xml | 0 .../helloworld/HelloWorldApplication.java | 0 .../helloworld/HelloWorldController.java | 0 .../src/main/resources/application.yml | 0 .../HelloWorld/src/main/resources/logback.xml | 0 .../cloud/helloworld/SpringContextTest.java | 0 .../spring-cloud-zookeeper/README.md | 0 .../spring-cloud-zookeeper/pom.xml | 2 +- .../README.md | 0 .../eureka-client/pom.xml | 0 .../client/EurekaClientApplication.java | 0 .../eureka/client/GreetingController.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/logback.xml | 0 .../eureka/client/SpringContextTest.java | 0 .../eureka-server/pom.xml | 0 .../server/EurekaServerApplication.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/logback.xml | 0 .../eureka/server/SpringContextTest.java | 0 .../pom.xml | 2 +- .../zuul-server/pom.xml | 0 .../spring/cloud/zuul/config/ZuulConfig.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/logback.xml | 0 .../cloud/zuul/config/SpringContextTest.java | 0 .../spring-cloud-zuul-fallback/README.md | 0 .../api-gateway/pom.xml | 0 .../apigateway/ApiGatewayApplication.java | 0 .../fallback/GatewayClientResponse.java | 0 .../fallback/GatewayServiceFallback.java | 0 .../fallback/WeatherServiceFallback.java | 0 .../src/main/resources/application.yml | 0 .../ApiGatewayApplicationIntegrationTest.java | 0 .../GatewayServiceFallbackUnitTest.java | 0 .../WeatherServiceFallbackUnitTest.java | 0 .../src/test/resources/logback.xml | 0 .../spring-cloud-zuul-fallback/pom.xml | 4 +- .../weather-service/pom.xml | 0 .../weatherservice/WeatherController.java | 0 .../WeatherServiceApplication.java | 0 .../src/main/resources/application.yml | 0 .../WeatherControllerIntegrationTest.java | 0 ...therServiceApplicationIntegrationTest.java | 0 .../spring-cloud-zuul/README.md | 0 .../spring-cloud-zuul/pom.xml | 2 +- .../spring-zuul-foos-resource/pom.xml | 0 .../config/ResourceServerApplication.java | 0 .../config/ResourceServerWebConfig.java | 0 .../web/controller/FooController.java | 0 .../main/java/com/baeldung/web/dto/Foo.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/logback.xml | 0 .../java/com/baeldung/SpringContextTest.java | 0 .../spring-zuul-post-filter/.gitignore | 0 .../spring-zuul-post-filter/pom.xml | 0 .../baeldung/ZuulPostFilterApplication.java | 0 .../controllers/GreetingController.java | 0 .../baeldung/filters/ResponseLogFilter.java | 0 .../src/main/resources/application.yml | 0 .../com/baeldung/ZuulPostFilterLiveTest.java | 0 .../spring-zuul-rate-limiting/pom.xml | 0 .../ZuulRatelimitDemoApplication.java | 0 .../controller/GreetingController.java | 0 .../src/main/resources/application.yml | 0 .../GreetingControllerIntegrationTest.java | 0 .../controller/SpringContextTest.java | 0 .../src/test/resources/application.properties | 0 .../src/test/resources/logback.xml | 0 .../spring-zuul-ui/README.md | 0 .../spring-cloud-zuul/spring-zuul-ui/pom.xml | 0 .../com/baeldung/config/CustomZuulFilter.java | 0 .../com/baeldung/config/UiApplication.java | 0 .../java/com/baeldung/config/UiWebConfig.java | 0 .../filter/CustomZuulErrorApplication.java | 0 .../zuul/filter/CustomZuulErrorFilter.java | 0 .../cloud/zuul/filter/ZuulConfiguration.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/logback.xml | 0 .../src/main/resources/templates/index.html | 0 .../resources/angular-utf8-base64.min.js | 0 .../java/com/baeldung/SpringContextTest.java | 0 .../filter/CustomZuulErrorFilterLiveTest.java | 0 .../test/java/com/baeldung/web/LiveTest.java | 0 .../src/test/resources/.gitignore | 0 .../resources/persistence-mysql.properties | 0 .../bin/eureka-client/pom.xml | 42 --------------- .../src/main/resources/application.yml | 13 ----- .../bin/eureka-server/pom.xml | 43 --------------- .../bin/pom.xml | 31 ----------- .../bin/zuul-server/pom.xml | 50 ------------------ .../src/main/resources/application.properties | 9 ---- .../src/main/resources/application.yml | 7 --- 934 files changed, 35 insertions(+), 230 deletions(-) rename {spring-cloud => spring-cloud-modules}/README.md (100%) rename {spring-cloud => spring-cloud-modules}/pom.xml (97%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/additional-sources-simple/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/additional-sources-simple/src/main/java/com/baeldung/spring/cloud/archaius/additionalsources/AdditionalSourcesSimpleApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/additional-sources-simple/src/main/java/com/baeldung/spring/cloud/archaius/additionalsources/config/ApplicationPropertiesConfigurations.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/additional-sources-simple/src/main/java/com/baeldung/spring/cloud/archaius/additionalsources/controller/ConfigPropertiesController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/additional-sources-simple/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/additional-sources-simple/src/main/resources/config.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/additional-sources-simple/src/main/resources/other-config.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/additional-sources-simple/src/test/java/com/baeldung/spring/cloud/archaius/additionalsources/ArchaiusAdditionalSourcesLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/additional-sources-simple/src/test/java/com/baeldung/spring/cloud/archaius/additionalsources/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/additional-sources-simple/src/test/resources/logback-test.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/basic-config/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/basic-config/src/main/java/com/baeldung/spring/cloud/archaius/basic/BasicArchaiusApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/basic-config/src/main/java/com/baeldung/spring/cloud/archaius/basic/controller/ConfigPropertiesController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/basic-config/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/basic-config/src/main/resources/config.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/basic-config/src/main/resources/other.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/spring/cloud/archaius/basic/ArchaiusBasicConfigurationIntegrationTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/spring/cloud/archaius/basic/ArchaiusBasicConfigurationLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/spring/cloud/archaius/basic/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/basic-config/src/test/resources/config.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/basic-config/src/test/resources/logback-test.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/dynamodb-config/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/DynamoSourcesApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/config/ApplicationPropertiesConfigurations.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/config/DynamoDbConfiguration.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/controller/ConfigPropertiesController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/dynamodb/ArchaiusProperties.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/dynamodb/ArchaiusPropertiesRepository.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/dynamodb-config/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/dynamodb-config/src/test/java/com/baeldung/spring/cloud/archaius/dynamosources/ArchaiusDynamoDbLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/dynamodb-config/src/test/java/com/baeldung/spring/cloud/archaius/dynamosources/SpringContextLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/extra-configs/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/extra-configs/src/main/java/com/baeldung/spring/cloud/archaius/extraconfigs/ExtraConfigsApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/extra-configs/src/main/java/com/baeldung/spring/cloud/archaius/extraconfigs/controllers/ConfigPropertiesController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/extra-configs/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/extra-configs/src/main/resources/other-config-dir/extra.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/extra-configs/src/main/resources/other.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/extra-configs/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/extra-configs/src/test/java/com/baeldung/spring/cloud/archaius/extraconfigs/ArchaiusExtraConfigsLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/extra-configs/src/test/resources/logback-test.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/jdbc-config/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/JdbcSourcesApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/config/ApplicationPropertiesConfigurations.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/controller/ConfigPropertiesController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/jdbc/Properties.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/jdbc-config/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/jdbc-config/src/main/resources/data.sql (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/jdbc-config/src/test/java/com/baeldung/spring/cloud/archaius/jdbconfig/ArchaiusJDBCSourceLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/jdbc-config/src/test/java/com/baeldung/spring/cloud/archaius/jdbconfig/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/jdbc-config/src/test/resources/logback-test.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/pom.xml (97%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/zookeeper-config/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/zookeeper-config/src/main/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/ZookeeperConfigApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/zookeeper-config/src/main/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/config/ZookeeperConfigsInitializer.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/zookeeper-config/src/main/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/controller/ConfigPropertiesController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/zookeeper-config/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/zookeeper-config/src/test/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/ArchaiusZookeeperLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/zookeeper-config/src/test/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/SpringContextLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/pom.xml (98%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/InstanceProfileAwsApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/SpringCloudAwsApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/config/SpringCloudAwsConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/ec2/EC2EnableMetadata.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/ec2/EC2Metadata.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/s3/SpringCloudS3.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/s3/SpringCloudS3Service.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/sns/SNSEndpointController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/sns/SNSMessageSender.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/sqs/SpringCloudSQS.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/src/main/resources/InstanceProfileFormation.yaml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/src/main/resources/application-instance-profile.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/src/main/resources/aws-config.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/SpringCloudAwsTestUtil.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/SpringContextLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/ec2/EC2MetadataLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/rds/SpringCloudRDSLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/s3/SpringCloudS3LiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sns/SNSEndpointControllerUnitTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sns/SpringCloudSNSLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sqs/Greeting.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sqs/SpringCloudSQSLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/src/test/resources/application-test.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/src/test/resources/test-file-upload.txt (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/application-config/book-service.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/application-config/discovery.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/application-config/gateway.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/application-config/rating-service.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/application-config/zipkin.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/config/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/config/src/main/java/com/baeldung/spring/cloud/bootstrap/config/ConfigApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/config/src/main/java/com/baeldung/spring/cloud/bootstrap/config/SecurityConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/config/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/config/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/config/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/customer-service/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/customer-service/src/main/java/com/baeldung/customerservice/Customer.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/customer-service/src/main/java/com/baeldung/customerservice/CustomerApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/customer-service/src/main/java/com/baeldung/customerservice/CustomerService.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/customer-service/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/customer-service/src/test/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/discovery/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/discovery/src/main/java/com/baeldung/spring/cloud/bootstrap/discovery/DiscoveryApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/discovery/src/main/java/com/baeldung/spring/cloud/bootstrap/discovery/SecurityConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/discovery/src/main/java/com/baeldung/spring/cloud/bootstrap/discovery/SessionConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/discovery/src/main/resources/bootstrap.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/discovery/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/discovery/src/test/java/com/baeldung/SpringContextLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/.angular-cli.json (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/.editorconfig (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/.gitignore (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/e2e/app.e2e-spec.ts (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/e2e/app.po.ts (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/e2e/tsconfig.e2e.json (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/karma.conf.js (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/package.json (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/protractor.conf.js (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.component.css (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.component.html (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.component.ts (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.module.ts (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book.ts (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-detail/book-detail.component.css (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-detail/book-detail.component.html (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-detail/book-detail.component.ts (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-list/book-list.component.css (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-list/book-list.component.html (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-list/book-list.component.ts (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/click-stop-propagation.directive.ts (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/http.service.ts (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/principal.ts (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/rating.ts (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/rating/rating.component.css (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/rating/rating.component.html (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/rating/rating.component.ts (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/assets/.gitkeep (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/environments/environment.prod.ts (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/environments/environment.ts (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/favicon.ico (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/index.html (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/main.ts (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/polyfills.ts (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/styles.css (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/test.ts (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/tsconfig.app.json (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/tsconfig.spec.json (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/typings.d.ts (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/tsconfig.json (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/tslint.json (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/AuthenticationController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/ErrorPageConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/GatewayApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/SecurityConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/SessionConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/book/Book.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/book/BooksClient.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/rating/Rating.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/rating/RatingsClient.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/controller/CombinedController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/filter/SessionSavingZuulPreFilter.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/bootstrap.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/css/wro.css (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.eot (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.svg (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.ttf (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.woff (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.eot (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.svg (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.ttf (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.woff (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/404-icon.png (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/homepage-bg.jpg (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/platform-bg.png (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/platform-spring-xd.png (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/spring-logo-eureka-mobile.png (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/spring-logo-eureka.png (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/js/wro.js (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/home/favicon.ico (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/home/index.html (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/home/inline.bundle.js (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/home/inline.bundle.js.map (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/home/main.bundle.js (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/home/main.bundle.js.map (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/home/polyfills.bundle.js (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/home/polyfills.bundle.js.map (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/home/styles.bundle.js (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/home/styles.bundle.js.map (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/index.html (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/SpringContextLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/LiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/SpringContextLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/test/resources/bootstrap.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/order-service/order-client/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderClient.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderClientImpl.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderDTO.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderResponse.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/order-service/order-client/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/order-service/order-server/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/order-service/order-server/src/main/java/com/baeldung/orderservice/Order.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/order-service/order-server/src/main/java/com/baeldung/orderservice/OrderApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/order-service/order-server/src/main/java/com/baeldung/orderservice/OrderService.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/order-service/order-server/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/order-service/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/pom.xml (93%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-book/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/BookServiceApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/DataLoader.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/SecurityConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/SessionConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/Book.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookNotFoundException.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookRepository.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookService.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-book/src/main/resources/bootstrap.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-book/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-book/src/test/java/com/baeldung/SpringContextLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-book/src/test/resources/bootstrap.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-rating/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/DataLoader.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/RatingServiceApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/SecurityConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/SessionConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/Rating.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingCacheRepository.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingNotFoundException.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingRepository.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingService.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-rating/src/main/resources/bootstrap.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-rating/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-rating/src/test/java/com/baeldung/SpringContextLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-rating/src/test/resources/bootstrap.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/zipkin/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/zipkin/src/main/java/com/baeldung/spring/cloud/bootstrap/zipkin/ZipkinApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/zipkin/src/main/resources/bootstrap.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/zipkin/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/zipkin/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-circuit-breaker/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-circuit-breaker/pom.xml (96%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-circuit-breaker/src/main/java/com/baeldung/circuitbreaker/AlbumService.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-circuit-breaker/src/main/java/com/baeldung/circuitbreaker/Controller.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-circuit-breaker/src/main/java/com/baeldung/circuitbreaker/SpringApp.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-circuit-breaker/src/main/resources/fallback-album-list.json (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-config/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-config/client/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-config/client/src/main/java/com/baeldung/spring/cloud/config/client/ConfigClient.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-config/client/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-config/client/src/test/java/com/baeldung/spring/cloud/config/client/SpringContextLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-config/config-repo/config-client-development.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-config/config-repo/config-client-production.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-config/pom.xml (95%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-config/server/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-config/server/src/main/java/com/baeldung/spring/cloud/config/server/ConfigServer.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-config/server/src/main/java/com/baeldung/spring/cloud/config/server/SecurityConfiguration.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-config/server/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-config/server/src/main/resources/config-server.jks (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-config/server/src/test/java/com/baeldung/spring/cloud/config/server/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-config/server/src/test/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-connectors-heroku/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-connectors-heroku/pom.xml (97%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/ConnectorsHerokuApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/book/Book.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/book/BookController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/book/BookRepository.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/book/BookService.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/Product.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/ProductController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/ProductRepository.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/ProductService.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-connectors-heroku/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-connectors-heroku/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-connectors-heroku/src/test/java/com/baeldung/spring/cloud/connectors/heroku/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-connectors-heroku/src/test/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-consul/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-consul/pom.xml (97%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/discovery/DiscoveryClientApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/discovery/DiscoveryClientController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/health/ServiceDiscoveryApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/health/ServiceDiscoveryController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/leadership/LeadershipElection.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/properties/DistributedPropertiesApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/properties/DistributedPropertiesController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/properties/MyProperties.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-consul/src/main/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-consul/src/main/resources/bootstrap.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-consul/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-consul/src/test/java/com/baeldung/spring/cloud/consul/SpringContextLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-contract/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-contract/pom.xml (97%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-contract/spring-cloud-contract-consumer/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-contract/spring-cloud-contract-consumer/src/main/java/com/baeldung/spring/cloud/springcloudcontractconsumer/SpringCloudContractConsumerApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-contract/spring-cloud-contract-consumer/src/main/java/com/baeldung/spring/cloud/springcloudcontractconsumer/controller/BasicMathController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-contract/spring-cloud-contract-consumer/src/main/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-contract/spring-cloud-contract-consumer/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-contract/spring-cloud-contract-consumer/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-contract/spring-cloud-contract-consumer/src/test/java/com/baeldung/spring/cloud/springcloudcontractconsumer/controller/BasicMathControllerIntegrationTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-contract/spring-cloud-contract-producer/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-contract/spring-cloud-contract-producer/src/main/java/com/baeldung/spring/cloud/springcloudcontractproducer/SpringCloudContractProducerApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-contract/spring-cloud-contract-producer/src/main/java/com/baeldung/spring/cloud/springcloudcontractproducer/controller/EvenOddController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-contract/spring-cloud-contract-producer/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-contract/spring-cloud-contract-producer/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-contract/spring-cloud-contract-producer/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-contract/spring-cloud-contract-producer/src/test/java/com/baeldung/spring/cloud/springcloudcontractproducer/BaseTestClass.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-contract/spring-cloud-contract-producer/src/test/resources/contracts/shouldReturnEvenWhenRequestParamIsEven.groovy (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-contract/spring-cloud-contract-producer/src/test/resources/contracts/shouldReturnOddWhenRequestParamIsOdd.groovy (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-dapr/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-dapr/dapr-config/basic-config.yaml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-dapr/dapr-config/consul-config.yaml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-dapr/dapr-config/consul-zipkin-config.yaml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-dapr/gateway/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-dapr/gateway/src/main/java/com/baeldung/gateway/GatewayApp.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-dapr/gateway/src/main/resources/application-no-dapr.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-dapr/gateway/src/main/resources/application-with-dapr.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-dapr/greeting/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-dapr/greeting/src/main/java/com/baeldung/hello/GreetingApp.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-dapr/greeting/src/main/java/com/baeldung/hello/GreetingController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-dapr/greeting/src/main/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-dapr/pom.xml (90%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-docker/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-docker/docker-compose-scale.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-docker/docker-compose.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-docker/docker-message-server/Dockerfile (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-docker/docker-message-server/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-docker/docker-message-server/src/main/java/com/baeldung/spring/cloud/config/docker/DockerMessageController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-docker/docker-message-server/src/main/java/com/baeldung/spring/cloud/config/docker/DockerServer.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-docker/docker-message-server/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-docker/docker-product-server/Dockerfile (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-docker/docker-product-server/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-docker/docker-product-server/src/main/java/com/baeldung/spring/cloud/config/docker/DockerProductController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-docker/docker-product-server/src/main/java/com/baeldung/spring/cloud/config/docker/DockerServer.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-docker/docker-product-server/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-docker/pom.xml (92%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka-self-preservation/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka-self-preservation/pom.xml (96%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka-self-preservation/spring-cloud-eureka-client/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka-self-preservation/spring-cloud-eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/EurekaClientApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka-self-preservation/spring-cloud-eureka-client/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka-self-preservation/spring-cloud-eureka-server/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka-self-preservation/spring-cloud-eureka-server/src/main/java/com/baeldung/spring/cloud/eureka/server/EurekaServerApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka-self-preservation/spring-cloud-eureka-server/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/pom.xml (96%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-client-profiles/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-client-profiles/src/main/java/com/baeldung/spring/cloud/eureka/client/EurekaClientApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-client-profiles/src/main/java/com/baeldung/spring/cloud/eureka/client/controller/HelloWorldController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-client-profiles/src/main/resources/application-dev.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-client-profiles/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-client-profiles/src/test/java/com/baeldung/spring/cloud/eureka/client/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-client/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/EurekaClientApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/GreetingController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-client/src/main/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-client/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-client/src/test/java/com/baeldung/spring/cloud/eureka/client/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/main/java/com/baeldung/spring/cloud/Application.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/main/java/com/baeldung/spring/cloud/client/BooksClient.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/main/java/com/baeldung/spring/cloud/model/Book.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/BookMocks.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/BooksClientIntegrationTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/EurekaContainerConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/LoadBalancerBooksClientIntegrationTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/MockBookServiceConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/RibbonTestConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/ServiceDiscoveryBooksClientLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/WireMockConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/resources/application-eureka-test.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/resources/application-ribbon-test.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/resources/application-test.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/resources/payload/get-books-response.json (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-feign-client/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/java/com/baeldung/spring/cloud/feign/client/FeignClientApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/java/com/baeldung/spring/cloud/feign/client/GreetingClient.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/java/com/baeldung/spring/cloud/feign/client/NoFeignClientController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/resources/templates/greeting-view.html (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/test/java/com/baeldung/spring/cloud/feign/client/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-server/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-server/src/main/java/com/baeldung/spring/cloud/eureka/server/EurekaServerApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-server/src/main/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-server/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-server/src/test/java/com/baeldung/spring/cloud/eureka/server/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-functions/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-functions/pom.xml (98%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-functions/src/main/java/com/baeldung/spring/cloudfunction/aws/CloudFunctionAwsApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-functions/src/main/java/com/baeldung/spring/cloudfunction/aws/StringReverseHandler.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-functions/src/main/java/com/baeldung/spring/cloudfunction/aws/functions/Greeter.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-functions/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-functions/src/test/java/com/baeldung/spring/cloudfunction/aws/CloudFunctionApplicationUnitTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-functions/src/test/java/com/baeldung/spring/cloudfunction/aws/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-functions/src/test/resources/logback-test.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/README-OAuth.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/baeldung-realm.json (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/pom.xml (99%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/CustomFiltersGatewayApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/config/WebClientConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/factories/ChainRequestGatewayFilterFactory.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/factories/LoggingGatewayFilterFactory.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/factories/ModifyRequestGatewayFilterFactory.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/factories/ModifyResponseGatewayFilterFactory.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/global/FirstPreLastPostGlobalFilter.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/global/LoggingGlobalFiltersConfigurations.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/global/LoggingGlobalPreFilter.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/routes/ServiceRouteConfiguration.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/secondservice/SecondServiceApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/secondservice/web/SecondServiceRestController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/service/ServiceApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/service/web/ServiceRestController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/custompredicates/CustomPredicatesApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/custompredicates/config/CustomPredicatesConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/custompredicates/factories/GoldenCustomerRoutePredicateFactory.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/custompredicates/service/GoldenCustomerService.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/introduction/IntroductionGatewayApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/oauth/backend/QuotesApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/oauth/backend/domain/Quote.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/oauth/backend/web/QuoteApi.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/oauth/server/ResourceServerGatewayApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/oauth/shared/KeycloakReactiveTokenInstrospector.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/rewrite/URLRewriteGatewayApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/rewrite/routes/DynamicRewriteRoute.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/webfilters/WebFilterGatewayApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/webfilters/config/ModifyBodyRouteConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/webfilters/config/RequestRateLimiterResolverConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/resources/application-customroutes.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/resources/application-nosecurity.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/resources/application-oauth-client.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/resources/application-resource-server.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/resources/application-url-rewrite.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/resources/application-webfilters.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/resources/customfilters-global-application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/resources/introduction-application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/resources/quotes-application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/resources/secondservice-application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/resources/service-application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/CustomFiltersLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/utils/LoggerListAppender.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/secondservice/SecondServiceIntegrationTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/secondservice/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/service/ServiceIntegrationTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/service/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/custompredicates/CustomPredicatesApplicationLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/introduction/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/rewrite/URLRewriteGatewayApplicationLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/webfilters/RedisWebFilterFactoriesLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/webfilters/WebFilterFactoriesLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/test/postman/OAuth_Gateway.postman_collection.json (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/test/resources/logback-test.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-hystrix/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-hystrix/feign-rest-consumer/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-hystrix/feign-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingClient.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-hystrix/feign-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-hystrix/feign-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/RestConsumerFeignApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-hystrix/feign-rest-consumer/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-hystrix/feign-rest-consumer/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-hystrix/feign-rest-consumer/src/main/resources/templates/greeting-view.html (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-hystrix/feign-rest-consumer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/consumer/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-hystrix/pom.xml (91%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-hystrix/rest-consumer/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-hystrix/rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-hystrix/rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingService.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-hystrix/rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/RestConsumerApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-hystrix/rest-consumer/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-hystrix/rest-consumer/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-hystrix/rest-consumer/src/main/resources/templates/greeting-view.html (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-hystrix/rest-consumer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/consumer/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-hystrix/rest-producer/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-hystrix/rest-producer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/producer/GreetingController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-hystrix/rest-producer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/producer/GreetingControllerImpl.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-hystrix/rest-producer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/producer/RestProducerApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-hystrix/rest-producer/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-hystrix/rest-producer/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-hystrix/rest-producer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/producer/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/client-service/.gitignore (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/client-service/Dockerfile (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/client-service/client-config.yaml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/client-service/client-service-deployment.yaml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/client-service/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/java/com/baeldung/spring/cloud/kubernetes/client/Application.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/java/com/baeldung/spring/cloud/kubernetes/client/ClientConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/java/com/baeldung/spring/cloud/kubernetes/client/ClientController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/java/com/baeldung/spring/cloud/kubernetes/client/RibbonConfiguration.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/java/com/baeldung/spring/cloud/kubernetes/client/TravelAgencyService.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/resources/application.yaml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/client-service/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/deployment-travel-client.sh (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/Dockerfile (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/mongo-deployment.yaml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/secret.yaml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/java/com/baeldung/spring/cloud/kubernetes/travelagency/Application.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/java/com/baeldung/spring/cloud/kubernetes/travelagency/controller/TravelAgencyController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/java/com/baeldung/spring/cloud/kubernetes/travelagency/model/TravelDeal.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/java/com/baeldung/spring/cloud/kubernetes/travelagency/repository/TravelDealRepository.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/resources/logback-spring.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/test/java/com/baeldung/spring/cloud/kubernetes/travelagency/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/travel-agency-deployment.yaml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/.gitignore (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/Dockerfile (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/src/main/java/com/baeldung/spring/cloud/kubernetes/backend/KubernetesBackendApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/.gitignore (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/Dockerfile (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/src/main/java/com/baeldung/spring/cloud/kubernetes/frontend/KubernetesFrontendApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-minikube/object-configurations/backend-deployment.yaml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-minikube/object-configurations/frontend-deployment.yaml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/Dockerfile (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/main/java/com/baeldung/liveness/Application.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/main/java/com/baeldung/liveness/health/CustomHealthIndicator.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/main/resources/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/main/resources/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/test/resources/logback-test.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-selfhealing/object-configurations/liveness-example-k8s-template.yaml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-selfhealing/object-configurations/readiness-example-k8s-template.yaml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/Dockerfile (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/main/java/com/baeldung/readiness/Application.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/main/java/com/baeldung/readiness/health/CustomHealthIndicator.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/main/resources/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/main/resources/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/test/resources/logback-test.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/pom.xml (96%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-loadbalancer/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-loadbalancer/pom.xml (96%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/.gitignore (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/.mvn/wrapper/MavenWrapperDownloader.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/.mvn/wrapper/maven-wrapper.jar (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/.mvn/wrapper/maven-wrapper.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/mvnw (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/mvnw.cmd (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/src/main/java/com/baeldung/spring/cloud/loadbalancer/client/ClientApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/.gitignore (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/.mvn/wrapper/MavenWrapperDownloader.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/.mvn/wrapper/maven-wrapper.jar (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/.mvn/wrapper/maven-wrapper.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/mvnw (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/mvnw.cmd (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/src/main/java/com/baeldung/spring/cloud/loadbalancer/server/ServerApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-netflix-feign/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-netflix-feign/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/ExampleApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/client/JSONPlaceHolderClient.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/config/ClientConfiguration.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/config/CustomErrorDecoder.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/exception/BadRequestException.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/exception/NotFoundException.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/hystrix/JSONPlaceHolderFallback.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/model/Post.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/service/JSONPlaceHolderService.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/service/impl/JSONPlaceHolderServiceImpl.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-netflix-feign/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-netflix-feign/src/test/java/com/baeldung/cloud/netflix/feign/NetflixFeignUnitTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-open-service-broker/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-open-service-broker/pom.xml (96%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/ServiceBrokerApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/config/CatalogConfiguration.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/mail/MailController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/mail/MailService.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/mail/MailServiceBinding.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/mail/MailServiceInstance.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/services/MailServiceInstanceBindingService.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/services/MailServiceInstanceService.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-open-service-broker/src/main/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-open-service-broker/src/test/java/com/baeldung/spring/cloud/openservicebroker/services/MailServiceInstanceBindingServiceUnitTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-open-service-broker/src/test/java/com/baeldung/spring/cloud/openservicebroker/services/MailServiceInstanceServiceUnitTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/ExampleApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/client/JSONPlaceHolderClient.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/client/PaymentClient.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/client/UserClient.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/config/ClientConfiguration.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/config/CustomErrorDecoder.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/config/FeignConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/controller/PaymentController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/exception/BadRequestException.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/exception/NotFoundException.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/config/ExceptionMessage.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/config/FeignSupportConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/config/RetreiveMessageErrorDecoder.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/controller/FileController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/UploadClient.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/UploadResource.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/UploadService.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/hystrix/JSONPlaceHolderFallback.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/model/Payment.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/model/Post.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/oauthfeign/OAuth2WebSecurityConfigurerAdapter.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/oauthfeign/OAuthClientCredentialsFeignManager.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/oauthfeign/OAuthFeignConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/service/JSONPlaceHolderService.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/service/impl/JSONPlaceHolderServiceImpl.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/resources/fileupload.txt (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/OpenFeignFileUploadLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/OpenFeignManualTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/OpenFeignOAuth2ManualTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/.gitignore (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/application-config/discovery.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/application-config/resource.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/pom.xml (96%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-books-api/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/BooksApiApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/SessionConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/persistence/dao/BookRepository.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/persistence/model/Book.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-books-api/src/main/resources/bootstrap.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-books-api/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/BooksApiIntegrationTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/RestApiLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/SessionLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/SpringContextLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-books-api/src/test/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-config-server/.gitignore (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-config-server/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-config-server/src/main/java/com/baeldung/SpringCloudRestConfigApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-config-server/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-config-server/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-config-server/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-discovery-server/.gitignore (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-discovery-server/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/java/com/baeldung/SessionConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/java/com/baeldung/SpringCloudRestServerApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/resources/bootstrap.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-discovery-server/src/test/java/com/baeldung/SpringCloudRestServerIntegrationTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-discovery-server/src/test/java/com/baeldung/SpringContextLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-reviews-api/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/BookReviewsApiApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/SessionConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/persistence/dao/BookReviewRepository.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/persistence/model/BookReview.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/resources/bootstrap.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/java/com/baeldung/BookReviewsApiIntegrationTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/java/com/baeldung/RestApiLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/java/com/baeldung/SpringContextLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-client/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-client/pom.xml (94%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-client/src/main/java/com/baeldung/spring/cloud/ribbon/client/RestTemplateConfiguration.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-client/src/main/java/com/baeldung/spring/cloud/ribbon/client/RibbonConfiguration.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-client/src/main/java/com/baeldung/spring/cloud/ribbon/client/ServerLocationApp.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-client/src/main/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-client/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-client/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-client/src/test/java/com/baeldung/spring/cloud/ribbon/client/ServerLocationAppIntegrationTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-client/src/test/java/com/baeldung/spring/cloud/ribbon/client/TestConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-retry/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-retry/pom.xml (96%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-retry/ribbon-client-service/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/RibbonClientApp.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/backoff/ExponentialBackoffRetryFactory.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/backoff/ExponentialRandomBackoffRetryFactory.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/backoff/FixedBackoffRetryFactory.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/config/RibbonConfiguration.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/config/WeatherClientRibbonConfiguration.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/controller/RibbonClientController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-retry/ribbon-client-service/src/main/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-retry/ribbon-client-service/src/test/java/com/baeldung/spring/cloud/ribbon/retry/RibbonRetryFailureManualTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-retry/ribbon-client-service/src/test/java/com/baeldung/spring/cloud/ribbon/retry/RibbonRetrySuccessManualTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-retry/ribbon-weather-service/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-retry/ribbon-weather-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/RibbonWeatherServiceApp.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-retry/ribbon-weather-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/WeatherController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-retry/ribbon-weather-service/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/alias.rtf (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-client/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-client/src/main/java/com/baeldung/CloudSite.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-client/src/main/java/com/baeldung/config/SiteSecurityConfigurer.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-client/src/main/java/com/baeldung/controller/CloudSiteController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-client/src/main/java/com/baeldung/filters/SimpleFilter.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-client/src/main/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-client/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-client/src/main/resources/templates/personinfo.html (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-client/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-client/src/test/java/com/baeldung/example/springoath2/Springoath2ApplicationIntegrationTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-resource/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-resource/src/main/java/com/baeldung/Application.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-resource/src/main/java/com/baeldung/config/ResourceConfigurer.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-resource/src/main/java/com/baeldung/controller/PersonInfoController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-resource/src/main/java/com/baeldung/controller/ResourceController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-resource/src/main/java/com/baeldung/model/Person.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-resource/src/main/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-resource/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-resource/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-resource/src/test/java/com/baeldung/service/personservice/PersonserviceApplicationIntegrationTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-server/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-server/src/main/java/com/baeldung/AuthServer.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-server/src/main/java/com/baeldung/config/AuthServerConfigurer.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-server/src/main/java/com/baeldung/config/WebMvcConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-server/src/main/java/com/baeldung/config/WebSecurityConfigurer.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-server/src/main/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-server/src/main/resources/certificate/mykeystore.jks (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-server/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-server/src/main/resources/templates/login.html (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-server/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/mykeystore.jks (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/pom.xml (95%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/pubkey.txt (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-sentinel/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-sentinel/pom.xml (95%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-sentinel/src/main/java/com/baeldung/spring/cloud/sentinel/SentinelApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-sentinel/src/main/java/com/baeldung/spring/cloud/sentinel/config/SentinelAspectConfiguration.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-sentinel/src/main/java/com/baeldung/spring/cloud/sentinel/controller/GreetingController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-sentinel/src/main/java/com/baeldung/spring/cloud/sentinel/service/GreetingService.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream-starters/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream-starters/bash/hadoop.sh (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream-starters/hdfs/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream-starters/hdfs/hdfs.sh (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream-starters/twitter/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream-starters/twitter/twitter.sh (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream-starters/twitterhdfs/.gitignore (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream-starters/twitterhdfs/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream-starters/twitterhdfs/src/main/java/com/baeldung/twitterhdfs/aggregate/AggregateApp.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream-starters/twitterhdfs/src/main/java/com/baeldung/twitterhdfs/processor/ProcessorApp.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream-starters/twitterhdfs/src/main/java/com/baeldung/twitterhdfs/sink/SinkApp.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream-starters/twitterhdfs/src/main/java/com/baeldung/twitterhdfs/source/SourceApp.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream-starters/twitterhdfs/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream-starters/twitterhdfs/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream-starters/twitterhdfs/src/test/java/com/baeldung/twitterhdfs/aggregate/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/pom.xml (96%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-kafka/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-kafka/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/AvroKafkaApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/config/SchemRegistryConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/consumer/AvroConsumer.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/controller/AvroController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/producer/AvroProducer.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-kafka/src/main/resources/application.yaml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-kafka/src/main/resources/employee-key-schema.avsc (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-kafka/src/main/resources/employee-schema.avsc (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-kinesis/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-kinesis/src/main/java/com/baeldung/KinesisApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-kinesis/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-kinesis/src/test/java/com/baeldung/KinesisApplicationIntegrationTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-kinesis/src/test/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-rabbit/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsServiceApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsWithConditionsServiceApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/MyLoggerServiceApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/messages/TextPlainMessageConverter.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/model/LogMessage.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/processor/MyProcessor.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsServiceApplicationIntegrationTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsWithConditionsServiceIntegrationTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MyLoggerApplicationIntegrationTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-task/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-task/pom.xml (96%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-task/springcloudtaskbatch/.gitignore (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-task/springcloudtaskbatch/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-task/springcloudtaskbatch/src/main/java/com/baeldung/task/HelloWorldTaskConfigurer.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-task/springcloudtaskbatch/src/main/java/com/baeldung/task/JobConfiguration.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-task/springcloudtaskbatch/src/main/java/com/baeldung/task/TaskDemo.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-task/springcloudtaskbatch/src/main/java/com/baeldung/task/TaskListener.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-task/springcloudtaskbatch/src/main/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-task/springcloudtaskbatch/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-task/springcloudtaskbatch/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-task/springcloudtaskbatch/src/test/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-task/springcloudtasksink/.gitignore (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-task/springcloudtasksink/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-task/springcloudtasksink/src/main/java/com/baeldung/SpringCloudTaskFinal/SpringCloudTaskSinkApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-task/springcloudtasksink/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-task/springcloudtasksink/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-task/springcloudtasksink/src/test/java/com/baeldung/SpringCloudTaskFinal/SpringCloudTaskSinkApplicationIntegrationTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-task/springcloudtasksink/src/test/java/com/baeldung/SpringCloudTaskFinal/TaskSinkConfiguration.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-task/springcloudtasksink/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-vault/.gitignore (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-vault/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-vault/database-setup.sql (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-vault/pom.xml (97%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-vault/sample-policy.hcl (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/AccountRepo.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/AccountResource.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/SecretResource.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/VaultSampleApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/domain/Account.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-vault/src/main/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-vault/src/main/resources/vault.jks (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-vault/src/test/java/com/baeldung/spring/cloud/vaultsample/SpringContextLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-vault/src/test/java/com/baeldung/spring/cloud/vaultsample/VaultSampleApplicationLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-vault/src/test/resources/bootstrap.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-vault/src/test/resources/vault.jks (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-vault/src/test/vault-config/localhost.cert (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-vault/src/test/vault-config/localhost.key (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-vault/src/test/vault-config/vault-test.hcl (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-vault/vault-cheatsheet.txt (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-vault/vault-env.bat (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-vault/vault-env.sh (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-vault/vault-start.bat (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-vault/vault-start.sh (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-vault/vault-unseal.bat (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-vault/vault-unseal.sh (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zookeeper/Greeting/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zookeeper/Greeting/src/main/java/com/baeldung/spring/cloud/greeting/GreetingApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zookeeper/Greeting/src/main/java/com/baeldung/spring/cloud/greeting/GreetingController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zookeeper/Greeting/src/main/java/com/baeldung/spring/cloud/greeting/HelloWorldClient.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zookeeper/Greeting/src/main/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zookeeper/Greeting/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zookeeper/Greeting/src/main/resources/templates/greeting-view.html (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zookeeper/Greeting/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zookeeper/HelloWorld/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zookeeper/HelloWorld/src/main/java/com/baeldung/spring/cloud/helloworld/HelloWorldApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zookeeper/HelloWorld/src/main/java/com/baeldung/spring/cloud/helloworld/HelloWorldController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zookeeper/HelloWorld/src/main/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zookeeper/HelloWorld/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zookeeper/HelloWorld/src/test/java/com/baeldung/spring/cloud/helloworld/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zookeeper/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zookeeper/pom.xml (90%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-eureka-integration/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-eureka-integration/eureka-client/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-eureka-integration/eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/EurekaClientApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-eureka-integration/eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/GreetingController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-eureka-integration/eureka-client/src/main/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-eureka-integration/eureka-client/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-eureka-integration/eureka-client/src/test/java/com/baeldung/spring/cloud/eureka/client/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-eureka-integration/eureka-server/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-eureka-integration/eureka-server/src/main/java/com/baeldung/spring/cloud/eureka/server/EurekaServerApplication.java (100%) rename {spring-cloud/spring-cloud-zuul-eureka-integration/bin => spring-cloud-modules/spring-cloud-zuul-eureka-integration}/eureka-server/src/main/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-eureka-integration/eureka-server/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-eureka-integration/eureka-server/src/test/java/com/baeldung/spring/cloud/eureka/server/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-eureka-integration/pom.xml (94%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-eureka-integration/zuul-server/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-eureka-integration/zuul-server/src/main/java/com/baeldung/spring/cloud/zuul/config/ZuulConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-eureka-integration/zuul-server/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-eureka-integration/zuul-server/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-eureka-integration/zuul-server/src/test/java/com/baeldung/spring/cloud/zuul/config/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-fallback/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-fallback/api-gateway/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/ApiGatewayApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayClientResponse.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayServiceFallback.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/WeatherServiceFallback.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-fallback/api-gateway/src/main/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-fallback/api-gateway/src/test/java/com/baeldung/spring/cloud/apigateway/ApiGatewayApplicationIntegrationTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-fallback/api-gateway/src/test/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayServiceFallbackUnitTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-fallback/api-gateway/src/test/java/com/baeldung/spring/cloud/apigateway/fallback/WeatherServiceFallbackUnitTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-fallback/api-gateway/src/test/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-fallback/pom.xml (93%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-fallback/weather-service/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-fallback/weather-service/src/main/java/com/baeldung/spring/cloud/weatherservice/WeatherController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-fallback/weather-service/src/main/java/com/baeldung/spring/cloud/weatherservice/WeatherServiceApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-fallback/weather-service/src/main/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-fallback/weather-service/src/test/java/com/baeldung/spring/cloud/weatherservice/WeatherControllerIntegrationTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-fallback/weather-service/src/test/java/com/baeldung/spring/cloud/weatherservice/WeatherServiceApplicationIntegrationTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/pom.xml (97%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-foos-resource/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-foos-resource/src/main/java/com/baeldung/config/ResourceServerApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-foos-resource/src/main/java/com/baeldung/config/ResourceServerWebConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-foos-resource/src/main/java/com/baeldung/web/controller/FooController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-foos-resource/src/main/java/com/baeldung/web/dto/Foo.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-foos-resource/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-foos-resource/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-foos-resource/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-post-filter/.gitignore (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-post-filter/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-post-filter/src/main/java/com/baeldung/ZuulPostFilterApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-post-filter/src/main/java/com/baeldung/controllers/GreetingController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-post-filter/src/main/java/com/baeldung/filters/ResponseLogFilter.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-post-filter/src/main/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-post-filter/src/test/java/com/baeldung/ZuulPostFilterLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-rate-limiting/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-rate-limiting/src/main/java/com/baeldung/spring/cloud/zuulratelimitdemo/ZuulRatelimitDemoApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-rate-limiting/src/main/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/GreetingController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-rate-limiting/src/main/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-rate-limiting/src/test/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/GreetingControllerIntegrationTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-rate-limiting/src/test/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-rate-limiting/src/test/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-rate-limiting/src/test/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-ui/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-ui/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/config/CustomZuulFilter.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/config/UiApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/config/UiWebConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/spring/cloud/zuul/filter/CustomZuulErrorApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/spring/cloud/zuul/filter/CustomZuulErrorFilter.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/spring/cloud/zuul/filter/ZuulConfiguration.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-ui/src/main/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-ui/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-ui/src/main/resources/templates/index.html (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-ui/src/main/webapp/resources/angular-utf8-base64.min.js (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-ui/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-ui/src/test/java/com/baeldung/spring/cloud/zuul/filter/CustomZuulErrorFilterLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-ui/src/test/java/com/baeldung/web/LiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-ui/src/test/resources/.gitignore (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-ui/src/test/resources/persistence-mysql.properties (100%) delete mode 100644 spring-cloud/spring-cloud-zuul-eureka-integration/bin/eureka-client/pom.xml delete mode 100644 spring-cloud/spring-cloud-zuul-eureka-integration/bin/eureka-client/src/main/resources/application.yml delete mode 100644 spring-cloud/spring-cloud-zuul-eureka-integration/bin/eureka-server/pom.xml delete mode 100644 spring-cloud/spring-cloud-zuul-eureka-integration/bin/pom.xml delete mode 100644 spring-cloud/spring-cloud-zuul-eureka-integration/bin/zuul-server/pom.xml delete mode 100644 spring-cloud/spring-cloud-zuul-eureka-integration/bin/zuul-server/src/main/resources/application.properties delete mode 100644 spring-cloud/spring-cloud-zuul-eureka-integration/eureka-server/src/main/resources/application.yml diff --git a/pom.xml b/pom.xml index e9942d77e8..9fa62d27ee 100644 --- a/pom.xml +++ b/pom.xml @@ -616,7 +616,7 @@ spring-caching spring-caching-2 - spring-cloud + spring-cloud-modules spring-cloud-bus spring-cloud-data-flow @@ -1072,7 +1072,7 @@ spring-caching spring-caching-2 - spring-cloud + spring-cloud-modules spring-cloud-bus spring-cloud-data-flow diff --git a/spring-cloud/README.md b/spring-cloud-modules/README.md similarity index 100% rename from spring-cloud/README.md rename to spring-cloud-modules/README.md diff --git a/spring-cloud/pom.xml b/spring-cloud-modules/pom.xml similarity index 97% rename from spring-cloud/pom.xml rename to spring-cloud-modules/pom.xml index f58e1aec5c..d2f3845922 100644 --- a/spring-cloud/pom.xml +++ b/spring-cloud-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.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT - spring-cloud + spring-cloud-modules pom diff --git a/spring-cloud/spring-cloud-archaius/README.md b/spring-cloud-modules/spring-cloud-archaius/README.md similarity index 100% rename from spring-cloud/spring-cloud-archaius/README.md rename to spring-cloud-modules/spring-cloud-archaius/README.md diff --git a/spring-cloud/spring-cloud-archaius/additional-sources-simple/pom.xml b/spring-cloud-modules/spring-cloud-archaius/additional-sources-simple/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-archaius/additional-sources-simple/pom.xml rename to spring-cloud-modules/spring-cloud-archaius/additional-sources-simple/pom.xml diff --git a/spring-cloud/spring-cloud-archaius/additional-sources-simple/src/main/java/com/baeldung/spring/cloud/archaius/additionalsources/AdditionalSourcesSimpleApplication.java b/spring-cloud-modules/spring-cloud-archaius/additional-sources-simple/src/main/java/com/baeldung/spring/cloud/archaius/additionalsources/AdditionalSourcesSimpleApplication.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/additional-sources-simple/src/main/java/com/baeldung/spring/cloud/archaius/additionalsources/AdditionalSourcesSimpleApplication.java rename to spring-cloud-modules/spring-cloud-archaius/additional-sources-simple/src/main/java/com/baeldung/spring/cloud/archaius/additionalsources/AdditionalSourcesSimpleApplication.java diff --git a/spring-cloud/spring-cloud-archaius/additional-sources-simple/src/main/java/com/baeldung/spring/cloud/archaius/additionalsources/config/ApplicationPropertiesConfigurations.java b/spring-cloud-modules/spring-cloud-archaius/additional-sources-simple/src/main/java/com/baeldung/spring/cloud/archaius/additionalsources/config/ApplicationPropertiesConfigurations.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/additional-sources-simple/src/main/java/com/baeldung/spring/cloud/archaius/additionalsources/config/ApplicationPropertiesConfigurations.java rename to spring-cloud-modules/spring-cloud-archaius/additional-sources-simple/src/main/java/com/baeldung/spring/cloud/archaius/additionalsources/config/ApplicationPropertiesConfigurations.java diff --git a/spring-cloud/spring-cloud-archaius/additional-sources-simple/src/main/java/com/baeldung/spring/cloud/archaius/additionalsources/controller/ConfigPropertiesController.java b/spring-cloud-modules/spring-cloud-archaius/additional-sources-simple/src/main/java/com/baeldung/spring/cloud/archaius/additionalsources/controller/ConfigPropertiesController.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/additional-sources-simple/src/main/java/com/baeldung/spring/cloud/archaius/additionalsources/controller/ConfigPropertiesController.java rename to spring-cloud-modules/spring-cloud-archaius/additional-sources-simple/src/main/java/com/baeldung/spring/cloud/archaius/additionalsources/controller/ConfigPropertiesController.java diff --git a/spring-cloud/spring-cloud-archaius/additional-sources-simple/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-archaius/additional-sources-simple/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-archaius/additional-sources-simple/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-archaius/additional-sources-simple/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-archaius/additional-sources-simple/src/main/resources/config.properties b/spring-cloud-modules/spring-cloud-archaius/additional-sources-simple/src/main/resources/config.properties similarity index 100% rename from spring-cloud/spring-cloud-archaius/additional-sources-simple/src/main/resources/config.properties rename to spring-cloud-modules/spring-cloud-archaius/additional-sources-simple/src/main/resources/config.properties diff --git a/spring-cloud/spring-cloud-archaius/additional-sources-simple/src/main/resources/other-config.properties b/spring-cloud-modules/spring-cloud-archaius/additional-sources-simple/src/main/resources/other-config.properties similarity index 100% rename from spring-cloud/spring-cloud-archaius/additional-sources-simple/src/main/resources/other-config.properties rename to spring-cloud-modules/spring-cloud-archaius/additional-sources-simple/src/main/resources/other-config.properties diff --git a/spring-cloud/spring-cloud-archaius/additional-sources-simple/src/test/java/com/baeldung/spring/cloud/archaius/additionalsources/ArchaiusAdditionalSourcesLiveTest.java b/spring-cloud-modules/spring-cloud-archaius/additional-sources-simple/src/test/java/com/baeldung/spring/cloud/archaius/additionalsources/ArchaiusAdditionalSourcesLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/additional-sources-simple/src/test/java/com/baeldung/spring/cloud/archaius/additionalsources/ArchaiusAdditionalSourcesLiveTest.java rename to spring-cloud-modules/spring-cloud-archaius/additional-sources-simple/src/test/java/com/baeldung/spring/cloud/archaius/additionalsources/ArchaiusAdditionalSourcesLiveTest.java diff --git a/spring-cloud/spring-cloud-archaius/additional-sources-simple/src/test/java/com/baeldung/spring/cloud/archaius/additionalsources/SpringContextTest.java b/spring-cloud-modules/spring-cloud-archaius/additional-sources-simple/src/test/java/com/baeldung/spring/cloud/archaius/additionalsources/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/additional-sources-simple/src/test/java/com/baeldung/spring/cloud/archaius/additionalsources/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-archaius/additional-sources-simple/src/test/java/com/baeldung/spring/cloud/archaius/additionalsources/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-archaius/additional-sources-simple/src/test/resources/logback-test.xml b/spring-cloud-modules/spring-cloud-archaius/additional-sources-simple/src/test/resources/logback-test.xml similarity index 100% rename from spring-cloud/spring-cloud-archaius/additional-sources-simple/src/test/resources/logback-test.xml rename to spring-cloud-modules/spring-cloud-archaius/additional-sources-simple/src/test/resources/logback-test.xml diff --git a/spring-cloud/spring-cloud-archaius/basic-config/pom.xml b/spring-cloud-modules/spring-cloud-archaius/basic-config/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-archaius/basic-config/pom.xml rename to spring-cloud-modules/spring-cloud-archaius/basic-config/pom.xml diff --git a/spring-cloud/spring-cloud-archaius/basic-config/src/main/java/com/baeldung/spring/cloud/archaius/basic/BasicArchaiusApplication.java b/spring-cloud-modules/spring-cloud-archaius/basic-config/src/main/java/com/baeldung/spring/cloud/archaius/basic/BasicArchaiusApplication.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/basic-config/src/main/java/com/baeldung/spring/cloud/archaius/basic/BasicArchaiusApplication.java rename to spring-cloud-modules/spring-cloud-archaius/basic-config/src/main/java/com/baeldung/spring/cloud/archaius/basic/BasicArchaiusApplication.java diff --git a/spring-cloud/spring-cloud-archaius/basic-config/src/main/java/com/baeldung/spring/cloud/archaius/basic/controller/ConfigPropertiesController.java b/spring-cloud-modules/spring-cloud-archaius/basic-config/src/main/java/com/baeldung/spring/cloud/archaius/basic/controller/ConfigPropertiesController.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/basic-config/src/main/java/com/baeldung/spring/cloud/archaius/basic/controller/ConfigPropertiesController.java rename to spring-cloud-modules/spring-cloud-archaius/basic-config/src/main/java/com/baeldung/spring/cloud/archaius/basic/controller/ConfigPropertiesController.java diff --git a/spring-cloud/spring-cloud-archaius/basic-config/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-archaius/basic-config/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-archaius/basic-config/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-archaius/basic-config/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-archaius/basic-config/src/main/resources/config.properties b/spring-cloud-modules/spring-cloud-archaius/basic-config/src/main/resources/config.properties similarity index 100% rename from spring-cloud/spring-cloud-archaius/basic-config/src/main/resources/config.properties rename to spring-cloud-modules/spring-cloud-archaius/basic-config/src/main/resources/config.properties diff --git a/spring-cloud/spring-cloud-archaius/basic-config/src/main/resources/other.properties b/spring-cloud-modules/spring-cloud-archaius/basic-config/src/main/resources/other.properties similarity index 100% rename from spring-cloud/spring-cloud-archaius/basic-config/src/main/resources/other.properties rename to spring-cloud-modules/spring-cloud-archaius/basic-config/src/main/resources/other.properties diff --git a/spring-cloud/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/spring/cloud/archaius/basic/ArchaiusBasicConfigurationIntegrationTest.java b/spring-cloud-modules/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/spring/cloud/archaius/basic/ArchaiusBasicConfigurationIntegrationTest.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/spring/cloud/archaius/basic/ArchaiusBasicConfigurationIntegrationTest.java rename to spring-cloud-modules/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/spring/cloud/archaius/basic/ArchaiusBasicConfigurationIntegrationTest.java diff --git a/spring-cloud/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/spring/cloud/archaius/basic/ArchaiusBasicConfigurationLiveTest.java b/spring-cloud-modules/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/spring/cloud/archaius/basic/ArchaiusBasicConfigurationLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/spring/cloud/archaius/basic/ArchaiusBasicConfigurationLiveTest.java rename to spring-cloud-modules/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/spring/cloud/archaius/basic/ArchaiusBasicConfigurationLiveTest.java diff --git a/spring-cloud/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/spring/cloud/archaius/basic/SpringContextTest.java b/spring-cloud-modules/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/spring/cloud/archaius/basic/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/spring/cloud/archaius/basic/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/spring/cloud/archaius/basic/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-archaius/basic-config/src/test/resources/config.properties b/spring-cloud-modules/spring-cloud-archaius/basic-config/src/test/resources/config.properties similarity index 100% rename from spring-cloud/spring-cloud-archaius/basic-config/src/test/resources/config.properties rename to spring-cloud-modules/spring-cloud-archaius/basic-config/src/test/resources/config.properties diff --git a/spring-cloud/spring-cloud-archaius/basic-config/src/test/resources/logback-test.xml b/spring-cloud-modules/spring-cloud-archaius/basic-config/src/test/resources/logback-test.xml similarity index 100% rename from spring-cloud/spring-cloud-archaius/basic-config/src/test/resources/logback-test.xml rename to spring-cloud-modules/spring-cloud-archaius/basic-config/src/test/resources/logback-test.xml diff --git a/spring-cloud/spring-cloud-archaius/dynamodb-config/pom.xml b/spring-cloud-modules/spring-cloud-archaius/dynamodb-config/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-archaius/dynamodb-config/pom.xml rename to spring-cloud-modules/spring-cloud-archaius/dynamodb-config/pom.xml diff --git a/spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/DynamoSourcesApplication.java b/spring-cloud-modules/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/DynamoSourcesApplication.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/DynamoSourcesApplication.java rename to spring-cloud-modules/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/DynamoSourcesApplication.java diff --git a/spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/config/ApplicationPropertiesConfigurations.java b/spring-cloud-modules/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/config/ApplicationPropertiesConfigurations.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/config/ApplicationPropertiesConfigurations.java rename to spring-cloud-modules/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/config/ApplicationPropertiesConfigurations.java diff --git a/spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/config/DynamoDbConfiguration.java b/spring-cloud-modules/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/config/DynamoDbConfiguration.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/config/DynamoDbConfiguration.java rename to spring-cloud-modules/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/config/DynamoDbConfiguration.java diff --git a/spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/controller/ConfigPropertiesController.java b/spring-cloud-modules/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/controller/ConfigPropertiesController.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/controller/ConfigPropertiesController.java rename to spring-cloud-modules/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/controller/ConfigPropertiesController.java diff --git a/spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/dynamodb/ArchaiusProperties.java b/spring-cloud-modules/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/dynamodb/ArchaiusProperties.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/dynamodb/ArchaiusProperties.java rename to spring-cloud-modules/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/dynamodb/ArchaiusProperties.java diff --git a/spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/dynamodb/ArchaiusPropertiesRepository.java b/spring-cloud-modules/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/dynamodb/ArchaiusPropertiesRepository.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/dynamodb/ArchaiusPropertiesRepository.java rename to spring-cloud-modules/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/dynamodb/ArchaiusPropertiesRepository.java diff --git a/spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-archaius/dynamodb-config/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-archaius/dynamodb-config/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-archaius/dynamodb-config/src/test/java/com/baeldung/spring/cloud/archaius/dynamosources/ArchaiusDynamoDbLiveTest.java b/spring-cloud-modules/spring-cloud-archaius/dynamodb-config/src/test/java/com/baeldung/spring/cloud/archaius/dynamosources/ArchaiusDynamoDbLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/dynamodb-config/src/test/java/com/baeldung/spring/cloud/archaius/dynamosources/ArchaiusDynamoDbLiveTest.java rename to spring-cloud-modules/spring-cloud-archaius/dynamodb-config/src/test/java/com/baeldung/spring/cloud/archaius/dynamosources/ArchaiusDynamoDbLiveTest.java diff --git a/spring-cloud/spring-cloud-archaius/dynamodb-config/src/test/java/com/baeldung/spring/cloud/archaius/dynamosources/SpringContextLiveTest.java b/spring-cloud-modules/spring-cloud-archaius/dynamodb-config/src/test/java/com/baeldung/spring/cloud/archaius/dynamosources/SpringContextLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/dynamodb-config/src/test/java/com/baeldung/spring/cloud/archaius/dynamosources/SpringContextLiveTest.java rename to spring-cloud-modules/spring-cloud-archaius/dynamodb-config/src/test/java/com/baeldung/spring/cloud/archaius/dynamosources/SpringContextLiveTest.java diff --git a/spring-cloud/spring-cloud-archaius/extra-configs/pom.xml b/spring-cloud-modules/spring-cloud-archaius/extra-configs/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-archaius/extra-configs/pom.xml rename to spring-cloud-modules/spring-cloud-archaius/extra-configs/pom.xml diff --git a/spring-cloud/spring-cloud-archaius/extra-configs/src/main/java/com/baeldung/spring/cloud/archaius/extraconfigs/ExtraConfigsApplication.java b/spring-cloud-modules/spring-cloud-archaius/extra-configs/src/main/java/com/baeldung/spring/cloud/archaius/extraconfigs/ExtraConfigsApplication.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/extra-configs/src/main/java/com/baeldung/spring/cloud/archaius/extraconfigs/ExtraConfigsApplication.java rename to spring-cloud-modules/spring-cloud-archaius/extra-configs/src/main/java/com/baeldung/spring/cloud/archaius/extraconfigs/ExtraConfigsApplication.java diff --git a/spring-cloud/spring-cloud-archaius/extra-configs/src/main/java/com/baeldung/spring/cloud/archaius/extraconfigs/controllers/ConfigPropertiesController.java b/spring-cloud-modules/spring-cloud-archaius/extra-configs/src/main/java/com/baeldung/spring/cloud/archaius/extraconfigs/controllers/ConfigPropertiesController.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/extra-configs/src/main/java/com/baeldung/spring/cloud/archaius/extraconfigs/controllers/ConfigPropertiesController.java rename to spring-cloud-modules/spring-cloud-archaius/extra-configs/src/main/java/com/baeldung/spring/cloud/archaius/extraconfigs/controllers/ConfigPropertiesController.java diff --git a/spring-cloud/spring-cloud-archaius/extra-configs/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-archaius/extra-configs/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-archaius/extra-configs/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-archaius/extra-configs/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-archaius/extra-configs/src/main/resources/other-config-dir/extra.properties b/spring-cloud-modules/spring-cloud-archaius/extra-configs/src/main/resources/other-config-dir/extra.properties similarity index 100% rename from spring-cloud/spring-cloud-archaius/extra-configs/src/main/resources/other-config-dir/extra.properties rename to spring-cloud-modules/spring-cloud-archaius/extra-configs/src/main/resources/other-config-dir/extra.properties diff --git a/spring-cloud/spring-cloud-archaius/extra-configs/src/main/resources/other.properties b/spring-cloud-modules/spring-cloud-archaius/extra-configs/src/main/resources/other.properties similarity index 100% rename from spring-cloud/spring-cloud-archaius/extra-configs/src/main/resources/other.properties rename to spring-cloud-modules/spring-cloud-archaius/extra-configs/src/main/resources/other.properties diff --git a/spring-cloud/spring-cloud-archaius/extra-configs/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-archaius/extra-configs/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/extra-configs/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-archaius/extra-configs/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-archaius/extra-configs/src/test/java/com/baeldung/spring/cloud/archaius/extraconfigs/ArchaiusExtraConfigsLiveTest.java b/spring-cloud-modules/spring-cloud-archaius/extra-configs/src/test/java/com/baeldung/spring/cloud/archaius/extraconfigs/ArchaiusExtraConfigsLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/extra-configs/src/test/java/com/baeldung/spring/cloud/archaius/extraconfigs/ArchaiusExtraConfigsLiveTest.java rename to spring-cloud-modules/spring-cloud-archaius/extra-configs/src/test/java/com/baeldung/spring/cloud/archaius/extraconfigs/ArchaiusExtraConfigsLiveTest.java diff --git a/spring-cloud/spring-cloud-archaius/extra-configs/src/test/resources/logback-test.xml b/spring-cloud-modules/spring-cloud-archaius/extra-configs/src/test/resources/logback-test.xml similarity index 100% rename from spring-cloud/spring-cloud-archaius/extra-configs/src/test/resources/logback-test.xml rename to spring-cloud-modules/spring-cloud-archaius/extra-configs/src/test/resources/logback-test.xml diff --git a/spring-cloud/spring-cloud-archaius/jdbc-config/pom.xml b/spring-cloud-modules/spring-cloud-archaius/jdbc-config/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-archaius/jdbc-config/pom.xml rename to spring-cloud-modules/spring-cloud-archaius/jdbc-config/pom.xml diff --git a/spring-cloud/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/JdbcSourcesApplication.java b/spring-cloud-modules/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/JdbcSourcesApplication.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/JdbcSourcesApplication.java rename to spring-cloud-modules/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/JdbcSourcesApplication.java diff --git a/spring-cloud/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/config/ApplicationPropertiesConfigurations.java b/spring-cloud-modules/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/config/ApplicationPropertiesConfigurations.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/config/ApplicationPropertiesConfigurations.java rename to spring-cloud-modules/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/config/ApplicationPropertiesConfigurations.java diff --git a/spring-cloud/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/controller/ConfigPropertiesController.java b/spring-cloud-modules/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/controller/ConfigPropertiesController.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/controller/ConfigPropertiesController.java rename to spring-cloud-modules/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/controller/ConfigPropertiesController.java diff --git a/spring-cloud/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/jdbc/Properties.java b/spring-cloud-modules/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/jdbc/Properties.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/jdbc/Properties.java rename to spring-cloud-modules/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/jdbc/Properties.java diff --git a/spring-cloud/spring-cloud-archaius/jdbc-config/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-archaius/jdbc-config/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-archaius/jdbc-config/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-archaius/jdbc-config/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-archaius/jdbc-config/src/main/resources/data.sql b/spring-cloud-modules/spring-cloud-archaius/jdbc-config/src/main/resources/data.sql similarity index 100% rename from spring-cloud/spring-cloud-archaius/jdbc-config/src/main/resources/data.sql rename to spring-cloud-modules/spring-cloud-archaius/jdbc-config/src/main/resources/data.sql diff --git a/spring-cloud/spring-cloud-archaius/jdbc-config/src/test/java/com/baeldung/spring/cloud/archaius/jdbconfig/ArchaiusJDBCSourceLiveTest.java b/spring-cloud-modules/spring-cloud-archaius/jdbc-config/src/test/java/com/baeldung/spring/cloud/archaius/jdbconfig/ArchaiusJDBCSourceLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/jdbc-config/src/test/java/com/baeldung/spring/cloud/archaius/jdbconfig/ArchaiusJDBCSourceLiveTest.java rename to spring-cloud-modules/spring-cloud-archaius/jdbc-config/src/test/java/com/baeldung/spring/cloud/archaius/jdbconfig/ArchaiusJDBCSourceLiveTest.java diff --git a/spring-cloud/spring-cloud-archaius/jdbc-config/src/test/java/com/baeldung/spring/cloud/archaius/jdbconfig/SpringContextTest.java b/spring-cloud-modules/spring-cloud-archaius/jdbc-config/src/test/java/com/baeldung/spring/cloud/archaius/jdbconfig/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/jdbc-config/src/test/java/com/baeldung/spring/cloud/archaius/jdbconfig/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-archaius/jdbc-config/src/test/java/com/baeldung/spring/cloud/archaius/jdbconfig/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-archaius/jdbc-config/src/test/resources/logback-test.xml b/spring-cloud-modules/spring-cloud-archaius/jdbc-config/src/test/resources/logback-test.xml similarity index 100% rename from spring-cloud/spring-cloud-archaius/jdbc-config/src/test/resources/logback-test.xml rename to spring-cloud-modules/spring-cloud-archaius/jdbc-config/src/test/resources/logback-test.xml diff --git a/spring-cloud/spring-cloud-archaius/pom.xml b/spring-cloud-modules/spring-cloud-archaius/pom.xml similarity index 97% rename from spring-cloud/spring-cloud-archaius/pom.xml rename to spring-cloud-modules/spring-cloud-archaius/pom.xml index 058f383ec0..1208daaba6 100644 --- a/spring-cloud/spring-cloud-archaius/pom.xml +++ b/spring-cloud-modules/spring-cloud-archaius/pom.xml @@ -11,7 +11,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-archaius/zookeeper-config/pom.xml b/spring-cloud-modules/spring-cloud-archaius/zookeeper-config/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-archaius/zookeeper-config/pom.xml rename to spring-cloud-modules/spring-cloud-archaius/zookeeper-config/pom.xml diff --git a/spring-cloud/spring-cloud-archaius/zookeeper-config/src/main/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/ZookeeperConfigApplication.java b/spring-cloud-modules/spring-cloud-archaius/zookeeper-config/src/main/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/ZookeeperConfigApplication.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/zookeeper-config/src/main/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/ZookeeperConfigApplication.java rename to spring-cloud-modules/spring-cloud-archaius/zookeeper-config/src/main/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/ZookeeperConfigApplication.java diff --git a/spring-cloud/spring-cloud-archaius/zookeeper-config/src/main/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/config/ZookeeperConfigsInitializer.java b/spring-cloud-modules/spring-cloud-archaius/zookeeper-config/src/main/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/config/ZookeeperConfigsInitializer.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/zookeeper-config/src/main/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/config/ZookeeperConfigsInitializer.java rename to spring-cloud-modules/spring-cloud-archaius/zookeeper-config/src/main/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/config/ZookeeperConfigsInitializer.java diff --git a/spring-cloud/spring-cloud-archaius/zookeeper-config/src/main/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/controller/ConfigPropertiesController.java b/spring-cloud-modules/spring-cloud-archaius/zookeeper-config/src/main/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/controller/ConfigPropertiesController.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/zookeeper-config/src/main/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/controller/ConfigPropertiesController.java rename to spring-cloud-modules/spring-cloud-archaius/zookeeper-config/src/main/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/controller/ConfigPropertiesController.java diff --git a/spring-cloud/spring-cloud-archaius/zookeeper-config/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-archaius/zookeeper-config/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-archaius/zookeeper-config/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-archaius/zookeeper-config/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-archaius/zookeeper-config/src/test/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/ArchaiusZookeeperLiveTest.java b/spring-cloud-modules/spring-cloud-archaius/zookeeper-config/src/test/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/ArchaiusZookeeperLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/zookeeper-config/src/test/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/ArchaiusZookeeperLiveTest.java rename to spring-cloud-modules/spring-cloud-archaius/zookeeper-config/src/test/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/ArchaiusZookeeperLiveTest.java diff --git a/spring-cloud/spring-cloud-archaius/zookeeper-config/src/test/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/SpringContextLiveTest.java b/spring-cloud-modules/spring-cloud-archaius/zookeeper-config/src/test/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/SpringContextLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/zookeeper-config/src/test/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/SpringContextLiveTest.java rename to spring-cloud-modules/spring-cloud-archaius/zookeeper-config/src/test/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/SpringContextLiveTest.java diff --git a/spring-cloud/spring-cloud-aws/README.md b/spring-cloud-modules/spring-cloud-aws/README.md similarity index 100% rename from spring-cloud/spring-cloud-aws/README.md rename to spring-cloud-modules/spring-cloud-aws/README.md diff --git a/spring-cloud/spring-cloud-aws/pom.xml b/spring-cloud-modules/spring-cloud-aws/pom.xml similarity index 98% rename from spring-cloud/spring-cloud-aws/pom.xml rename to spring-cloud-modules/spring-cloud-aws/pom.xml index 312e800874..7c32bf5de5 100644 --- a/spring-cloud/spring-cloud-aws/pom.xml +++ b/spring-cloud-modules/spring-cloud-aws/pom.xml @@ -11,7 +11,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/InstanceProfileAwsApplication.java b/spring-cloud-modules/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/InstanceProfileAwsApplication.java similarity index 100% rename from spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/InstanceProfileAwsApplication.java rename to spring-cloud-modules/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/InstanceProfileAwsApplication.java diff --git a/spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/SpringCloudAwsApplication.java b/spring-cloud-modules/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/SpringCloudAwsApplication.java similarity index 100% rename from spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/SpringCloudAwsApplication.java rename to spring-cloud-modules/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/SpringCloudAwsApplication.java diff --git a/spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/config/SpringCloudAwsConfig.java b/spring-cloud-modules/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/config/SpringCloudAwsConfig.java similarity index 100% rename from spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/config/SpringCloudAwsConfig.java rename to spring-cloud-modules/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/config/SpringCloudAwsConfig.java diff --git a/spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/ec2/EC2EnableMetadata.java b/spring-cloud-modules/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/ec2/EC2EnableMetadata.java similarity index 100% rename from spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/ec2/EC2EnableMetadata.java rename to spring-cloud-modules/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/ec2/EC2EnableMetadata.java diff --git a/spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/ec2/EC2Metadata.java b/spring-cloud-modules/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/ec2/EC2Metadata.java similarity index 100% rename from spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/ec2/EC2Metadata.java rename to spring-cloud-modules/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/ec2/EC2Metadata.java diff --git a/spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/s3/SpringCloudS3.java b/spring-cloud-modules/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/s3/SpringCloudS3.java similarity index 100% rename from spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/s3/SpringCloudS3.java rename to spring-cloud-modules/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/s3/SpringCloudS3.java diff --git a/spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/s3/SpringCloudS3Service.java b/spring-cloud-modules/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/s3/SpringCloudS3Service.java similarity index 100% rename from spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/s3/SpringCloudS3Service.java rename to spring-cloud-modules/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/s3/SpringCloudS3Service.java diff --git a/spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/sns/SNSEndpointController.java b/spring-cloud-modules/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/sns/SNSEndpointController.java similarity index 100% rename from spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/sns/SNSEndpointController.java rename to spring-cloud-modules/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/sns/SNSEndpointController.java diff --git a/spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/sns/SNSMessageSender.java b/spring-cloud-modules/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/sns/SNSMessageSender.java similarity index 100% rename from spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/sns/SNSMessageSender.java rename to spring-cloud-modules/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/sns/SNSMessageSender.java diff --git a/spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/sqs/SpringCloudSQS.java b/spring-cloud-modules/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/sqs/SpringCloudSQS.java similarity index 100% rename from spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/sqs/SpringCloudSQS.java rename to spring-cloud-modules/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/sqs/SpringCloudSQS.java diff --git a/spring-cloud/spring-cloud-aws/src/main/resources/InstanceProfileFormation.yaml b/spring-cloud-modules/spring-cloud-aws/src/main/resources/InstanceProfileFormation.yaml similarity index 100% rename from spring-cloud/spring-cloud-aws/src/main/resources/InstanceProfileFormation.yaml rename to spring-cloud-modules/spring-cloud-aws/src/main/resources/InstanceProfileFormation.yaml diff --git a/spring-cloud/spring-cloud-aws/src/main/resources/application-instance-profile.properties b/spring-cloud-modules/spring-cloud-aws/src/main/resources/application-instance-profile.properties similarity index 100% rename from spring-cloud/spring-cloud-aws/src/main/resources/application-instance-profile.properties rename to spring-cloud-modules/spring-cloud-aws/src/main/resources/application-instance-profile.properties diff --git a/spring-cloud/spring-cloud-aws/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-aws/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-aws/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-aws/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-aws/src/main/resources/aws-config.xml b/spring-cloud-modules/spring-cloud-aws/src/main/resources/aws-config.xml similarity index 100% rename from spring-cloud/spring-cloud-aws/src/main/resources/aws-config.xml rename to spring-cloud-modules/spring-cloud-aws/src/main/resources/aws-config.xml diff --git a/spring-cloud/spring-cloud-aws/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-aws/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-aws/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-aws/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/SpringCloudAwsTestUtil.java b/spring-cloud-modules/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/SpringCloudAwsTestUtil.java similarity index 100% rename from spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/SpringCloudAwsTestUtil.java rename to spring-cloud-modules/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/SpringCloudAwsTestUtil.java diff --git a/spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/SpringContextLiveTest.java b/spring-cloud-modules/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/SpringContextLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/SpringContextLiveTest.java rename to spring-cloud-modules/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/SpringContextLiveTest.java diff --git a/spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/ec2/EC2MetadataLiveTest.java b/spring-cloud-modules/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/ec2/EC2MetadataLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/ec2/EC2MetadataLiveTest.java rename to spring-cloud-modules/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/ec2/EC2MetadataLiveTest.java diff --git a/spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/rds/SpringCloudRDSLiveTest.java b/spring-cloud-modules/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/rds/SpringCloudRDSLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/rds/SpringCloudRDSLiveTest.java rename to spring-cloud-modules/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/rds/SpringCloudRDSLiveTest.java diff --git a/spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/s3/SpringCloudS3LiveTest.java b/spring-cloud-modules/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/s3/SpringCloudS3LiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/s3/SpringCloudS3LiveTest.java rename to spring-cloud-modules/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/s3/SpringCloudS3LiveTest.java diff --git a/spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sns/SNSEndpointControllerUnitTest.java b/spring-cloud-modules/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sns/SNSEndpointControllerUnitTest.java similarity index 100% rename from spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sns/SNSEndpointControllerUnitTest.java rename to spring-cloud-modules/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sns/SNSEndpointControllerUnitTest.java diff --git a/spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sns/SpringCloudSNSLiveTest.java b/spring-cloud-modules/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sns/SpringCloudSNSLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sns/SpringCloudSNSLiveTest.java rename to spring-cloud-modules/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sns/SpringCloudSNSLiveTest.java diff --git a/spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sqs/Greeting.java b/spring-cloud-modules/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sqs/Greeting.java similarity index 100% rename from spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sqs/Greeting.java rename to spring-cloud-modules/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sqs/Greeting.java diff --git a/spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sqs/SpringCloudSQSLiveTest.java b/spring-cloud-modules/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sqs/SpringCloudSQSLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sqs/SpringCloudSQSLiveTest.java rename to spring-cloud-modules/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sqs/SpringCloudSQSLiveTest.java diff --git a/spring-cloud/spring-cloud-aws/src/test/resources/application-test.properties b/spring-cloud-modules/spring-cloud-aws/src/test/resources/application-test.properties similarity index 100% rename from spring-cloud/spring-cloud-aws/src/test/resources/application-test.properties rename to spring-cloud-modules/spring-cloud-aws/src/test/resources/application-test.properties diff --git a/spring-cloud/spring-cloud-aws/src/test/resources/test-file-upload.txt b/spring-cloud-modules/spring-cloud-aws/src/test/resources/test-file-upload.txt similarity index 100% rename from spring-cloud/spring-cloud-aws/src/test/resources/test-file-upload.txt rename to spring-cloud-modules/spring-cloud-aws/src/test/resources/test-file-upload.txt diff --git a/spring-cloud/spring-cloud-bootstrap/README.md b/spring-cloud-modules/spring-cloud-bootstrap/README.md similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/README.md rename to spring-cloud-modules/spring-cloud-bootstrap/README.md diff --git a/spring-cloud/spring-cloud-bootstrap/application-config/book-service.properties b/spring-cloud-modules/spring-cloud-bootstrap/application-config/book-service.properties similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/application-config/book-service.properties rename to spring-cloud-modules/spring-cloud-bootstrap/application-config/book-service.properties diff --git a/spring-cloud/spring-cloud-bootstrap/application-config/discovery.properties b/spring-cloud-modules/spring-cloud-bootstrap/application-config/discovery.properties similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/application-config/discovery.properties rename to spring-cloud-modules/spring-cloud-bootstrap/application-config/discovery.properties diff --git a/spring-cloud/spring-cloud-bootstrap/application-config/gateway.properties b/spring-cloud-modules/spring-cloud-bootstrap/application-config/gateway.properties similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/application-config/gateway.properties rename to spring-cloud-modules/spring-cloud-bootstrap/application-config/gateway.properties diff --git a/spring-cloud/spring-cloud-bootstrap/application-config/rating-service.properties b/spring-cloud-modules/spring-cloud-bootstrap/application-config/rating-service.properties similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/application-config/rating-service.properties rename to spring-cloud-modules/spring-cloud-bootstrap/application-config/rating-service.properties diff --git a/spring-cloud/spring-cloud-bootstrap/application-config/zipkin.properties b/spring-cloud-modules/spring-cloud-bootstrap/application-config/zipkin.properties similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/application-config/zipkin.properties rename to spring-cloud-modules/spring-cloud-bootstrap/application-config/zipkin.properties diff --git a/spring-cloud/spring-cloud-bootstrap/config/pom.xml b/spring-cloud-modules/spring-cloud-bootstrap/config/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/config/pom.xml rename to spring-cloud-modules/spring-cloud-bootstrap/config/pom.xml diff --git a/spring-cloud/spring-cloud-bootstrap/config/src/main/java/com/baeldung/spring/cloud/bootstrap/config/ConfigApplication.java b/spring-cloud-modules/spring-cloud-bootstrap/config/src/main/java/com/baeldung/spring/cloud/bootstrap/config/ConfigApplication.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/config/src/main/java/com/baeldung/spring/cloud/bootstrap/config/ConfigApplication.java rename to spring-cloud-modules/spring-cloud-bootstrap/config/src/main/java/com/baeldung/spring/cloud/bootstrap/config/ConfigApplication.java diff --git a/spring-cloud/spring-cloud-bootstrap/config/src/main/java/com/baeldung/spring/cloud/bootstrap/config/SecurityConfig.java b/spring-cloud-modules/spring-cloud-bootstrap/config/src/main/java/com/baeldung/spring/cloud/bootstrap/config/SecurityConfig.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/config/src/main/java/com/baeldung/spring/cloud/bootstrap/config/SecurityConfig.java rename to spring-cloud-modules/spring-cloud-bootstrap/config/src/main/java/com/baeldung/spring/cloud/bootstrap/config/SecurityConfig.java diff --git a/spring-cloud/spring-cloud-bootstrap/config/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-bootstrap/config/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/config/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-bootstrap/config/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-bootstrap/config/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-bootstrap/config/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/config/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-bootstrap/config/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-bootstrap/config/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-bootstrap/config/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/config/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-bootstrap/config/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-bootstrap/customer-service/pom.xml b/spring-cloud-modules/spring-cloud-bootstrap/customer-service/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/customer-service/pom.xml rename to spring-cloud-modules/spring-cloud-bootstrap/customer-service/pom.xml diff --git a/spring-cloud/spring-cloud-bootstrap/customer-service/src/main/java/com/baeldung/customerservice/Customer.java b/spring-cloud-modules/spring-cloud-bootstrap/customer-service/src/main/java/com/baeldung/customerservice/Customer.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/customer-service/src/main/java/com/baeldung/customerservice/Customer.java rename to spring-cloud-modules/spring-cloud-bootstrap/customer-service/src/main/java/com/baeldung/customerservice/Customer.java diff --git a/spring-cloud/spring-cloud-bootstrap/customer-service/src/main/java/com/baeldung/customerservice/CustomerApplication.java b/spring-cloud-modules/spring-cloud-bootstrap/customer-service/src/main/java/com/baeldung/customerservice/CustomerApplication.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/customer-service/src/main/java/com/baeldung/customerservice/CustomerApplication.java rename to spring-cloud-modules/spring-cloud-bootstrap/customer-service/src/main/java/com/baeldung/customerservice/CustomerApplication.java diff --git a/spring-cloud/spring-cloud-bootstrap/customer-service/src/main/java/com/baeldung/customerservice/CustomerService.java b/spring-cloud-modules/spring-cloud-bootstrap/customer-service/src/main/java/com/baeldung/customerservice/CustomerService.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/customer-service/src/main/java/com/baeldung/customerservice/CustomerService.java rename to spring-cloud-modules/spring-cloud-bootstrap/customer-service/src/main/java/com/baeldung/customerservice/CustomerService.java diff --git a/spring-cloud/spring-cloud-bootstrap/customer-service/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-bootstrap/customer-service/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/customer-service/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-bootstrap/customer-service/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-bootstrap/customer-service/src/test/resources/application.properties b/spring-cloud-modules/spring-cloud-bootstrap/customer-service/src/test/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/customer-service/src/test/resources/application.properties rename to spring-cloud-modules/spring-cloud-bootstrap/customer-service/src/test/resources/application.properties diff --git a/spring-cloud/spring-cloud-bootstrap/discovery/pom.xml b/spring-cloud-modules/spring-cloud-bootstrap/discovery/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/discovery/pom.xml rename to spring-cloud-modules/spring-cloud-bootstrap/discovery/pom.xml diff --git a/spring-cloud/spring-cloud-bootstrap/discovery/src/main/java/com/baeldung/spring/cloud/bootstrap/discovery/DiscoveryApplication.java b/spring-cloud-modules/spring-cloud-bootstrap/discovery/src/main/java/com/baeldung/spring/cloud/bootstrap/discovery/DiscoveryApplication.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/discovery/src/main/java/com/baeldung/spring/cloud/bootstrap/discovery/DiscoveryApplication.java rename to spring-cloud-modules/spring-cloud-bootstrap/discovery/src/main/java/com/baeldung/spring/cloud/bootstrap/discovery/DiscoveryApplication.java diff --git a/spring-cloud/spring-cloud-bootstrap/discovery/src/main/java/com/baeldung/spring/cloud/bootstrap/discovery/SecurityConfig.java b/spring-cloud-modules/spring-cloud-bootstrap/discovery/src/main/java/com/baeldung/spring/cloud/bootstrap/discovery/SecurityConfig.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/discovery/src/main/java/com/baeldung/spring/cloud/bootstrap/discovery/SecurityConfig.java rename to spring-cloud-modules/spring-cloud-bootstrap/discovery/src/main/java/com/baeldung/spring/cloud/bootstrap/discovery/SecurityConfig.java diff --git a/spring-cloud/spring-cloud-bootstrap/discovery/src/main/java/com/baeldung/spring/cloud/bootstrap/discovery/SessionConfig.java b/spring-cloud-modules/spring-cloud-bootstrap/discovery/src/main/java/com/baeldung/spring/cloud/bootstrap/discovery/SessionConfig.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/discovery/src/main/java/com/baeldung/spring/cloud/bootstrap/discovery/SessionConfig.java rename to spring-cloud-modules/spring-cloud-bootstrap/discovery/src/main/java/com/baeldung/spring/cloud/bootstrap/discovery/SessionConfig.java diff --git a/spring-cloud/spring-cloud-bootstrap/discovery/src/main/resources/bootstrap.properties b/spring-cloud-modules/spring-cloud-bootstrap/discovery/src/main/resources/bootstrap.properties similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/discovery/src/main/resources/bootstrap.properties rename to spring-cloud-modules/spring-cloud-bootstrap/discovery/src/main/resources/bootstrap.properties diff --git a/spring-cloud/spring-cloud-bootstrap/discovery/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-bootstrap/discovery/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/discovery/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-bootstrap/discovery/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-bootstrap/discovery/src/test/java/com/baeldung/SpringContextLiveTest.java b/spring-cloud-modules/spring-cloud-bootstrap/discovery/src/test/java/com/baeldung/SpringContextLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/discovery/src/test/java/com/baeldung/SpringContextLiveTest.java rename to spring-cloud-modules/spring-cloud-bootstrap/discovery/src/test/java/com/baeldung/SpringContextLiveTest.java diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/pom.xml b/spring-cloud-modules/spring-cloud-bootstrap/gateway/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/pom.xml rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/pom.xml diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/.angular-cli.json b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/.angular-cli.json similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/.angular-cli.json rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/.angular-cli.json diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/.editorconfig b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/.editorconfig similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/.editorconfig rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/.editorconfig diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/.gitignore b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/.gitignore similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/.gitignore rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/.gitignore diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/README.md b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/README.md similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/README.md rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/README.md diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/e2e/app.e2e-spec.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/e2e/app.e2e-spec.ts similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/e2e/app.e2e-spec.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/e2e/app.e2e-spec.ts diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/e2e/app.po.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/e2e/app.po.ts similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/e2e/app.po.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/e2e/app.po.ts diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/e2e/tsconfig.e2e.json b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/e2e/tsconfig.e2e.json similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/e2e/tsconfig.e2e.json rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/e2e/tsconfig.e2e.json diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/karma.conf.js b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/karma.conf.js similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/karma.conf.js rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/karma.conf.js diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/package.json b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/package.json similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/package.json rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/package.json diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/protractor.conf.js b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/protractor.conf.js similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/protractor.conf.js rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/protractor.conf.js diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.component.css b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.component.css similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.component.css rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.component.css diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.component.html b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.component.html similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.component.html rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.component.html diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.component.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.component.ts similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.component.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.component.ts diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.module.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.module.ts similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.module.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.module.ts diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book.ts similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book.ts diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-detail/book-detail.component.css b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-detail/book-detail.component.css similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-detail/book-detail.component.css rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-detail/book-detail.component.css diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-detail/book-detail.component.html b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-detail/book-detail.component.html similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-detail/book-detail.component.html rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-detail/book-detail.component.html diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-detail/book-detail.component.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-detail/book-detail.component.ts similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-detail/book-detail.component.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-detail/book-detail.component.ts diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-list/book-list.component.css b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-list/book-list.component.css similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-list/book-list.component.css rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-list/book-list.component.css diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-list/book-list.component.html b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-list/book-list.component.html similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-list/book-list.component.html rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-list/book-list.component.html diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-list/book-list.component.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-list/book-list.component.ts similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-list/book-list.component.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-list/book-list.component.ts diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/click-stop-propagation.directive.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/click-stop-propagation.directive.ts similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/click-stop-propagation.directive.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/click-stop-propagation.directive.ts diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/http.service.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/http.service.ts similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/http.service.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/http.service.ts diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/principal.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/principal.ts similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/principal.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/principal.ts diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/rating.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/rating.ts similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/rating.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/rating.ts diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/rating/rating.component.css b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/rating/rating.component.css similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/rating/rating.component.css rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/rating/rating.component.css diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/rating/rating.component.html b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/rating/rating.component.html similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/rating/rating.component.html rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/rating/rating.component.html diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/rating/rating.component.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/rating/rating.component.ts similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/rating/rating.component.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/rating/rating.component.ts diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/assets/.gitkeep b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/assets/.gitkeep similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/assets/.gitkeep rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/assets/.gitkeep diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/environments/environment.prod.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/environments/environment.prod.ts similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/environments/environment.prod.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/environments/environment.prod.ts diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/environments/environment.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/environments/environment.ts similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/environments/environment.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/environments/environment.ts diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/favicon.ico b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/favicon.ico similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/favicon.ico rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/favicon.ico diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/index.html b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/index.html similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/index.html rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/index.html diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/main.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/main.ts similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/main.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/main.ts diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/polyfills.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/polyfills.ts similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/polyfills.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/polyfills.ts diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/styles.css b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/styles.css similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/styles.css rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/styles.css diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/test.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/test.ts similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/test.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/test.ts diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/tsconfig.app.json b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/tsconfig.app.json similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/tsconfig.app.json rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/tsconfig.app.json diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/tsconfig.spec.json b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/tsconfig.spec.json similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/tsconfig.spec.json rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/tsconfig.spec.json diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/typings.d.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/typings.d.ts similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/typings.d.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/typings.d.ts diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/tsconfig.json b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/tsconfig.json similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/tsconfig.json rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/tsconfig.json diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/tslint.json b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/tslint.json similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/tslint.json rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/tslint.json diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/AuthenticationController.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/AuthenticationController.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/AuthenticationController.java rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/AuthenticationController.java diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/ErrorPageConfig.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/ErrorPageConfig.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/ErrorPageConfig.java rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/ErrorPageConfig.java diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/GatewayApplication.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/GatewayApplication.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/GatewayApplication.java rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/GatewayApplication.java diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/SecurityConfig.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/SecurityConfig.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/SecurityConfig.java rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/SecurityConfig.java diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/SessionConfig.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/SessionConfig.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/SessionConfig.java rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/SessionConfig.java diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/book/Book.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/book/Book.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/book/Book.java rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/book/Book.java diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/book/BooksClient.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/book/BooksClient.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/book/BooksClient.java rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/book/BooksClient.java diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/rating/Rating.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/rating/Rating.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/rating/Rating.java rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/rating/Rating.java diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/rating/RatingsClient.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/rating/RatingsClient.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/rating/RatingsClient.java rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/rating/RatingsClient.java diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/controller/CombinedController.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/controller/CombinedController.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/controller/CombinedController.java rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/controller/CombinedController.java diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/filter/SessionSavingZuulPreFilter.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/filter/SessionSavingZuulPreFilter.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/filter/SessionSavingZuulPreFilter.java rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/filter/SessionSavingZuulPreFilter.java diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/bootstrap.properties b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/bootstrap.properties similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/bootstrap.properties rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/bootstrap.properties diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/css/wro.css b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/css/wro.css similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/css/wro.css rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/css/wro.css diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.eot b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.eot similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.eot rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.eot diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.svg b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.svg similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.svg rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.svg diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.ttf b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.ttf similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.ttf rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.ttf diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.woff b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.woff similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.woff rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.woff diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.eot b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.eot similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.eot rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.eot diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.svg b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.svg similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.svg rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.svg diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.ttf b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.ttf similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.ttf rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.ttf diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.woff b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.woff similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.woff rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.woff diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/404-icon.png b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/404-icon.png similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/404-icon.png rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/404-icon.png diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/homepage-bg.jpg b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/homepage-bg.jpg similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/homepage-bg.jpg rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/homepage-bg.jpg diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/platform-bg.png b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/platform-bg.png similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/platform-bg.png rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/platform-bg.png diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/platform-spring-xd.png b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/platform-spring-xd.png similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/platform-spring-xd.png rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/platform-spring-xd.png diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/spring-logo-eureka-mobile.png b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/spring-logo-eureka-mobile.png similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/spring-logo-eureka-mobile.png rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/spring-logo-eureka-mobile.png diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/spring-logo-eureka.png b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/spring-logo-eureka.png similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/spring-logo-eureka.png rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/spring-logo-eureka.png diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/js/wro.js b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/js/wro.js similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/js/wro.js rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/js/wro.js diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/home/favicon.ico b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/favicon.ico similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/home/favicon.ico rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/favicon.ico diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/home/index.html b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/index.html similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/home/index.html rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/index.html diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/home/inline.bundle.js b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/inline.bundle.js similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/home/inline.bundle.js rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/inline.bundle.js diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/home/inline.bundle.js.map b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/inline.bundle.js.map similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/home/inline.bundle.js.map rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/inline.bundle.js.map diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/home/main.bundle.js b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/main.bundle.js similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/home/main.bundle.js rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/main.bundle.js diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/home/main.bundle.js.map b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/main.bundle.js.map similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/home/main.bundle.js.map rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/main.bundle.js.map diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/home/polyfills.bundle.js b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/polyfills.bundle.js similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/home/polyfills.bundle.js rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/polyfills.bundle.js diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/home/polyfills.bundle.js.map b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/polyfills.bundle.js.map similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/home/polyfills.bundle.js.map rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/polyfills.bundle.js.map diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/home/styles.bundle.js b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/styles.bundle.js similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/home/styles.bundle.js rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/styles.bundle.js diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/home/styles.bundle.js.map b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/styles.bundle.js.map similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/home/styles.bundle.js.map rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/styles.bundle.js.map diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/index.html b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/index.html similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/index.html rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/index.html diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/SpringContextLiveTest.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/SpringContextLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/SpringContextLiveTest.java rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/SpringContextLiveTest.java diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/LiveTest.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/LiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/LiveTest.java rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/LiveTest.java diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/SpringContextLiveTest.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/SpringContextLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/SpringContextLiveTest.java rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/SpringContextLiveTest.java diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/test/resources/bootstrap.properties b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/test/resources/bootstrap.properties similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/test/resources/bootstrap.properties rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/test/resources/bootstrap.properties diff --git a/spring-cloud/spring-cloud-bootstrap/order-service/order-client/pom.xml b/spring-cloud-modules/spring-cloud-bootstrap/order-service/order-client/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/order-service/order-client/pom.xml rename to spring-cloud-modules/spring-cloud-bootstrap/order-service/order-client/pom.xml diff --git a/spring-cloud/spring-cloud-bootstrap/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderClient.java b/spring-cloud-modules/spring-cloud-bootstrap/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderClient.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderClient.java rename to spring-cloud-modules/spring-cloud-bootstrap/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderClient.java diff --git a/spring-cloud/spring-cloud-bootstrap/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderClientImpl.java b/spring-cloud-modules/spring-cloud-bootstrap/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderClientImpl.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderClientImpl.java rename to spring-cloud-modules/spring-cloud-bootstrap/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderClientImpl.java diff --git a/spring-cloud/spring-cloud-bootstrap/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderDTO.java b/spring-cloud-modules/spring-cloud-bootstrap/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderDTO.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderDTO.java rename to spring-cloud-modules/spring-cloud-bootstrap/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderDTO.java diff --git a/spring-cloud/spring-cloud-bootstrap/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderResponse.java b/spring-cloud-modules/spring-cloud-bootstrap/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderResponse.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderResponse.java rename to spring-cloud-modules/spring-cloud-bootstrap/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderResponse.java diff --git a/spring-cloud/spring-cloud-bootstrap/order-service/order-client/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-bootstrap/order-service/order-client/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/order-service/order-client/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-bootstrap/order-service/order-client/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-bootstrap/order-service/order-server/pom.xml b/spring-cloud-modules/spring-cloud-bootstrap/order-service/order-server/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/order-service/order-server/pom.xml rename to spring-cloud-modules/spring-cloud-bootstrap/order-service/order-server/pom.xml diff --git a/spring-cloud/spring-cloud-bootstrap/order-service/order-server/src/main/java/com/baeldung/orderservice/Order.java b/spring-cloud-modules/spring-cloud-bootstrap/order-service/order-server/src/main/java/com/baeldung/orderservice/Order.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/order-service/order-server/src/main/java/com/baeldung/orderservice/Order.java rename to spring-cloud-modules/spring-cloud-bootstrap/order-service/order-server/src/main/java/com/baeldung/orderservice/Order.java diff --git a/spring-cloud/spring-cloud-bootstrap/order-service/order-server/src/main/java/com/baeldung/orderservice/OrderApplication.java b/spring-cloud-modules/spring-cloud-bootstrap/order-service/order-server/src/main/java/com/baeldung/orderservice/OrderApplication.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/order-service/order-server/src/main/java/com/baeldung/orderservice/OrderApplication.java rename to spring-cloud-modules/spring-cloud-bootstrap/order-service/order-server/src/main/java/com/baeldung/orderservice/OrderApplication.java diff --git a/spring-cloud/spring-cloud-bootstrap/order-service/order-server/src/main/java/com/baeldung/orderservice/OrderService.java b/spring-cloud-modules/spring-cloud-bootstrap/order-service/order-server/src/main/java/com/baeldung/orderservice/OrderService.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/order-service/order-server/src/main/java/com/baeldung/orderservice/OrderService.java rename to spring-cloud-modules/spring-cloud-bootstrap/order-service/order-server/src/main/java/com/baeldung/orderservice/OrderService.java diff --git a/spring-cloud/spring-cloud-bootstrap/order-service/order-server/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-bootstrap/order-service/order-server/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/order-service/order-server/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-bootstrap/order-service/order-server/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-bootstrap/order-service/pom.xml b/spring-cloud-modules/spring-cloud-bootstrap/order-service/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/order-service/pom.xml rename to spring-cloud-modules/spring-cloud-bootstrap/order-service/pom.xml diff --git a/spring-cloud/spring-cloud-bootstrap/pom.xml b/spring-cloud-modules/spring-cloud-bootstrap/pom.xml similarity index 93% rename from spring-cloud/spring-cloud-bootstrap/pom.xml rename to spring-cloud-modules/spring-cloud-bootstrap/pom.xml index deba342d69..1e97082db1 100644 --- a/spring-cloud/spring-cloud-bootstrap/pom.xml +++ b/spring-cloud-modules/spring-cloud-bootstrap/pom.xml @@ -10,7 +10,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-bootstrap/svc-book/pom.xml b/spring-cloud-modules/spring-cloud-bootstrap/svc-book/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-book/pom.xml rename to spring-cloud-modules/spring-cloud-bootstrap/svc-book/pom.xml diff --git a/spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/BookServiceApplication.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/BookServiceApplication.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/BookServiceApplication.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/BookServiceApplication.java diff --git a/spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/DataLoader.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/DataLoader.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/DataLoader.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/DataLoader.java diff --git a/spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/SecurityConfig.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/SecurityConfig.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/SecurityConfig.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/SecurityConfig.java diff --git a/spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/SessionConfig.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/SessionConfig.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/SessionConfig.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/SessionConfig.java diff --git a/spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/Book.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/Book.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/Book.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/Book.java diff --git a/spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookController.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookController.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookController.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookController.java diff --git a/spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookNotFoundException.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookNotFoundException.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookNotFoundException.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookNotFoundException.java diff --git a/spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookRepository.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookRepository.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookRepository.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookRepository.java diff --git a/spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookService.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookService.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookService.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookService.java diff --git a/spring-cloud/spring-cloud-bootstrap/svc-book/src/main/resources/bootstrap.properties b/spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/resources/bootstrap.properties similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-book/src/main/resources/bootstrap.properties rename to spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/resources/bootstrap.properties diff --git a/spring-cloud/spring-cloud-bootstrap/svc-book/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-book/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-bootstrap/svc-book/src/test/java/com/baeldung/SpringContextLiveTest.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/test/java/com/baeldung/SpringContextLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-book/src/test/java/com/baeldung/SpringContextLiveTest.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/test/java/com/baeldung/SpringContextLiveTest.java diff --git a/spring-cloud/spring-cloud-bootstrap/svc-book/src/test/resources/bootstrap.properties b/spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/test/resources/bootstrap.properties similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-book/src/test/resources/bootstrap.properties rename to spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/test/resources/bootstrap.properties diff --git a/spring-cloud/spring-cloud-bootstrap/svc-rating/pom.xml b/spring-cloud-modules/spring-cloud-bootstrap/svc-rating/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-rating/pom.xml rename to spring-cloud-modules/spring-cloud-bootstrap/svc-rating/pom.xml diff --git a/spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/DataLoader.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/DataLoader.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/DataLoader.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/DataLoader.java diff --git a/spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/RatingServiceApplication.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/RatingServiceApplication.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/RatingServiceApplication.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/RatingServiceApplication.java diff --git a/spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/SecurityConfig.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/SecurityConfig.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/SecurityConfig.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/SecurityConfig.java diff --git a/spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/SessionConfig.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/SessionConfig.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/SessionConfig.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/SessionConfig.java diff --git a/spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/Rating.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/Rating.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/Rating.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/Rating.java diff --git a/spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingCacheRepository.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingCacheRepository.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingCacheRepository.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingCacheRepository.java diff --git a/spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingController.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingController.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingController.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingController.java diff --git a/spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingNotFoundException.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingNotFoundException.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingNotFoundException.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingNotFoundException.java diff --git a/spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingRepository.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingRepository.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingRepository.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingRepository.java diff --git a/spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingService.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingService.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingService.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingService.java diff --git a/spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/resources/bootstrap.properties b/spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/resources/bootstrap.properties similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/resources/bootstrap.properties rename to spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/resources/bootstrap.properties diff --git a/spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-bootstrap/svc-rating/src/test/java/com/baeldung/SpringContextLiveTest.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/test/java/com/baeldung/SpringContextLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-rating/src/test/java/com/baeldung/SpringContextLiveTest.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/test/java/com/baeldung/SpringContextLiveTest.java diff --git a/spring-cloud/spring-cloud-bootstrap/svc-rating/src/test/resources/bootstrap.properties b/spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/test/resources/bootstrap.properties similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-rating/src/test/resources/bootstrap.properties rename to spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/test/resources/bootstrap.properties diff --git a/spring-cloud/spring-cloud-bootstrap/zipkin/pom.xml b/spring-cloud-modules/spring-cloud-bootstrap/zipkin/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/zipkin/pom.xml rename to spring-cloud-modules/spring-cloud-bootstrap/zipkin/pom.xml diff --git a/spring-cloud/spring-cloud-bootstrap/zipkin/src/main/java/com/baeldung/spring/cloud/bootstrap/zipkin/ZipkinApplication.java b/spring-cloud-modules/spring-cloud-bootstrap/zipkin/src/main/java/com/baeldung/spring/cloud/bootstrap/zipkin/ZipkinApplication.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/zipkin/src/main/java/com/baeldung/spring/cloud/bootstrap/zipkin/ZipkinApplication.java rename to spring-cloud-modules/spring-cloud-bootstrap/zipkin/src/main/java/com/baeldung/spring/cloud/bootstrap/zipkin/ZipkinApplication.java diff --git a/spring-cloud/spring-cloud-bootstrap/zipkin/src/main/resources/bootstrap.properties b/spring-cloud-modules/spring-cloud-bootstrap/zipkin/src/main/resources/bootstrap.properties similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/zipkin/src/main/resources/bootstrap.properties rename to spring-cloud-modules/spring-cloud-bootstrap/zipkin/src/main/resources/bootstrap.properties diff --git a/spring-cloud/spring-cloud-bootstrap/zipkin/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-bootstrap/zipkin/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/zipkin/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-bootstrap/zipkin/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-bootstrap/zipkin/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-bootstrap/zipkin/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/zipkin/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-bootstrap/zipkin/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-circuit-breaker/README.md b/spring-cloud-modules/spring-cloud-circuit-breaker/README.md similarity index 100% rename from spring-cloud/spring-cloud-circuit-breaker/README.md rename to spring-cloud-modules/spring-cloud-circuit-breaker/README.md diff --git a/spring-cloud/spring-cloud-circuit-breaker/pom.xml b/spring-cloud-modules/spring-cloud-circuit-breaker/pom.xml similarity index 96% rename from spring-cloud/spring-cloud-circuit-breaker/pom.xml rename to spring-cloud-modules/spring-cloud-circuit-breaker/pom.xml index 0b0dafee46..3fe060c0b6 100644 --- a/spring-cloud/spring-cloud-circuit-breaker/pom.xml +++ b/spring-cloud-modules/spring-cloud-circuit-breaker/pom.xml @@ -9,7 +9,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-circuit-breaker/src/main/java/com/baeldung/circuitbreaker/AlbumService.java b/spring-cloud-modules/spring-cloud-circuit-breaker/src/main/java/com/baeldung/circuitbreaker/AlbumService.java similarity index 100% rename from spring-cloud/spring-cloud-circuit-breaker/src/main/java/com/baeldung/circuitbreaker/AlbumService.java rename to spring-cloud-modules/spring-cloud-circuit-breaker/src/main/java/com/baeldung/circuitbreaker/AlbumService.java diff --git a/spring-cloud/spring-cloud-circuit-breaker/src/main/java/com/baeldung/circuitbreaker/Controller.java b/spring-cloud-modules/spring-cloud-circuit-breaker/src/main/java/com/baeldung/circuitbreaker/Controller.java similarity index 100% rename from spring-cloud/spring-cloud-circuit-breaker/src/main/java/com/baeldung/circuitbreaker/Controller.java rename to spring-cloud-modules/spring-cloud-circuit-breaker/src/main/java/com/baeldung/circuitbreaker/Controller.java diff --git a/spring-cloud/spring-cloud-circuit-breaker/src/main/java/com/baeldung/circuitbreaker/SpringApp.java b/spring-cloud-modules/spring-cloud-circuit-breaker/src/main/java/com/baeldung/circuitbreaker/SpringApp.java similarity index 100% rename from spring-cloud/spring-cloud-circuit-breaker/src/main/java/com/baeldung/circuitbreaker/SpringApp.java rename to spring-cloud-modules/spring-cloud-circuit-breaker/src/main/java/com/baeldung/circuitbreaker/SpringApp.java diff --git a/spring-cloud/spring-cloud-circuit-breaker/src/main/resources/fallback-album-list.json b/spring-cloud-modules/spring-cloud-circuit-breaker/src/main/resources/fallback-album-list.json similarity index 100% rename from spring-cloud/spring-cloud-circuit-breaker/src/main/resources/fallback-album-list.json rename to spring-cloud-modules/spring-cloud-circuit-breaker/src/main/resources/fallback-album-list.json diff --git a/spring-cloud/spring-cloud-config/README.md b/spring-cloud-modules/spring-cloud-config/README.md similarity index 100% rename from spring-cloud/spring-cloud-config/README.md rename to spring-cloud-modules/spring-cloud-config/README.md diff --git a/spring-cloud/spring-cloud-config/client/pom.xml b/spring-cloud-modules/spring-cloud-config/client/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-config/client/pom.xml rename to spring-cloud-modules/spring-cloud-config/client/pom.xml diff --git a/spring-cloud/spring-cloud-config/client/src/main/java/com/baeldung/spring/cloud/config/client/ConfigClient.java b/spring-cloud-modules/spring-cloud-config/client/src/main/java/com/baeldung/spring/cloud/config/client/ConfigClient.java similarity index 100% rename from spring-cloud/spring-cloud-config/client/src/main/java/com/baeldung/spring/cloud/config/client/ConfigClient.java rename to spring-cloud-modules/spring-cloud-config/client/src/main/java/com/baeldung/spring/cloud/config/client/ConfigClient.java diff --git a/spring-cloud/spring-cloud-config/client/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-config/client/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-config/client/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-config/client/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-config/client/src/test/java/com/baeldung/spring/cloud/config/client/SpringContextLiveTest.java b/spring-cloud-modules/spring-cloud-config/client/src/test/java/com/baeldung/spring/cloud/config/client/SpringContextLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-config/client/src/test/java/com/baeldung/spring/cloud/config/client/SpringContextLiveTest.java rename to spring-cloud-modules/spring-cloud-config/client/src/test/java/com/baeldung/spring/cloud/config/client/SpringContextLiveTest.java diff --git a/spring-cloud/spring-cloud-config/config-repo/config-client-development.properties b/spring-cloud-modules/spring-cloud-config/config-repo/config-client-development.properties similarity index 100% rename from spring-cloud/spring-cloud-config/config-repo/config-client-development.properties rename to spring-cloud-modules/spring-cloud-config/config-repo/config-client-development.properties diff --git a/spring-cloud/spring-cloud-config/config-repo/config-client-production.properties b/spring-cloud-modules/spring-cloud-config/config-repo/config-client-production.properties similarity index 100% rename from spring-cloud/spring-cloud-config/config-repo/config-client-production.properties rename to spring-cloud-modules/spring-cloud-config/config-repo/config-client-production.properties diff --git a/spring-cloud/spring-cloud-config/pom.xml b/spring-cloud-modules/spring-cloud-config/pom.xml similarity index 95% rename from spring-cloud/spring-cloud-config/pom.xml rename to spring-cloud-modules/spring-cloud-config/pom.xml index 1c8ada8a65..09be8ae1b8 100644 --- a/spring-cloud/spring-cloud-config/pom.xml +++ b/spring-cloud-modules/spring-cloud-config/pom.xml @@ -11,7 +11,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-config/server/pom.xml b/spring-cloud-modules/spring-cloud-config/server/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-config/server/pom.xml rename to spring-cloud-modules/spring-cloud-config/server/pom.xml diff --git a/spring-cloud/spring-cloud-config/server/src/main/java/com/baeldung/spring/cloud/config/server/ConfigServer.java b/spring-cloud-modules/spring-cloud-config/server/src/main/java/com/baeldung/spring/cloud/config/server/ConfigServer.java similarity index 100% rename from spring-cloud/spring-cloud-config/server/src/main/java/com/baeldung/spring/cloud/config/server/ConfigServer.java rename to spring-cloud-modules/spring-cloud-config/server/src/main/java/com/baeldung/spring/cloud/config/server/ConfigServer.java diff --git a/spring-cloud/spring-cloud-config/server/src/main/java/com/baeldung/spring/cloud/config/server/SecurityConfiguration.java b/spring-cloud-modules/spring-cloud-config/server/src/main/java/com/baeldung/spring/cloud/config/server/SecurityConfiguration.java similarity index 100% rename from spring-cloud/spring-cloud-config/server/src/main/java/com/baeldung/spring/cloud/config/server/SecurityConfiguration.java rename to spring-cloud-modules/spring-cloud-config/server/src/main/java/com/baeldung/spring/cloud/config/server/SecurityConfiguration.java diff --git a/spring-cloud/spring-cloud-config/server/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-config/server/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-config/server/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-config/server/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-config/server/src/main/resources/config-server.jks b/spring-cloud-modules/spring-cloud-config/server/src/main/resources/config-server.jks similarity index 100% rename from spring-cloud/spring-cloud-config/server/src/main/resources/config-server.jks rename to spring-cloud-modules/spring-cloud-config/server/src/main/resources/config-server.jks diff --git a/spring-cloud/spring-cloud-config/server/src/test/java/com/baeldung/spring/cloud/config/server/SpringContextTest.java b/spring-cloud-modules/spring-cloud-config/server/src/test/java/com/baeldung/spring/cloud/config/server/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-config/server/src/test/java/com/baeldung/spring/cloud/config/server/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-config/server/src/test/java/com/baeldung/spring/cloud/config/server/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-config/server/src/test/resources/application.properties b/spring-cloud-modules/spring-cloud-config/server/src/test/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-config/server/src/test/resources/application.properties rename to spring-cloud-modules/spring-cloud-config/server/src/test/resources/application.properties diff --git a/spring-cloud/spring-cloud-connectors-heroku/README.md b/spring-cloud-modules/spring-cloud-connectors-heroku/README.md similarity index 100% rename from spring-cloud/spring-cloud-connectors-heroku/README.md rename to spring-cloud-modules/spring-cloud-connectors-heroku/README.md diff --git a/spring-cloud/spring-cloud-connectors-heroku/pom.xml b/spring-cloud-modules/spring-cloud-connectors-heroku/pom.xml similarity index 97% rename from spring-cloud/spring-cloud-connectors-heroku/pom.xml rename to spring-cloud-modules/spring-cloud-connectors-heroku/pom.xml index b38ede6d89..88e60f5ce8 100644 --- a/spring-cloud/spring-cloud-connectors-heroku/pom.xml +++ b/spring-cloud-modules/spring-cloud-connectors-heroku/pom.xml @@ -10,7 +10,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/ConnectorsHerokuApplication.java b/spring-cloud-modules/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/ConnectorsHerokuApplication.java similarity index 100% rename from spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/ConnectorsHerokuApplication.java rename to spring-cloud-modules/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/ConnectorsHerokuApplication.java diff --git a/spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/book/Book.java b/spring-cloud-modules/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/book/Book.java similarity index 100% rename from spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/book/Book.java rename to spring-cloud-modules/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/book/Book.java diff --git a/spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/book/BookController.java b/spring-cloud-modules/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/book/BookController.java similarity index 100% rename from spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/book/BookController.java rename to spring-cloud-modules/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/book/BookController.java diff --git a/spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/book/BookRepository.java b/spring-cloud-modules/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/book/BookRepository.java similarity index 100% rename from spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/book/BookRepository.java rename to spring-cloud-modules/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/book/BookRepository.java diff --git a/spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/book/BookService.java b/spring-cloud-modules/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/book/BookService.java similarity index 100% rename from spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/book/BookService.java rename to spring-cloud-modules/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/book/BookService.java diff --git a/spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/Product.java b/spring-cloud-modules/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/Product.java similarity index 100% rename from spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/Product.java rename to spring-cloud-modules/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/Product.java diff --git a/spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/ProductController.java b/spring-cloud-modules/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/ProductController.java similarity index 100% rename from spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/ProductController.java rename to spring-cloud-modules/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/ProductController.java diff --git a/spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/ProductRepository.java b/spring-cloud-modules/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/ProductRepository.java similarity index 100% rename from spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/ProductRepository.java rename to spring-cloud-modules/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/ProductRepository.java diff --git a/spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/ProductService.java b/spring-cloud-modules/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/ProductService.java similarity index 100% rename from spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/ProductService.java rename to spring-cloud-modules/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/ProductService.java diff --git a/spring-cloud/spring-cloud-connectors-heroku/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-connectors-heroku/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-connectors-heroku/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-connectors-heroku/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-connectors-heroku/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-connectors-heroku/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-connectors-heroku/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-connectors-heroku/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-connectors-heroku/src/test/java/com/baeldung/spring/cloud/connectors/heroku/SpringContextTest.java b/spring-cloud-modules/spring-cloud-connectors-heroku/src/test/java/com/baeldung/spring/cloud/connectors/heroku/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-connectors-heroku/src/test/java/com/baeldung/spring/cloud/connectors/heroku/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-connectors-heroku/src/test/java/com/baeldung/spring/cloud/connectors/heroku/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-connectors-heroku/src/test/resources/application.properties b/spring-cloud-modules/spring-cloud-connectors-heroku/src/test/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-connectors-heroku/src/test/resources/application.properties rename to spring-cloud-modules/spring-cloud-connectors-heroku/src/test/resources/application.properties diff --git a/spring-cloud/spring-cloud-consul/README.md b/spring-cloud-modules/spring-cloud-consul/README.md similarity index 100% rename from spring-cloud/spring-cloud-consul/README.md rename to spring-cloud-modules/spring-cloud-consul/README.md diff --git a/spring-cloud/spring-cloud-consul/pom.xml b/spring-cloud-modules/spring-cloud-consul/pom.xml similarity index 97% rename from spring-cloud/spring-cloud-consul/pom.xml rename to spring-cloud-modules/spring-cloud-consul/pom.xml index f21550e360..52da6ff763 100644 --- a/spring-cloud/spring-cloud-consul/pom.xml +++ b/spring-cloud-modules/spring-cloud-consul/pom.xml @@ -10,7 +10,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/discovery/DiscoveryClientApplication.java b/spring-cloud-modules/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/discovery/DiscoveryClientApplication.java similarity index 100% rename from spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/discovery/DiscoveryClientApplication.java rename to spring-cloud-modules/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/discovery/DiscoveryClientApplication.java diff --git a/spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/discovery/DiscoveryClientController.java b/spring-cloud-modules/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/discovery/DiscoveryClientController.java similarity index 100% rename from spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/discovery/DiscoveryClientController.java rename to spring-cloud-modules/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/discovery/DiscoveryClientController.java diff --git a/spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/health/ServiceDiscoveryApplication.java b/spring-cloud-modules/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/health/ServiceDiscoveryApplication.java similarity index 100% rename from spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/health/ServiceDiscoveryApplication.java rename to spring-cloud-modules/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/health/ServiceDiscoveryApplication.java diff --git a/spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/health/ServiceDiscoveryController.java b/spring-cloud-modules/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/health/ServiceDiscoveryController.java similarity index 100% rename from spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/health/ServiceDiscoveryController.java rename to spring-cloud-modules/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/health/ServiceDiscoveryController.java diff --git a/spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/leadership/LeadershipElection.java b/spring-cloud-modules/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/leadership/LeadershipElection.java similarity index 100% rename from spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/leadership/LeadershipElection.java rename to spring-cloud-modules/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/leadership/LeadershipElection.java diff --git a/spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/properties/DistributedPropertiesApplication.java b/spring-cloud-modules/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/properties/DistributedPropertiesApplication.java similarity index 100% rename from spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/properties/DistributedPropertiesApplication.java rename to spring-cloud-modules/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/properties/DistributedPropertiesApplication.java diff --git a/spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/properties/DistributedPropertiesController.java b/spring-cloud-modules/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/properties/DistributedPropertiesController.java similarity index 100% rename from spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/properties/DistributedPropertiesController.java rename to spring-cloud-modules/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/properties/DistributedPropertiesController.java diff --git a/spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/properties/MyProperties.java b/spring-cloud-modules/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/properties/MyProperties.java similarity index 100% rename from spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/properties/MyProperties.java rename to spring-cloud-modules/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/properties/MyProperties.java diff --git a/spring-cloud/spring-cloud-consul/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-consul/src/main/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-consul/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-consul/src/main/resources/application.yml diff --git a/spring-cloud/spring-cloud-consul/src/main/resources/bootstrap.yml b/spring-cloud-modules/spring-cloud-consul/src/main/resources/bootstrap.yml similarity index 100% rename from spring-cloud/spring-cloud-consul/src/main/resources/bootstrap.yml rename to spring-cloud-modules/spring-cloud-consul/src/main/resources/bootstrap.yml diff --git a/spring-cloud/spring-cloud-consul/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-consul/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-consul/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-consul/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-consul/src/test/java/com/baeldung/spring/cloud/consul/SpringContextLiveTest.java b/spring-cloud-modules/spring-cloud-consul/src/test/java/com/baeldung/spring/cloud/consul/SpringContextLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-consul/src/test/java/com/baeldung/spring/cloud/consul/SpringContextLiveTest.java rename to spring-cloud-modules/spring-cloud-consul/src/test/java/com/baeldung/spring/cloud/consul/SpringContextLiveTest.java diff --git a/spring-cloud/spring-cloud-contract/README.md b/spring-cloud-modules/spring-cloud-contract/README.md similarity index 100% rename from spring-cloud/spring-cloud-contract/README.md rename to spring-cloud-modules/spring-cloud-contract/README.md diff --git a/spring-cloud/spring-cloud-contract/pom.xml b/spring-cloud-modules/spring-cloud-contract/pom.xml similarity index 97% rename from spring-cloud/spring-cloud-contract/pom.xml rename to spring-cloud-modules/spring-cloud-contract/pom.xml index 6e8b130ed1..bfbac19a81 100644 --- a/spring-cloud/spring-cloud-contract/pom.xml +++ b/spring-cloud-modules/spring-cloud-contract/pom.xml @@ -10,7 +10,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-contract/spring-cloud-contract-consumer/pom.xml b/spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-consumer/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-contract/spring-cloud-contract-consumer/pom.xml rename to spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-consumer/pom.xml diff --git a/spring-cloud/spring-cloud-contract/spring-cloud-contract-consumer/src/main/java/com/baeldung/spring/cloud/springcloudcontractconsumer/SpringCloudContractConsumerApplication.java b/spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-consumer/src/main/java/com/baeldung/spring/cloud/springcloudcontractconsumer/SpringCloudContractConsumerApplication.java similarity index 100% rename from spring-cloud/spring-cloud-contract/spring-cloud-contract-consumer/src/main/java/com/baeldung/spring/cloud/springcloudcontractconsumer/SpringCloudContractConsumerApplication.java rename to spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-consumer/src/main/java/com/baeldung/spring/cloud/springcloudcontractconsumer/SpringCloudContractConsumerApplication.java diff --git a/spring-cloud/spring-cloud-contract/spring-cloud-contract-consumer/src/main/java/com/baeldung/spring/cloud/springcloudcontractconsumer/controller/BasicMathController.java b/spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-consumer/src/main/java/com/baeldung/spring/cloud/springcloudcontractconsumer/controller/BasicMathController.java similarity index 100% rename from spring-cloud/spring-cloud-contract/spring-cloud-contract-consumer/src/main/java/com/baeldung/spring/cloud/springcloudcontractconsumer/controller/BasicMathController.java rename to spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-consumer/src/main/java/com/baeldung/spring/cloud/springcloudcontractconsumer/controller/BasicMathController.java diff --git a/spring-cloud/spring-cloud-contract/spring-cloud-contract-consumer/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-consumer/src/main/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-contract/spring-cloud-contract-consumer/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-consumer/src/main/resources/application.yml diff --git a/spring-cloud/spring-cloud-contract/spring-cloud-contract-consumer/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-consumer/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-contract/spring-cloud-contract-consumer/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-consumer/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-contract/spring-cloud-contract-consumer/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-consumer/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-contract/spring-cloud-contract-consumer/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-consumer/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-contract/spring-cloud-contract-consumer/src/test/java/com/baeldung/spring/cloud/springcloudcontractconsumer/controller/BasicMathControllerIntegrationTest.java b/spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-consumer/src/test/java/com/baeldung/spring/cloud/springcloudcontractconsumer/controller/BasicMathControllerIntegrationTest.java similarity index 100% rename from spring-cloud/spring-cloud-contract/spring-cloud-contract-consumer/src/test/java/com/baeldung/spring/cloud/springcloudcontractconsumer/controller/BasicMathControllerIntegrationTest.java rename to spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-consumer/src/test/java/com/baeldung/spring/cloud/springcloudcontractconsumer/controller/BasicMathControllerIntegrationTest.java diff --git a/spring-cloud/spring-cloud-contract/spring-cloud-contract-producer/pom.xml b/spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-producer/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-contract/spring-cloud-contract-producer/pom.xml rename to spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-producer/pom.xml diff --git a/spring-cloud/spring-cloud-contract/spring-cloud-contract-producer/src/main/java/com/baeldung/spring/cloud/springcloudcontractproducer/SpringCloudContractProducerApplication.java b/spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-producer/src/main/java/com/baeldung/spring/cloud/springcloudcontractproducer/SpringCloudContractProducerApplication.java similarity index 100% rename from spring-cloud/spring-cloud-contract/spring-cloud-contract-producer/src/main/java/com/baeldung/spring/cloud/springcloudcontractproducer/SpringCloudContractProducerApplication.java rename to spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-producer/src/main/java/com/baeldung/spring/cloud/springcloudcontractproducer/SpringCloudContractProducerApplication.java diff --git a/spring-cloud/spring-cloud-contract/spring-cloud-contract-producer/src/main/java/com/baeldung/spring/cloud/springcloudcontractproducer/controller/EvenOddController.java b/spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-producer/src/main/java/com/baeldung/spring/cloud/springcloudcontractproducer/controller/EvenOddController.java similarity index 100% rename from spring-cloud/spring-cloud-contract/spring-cloud-contract-producer/src/main/java/com/baeldung/spring/cloud/springcloudcontractproducer/controller/EvenOddController.java rename to spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-producer/src/main/java/com/baeldung/spring/cloud/springcloudcontractproducer/controller/EvenOddController.java diff --git a/spring-cloud/spring-cloud-contract/spring-cloud-contract-producer/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-producer/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-contract/spring-cloud-contract-producer/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-producer/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-contract/spring-cloud-contract-producer/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-producer/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-contract/spring-cloud-contract-producer/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-producer/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-contract/spring-cloud-contract-producer/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-producer/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-contract/spring-cloud-contract-producer/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-producer/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-contract/spring-cloud-contract-producer/src/test/java/com/baeldung/spring/cloud/springcloudcontractproducer/BaseTestClass.java b/spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-producer/src/test/java/com/baeldung/spring/cloud/springcloudcontractproducer/BaseTestClass.java similarity index 100% rename from spring-cloud/spring-cloud-contract/spring-cloud-contract-producer/src/test/java/com/baeldung/spring/cloud/springcloudcontractproducer/BaseTestClass.java rename to spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-producer/src/test/java/com/baeldung/spring/cloud/springcloudcontractproducer/BaseTestClass.java diff --git a/spring-cloud/spring-cloud-contract/spring-cloud-contract-producer/src/test/resources/contracts/shouldReturnEvenWhenRequestParamIsEven.groovy b/spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-producer/src/test/resources/contracts/shouldReturnEvenWhenRequestParamIsEven.groovy similarity index 100% rename from spring-cloud/spring-cloud-contract/spring-cloud-contract-producer/src/test/resources/contracts/shouldReturnEvenWhenRequestParamIsEven.groovy rename to spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-producer/src/test/resources/contracts/shouldReturnEvenWhenRequestParamIsEven.groovy diff --git a/spring-cloud/spring-cloud-contract/spring-cloud-contract-producer/src/test/resources/contracts/shouldReturnOddWhenRequestParamIsOdd.groovy b/spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-producer/src/test/resources/contracts/shouldReturnOddWhenRequestParamIsOdd.groovy similarity index 100% rename from spring-cloud/spring-cloud-contract/spring-cloud-contract-producer/src/test/resources/contracts/shouldReturnOddWhenRequestParamIsOdd.groovy rename to spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-producer/src/test/resources/contracts/shouldReturnOddWhenRequestParamIsOdd.groovy diff --git a/spring-cloud/spring-cloud-dapr/README.md b/spring-cloud-modules/spring-cloud-dapr/README.md similarity index 100% rename from spring-cloud/spring-cloud-dapr/README.md rename to spring-cloud-modules/spring-cloud-dapr/README.md diff --git a/spring-cloud/spring-cloud-dapr/dapr-config/basic-config.yaml b/spring-cloud-modules/spring-cloud-dapr/dapr-config/basic-config.yaml similarity index 100% rename from spring-cloud/spring-cloud-dapr/dapr-config/basic-config.yaml rename to spring-cloud-modules/spring-cloud-dapr/dapr-config/basic-config.yaml diff --git a/spring-cloud/spring-cloud-dapr/dapr-config/consul-config.yaml b/spring-cloud-modules/spring-cloud-dapr/dapr-config/consul-config.yaml similarity index 100% rename from spring-cloud/spring-cloud-dapr/dapr-config/consul-config.yaml rename to spring-cloud-modules/spring-cloud-dapr/dapr-config/consul-config.yaml diff --git a/spring-cloud/spring-cloud-dapr/dapr-config/consul-zipkin-config.yaml b/spring-cloud-modules/spring-cloud-dapr/dapr-config/consul-zipkin-config.yaml similarity index 100% rename from spring-cloud/spring-cloud-dapr/dapr-config/consul-zipkin-config.yaml rename to spring-cloud-modules/spring-cloud-dapr/dapr-config/consul-zipkin-config.yaml diff --git a/spring-cloud/spring-cloud-dapr/gateway/pom.xml b/spring-cloud-modules/spring-cloud-dapr/gateway/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-dapr/gateway/pom.xml rename to spring-cloud-modules/spring-cloud-dapr/gateway/pom.xml diff --git a/spring-cloud/spring-cloud-dapr/gateway/src/main/java/com/baeldung/gateway/GatewayApp.java b/spring-cloud-modules/spring-cloud-dapr/gateway/src/main/java/com/baeldung/gateway/GatewayApp.java similarity index 100% rename from spring-cloud/spring-cloud-dapr/gateway/src/main/java/com/baeldung/gateway/GatewayApp.java rename to spring-cloud-modules/spring-cloud-dapr/gateway/src/main/java/com/baeldung/gateway/GatewayApp.java diff --git a/spring-cloud/spring-cloud-dapr/gateway/src/main/resources/application-no-dapr.yml b/spring-cloud-modules/spring-cloud-dapr/gateway/src/main/resources/application-no-dapr.yml similarity index 100% rename from spring-cloud/spring-cloud-dapr/gateway/src/main/resources/application-no-dapr.yml rename to spring-cloud-modules/spring-cloud-dapr/gateway/src/main/resources/application-no-dapr.yml diff --git a/spring-cloud/spring-cloud-dapr/gateway/src/main/resources/application-with-dapr.yml b/spring-cloud-modules/spring-cloud-dapr/gateway/src/main/resources/application-with-dapr.yml similarity index 100% rename from spring-cloud/spring-cloud-dapr/gateway/src/main/resources/application-with-dapr.yml rename to spring-cloud-modules/spring-cloud-dapr/gateway/src/main/resources/application-with-dapr.yml diff --git a/spring-cloud/spring-cloud-dapr/greeting/pom.xml b/spring-cloud-modules/spring-cloud-dapr/greeting/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-dapr/greeting/pom.xml rename to spring-cloud-modules/spring-cloud-dapr/greeting/pom.xml diff --git a/spring-cloud/spring-cloud-dapr/greeting/src/main/java/com/baeldung/hello/GreetingApp.java b/spring-cloud-modules/spring-cloud-dapr/greeting/src/main/java/com/baeldung/hello/GreetingApp.java similarity index 100% rename from spring-cloud/spring-cloud-dapr/greeting/src/main/java/com/baeldung/hello/GreetingApp.java rename to spring-cloud-modules/spring-cloud-dapr/greeting/src/main/java/com/baeldung/hello/GreetingApp.java diff --git a/spring-cloud/spring-cloud-dapr/greeting/src/main/java/com/baeldung/hello/GreetingController.java b/spring-cloud-modules/spring-cloud-dapr/greeting/src/main/java/com/baeldung/hello/GreetingController.java similarity index 100% rename from spring-cloud/spring-cloud-dapr/greeting/src/main/java/com/baeldung/hello/GreetingController.java rename to spring-cloud-modules/spring-cloud-dapr/greeting/src/main/java/com/baeldung/hello/GreetingController.java diff --git a/spring-cloud/spring-cloud-dapr/greeting/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-dapr/greeting/src/main/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-dapr/greeting/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-dapr/greeting/src/main/resources/application.yml diff --git a/spring-cloud/spring-cloud-dapr/pom.xml b/spring-cloud-modules/spring-cloud-dapr/pom.xml similarity index 90% rename from spring-cloud/spring-cloud-dapr/pom.xml rename to spring-cloud-modules/spring-cloud-dapr/pom.xml index 436666b08e..24b6c989bd 100644 --- a/spring-cloud/spring-cloud-dapr/pom.xml +++ b/spring-cloud-modules/spring-cloud-dapr/pom.xml @@ -8,7 +8,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-docker/README.md b/spring-cloud-modules/spring-cloud-docker/README.md similarity index 100% rename from spring-cloud/spring-cloud-docker/README.md rename to spring-cloud-modules/spring-cloud-docker/README.md diff --git a/spring-cloud/spring-cloud-docker/docker-compose-scale.yml b/spring-cloud-modules/spring-cloud-docker/docker-compose-scale.yml similarity index 100% rename from spring-cloud/spring-cloud-docker/docker-compose-scale.yml rename to spring-cloud-modules/spring-cloud-docker/docker-compose-scale.yml diff --git a/spring-cloud/spring-cloud-docker/docker-compose.yml b/spring-cloud-modules/spring-cloud-docker/docker-compose.yml similarity index 100% rename from spring-cloud/spring-cloud-docker/docker-compose.yml rename to spring-cloud-modules/spring-cloud-docker/docker-compose.yml diff --git a/spring-cloud/spring-cloud-docker/docker-message-server/Dockerfile b/spring-cloud-modules/spring-cloud-docker/docker-message-server/Dockerfile similarity index 100% rename from spring-cloud/spring-cloud-docker/docker-message-server/Dockerfile rename to spring-cloud-modules/spring-cloud-docker/docker-message-server/Dockerfile diff --git a/spring-cloud/spring-cloud-docker/docker-message-server/pom.xml b/spring-cloud-modules/spring-cloud-docker/docker-message-server/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-docker/docker-message-server/pom.xml rename to spring-cloud-modules/spring-cloud-docker/docker-message-server/pom.xml diff --git a/spring-cloud/spring-cloud-docker/docker-message-server/src/main/java/com/baeldung/spring/cloud/config/docker/DockerMessageController.java b/spring-cloud-modules/spring-cloud-docker/docker-message-server/src/main/java/com/baeldung/spring/cloud/config/docker/DockerMessageController.java similarity index 100% rename from spring-cloud/spring-cloud-docker/docker-message-server/src/main/java/com/baeldung/spring/cloud/config/docker/DockerMessageController.java rename to spring-cloud-modules/spring-cloud-docker/docker-message-server/src/main/java/com/baeldung/spring/cloud/config/docker/DockerMessageController.java diff --git a/spring-cloud/spring-cloud-docker/docker-message-server/src/main/java/com/baeldung/spring/cloud/config/docker/DockerServer.java b/spring-cloud-modules/spring-cloud-docker/docker-message-server/src/main/java/com/baeldung/spring/cloud/config/docker/DockerServer.java similarity index 100% rename from spring-cloud/spring-cloud-docker/docker-message-server/src/main/java/com/baeldung/spring/cloud/config/docker/DockerServer.java rename to spring-cloud-modules/spring-cloud-docker/docker-message-server/src/main/java/com/baeldung/spring/cloud/config/docker/DockerServer.java diff --git a/spring-cloud/spring-cloud-docker/docker-message-server/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-docker/docker-message-server/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-docker/docker-message-server/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-docker/docker-message-server/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-docker/docker-product-server/Dockerfile b/spring-cloud-modules/spring-cloud-docker/docker-product-server/Dockerfile similarity index 100% rename from spring-cloud/spring-cloud-docker/docker-product-server/Dockerfile rename to spring-cloud-modules/spring-cloud-docker/docker-product-server/Dockerfile diff --git a/spring-cloud/spring-cloud-docker/docker-product-server/pom.xml b/spring-cloud-modules/spring-cloud-docker/docker-product-server/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-docker/docker-product-server/pom.xml rename to spring-cloud-modules/spring-cloud-docker/docker-product-server/pom.xml diff --git a/spring-cloud/spring-cloud-docker/docker-product-server/src/main/java/com/baeldung/spring/cloud/config/docker/DockerProductController.java b/spring-cloud-modules/spring-cloud-docker/docker-product-server/src/main/java/com/baeldung/spring/cloud/config/docker/DockerProductController.java similarity index 100% rename from spring-cloud/spring-cloud-docker/docker-product-server/src/main/java/com/baeldung/spring/cloud/config/docker/DockerProductController.java rename to spring-cloud-modules/spring-cloud-docker/docker-product-server/src/main/java/com/baeldung/spring/cloud/config/docker/DockerProductController.java diff --git a/spring-cloud/spring-cloud-docker/docker-product-server/src/main/java/com/baeldung/spring/cloud/config/docker/DockerServer.java b/spring-cloud-modules/spring-cloud-docker/docker-product-server/src/main/java/com/baeldung/spring/cloud/config/docker/DockerServer.java similarity index 100% rename from spring-cloud/spring-cloud-docker/docker-product-server/src/main/java/com/baeldung/spring/cloud/config/docker/DockerServer.java rename to spring-cloud-modules/spring-cloud-docker/docker-product-server/src/main/java/com/baeldung/spring/cloud/config/docker/DockerServer.java diff --git a/spring-cloud/spring-cloud-docker/docker-product-server/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-docker/docker-product-server/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-docker/docker-product-server/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-docker/docker-product-server/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-docker/pom.xml b/spring-cloud-modules/spring-cloud-docker/pom.xml similarity index 92% rename from spring-cloud/spring-cloud-docker/pom.xml rename to spring-cloud-modules/spring-cloud-docker/pom.xml index 735dae2ea7..4cc5f35bd9 100644 --- a/spring-cloud/spring-cloud-docker/pom.xml +++ b/spring-cloud-modules/spring-cloud-docker/pom.xml @@ -10,7 +10,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-eureka-self-preservation/README.md b/spring-cloud-modules/spring-cloud-eureka-self-preservation/README.md similarity index 100% rename from spring-cloud/spring-cloud-eureka-self-preservation/README.md rename to spring-cloud-modules/spring-cloud-eureka-self-preservation/README.md diff --git a/spring-cloud/spring-cloud-eureka-self-preservation/pom.xml b/spring-cloud-modules/spring-cloud-eureka-self-preservation/pom.xml similarity index 96% rename from spring-cloud/spring-cloud-eureka-self-preservation/pom.xml rename to spring-cloud-modules/spring-cloud-eureka-self-preservation/pom.xml index 5000adc164..9827c578a4 100644 --- a/spring-cloud/spring-cloud-eureka-self-preservation/pom.xml +++ b/spring-cloud-modules/spring-cloud-eureka-self-preservation/pom.xml @@ -11,7 +11,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-eureka-self-preservation/spring-cloud-eureka-client/pom.xml b/spring-cloud-modules/spring-cloud-eureka-self-preservation/spring-cloud-eureka-client/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-eureka-self-preservation/spring-cloud-eureka-client/pom.xml rename to spring-cloud-modules/spring-cloud-eureka-self-preservation/spring-cloud-eureka-client/pom.xml diff --git a/spring-cloud/spring-cloud-eureka-self-preservation/spring-cloud-eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/EurekaClientApplication.java b/spring-cloud-modules/spring-cloud-eureka-self-preservation/spring-cloud-eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/EurekaClientApplication.java similarity index 100% rename from spring-cloud/spring-cloud-eureka-self-preservation/spring-cloud-eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/EurekaClientApplication.java rename to spring-cloud-modules/spring-cloud-eureka-self-preservation/spring-cloud-eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/EurekaClientApplication.java diff --git a/spring-cloud/spring-cloud-eureka-self-preservation/spring-cloud-eureka-client/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-eureka-self-preservation/spring-cloud-eureka-client/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-eureka-self-preservation/spring-cloud-eureka-client/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-eureka-self-preservation/spring-cloud-eureka-client/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-eureka-self-preservation/spring-cloud-eureka-server/pom.xml b/spring-cloud-modules/spring-cloud-eureka-self-preservation/spring-cloud-eureka-server/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-eureka-self-preservation/spring-cloud-eureka-server/pom.xml rename to spring-cloud-modules/spring-cloud-eureka-self-preservation/spring-cloud-eureka-server/pom.xml diff --git a/spring-cloud/spring-cloud-eureka-self-preservation/spring-cloud-eureka-server/src/main/java/com/baeldung/spring/cloud/eureka/server/EurekaServerApplication.java b/spring-cloud-modules/spring-cloud-eureka-self-preservation/spring-cloud-eureka-server/src/main/java/com/baeldung/spring/cloud/eureka/server/EurekaServerApplication.java similarity index 100% rename from spring-cloud/spring-cloud-eureka-self-preservation/spring-cloud-eureka-server/src/main/java/com/baeldung/spring/cloud/eureka/server/EurekaServerApplication.java rename to spring-cloud-modules/spring-cloud-eureka-self-preservation/spring-cloud-eureka-server/src/main/java/com/baeldung/spring/cloud/eureka/server/EurekaServerApplication.java diff --git a/spring-cloud/spring-cloud-eureka-self-preservation/spring-cloud-eureka-server/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-eureka-self-preservation/spring-cloud-eureka-server/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-eureka-self-preservation/spring-cloud-eureka-server/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-eureka-self-preservation/spring-cloud-eureka-server/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-eureka/README.md b/spring-cloud-modules/spring-cloud-eureka/README.md similarity index 100% rename from spring-cloud/spring-cloud-eureka/README.md rename to spring-cloud-modules/spring-cloud-eureka/README.md diff --git a/spring-cloud/spring-cloud-eureka/pom.xml b/spring-cloud-modules/spring-cloud-eureka/pom.xml similarity index 96% rename from spring-cloud/spring-cloud-eureka/pom.xml rename to spring-cloud-modules/spring-cloud-eureka/pom.xml index 63190f7f20..2a9c4f5fde 100644 --- a/spring-cloud/spring-cloud-eureka/pom.xml +++ b/spring-cloud-modules/spring-cloud-eureka/pom.xml @@ -11,7 +11,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client-profiles/pom.xml b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client-profiles/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client-profiles/pom.xml rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client-profiles/pom.xml diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client-profiles/src/main/java/com/baeldung/spring/cloud/eureka/client/EurekaClientApplication.java b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client-profiles/src/main/java/com/baeldung/spring/cloud/eureka/client/EurekaClientApplication.java similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client-profiles/src/main/java/com/baeldung/spring/cloud/eureka/client/EurekaClientApplication.java rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client-profiles/src/main/java/com/baeldung/spring/cloud/eureka/client/EurekaClientApplication.java diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client-profiles/src/main/java/com/baeldung/spring/cloud/eureka/client/controller/HelloWorldController.java b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client-profiles/src/main/java/com/baeldung/spring/cloud/eureka/client/controller/HelloWorldController.java similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client-profiles/src/main/java/com/baeldung/spring/cloud/eureka/client/controller/HelloWorldController.java rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client-profiles/src/main/java/com/baeldung/spring/cloud/eureka/client/controller/HelloWorldController.java diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client-profiles/src/main/resources/application-dev.properties b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client-profiles/src/main/resources/application-dev.properties similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client-profiles/src/main/resources/application-dev.properties rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client-profiles/src/main/resources/application-dev.properties diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client-profiles/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client-profiles/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client-profiles/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client-profiles/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client-profiles/src/test/java/com/baeldung/spring/cloud/eureka/client/SpringContextTest.java b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client-profiles/src/test/java/com/baeldung/spring/cloud/eureka/client/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client-profiles/src/test/java/com/baeldung/spring/cloud/eureka/client/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client-profiles/src/test/java/com/baeldung/spring/cloud/eureka/client/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client/pom.xml b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client/pom.xml rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client/pom.xml diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/EurekaClientApplication.java b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/EurekaClientApplication.java similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/EurekaClientApplication.java rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/EurekaClientApplication.java diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/GreetingController.java b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/GreetingController.java similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/GreetingController.java rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/GreetingController.java diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client/src/main/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client/src/main/resources/application.yml diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client/src/test/java/com/baeldung/spring/cloud/eureka/client/SpringContextTest.java b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client/src/test/java/com/baeldung/spring/cloud/eureka/client/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client/src/test/java/com/baeldung/spring/cloud/eureka/client/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client/src/test/java/com/baeldung/spring/cloud/eureka/client/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/pom.xml b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/pom.xml rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/pom.xml diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/main/java/com/baeldung/spring/cloud/Application.java b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/main/java/com/baeldung/spring/cloud/Application.java similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/main/java/com/baeldung/spring/cloud/Application.java rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/main/java/com/baeldung/spring/cloud/Application.java diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/main/java/com/baeldung/spring/cloud/client/BooksClient.java b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/main/java/com/baeldung/spring/cloud/client/BooksClient.java similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/main/java/com/baeldung/spring/cloud/client/BooksClient.java rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/main/java/com/baeldung/spring/cloud/client/BooksClient.java diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/main/java/com/baeldung/spring/cloud/model/Book.java b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/main/java/com/baeldung/spring/cloud/model/Book.java similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/main/java/com/baeldung/spring/cloud/model/Book.java rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/main/java/com/baeldung/spring/cloud/model/Book.java diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/BookMocks.java b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/BookMocks.java similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/BookMocks.java rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/BookMocks.java diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/BooksClientIntegrationTest.java b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/BooksClientIntegrationTest.java similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/BooksClientIntegrationTest.java rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/BooksClientIntegrationTest.java diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/EurekaContainerConfig.java b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/EurekaContainerConfig.java similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/EurekaContainerConfig.java rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/EurekaContainerConfig.java diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/LoadBalancerBooksClientIntegrationTest.java b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/LoadBalancerBooksClientIntegrationTest.java similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/LoadBalancerBooksClientIntegrationTest.java rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/LoadBalancerBooksClientIntegrationTest.java diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/MockBookServiceConfig.java b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/MockBookServiceConfig.java similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/MockBookServiceConfig.java rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/MockBookServiceConfig.java diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/RibbonTestConfig.java b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/RibbonTestConfig.java similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/RibbonTestConfig.java rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/RibbonTestConfig.java diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/ServiceDiscoveryBooksClientLiveTest.java b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/ServiceDiscoveryBooksClientLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/ServiceDiscoveryBooksClientLiveTest.java rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/ServiceDiscoveryBooksClientLiveTest.java diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/WireMockConfig.java b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/WireMockConfig.java similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/WireMockConfig.java rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/WireMockConfig.java diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/resources/application-eureka-test.yml b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/resources/application-eureka-test.yml similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/resources/application-eureka-test.yml rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/resources/application-eureka-test.yml diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/resources/application-ribbon-test.yml b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/resources/application-ribbon-test.yml similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/resources/application-ribbon-test.yml rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/resources/application-ribbon-test.yml diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/resources/application-test.yml b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/resources/application-test.yml similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/resources/application-test.yml rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/resources/application-test.yml diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/resources/payload/get-books-response.json b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/resources/payload/get-books-response.json similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/resources/payload/get-books-response.json rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/resources/payload/get-books-response.json diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client/pom.xml b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client/pom.xml rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client/pom.xml diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/java/com/baeldung/spring/cloud/feign/client/FeignClientApplication.java b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/java/com/baeldung/spring/cloud/feign/client/FeignClientApplication.java similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/java/com/baeldung/spring/cloud/feign/client/FeignClientApplication.java rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/java/com/baeldung/spring/cloud/feign/client/FeignClientApplication.java diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/java/com/baeldung/spring/cloud/feign/client/GreetingClient.java b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/java/com/baeldung/spring/cloud/feign/client/GreetingClient.java similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/java/com/baeldung/spring/cloud/feign/client/GreetingClient.java rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/java/com/baeldung/spring/cloud/feign/client/GreetingClient.java diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/java/com/baeldung/spring/cloud/feign/client/NoFeignClientController.java b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/java/com/baeldung/spring/cloud/feign/client/NoFeignClientController.java similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/java/com/baeldung/spring/cloud/feign/client/NoFeignClientController.java rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/java/com/baeldung/spring/cloud/feign/client/NoFeignClientController.java diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/resources/application.yml diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/resources/templates/greeting-view.html b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/resources/templates/greeting-view.html similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/resources/templates/greeting-view.html rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/resources/templates/greeting-view.html diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/test/java/com/baeldung/spring/cloud/feign/client/SpringContextTest.java b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/test/java/com/baeldung/spring/cloud/feign/client/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/test/java/com/baeldung/spring/cloud/feign/client/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/test/java/com/baeldung/spring/cloud/feign/client/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-server/pom.xml b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-server/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-server/pom.xml rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-server/pom.xml diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-server/src/main/java/com/baeldung/spring/cloud/eureka/server/EurekaServerApplication.java b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-server/src/main/java/com/baeldung/spring/cloud/eureka/server/EurekaServerApplication.java similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-server/src/main/java/com/baeldung/spring/cloud/eureka/server/EurekaServerApplication.java rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-server/src/main/java/com/baeldung/spring/cloud/eureka/server/EurekaServerApplication.java diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-server/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-server/src/main/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-server/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-server/src/main/resources/application.yml diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-server/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-server/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-server/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-server/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-server/src/test/java/com/baeldung/spring/cloud/eureka/server/SpringContextTest.java b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-server/src/test/java/com/baeldung/spring/cloud/eureka/server/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-server/src/test/java/com/baeldung/spring/cloud/eureka/server/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-server/src/test/java/com/baeldung/spring/cloud/eureka/server/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-functions/README.md b/spring-cloud-modules/spring-cloud-functions/README.md similarity index 100% rename from spring-cloud/spring-cloud-functions/README.md rename to spring-cloud-modules/spring-cloud-functions/README.md diff --git a/spring-cloud/spring-cloud-functions/pom.xml b/spring-cloud-modules/spring-cloud-functions/pom.xml similarity index 98% rename from spring-cloud/spring-cloud-functions/pom.xml rename to spring-cloud-modules/spring-cloud-functions/pom.xml index d9f90c7a56..0b392daacf 100644 --- a/spring-cloud/spring-cloud-functions/pom.xml +++ b/spring-cloud-modules/spring-cloud-functions/pom.xml @@ -12,7 +12,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-functions/src/main/java/com/baeldung/spring/cloudfunction/aws/CloudFunctionAwsApplication.java b/spring-cloud-modules/spring-cloud-functions/src/main/java/com/baeldung/spring/cloudfunction/aws/CloudFunctionAwsApplication.java similarity index 100% rename from spring-cloud/spring-cloud-functions/src/main/java/com/baeldung/spring/cloudfunction/aws/CloudFunctionAwsApplication.java rename to spring-cloud-modules/spring-cloud-functions/src/main/java/com/baeldung/spring/cloudfunction/aws/CloudFunctionAwsApplication.java diff --git a/spring-cloud/spring-cloud-functions/src/main/java/com/baeldung/spring/cloudfunction/aws/StringReverseHandler.java b/spring-cloud-modules/spring-cloud-functions/src/main/java/com/baeldung/spring/cloudfunction/aws/StringReverseHandler.java similarity index 100% rename from spring-cloud/spring-cloud-functions/src/main/java/com/baeldung/spring/cloudfunction/aws/StringReverseHandler.java rename to spring-cloud-modules/spring-cloud-functions/src/main/java/com/baeldung/spring/cloudfunction/aws/StringReverseHandler.java diff --git a/spring-cloud/spring-cloud-functions/src/main/java/com/baeldung/spring/cloudfunction/aws/functions/Greeter.java b/spring-cloud-modules/spring-cloud-functions/src/main/java/com/baeldung/spring/cloudfunction/aws/functions/Greeter.java similarity index 100% rename from spring-cloud/spring-cloud-functions/src/main/java/com/baeldung/spring/cloudfunction/aws/functions/Greeter.java rename to spring-cloud-modules/spring-cloud-functions/src/main/java/com/baeldung/spring/cloudfunction/aws/functions/Greeter.java diff --git a/spring-cloud/spring-cloud-functions/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-functions/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-functions/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-functions/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-functions/src/test/java/com/baeldung/spring/cloudfunction/aws/CloudFunctionApplicationUnitTest.java b/spring-cloud-modules/spring-cloud-functions/src/test/java/com/baeldung/spring/cloudfunction/aws/CloudFunctionApplicationUnitTest.java similarity index 100% rename from spring-cloud/spring-cloud-functions/src/test/java/com/baeldung/spring/cloudfunction/aws/CloudFunctionApplicationUnitTest.java rename to spring-cloud-modules/spring-cloud-functions/src/test/java/com/baeldung/spring/cloudfunction/aws/CloudFunctionApplicationUnitTest.java diff --git a/spring-cloud/spring-cloud-functions/src/test/java/com/baeldung/spring/cloudfunction/aws/SpringContextTest.java b/spring-cloud-modules/spring-cloud-functions/src/test/java/com/baeldung/spring/cloudfunction/aws/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-functions/src/test/java/com/baeldung/spring/cloudfunction/aws/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-functions/src/test/java/com/baeldung/spring/cloudfunction/aws/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-functions/src/test/resources/logback-test.xml b/spring-cloud-modules/spring-cloud-functions/src/test/resources/logback-test.xml similarity index 100% rename from spring-cloud/spring-cloud-functions/src/test/resources/logback-test.xml rename to spring-cloud-modules/spring-cloud-functions/src/test/resources/logback-test.xml diff --git a/spring-cloud/spring-cloud-gateway/README-OAuth.md b/spring-cloud-modules/spring-cloud-gateway/README-OAuth.md similarity index 100% rename from spring-cloud/spring-cloud-gateway/README-OAuth.md rename to spring-cloud-modules/spring-cloud-gateway/README-OAuth.md diff --git a/spring-cloud/spring-cloud-gateway/README.md b/spring-cloud-modules/spring-cloud-gateway/README.md similarity index 100% rename from spring-cloud/spring-cloud-gateway/README.md rename to spring-cloud-modules/spring-cloud-gateway/README.md diff --git a/spring-cloud/spring-cloud-gateway/baeldung-realm.json b/spring-cloud-modules/spring-cloud-gateway/baeldung-realm.json similarity index 100% rename from spring-cloud/spring-cloud-gateway/baeldung-realm.json rename to spring-cloud-modules/spring-cloud-gateway/baeldung-realm.json diff --git a/spring-cloud/spring-cloud-gateway/pom.xml b/spring-cloud-modules/spring-cloud-gateway/pom.xml similarity index 99% rename from spring-cloud/spring-cloud-gateway/pom.xml rename to spring-cloud-modules/spring-cloud-gateway/pom.xml index e8949cc039..76072a59ac 100644 --- a/spring-cloud/spring-cloud-gateway/pom.xml +++ b/spring-cloud-modules/spring-cloud-gateway/pom.xml @@ -9,7 +9,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/CustomFiltersGatewayApplication.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/CustomFiltersGatewayApplication.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/CustomFiltersGatewayApplication.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/CustomFiltersGatewayApplication.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/config/WebClientConfig.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/config/WebClientConfig.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/config/WebClientConfig.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/config/WebClientConfig.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/factories/ChainRequestGatewayFilterFactory.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/factories/ChainRequestGatewayFilterFactory.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/factories/ChainRequestGatewayFilterFactory.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/factories/ChainRequestGatewayFilterFactory.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/factories/LoggingGatewayFilterFactory.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/factories/LoggingGatewayFilterFactory.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/factories/LoggingGatewayFilterFactory.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/factories/LoggingGatewayFilterFactory.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/factories/ModifyRequestGatewayFilterFactory.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/factories/ModifyRequestGatewayFilterFactory.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/factories/ModifyRequestGatewayFilterFactory.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/factories/ModifyRequestGatewayFilterFactory.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/factories/ModifyResponseGatewayFilterFactory.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/factories/ModifyResponseGatewayFilterFactory.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/factories/ModifyResponseGatewayFilterFactory.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/factories/ModifyResponseGatewayFilterFactory.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/global/FirstPreLastPostGlobalFilter.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/global/FirstPreLastPostGlobalFilter.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/global/FirstPreLastPostGlobalFilter.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/global/FirstPreLastPostGlobalFilter.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/global/LoggingGlobalFiltersConfigurations.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/global/LoggingGlobalFiltersConfigurations.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/global/LoggingGlobalFiltersConfigurations.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/global/LoggingGlobalFiltersConfigurations.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/global/LoggingGlobalPreFilter.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/global/LoggingGlobalPreFilter.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/global/LoggingGlobalPreFilter.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/global/LoggingGlobalPreFilter.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/routes/ServiceRouteConfiguration.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/routes/ServiceRouteConfiguration.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/routes/ServiceRouteConfiguration.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/routes/ServiceRouteConfiguration.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/secondservice/SecondServiceApplication.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/secondservice/SecondServiceApplication.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/secondservice/SecondServiceApplication.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/secondservice/SecondServiceApplication.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/secondservice/web/SecondServiceRestController.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/secondservice/web/SecondServiceRestController.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/secondservice/web/SecondServiceRestController.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/secondservice/web/SecondServiceRestController.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/service/ServiceApplication.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/service/ServiceApplication.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/service/ServiceApplication.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/service/ServiceApplication.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/service/web/ServiceRestController.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/service/web/ServiceRestController.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/service/web/ServiceRestController.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/service/web/ServiceRestController.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/custompredicates/CustomPredicatesApplication.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/custompredicates/CustomPredicatesApplication.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/custompredicates/CustomPredicatesApplication.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/custompredicates/CustomPredicatesApplication.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/custompredicates/config/CustomPredicatesConfig.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/custompredicates/config/CustomPredicatesConfig.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/custompredicates/config/CustomPredicatesConfig.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/custompredicates/config/CustomPredicatesConfig.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/custompredicates/factories/GoldenCustomerRoutePredicateFactory.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/custompredicates/factories/GoldenCustomerRoutePredicateFactory.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/custompredicates/factories/GoldenCustomerRoutePredicateFactory.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/custompredicates/factories/GoldenCustomerRoutePredicateFactory.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/custompredicates/service/GoldenCustomerService.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/custompredicates/service/GoldenCustomerService.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/custompredicates/service/GoldenCustomerService.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/custompredicates/service/GoldenCustomerService.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/introduction/IntroductionGatewayApplication.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/introduction/IntroductionGatewayApplication.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/introduction/IntroductionGatewayApplication.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/introduction/IntroductionGatewayApplication.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/oauth/backend/QuotesApplication.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/oauth/backend/QuotesApplication.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/oauth/backend/QuotesApplication.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/oauth/backend/QuotesApplication.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/oauth/backend/domain/Quote.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/oauth/backend/domain/Quote.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/oauth/backend/domain/Quote.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/oauth/backend/domain/Quote.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/oauth/backend/web/QuoteApi.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/oauth/backend/web/QuoteApi.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/oauth/backend/web/QuoteApi.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/oauth/backend/web/QuoteApi.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/oauth/server/ResourceServerGatewayApplication.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/oauth/server/ResourceServerGatewayApplication.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/oauth/server/ResourceServerGatewayApplication.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/oauth/server/ResourceServerGatewayApplication.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/oauth/shared/KeycloakReactiveTokenInstrospector.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/oauth/shared/KeycloakReactiveTokenInstrospector.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/oauth/shared/KeycloakReactiveTokenInstrospector.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/oauth/shared/KeycloakReactiveTokenInstrospector.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/rewrite/URLRewriteGatewayApplication.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/rewrite/URLRewriteGatewayApplication.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/rewrite/URLRewriteGatewayApplication.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/rewrite/URLRewriteGatewayApplication.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/rewrite/routes/DynamicRewriteRoute.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/rewrite/routes/DynamicRewriteRoute.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/rewrite/routes/DynamicRewriteRoute.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/rewrite/routes/DynamicRewriteRoute.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/webfilters/WebFilterGatewayApplication.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/webfilters/WebFilterGatewayApplication.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/webfilters/WebFilterGatewayApplication.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/webfilters/WebFilterGatewayApplication.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/webfilters/config/ModifyBodyRouteConfig.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/webfilters/config/ModifyBodyRouteConfig.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/webfilters/config/ModifyBodyRouteConfig.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/webfilters/config/ModifyBodyRouteConfig.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/webfilters/config/RequestRateLimiterResolverConfig.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/webfilters/config/RequestRateLimiterResolverConfig.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/webfilters/config/RequestRateLimiterResolverConfig.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/webfilters/config/RequestRateLimiterResolverConfig.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/resources/application-customroutes.yml b/spring-cloud-modules/spring-cloud-gateway/src/main/resources/application-customroutes.yml similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/resources/application-customroutes.yml rename to spring-cloud-modules/spring-cloud-gateway/src/main/resources/application-customroutes.yml diff --git a/spring-cloud/spring-cloud-gateway/src/main/resources/application-nosecurity.yml b/spring-cloud-modules/spring-cloud-gateway/src/main/resources/application-nosecurity.yml similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/resources/application-nosecurity.yml rename to spring-cloud-modules/spring-cloud-gateway/src/main/resources/application-nosecurity.yml diff --git a/spring-cloud/spring-cloud-gateway/src/main/resources/application-oauth-client.yml b/spring-cloud-modules/spring-cloud-gateway/src/main/resources/application-oauth-client.yml similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/resources/application-oauth-client.yml rename to spring-cloud-modules/spring-cloud-gateway/src/main/resources/application-oauth-client.yml diff --git a/spring-cloud/spring-cloud-gateway/src/main/resources/application-resource-server.yml b/spring-cloud-modules/spring-cloud-gateway/src/main/resources/application-resource-server.yml similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/resources/application-resource-server.yml rename to spring-cloud-modules/spring-cloud-gateway/src/main/resources/application-resource-server.yml diff --git a/spring-cloud/spring-cloud-gateway/src/main/resources/application-url-rewrite.yml b/spring-cloud-modules/spring-cloud-gateway/src/main/resources/application-url-rewrite.yml similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/resources/application-url-rewrite.yml rename to spring-cloud-modules/spring-cloud-gateway/src/main/resources/application-url-rewrite.yml diff --git a/spring-cloud/spring-cloud-gateway/src/main/resources/application-webfilters.yml b/spring-cloud-modules/spring-cloud-gateway/src/main/resources/application-webfilters.yml similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/resources/application-webfilters.yml rename to spring-cloud-modules/spring-cloud-gateway/src/main/resources/application-webfilters.yml diff --git a/spring-cloud/spring-cloud-gateway/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-gateway/src/main/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-gateway/src/main/resources/application.yml diff --git a/spring-cloud/spring-cloud-gateway/src/main/resources/customfilters-global-application.properties b/spring-cloud-modules/spring-cloud-gateway/src/main/resources/customfilters-global-application.properties similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/resources/customfilters-global-application.properties rename to spring-cloud-modules/spring-cloud-gateway/src/main/resources/customfilters-global-application.properties diff --git a/spring-cloud/spring-cloud-gateway/src/main/resources/introduction-application.properties b/spring-cloud-modules/spring-cloud-gateway/src/main/resources/introduction-application.properties similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/resources/introduction-application.properties rename to spring-cloud-modules/spring-cloud-gateway/src/main/resources/introduction-application.properties diff --git a/spring-cloud/spring-cloud-gateway/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-gateway/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-gateway/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-gateway/src/main/resources/quotes-application.properties b/spring-cloud-modules/spring-cloud-gateway/src/main/resources/quotes-application.properties similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/resources/quotes-application.properties rename to spring-cloud-modules/spring-cloud-gateway/src/main/resources/quotes-application.properties diff --git a/spring-cloud/spring-cloud-gateway/src/main/resources/secondservice-application.properties b/spring-cloud-modules/spring-cloud-gateway/src/main/resources/secondservice-application.properties similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/resources/secondservice-application.properties rename to spring-cloud-modules/spring-cloud-gateway/src/main/resources/secondservice-application.properties diff --git a/spring-cloud/spring-cloud-gateway/src/main/resources/service-application.properties b/spring-cloud-modules/spring-cloud-gateway/src/main/resources/service-application.properties similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/resources/service-application.properties rename to spring-cloud-modules/spring-cloud-gateway/src/main/resources/service-application.properties diff --git a/spring-cloud/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/CustomFiltersLiveTest.java b/spring-cloud-modules/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/CustomFiltersLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/CustomFiltersLiveTest.java rename to spring-cloud-modules/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/CustomFiltersLiveTest.java diff --git a/spring-cloud/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/utils/LoggerListAppender.java b/spring-cloud-modules/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/utils/LoggerListAppender.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/utils/LoggerListAppender.java rename to spring-cloud-modules/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/utils/LoggerListAppender.java diff --git a/spring-cloud/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/secondservice/SecondServiceIntegrationTest.java b/spring-cloud-modules/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/secondservice/SecondServiceIntegrationTest.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/secondservice/SecondServiceIntegrationTest.java rename to spring-cloud-modules/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/secondservice/SecondServiceIntegrationTest.java diff --git a/spring-cloud/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/secondservice/SpringContextTest.java b/spring-cloud-modules/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/secondservice/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/secondservice/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/secondservice/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/service/ServiceIntegrationTest.java b/spring-cloud-modules/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/service/ServiceIntegrationTest.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/service/ServiceIntegrationTest.java rename to spring-cloud-modules/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/service/ServiceIntegrationTest.java diff --git a/spring-cloud/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/service/SpringContextTest.java b/spring-cloud-modules/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/service/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/service/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/service/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/custompredicates/CustomPredicatesApplicationLiveTest.java b/spring-cloud-modules/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/custompredicates/CustomPredicatesApplicationLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/custompredicates/CustomPredicatesApplicationLiveTest.java rename to spring-cloud-modules/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/custompredicates/CustomPredicatesApplicationLiveTest.java diff --git a/spring-cloud/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/introduction/SpringContextTest.java b/spring-cloud-modules/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/introduction/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/introduction/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/introduction/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/rewrite/URLRewriteGatewayApplicationLiveTest.java b/spring-cloud-modules/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/rewrite/URLRewriteGatewayApplicationLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/rewrite/URLRewriteGatewayApplicationLiveTest.java rename to spring-cloud-modules/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/rewrite/URLRewriteGatewayApplicationLiveTest.java diff --git a/spring-cloud/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/webfilters/RedisWebFilterFactoriesLiveTest.java b/spring-cloud-modules/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/webfilters/RedisWebFilterFactoriesLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/webfilters/RedisWebFilterFactoriesLiveTest.java rename to spring-cloud-modules/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/webfilters/RedisWebFilterFactoriesLiveTest.java diff --git a/spring-cloud/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/webfilters/WebFilterFactoriesLiveTest.java b/spring-cloud-modules/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/webfilters/WebFilterFactoriesLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/webfilters/WebFilterFactoriesLiveTest.java rename to spring-cloud-modules/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/webfilters/WebFilterFactoriesLiveTest.java diff --git a/spring-cloud/spring-cloud-gateway/src/test/postman/OAuth_Gateway.postman_collection.json b/spring-cloud-modules/spring-cloud-gateway/src/test/postman/OAuth_Gateway.postman_collection.json similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/test/postman/OAuth_Gateway.postman_collection.json rename to spring-cloud-modules/spring-cloud-gateway/src/test/postman/OAuth_Gateway.postman_collection.json diff --git a/spring-cloud/spring-cloud-gateway/src/test/resources/logback-test.xml b/spring-cloud-modules/spring-cloud-gateway/src/test/resources/logback-test.xml similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/test/resources/logback-test.xml rename to spring-cloud-modules/spring-cloud-gateway/src/test/resources/logback-test.xml diff --git a/spring-cloud/spring-cloud-hystrix/README.md b/spring-cloud-modules/spring-cloud-hystrix/README.md similarity index 100% rename from spring-cloud/spring-cloud-hystrix/README.md rename to spring-cloud-modules/spring-cloud-hystrix/README.md diff --git a/spring-cloud/spring-cloud-hystrix/feign-rest-consumer/pom.xml b/spring-cloud-modules/spring-cloud-hystrix/feign-rest-consumer/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-hystrix/feign-rest-consumer/pom.xml rename to spring-cloud-modules/spring-cloud-hystrix/feign-rest-consumer/pom.xml diff --git a/spring-cloud/spring-cloud-hystrix/feign-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingClient.java b/spring-cloud-modules/spring-cloud-hystrix/feign-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingClient.java similarity index 100% rename from spring-cloud/spring-cloud-hystrix/feign-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingClient.java rename to spring-cloud-modules/spring-cloud-hystrix/feign-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingClient.java diff --git a/spring-cloud/spring-cloud-hystrix/feign-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingController.java b/spring-cloud-modules/spring-cloud-hystrix/feign-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingController.java similarity index 100% rename from spring-cloud/spring-cloud-hystrix/feign-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingController.java rename to spring-cloud-modules/spring-cloud-hystrix/feign-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingController.java diff --git a/spring-cloud/spring-cloud-hystrix/feign-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/RestConsumerFeignApplication.java b/spring-cloud-modules/spring-cloud-hystrix/feign-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/RestConsumerFeignApplication.java similarity index 100% rename from spring-cloud/spring-cloud-hystrix/feign-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/RestConsumerFeignApplication.java rename to spring-cloud-modules/spring-cloud-hystrix/feign-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/RestConsumerFeignApplication.java diff --git a/spring-cloud/spring-cloud-hystrix/feign-rest-consumer/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-hystrix/feign-rest-consumer/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-hystrix/feign-rest-consumer/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-hystrix/feign-rest-consumer/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-hystrix/feign-rest-consumer/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-hystrix/feign-rest-consumer/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-hystrix/feign-rest-consumer/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-hystrix/feign-rest-consumer/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-hystrix/feign-rest-consumer/src/main/resources/templates/greeting-view.html b/spring-cloud-modules/spring-cloud-hystrix/feign-rest-consumer/src/main/resources/templates/greeting-view.html similarity index 100% rename from spring-cloud/spring-cloud-hystrix/feign-rest-consumer/src/main/resources/templates/greeting-view.html rename to spring-cloud-modules/spring-cloud-hystrix/feign-rest-consumer/src/main/resources/templates/greeting-view.html diff --git a/spring-cloud/spring-cloud-hystrix/feign-rest-consumer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/consumer/SpringContextTest.java b/spring-cloud-modules/spring-cloud-hystrix/feign-rest-consumer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/consumer/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-hystrix/feign-rest-consumer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/consumer/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-hystrix/feign-rest-consumer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/consumer/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-hystrix/pom.xml b/spring-cloud-modules/spring-cloud-hystrix/pom.xml similarity index 91% rename from spring-cloud/spring-cloud-hystrix/pom.xml rename to spring-cloud-modules/spring-cloud-hystrix/pom.xml index 48216827c8..e1f30c25dc 100644 --- a/spring-cloud/spring-cloud-hystrix/pom.xml +++ b/spring-cloud-modules/spring-cloud-hystrix/pom.xml @@ -10,7 +10,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-hystrix/rest-consumer/pom.xml b/spring-cloud-modules/spring-cloud-hystrix/rest-consumer/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-hystrix/rest-consumer/pom.xml rename to spring-cloud-modules/spring-cloud-hystrix/rest-consumer/pom.xml diff --git a/spring-cloud/spring-cloud-hystrix/rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingController.java b/spring-cloud-modules/spring-cloud-hystrix/rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingController.java similarity index 100% rename from spring-cloud/spring-cloud-hystrix/rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingController.java rename to spring-cloud-modules/spring-cloud-hystrix/rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingController.java diff --git a/spring-cloud/spring-cloud-hystrix/rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingService.java b/spring-cloud-modules/spring-cloud-hystrix/rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingService.java similarity index 100% rename from spring-cloud/spring-cloud-hystrix/rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingService.java rename to spring-cloud-modules/spring-cloud-hystrix/rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingService.java diff --git a/spring-cloud/spring-cloud-hystrix/rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/RestConsumerApplication.java b/spring-cloud-modules/spring-cloud-hystrix/rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/RestConsumerApplication.java similarity index 100% rename from spring-cloud/spring-cloud-hystrix/rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/RestConsumerApplication.java rename to spring-cloud-modules/spring-cloud-hystrix/rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/RestConsumerApplication.java diff --git a/spring-cloud/spring-cloud-hystrix/rest-consumer/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-hystrix/rest-consumer/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-hystrix/rest-consumer/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-hystrix/rest-consumer/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-hystrix/rest-consumer/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-hystrix/rest-consumer/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-hystrix/rest-consumer/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-hystrix/rest-consumer/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-hystrix/rest-consumer/src/main/resources/templates/greeting-view.html b/spring-cloud-modules/spring-cloud-hystrix/rest-consumer/src/main/resources/templates/greeting-view.html similarity index 100% rename from spring-cloud/spring-cloud-hystrix/rest-consumer/src/main/resources/templates/greeting-view.html rename to spring-cloud-modules/spring-cloud-hystrix/rest-consumer/src/main/resources/templates/greeting-view.html diff --git a/spring-cloud/spring-cloud-hystrix/rest-consumer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/consumer/SpringContextTest.java b/spring-cloud-modules/spring-cloud-hystrix/rest-consumer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/consumer/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-hystrix/rest-consumer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/consumer/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-hystrix/rest-consumer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/consumer/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-hystrix/rest-producer/pom.xml b/spring-cloud-modules/spring-cloud-hystrix/rest-producer/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-hystrix/rest-producer/pom.xml rename to spring-cloud-modules/spring-cloud-hystrix/rest-producer/pom.xml diff --git a/spring-cloud/spring-cloud-hystrix/rest-producer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/producer/GreetingController.java b/spring-cloud-modules/spring-cloud-hystrix/rest-producer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/producer/GreetingController.java similarity index 100% rename from spring-cloud/spring-cloud-hystrix/rest-producer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/producer/GreetingController.java rename to spring-cloud-modules/spring-cloud-hystrix/rest-producer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/producer/GreetingController.java diff --git a/spring-cloud/spring-cloud-hystrix/rest-producer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/producer/GreetingControllerImpl.java b/spring-cloud-modules/spring-cloud-hystrix/rest-producer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/producer/GreetingControllerImpl.java similarity index 100% rename from spring-cloud/spring-cloud-hystrix/rest-producer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/producer/GreetingControllerImpl.java rename to spring-cloud-modules/spring-cloud-hystrix/rest-producer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/producer/GreetingControllerImpl.java diff --git a/spring-cloud/spring-cloud-hystrix/rest-producer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/producer/RestProducerApplication.java b/spring-cloud-modules/spring-cloud-hystrix/rest-producer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/producer/RestProducerApplication.java similarity index 100% rename from spring-cloud/spring-cloud-hystrix/rest-producer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/producer/RestProducerApplication.java rename to spring-cloud-modules/spring-cloud-hystrix/rest-producer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/producer/RestProducerApplication.java diff --git a/spring-cloud/spring-cloud-hystrix/rest-producer/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-hystrix/rest-producer/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-hystrix/rest-producer/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-hystrix/rest-producer/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-hystrix/rest-producer/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-hystrix/rest-producer/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-hystrix/rest-producer/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-hystrix/rest-producer/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-hystrix/rest-producer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/producer/SpringContextTest.java b/spring-cloud-modules/spring-cloud-hystrix/rest-producer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/producer/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-hystrix/rest-producer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/producer/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-hystrix/rest-producer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/producer/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-kubernetes/README.md b/spring-cloud-modules/spring-cloud-kubernetes/README.md similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/README.md rename to spring-cloud-modules/spring-cloud-kubernetes/README.md diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/.gitignore b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/.gitignore similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/.gitignore rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/.gitignore diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/Dockerfile b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/Dockerfile similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/Dockerfile rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/Dockerfile diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/client-config.yaml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/client-config.yaml similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/client-config.yaml rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/client-config.yaml diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/client-service-deployment.yaml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/client-service-deployment.yaml similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/client-service-deployment.yaml rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/client-service-deployment.yaml diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/pom.xml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/pom.xml rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/pom.xml diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/java/com/baeldung/spring/cloud/kubernetes/client/Application.java b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/java/com/baeldung/spring/cloud/kubernetes/client/Application.java similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/java/com/baeldung/spring/cloud/kubernetes/client/Application.java rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/java/com/baeldung/spring/cloud/kubernetes/client/Application.java diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/java/com/baeldung/spring/cloud/kubernetes/client/ClientConfig.java b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/java/com/baeldung/spring/cloud/kubernetes/client/ClientConfig.java similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/java/com/baeldung/spring/cloud/kubernetes/client/ClientConfig.java rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/java/com/baeldung/spring/cloud/kubernetes/client/ClientConfig.java diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/java/com/baeldung/spring/cloud/kubernetes/client/ClientController.java b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/java/com/baeldung/spring/cloud/kubernetes/client/ClientController.java similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/java/com/baeldung/spring/cloud/kubernetes/client/ClientController.java rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/java/com/baeldung/spring/cloud/kubernetes/client/ClientController.java diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/java/com/baeldung/spring/cloud/kubernetes/client/RibbonConfiguration.java b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/java/com/baeldung/spring/cloud/kubernetes/client/RibbonConfiguration.java similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/java/com/baeldung/spring/cloud/kubernetes/client/RibbonConfiguration.java rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/java/com/baeldung/spring/cloud/kubernetes/client/RibbonConfiguration.java diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/java/com/baeldung/spring/cloud/kubernetes/client/TravelAgencyService.java b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/java/com/baeldung/spring/cloud/kubernetes/client/TravelAgencyService.java similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/java/com/baeldung/spring/cloud/kubernetes/client/TravelAgencyService.java rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/java/com/baeldung/spring/cloud/kubernetes/client/TravelAgencyService.java diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/resources/application.yaml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/resources/application.yaml similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/resources/application.yaml rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/resources/application.yaml diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/deployment-travel-client.sh b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/deployment-travel-client.sh similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/deployment-travel-client.sh rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/deployment-travel-client.sh diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/Dockerfile b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/Dockerfile similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/Dockerfile rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/Dockerfile diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/mongo-deployment.yaml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/mongo-deployment.yaml similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/mongo-deployment.yaml rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/mongo-deployment.yaml diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/pom.xml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/pom.xml rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/pom.xml diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/secret.yaml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/secret.yaml similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/secret.yaml rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/secret.yaml diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/java/com/baeldung/spring/cloud/kubernetes/travelagency/Application.java b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/java/com/baeldung/spring/cloud/kubernetes/travelagency/Application.java similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/java/com/baeldung/spring/cloud/kubernetes/travelagency/Application.java rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/java/com/baeldung/spring/cloud/kubernetes/travelagency/Application.java diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/java/com/baeldung/spring/cloud/kubernetes/travelagency/controller/TravelAgencyController.java b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/java/com/baeldung/spring/cloud/kubernetes/travelagency/controller/TravelAgencyController.java similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/java/com/baeldung/spring/cloud/kubernetes/travelagency/controller/TravelAgencyController.java rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/java/com/baeldung/spring/cloud/kubernetes/travelagency/controller/TravelAgencyController.java diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/java/com/baeldung/spring/cloud/kubernetes/travelagency/model/TravelDeal.java b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/java/com/baeldung/spring/cloud/kubernetes/travelagency/model/TravelDeal.java similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/java/com/baeldung/spring/cloud/kubernetes/travelagency/model/TravelDeal.java rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/java/com/baeldung/spring/cloud/kubernetes/travelagency/model/TravelDeal.java diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/java/com/baeldung/spring/cloud/kubernetes/travelagency/repository/TravelDealRepository.java b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/java/com/baeldung/spring/cloud/kubernetes/travelagency/repository/TravelDealRepository.java similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/java/com/baeldung/spring/cloud/kubernetes/travelagency/repository/TravelDealRepository.java rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/java/com/baeldung/spring/cloud/kubernetes/travelagency/repository/TravelDealRepository.java diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/resources/logback-spring.xml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/resources/logback-spring.xml similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/resources/logback-spring.xml rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/resources/logback-spring.xml diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/test/java/com/baeldung/spring/cloud/kubernetes/travelagency/SpringContextTest.java b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/test/java/com/baeldung/spring/cloud/kubernetes/travelagency/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/test/java/com/baeldung/spring/cloud/kubernetes/travelagency/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/test/java/com/baeldung/spring/cloud/kubernetes/travelagency/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/travel-agency-deployment.yaml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/travel-agency-deployment.yaml similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/travel-agency-deployment.yaml rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/travel-agency-deployment.yaml diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/.gitignore b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/.gitignore similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/.gitignore rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/.gitignore diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/Dockerfile b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/Dockerfile similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/Dockerfile rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/Dockerfile diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/pom.xml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/pom.xml rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/pom.xml diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/src/main/java/com/baeldung/spring/cloud/kubernetes/backend/KubernetesBackendApplication.java b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/src/main/java/com/baeldung/spring/cloud/kubernetes/backend/KubernetesBackendApplication.java similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/src/main/java/com/baeldung/spring/cloud/kubernetes/backend/KubernetesBackendApplication.java rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/src/main/java/com/baeldung/spring/cloud/kubernetes/backend/KubernetesBackendApplication.java diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/.gitignore b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/.gitignore similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/.gitignore rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/.gitignore diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/Dockerfile b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/Dockerfile similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/Dockerfile rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/Dockerfile diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/pom.xml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/pom.xml rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/pom.xml diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/src/main/java/com/baeldung/spring/cloud/kubernetes/frontend/KubernetesFrontendApplication.java b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/src/main/java/com/baeldung/spring/cloud/kubernetes/frontend/KubernetesFrontendApplication.java similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/src/main/java/com/baeldung/spring/cloud/kubernetes/frontend/KubernetesFrontendApplication.java rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/src/main/java/com/baeldung/spring/cloud/kubernetes/frontend/KubernetesFrontendApplication.java diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/object-configurations/backend-deployment.yaml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/object-configurations/backend-deployment.yaml similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/object-configurations/backend-deployment.yaml rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/object-configurations/backend-deployment.yaml diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/object-configurations/frontend-deployment.yaml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/object-configurations/frontend-deployment.yaml similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/object-configurations/frontend-deployment.yaml rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/object-configurations/frontend-deployment.yaml diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/Dockerfile b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/Dockerfile similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/Dockerfile rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/Dockerfile diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/pom.xml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/pom.xml rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/pom.xml diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/main/java/com/baeldung/liveness/Application.java b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/main/java/com/baeldung/liveness/Application.java similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/main/java/com/baeldung/liveness/Application.java rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/main/java/com/baeldung/liveness/Application.java diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/main/java/com/baeldung/liveness/health/CustomHealthIndicator.java b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/main/java/com/baeldung/liveness/health/CustomHealthIndicator.java similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/main/java/com/baeldung/liveness/health/CustomHealthIndicator.java rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/main/java/com/baeldung/liveness/health/CustomHealthIndicator.java diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/main/resources/resources/application.properties b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/main/resources/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/main/resources/resources/application.properties rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/main/resources/resources/application.properties diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/main/resources/resources/logback.xml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/main/resources/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/main/resources/resources/logback.xml rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/main/resources/resources/logback.xml diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/test/resources/logback-test.xml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/test/resources/logback-test.xml similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/test/resources/logback-test.xml rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/test/resources/logback-test.xml diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/object-configurations/liveness-example-k8s-template.yaml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/object-configurations/liveness-example-k8s-template.yaml similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/object-configurations/liveness-example-k8s-template.yaml rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/object-configurations/liveness-example-k8s-template.yaml diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/object-configurations/readiness-example-k8s-template.yaml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/object-configurations/readiness-example-k8s-template.yaml similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/object-configurations/readiness-example-k8s-template.yaml rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/object-configurations/readiness-example-k8s-template.yaml diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/Dockerfile b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/Dockerfile similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/Dockerfile rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/Dockerfile diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/pom.xml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/pom.xml rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/pom.xml diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/main/java/com/baeldung/readiness/Application.java b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/main/java/com/baeldung/readiness/Application.java similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/main/java/com/baeldung/readiness/Application.java rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/main/java/com/baeldung/readiness/Application.java diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/main/java/com/baeldung/readiness/health/CustomHealthIndicator.java b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/main/java/com/baeldung/readiness/health/CustomHealthIndicator.java similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/main/java/com/baeldung/readiness/health/CustomHealthIndicator.java rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/main/java/com/baeldung/readiness/health/CustomHealthIndicator.java diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/main/resources/resources/application.properties b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/main/resources/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/main/resources/resources/application.properties rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/main/resources/resources/application.properties diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/main/resources/resources/logback.xml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/main/resources/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/main/resources/resources/logback.xml rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/main/resources/resources/logback.xml diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/test/resources/logback-test.xml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/test/resources/logback-test.xml similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/test/resources/logback-test.xml rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/test/resources/logback-test.xml diff --git a/spring-cloud/spring-cloud-kubernetes/pom.xml b/spring-cloud-modules/spring-cloud-kubernetes/pom.xml similarity index 96% rename from spring-cloud/spring-cloud-kubernetes/pom.xml rename to spring-cloud-modules/spring-cloud-kubernetes/pom.xml index 698bdce1e5..1131db150a 100644 --- a/spring-cloud/spring-cloud-kubernetes/pom.xml +++ b/spring-cloud-modules/spring-cloud-kubernetes/pom.xml @@ -11,7 +11,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-loadbalancer/README.md b/spring-cloud-modules/spring-cloud-loadbalancer/README.md similarity index 100% rename from spring-cloud/spring-cloud-loadbalancer/README.md rename to spring-cloud-modules/spring-cloud-loadbalancer/README.md diff --git a/spring-cloud/spring-cloud-loadbalancer/pom.xml b/spring-cloud-modules/spring-cloud-loadbalancer/pom.xml similarity index 96% rename from spring-cloud/spring-cloud-loadbalancer/pom.xml rename to spring-cloud-modules/spring-cloud-loadbalancer/pom.xml index 3b81def641..1a16877427 100644 --- a/spring-cloud/spring-cloud-loadbalancer/pom.xml +++ b/spring-cloud-modules/spring-cloud-loadbalancer/pom.xml @@ -11,7 +11,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/.gitignore b/spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/.gitignore similarity index 100% rename from spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/.gitignore rename to spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/.gitignore diff --git a/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/.mvn/wrapper/MavenWrapperDownloader.java b/spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/.mvn/wrapper/MavenWrapperDownloader.java similarity index 100% rename from spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/.mvn/wrapper/MavenWrapperDownloader.java rename to spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/.mvn/wrapper/MavenWrapperDownloader.java diff --git a/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/.mvn/wrapper/maven-wrapper.jar b/spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/.mvn/wrapper/maven-wrapper.jar rename to spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/.mvn/wrapper/maven-wrapper.jar diff --git a/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/.mvn/wrapper/maven-wrapper.properties b/spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/.mvn/wrapper/maven-wrapper.properties rename to spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/.mvn/wrapper/maven-wrapper.properties diff --git a/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/mvnw b/spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/mvnw similarity index 100% rename from spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/mvnw rename to spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/mvnw diff --git a/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/mvnw.cmd b/spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/mvnw.cmd similarity index 100% rename from spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/mvnw.cmd rename to spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/mvnw.cmd diff --git a/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/pom.xml b/spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/pom.xml rename to spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/pom.xml diff --git a/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/src/main/java/com/baeldung/spring/cloud/loadbalancer/client/ClientApplication.java b/spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/src/main/java/com/baeldung/spring/cloud/loadbalancer/client/ClientApplication.java similarity index 100% rename from spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/src/main/java/com/baeldung/spring/cloud/loadbalancer/client/ClientApplication.java rename to spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/src/main/java/com/baeldung/spring/cloud/loadbalancer/client/ClientApplication.java diff --git a/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/.gitignore b/spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/.gitignore similarity index 100% rename from spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/.gitignore rename to spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/.gitignore diff --git a/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/.mvn/wrapper/MavenWrapperDownloader.java b/spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/.mvn/wrapper/MavenWrapperDownloader.java similarity index 100% rename from spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/.mvn/wrapper/MavenWrapperDownloader.java rename to spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/.mvn/wrapper/MavenWrapperDownloader.java diff --git a/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/.mvn/wrapper/maven-wrapper.jar b/spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/.mvn/wrapper/maven-wrapper.jar rename to spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/.mvn/wrapper/maven-wrapper.jar diff --git a/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/.mvn/wrapper/maven-wrapper.properties b/spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/.mvn/wrapper/maven-wrapper.properties rename to spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/.mvn/wrapper/maven-wrapper.properties diff --git a/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/mvnw b/spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/mvnw similarity index 100% rename from spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/mvnw rename to spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/mvnw diff --git a/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/mvnw.cmd b/spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/mvnw.cmd similarity index 100% rename from spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/mvnw.cmd rename to spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/mvnw.cmd diff --git a/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/pom.xml b/spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/pom.xml rename to spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/pom.xml diff --git a/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/src/main/java/com/baeldung/spring/cloud/loadbalancer/server/ServerApplication.java b/spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/src/main/java/com/baeldung/spring/cloud/loadbalancer/server/ServerApplication.java similarity index 100% rename from spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/src/main/java/com/baeldung/spring/cloud/loadbalancer/server/ServerApplication.java rename to spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/src/main/java/com/baeldung/spring/cloud/loadbalancer/server/ServerApplication.java diff --git a/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-netflix-feign/README.md b/spring-cloud-modules/spring-cloud-netflix-feign/README.md similarity index 100% rename from spring-cloud/spring-cloud-netflix-feign/README.md rename to spring-cloud-modules/spring-cloud-netflix-feign/README.md diff --git a/spring-cloud/spring-cloud-netflix-feign/pom.xml b/spring-cloud-modules/spring-cloud-netflix-feign/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-netflix-feign/pom.xml rename to spring-cloud-modules/spring-cloud-netflix-feign/pom.xml diff --git a/spring-cloud/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/ExampleApplication.java b/spring-cloud-modules/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/ExampleApplication.java similarity index 100% rename from spring-cloud/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/ExampleApplication.java rename to spring-cloud-modules/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/ExampleApplication.java diff --git a/spring-cloud/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/client/JSONPlaceHolderClient.java b/spring-cloud-modules/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/client/JSONPlaceHolderClient.java similarity index 100% rename from spring-cloud/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/client/JSONPlaceHolderClient.java rename to spring-cloud-modules/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/client/JSONPlaceHolderClient.java diff --git a/spring-cloud/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/config/ClientConfiguration.java b/spring-cloud-modules/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/config/ClientConfiguration.java similarity index 100% rename from spring-cloud/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/config/ClientConfiguration.java rename to spring-cloud-modules/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/config/ClientConfiguration.java diff --git a/spring-cloud/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/config/CustomErrorDecoder.java b/spring-cloud-modules/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/config/CustomErrorDecoder.java similarity index 100% rename from spring-cloud/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/config/CustomErrorDecoder.java rename to spring-cloud-modules/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/config/CustomErrorDecoder.java diff --git a/spring-cloud/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/exception/BadRequestException.java b/spring-cloud-modules/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/exception/BadRequestException.java similarity index 100% rename from spring-cloud/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/exception/BadRequestException.java rename to spring-cloud-modules/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/exception/BadRequestException.java diff --git a/spring-cloud/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/exception/NotFoundException.java b/spring-cloud-modules/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/exception/NotFoundException.java similarity index 100% rename from spring-cloud/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/exception/NotFoundException.java rename to spring-cloud-modules/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/exception/NotFoundException.java diff --git a/spring-cloud/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/hystrix/JSONPlaceHolderFallback.java b/spring-cloud-modules/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/hystrix/JSONPlaceHolderFallback.java similarity index 100% rename from spring-cloud/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/hystrix/JSONPlaceHolderFallback.java rename to spring-cloud-modules/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/hystrix/JSONPlaceHolderFallback.java diff --git a/spring-cloud/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/model/Post.java b/spring-cloud-modules/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/model/Post.java similarity index 100% rename from spring-cloud/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/model/Post.java rename to spring-cloud-modules/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/model/Post.java diff --git a/spring-cloud/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/service/JSONPlaceHolderService.java b/spring-cloud-modules/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/service/JSONPlaceHolderService.java similarity index 100% rename from spring-cloud/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/service/JSONPlaceHolderService.java rename to spring-cloud-modules/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/service/JSONPlaceHolderService.java diff --git a/spring-cloud/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/service/impl/JSONPlaceHolderServiceImpl.java b/spring-cloud-modules/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/service/impl/JSONPlaceHolderServiceImpl.java similarity index 100% rename from spring-cloud/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/service/impl/JSONPlaceHolderServiceImpl.java rename to spring-cloud-modules/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/service/impl/JSONPlaceHolderServiceImpl.java diff --git a/spring-cloud/spring-cloud-netflix-feign/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-netflix-feign/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-netflix-feign/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-netflix-feign/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-netflix-feign/src/test/java/com/baeldung/cloud/netflix/feign/NetflixFeignUnitTest.java b/spring-cloud-modules/spring-cloud-netflix-feign/src/test/java/com/baeldung/cloud/netflix/feign/NetflixFeignUnitTest.java similarity index 100% rename from spring-cloud/spring-cloud-netflix-feign/src/test/java/com/baeldung/cloud/netflix/feign/NetflixFeignUnitTest.java rename to spring-cloud-modules/spring-cloud-netflix-feign/src/test/java/com/baeldung/cloud/netflix/feign/NetflixFeignUnitTest.java diff --git a/spring-cloud/spring-cloud-open-service-broker/README.md b/spring-cloud-modules/spring-cloud-open-service-broker/README.md similarity index 100% rename from spring-cloud/spring-cloud-open-service-broker/README.md rename to spring-cloud-modules/spring-cloud-open-service-broker/README.md diff --git a/spring-cloud/spring-cloud-open-service-broker/pom.xml b/spring-cloud-modules/spring-cloud-open-service-broker/pom.xml similarity index 96% rename from spring-cloud/spring-cloud-open-service-broker/pom.xml rename to spring-cloud-modules/spring-cloud-open-service-broker/pom.xml index ca55bc2147..6dcb27773e 100644 --- a/spring-cloud/spring-cloud-open-service-broker/pom.xml +++ b/spring-cloud-modules/spring-cloud-open-service-broker/pom.xml @@ -9,7 +9,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/ServiceBrokerApplication.java b/spring-cloud-modules/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/ServiceBrokerApplication.java similarity index 100% rename from spring-cloud/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/ServiceBrokerApplication.java rename to spring-cloud-modules/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/ServiceBrokerApplication.java diff --git a/spring-cloud/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/config/CatalogConfiguration.java b/spring-cloud-modules/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/config/CatalogConfiguration.java similarity index 100% rename from spring-cloud/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/config/CatalogConfiguration.java rename to spring-cloud-modules/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/config/CatalogConfiguration.java diff --git a/spring-cloud/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/mail/MailController.java b/spring-cloud-modules/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/mail/MailController.java similarity index 100% rename from spring-cloud/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/mail/MailController.java rename to spring-cloud-modules/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/mail/MailController.java diff --git a/spring-cloud/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/mail/MailService.java b/spring-cloud-modules/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/mail/MailService.java similarity index 100% rename from spring-cloud/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/mail/MailService.java rename to spring-cloud-modules/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/mail/MailService.java diff --git a/spring-cloud/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/mail/MailServiceBinding.java b/spring-cloud-modules/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/mail/MailServiceBinding.java similarity index 100% rename from spring-cloud/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/mail/MailServiceBinding.java rename to spring-cloud-modules/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/mail/MailServiceBinding.java diff --git a/spring-cloud/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/mail/MailServiceInstance.java b/spring-cloud-modules/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/mail/MailServiceInstance.java similarity index 100% rename from spring-cloud/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/mail/MailServiceInstance.java rename to spring-cloud-modules/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/mail/MailServiceInstance.java diff --git a/spring-cloud/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/services/MailServiceInstanceBindingService.java b/spring-cloud-modules/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/services/MailServiceInstanceBindingService.java similarity index 100% rename from spring-cloud/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/services/MailServiceInstanceBindingService.java rename to spring-cloud-modules/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/services/MailServiceInstanceBindingService.java diff --git a/spring-cloud/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/services/MailServiceInstanceService.java b/spring-cloud-modules/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/services/MailServiceInstanceService.java similarity index 100% rename from spring-cloud/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/services/MailServiceInstanceService.java rename to spring-cloud-modules/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/services/MailServiceInstanceService.java diff --git a/spring-cloud/spring-cloud-open-service-broker/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-open-service-broker/src/main/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-open-service-broker/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-open-service-broker/src/main/resources/application.yml diff --git a/spring-cloud/spring-cloud-open-service-broker/src/test/java/com/baeldung/spring/cloud/openservicebroker/services/MailServiceInstanceBindingServiceUnitTest.java b/spring-cloud-modules/spring-cloud-open-service-broker/src/test/java/com/baeldung/spring/cloud/openservicebroker/services/MailServiceInstanceBindingServiceUnitTest.java similarity index 100% rename from spring-cloud/spring-cloud-open-service-broker/src/test/java/com/baeldung/spring/cloud/openservicebroker/services/MailServiceInstanceBindingServiceUnitTest.java rename to spring-cloud-modules/spring-cloud-open-service-broker/src/test/java/com/baeldung/spring/cloud/openservicebroker/services/MailServiceInstanceBindingServiceUnitTest.java diff --git a/spring-cloud/spring-cloud-open-service-broker/src/test/java/com/baeldung/spring/cloud/openservicebroker/services/MailServiceInstanceServiceUnitTest.java b/spring-cloud-modules/spring-cloud-open-service-broker/src/test/java/com/baeldung/spring/cloud/openservicebroker/services/MailServiceInstanceServiceUnitTest.java similarity index 100% rename from spring-cloud/spring-cloud-open-service-broker/src/test/java/com/baeldung/spring/cloud/openservicebroker/services/MailServiceInstanceServiceUnitTest.java rename to spring-cloud-modules/spring-cloud-open-service-broker/src/test/java/com/baeldung/spring/cloud/openservicebroker/services/MailServiceInstanceServiceUnitTest.java diff --git a/spring-cloud/spring-cloud-openfeign/README.md b/spring-cloud-modules/spring-cloud-openfeign/README.md similarity index 100% rename from spring-cloud/spring-cloud-openfeign/README.md rename to spring-cloud-modules/spring-cloud-openfeign/README.md diff --git a/spring-cloud/spring-cloud-openfeign/pom.xml b/spring-cloud-modules/spring-cloud-openfeign/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-openfeign/pom.xml rename to spring-cloud-modules/spring-cloud-openfeign/pom.xml diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/ExampleApplication.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/ExampleApplication.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/ExampleApplication.java rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/ExampleApplication.java diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/client/JSONPlaceHolderClient.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/client/JSONPlaceHolderClient.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/client/JSONPlaceHolderClient.java rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/client/JSONPlaceHolderClient.java diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/client/PaymentClient.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/client/PaymentClient.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/client/PaymentClient.java rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/client/PaymentClient.java diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/client/UserClient.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/client/UserClient.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/client/UserClient.java rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/client/UserClient.java diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/config/ClientConfiguration.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/config/ClientConfiguration.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/config/ClientConfiguration.java rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/config/ClientConfiguration.java diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/config/CustomErrorDecoder.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/config/CustomErrorDecoder.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/config/CustomErrorDecoder.java rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/config/CustomErrorDecoder.java diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/config/FeignConfig.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/config/FeignConfig.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/config/FeignConfig.java rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/config/FeignConfig.java diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/controller/PaymentController.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/controller/PaymentController.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/controller/PaymentController.java rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/controller/PaymentController.java diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/exception/BadRequestException.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/exception/BadRequestException.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/exception/BadRequestException.java rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/exception/BadRequestException.java diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/exception/NotFoundException.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/exception/NotFoundException.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/exception/NotFoundException.java rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/exception/NotFoundException.java diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/config/ExceptionMessage.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/config/ExceptionMessage.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/config/ExceptionMessage.java rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/config/ExceptionMessage.java diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/config/FeignSupportConfig.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/config/FeignSupportConfig.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/config/FeignSupportConfig.java rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/config/FeignSupportConfig.java diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/config/RetreiveMessageErrorDecoder.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/config/RetreiveMessageErrorDecoder.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/config/RetreiveMessageErrorDecoder.java rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/config/RetreiveMessageErrorDecoder.java diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/controller/FileController.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/controller/FileController.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/controller/FileController.java rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/controller/FileController.java diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/UploadClient.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/UploadClient.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/UploadClient.java rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/UploadClient.java diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/UploadResource.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/UploadResource.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/UploadResource.java rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/UploadResource.java diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/UploadService.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/UploadService.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/UploadService.java rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/UploadService.java diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/hystrix/JSONPlaceHolderFallback.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/hystrix/JSONPlaceHolderFallback.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/hystrix/JSONPlaceHolderFallback.java rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/hystrix/JSONPlaceHolderFallback.java diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/model/Payment.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/model/Payment.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/model/Payment.java rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/model/Payment.java diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/model/Post.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/model/Post.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/model/Post.java rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/model/Post.java diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/oauthfeign/OAuth2WebSecurityConfigurerAdapter.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/oauthfeign/OAuth2WebSecurityConfigurerAdapter.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/oauthfeign/OAuth2WebSecurityConfigurerAdapter.java rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/oauthfeign/OAuth2WebSecurityConfigurerAdapter.java diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/oauthfeign/OAuthClientCredentialsFeignManager.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/oauthfeign/OAuthClientCredentialsFeignManager.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/oauthfeign/OAuthClientCredentialsFeignManager.java rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/oauthfeign/OAuthClientCredentialsFeignManager.java diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/oauthfeign/OAuthFeignConfig.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/oauthfeign/OAuthFeignConfig.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/oauthfeign/OAuthFeignConfig.java rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/oauthfeign/OAuthFeignConfig.java diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/service/JSONPlaceHolderService.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/service/JSONPlaceHolderService.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/service/JSONPlaceHolderService.java rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/service/JSONPlaceHolderService.java diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/service/impl/JSONPlaceHolderServiceImpl.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/service/impl/JSONPlaceHolderServiceImpl.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/service/impl/JSONPlaceHolderServiceImpl.java rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/service/impl/JSONPlaceHolderServiceImpl.java diff --git a/spring-cloud/spring-cloud-openfeign/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-openfeign/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-openfeign/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-openfeign/src/main/resources/fileupload.txt b/spring-cloud-modules/spring-cloud-openfeign/src/main/resources/fileupload.txt similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/resources/fileupload.txt rename to spring-cloud-modules/spring-cloud-openfeign/src/main/resources/fileupload.txt diff --git a/spring-cloud/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/OpenFeignFileUploadLiveTest.java b/spring-cloud-modules/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/OpenFeignFileUploadLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/OpenFeignFileUploadLiveTest.java rename to spring-cloud-modules/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/OpenFeignFileUploadLiveTest.java diff --git a/spring-cloud/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/OpenFeignManualTest.java b/spring-cloud-modules/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/OpenFeignManualTest.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/OpenFeignManualTest.java rename to spring-cloud-modules/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/OpenFeignManualTest.java diff --git a/spring-cloud/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/OpenFeignOAuth2ManualTest.java b/spring-cloud-modules/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/OpenFeignOAuth2ManualTest.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/OpenFeignOAuth2ManualTest.java rename to spring-cloud-modules/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/OpenFeignOAuth2ManualTest.java diff --git a/spring-cloud/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/SpringContextTest.java b/spring-cloud-modules/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-rest/.gitignore b/spring-cloud-modules/spring-cloud-rest/.gitignore similarity index 100% rename from spring-cloud/spring-cloud-rest/.gitignore rename to spring-cloud-modules/spring-cloud-rest/.gitignore diff --git a/spring-cloud/spring-cloud-rest/README.md b/spring-cloud-modules/spring-cloud-rest/README.md similarity index 100% rename from spring-cloud/spring-cloud-rest/README.md rename to spring-cloud-modules/spring-cloud-rest/README.md diff --git a/spring-cloud/spring-cloud-rest/application-config/discovery.properties b/spring-cloud-modules/spring-cloud-rest/application-config/discovery.properties similarity index 100% rename from spring-cloud/spring-cloud-rest/application-config/discovery.properties rename to spring-cloud-modules/spring-cloud-rest/application-config/discovery.properties diff --git a/spring-cloud/spring-cloud-rest/application-config/resource.properties b/spring-cloud-modules/spring-cloud-rest/application-config/resource.properties similarity index 100% rename from spring-cloud/spring-cloud-rest/application-config/resource.properties rename to spring-cloud-modules/spring-cloud-rest/application-config/resource.properties diff --git a/spring-cloud/spring-cloud-rest/pom.xml b/spring-cloud-modules/spring-cloud-rest/pom.xml similarity index 96% rename from spring-cloud/spring-cloud-rest/pom.xml rename to spring-cloud-modules/spring-cloud-rest/pom.xml index 8f0b7b8dcc..0b3cda772a 100644 --- a/spring-cloud/spring-cloud-rest/pom.xml +++ b/spring-cloud-modules/spring-cloud-rest/pom.xml @@ -11,7 +11,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/pom.xml b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/pom.xml rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/pom.xml diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/BooksApiApplication.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/BooksApiApplication.java similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/BooksApiApplication.java rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/BooksApiApplication.java diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/SessionConfig.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/SessionConfig.java similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/SessionConfig.java rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/SessionConfig.java diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/persistence/dao/BookRepository.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/persistence/dao/BookRepository.java similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/persistence/dao/BookRepository.java rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/persistence/dao/BookRepository.java diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/persistence/model/Book.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/persistence/model/Book.java similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/persistence/model/Book.java rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/persistence/model/Book.java diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/main/resources/bootstrap.properties b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/main/resources/bootstrap.properties similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/main/resources/bootstrap.properties rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/main/resources/bootstrap.properties diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/BooksApiIntegrationTest.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/BooksApiIntegrationTest.java similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/BooksApiIntegrationTest.java rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/BooksApiIntegrationTest.java diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/RestApiLiveTest.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/RestApiLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/RestApiLiveTest.java rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/RestApiLiveTest.java diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/SessionLiveTest.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/SessionLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/SessionLiveTest.java rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/SessionLiveTest.java diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/SpringContextLiveTest.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/SpringContextLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/SpringContextLiveTest.java rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/SpringContextLiveTest.java diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/test/resources/application.properties b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/test/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/test/resources/application.properties rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/test/resources/application.properties diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/.gitignore b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-config-server/.gitignore similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/.gitignore rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-config-server/.gitignore diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/pom.xml b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-config-server/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/pom.xml rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-config-server/pom.xml diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/src/main/java/com/baeldung/SpringCloudRestConfigApplication.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-config-server/src/main/java/com/baeldung/SpringCloudRestConfigApplication.java similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/src/main/java/com/baeldung/SpringCloudRestConfigApplication.java rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-config-server/src/main/java/com/baeldung/SpringCloudRestConfigApplication.java diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-config-server/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-config-server/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-config-server/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-config-server/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-config-server/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-config-server/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/.gitignore b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/.gitignore similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/.gitignore rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/.gitignore diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/pom.xml b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/pom.xml rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/pom.xml diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/java/com/baeldung/SessionConfig.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/java/com/baeldung/SessionConfig.java similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/java/com/baeldung/SessionConfig.java rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/java/com/baeldung/SessionConfig.java diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/java/com/baeldung/SpringCloudRestServerApplication.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/java/com/baeldung/SpringCloudRestServerApplication.java similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/java/com/baeldung/SpringCloudRestServerApplication.java rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/java/com/baeldung/SpringCloudRestServerApplication.java diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/resources/bootstrap.properties b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/resources/bootstrap.properties similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/resources/bootstrap.properties rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/resources/bootstrap.properties diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/src/test/java/com/baeldung/SpringCloudRestServerIntegrationTest.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/src/test/java/com/baeldung/SpringCloudRestServerIntegrationTest.java similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/src/test/java/com/baeldung/SpringCloudRestServerIntegrationTest.java rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/src/test/java/com/baeldung/SpringCloudRestServerIntegrationTest.java diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/src/test/java/com/baeldung/SpringContextLiveTest.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/src/test/java/com/baeldung/SpringContextLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/src/test/java/com/baeldung/SpringContextLiveTest.java rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/src/test/java/com/baeldung/SpringContextLiveTest.java diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/pom.xml b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/pom.xml rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/pom.xml diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/BookReviewsApiApplication.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/BookReviewsApiApplication.java similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/BookReviewsApiApplication.java rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/BookReviewsApiApplication.java diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/SessionConfig.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/SessionConfig.java similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/SessionConfig.java rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/SessionConfig.java diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/persistence/dao/BookReviewRepository.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/persistence/dao/BookReviewRepository.java similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/persistence/dao/BookReviewRepository.java rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/persistence/dao/BookReviewRepository.java diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/persistence/model/BookReview.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/persistence/model/BookReview.java similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/persistence/model/BookReview.java rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/persistence/model/BookReview.java diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/resources/bootstrap.properties b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/resources/bootstrap.properties similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/resources/bootstrap.properties rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/resources/bootstrap.properties diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/java/com/baeldung/BookReviewsApiIntegrationTest.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/java/com/baeldung/BookReviewsApiIntegrationTest.java similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/java/com/baeldung/BookReviewsApiIntegrationTest.java rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/java/com/baeldung/BookReviewsApiIntegrationTest.java diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/java/com/baeldung/RestApiLiveTest.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/java/com/baeldung/RestApiLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/java/com/baeldung/RestApiLiveTest.java rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/java/com/baeldung/RestApiLiveTest.java diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/java/com/baeldung/SpringContextLiveTest.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/java/com/baeldung/SpringContextLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/java/com/baeldung/SpringContextLiveTest.java rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/java/com/baeldung/SpringContextLiveTest.java diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/resources/application.properties b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/resources/application.properties rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/resources/application.properties diff --git a/spring-cloud/spring-cloud-ribbon-client/README.md b/spring-cloud-modules/spring-cloud-ribbon-client/README.md similarity index 100% rename from spring-cloud/spring-cloud-ribbon-client/README.md rename to spring-cloud-modules/spring-cloud-ribbon-client/README.md diff --git a/spring-cloud/spring-cloud-ribbon-client/pom.xml b/spring-cloud-modules/spring-cloud-ribbon-client/pom.xml similarity index 94% rename from spring-cloud/spring-cloud-ribbon-client/pom.xml rename to spring-cloud-modules/spring-cloud-ribbon-client/pom.xml index 3f7d8e9284..b78f6ef5cf 100644 --- a/spring-cloud/spring-cloud-ribbon-client/pom.xml +++ b/spring-cloud-modules/spring-cloud-ribbon-client/pom.xml @@ -10,7 +10,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-ribbon-client/src/main/java/com/baeldung/spring/cloud/ribbon/client/RestTemplateConfiguration.java b/spring-cloud-modules/spring-cloud-ribbon-client/src/main/java/com/baeldung/spring/cloud/ribbon/client/RestTemplateConfiguration.java similarity index 100% rename from spring-cloud/spring-cloud-ribbon-client/src/main/java/com/baeldung/spring/cloud/ribbon/client/RestTemplateConfiguration.java rename to spring-cloud-modules/spring-cloud-ribbon-client/src/main/java/com/baeldung/spring/cloud/ribbon/client/RestTemplateConfiguration.java diff --git a/spring-cloud/spring-cloud-ribbon-client/src/main/java/com/baeldung/spring/cloud/ribbon/client/RibbonConfiguration.java b/spring-cloud-modules/spring-cloud-ribbon-client/src/main/java/com/baeldung/spring/cloud/ribbon/client/RibbonConfiguration.java similarity index 100% rename from spring-cloud/spring-cloud-ribbon-client/src/main/java/com/baeldung/spring/cloud/ribbon/client/RibbonConfiguration.java rename to spring-cloud-modules/spring-cloud-ribbon-client/src/main/java/com/baeldung/spring/cloud/ribbon/client/RibbonConfiguration.java diff --git a/spring-cloud/spring-cloud-ribbon-client/src/main/java/com/baeldung/spring/cloud/ribbon/client/ServerLocationApp.java b/spring-cloud-modules/spring-cloud-ribbon-client/src/main/java/com/baeldung/spring/cloud/ribbon/client/ServerLocationApp.java similarity index 100% rename from spring-cloud/spring-cloud-ribbon-client/src/main/java/com/baeldung/spring/cloud/ribbon/client/ServerLocationApp.java rename to spring-cloud-modules/spring-cloud-ribbon-client/src/main/java/com/baeldung/spring/cloud/ribbon/client/ServerLocationApp.java diff --git a/spring-cloud/spring-cloud-ribbon-client/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-ribbon-client/src/main/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-ribbon-client/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-ribbon-client/src/main/resources/application.yml diff --git a/spring-cloud/spring-cloud-ribbon-client/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-ribbon-client/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-ribbon-client/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-ribbon-client/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-ribbon-client/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-ribbon-client/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-ribbon-client/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-ribbon-client/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-ribbon-client/src/test/java/com/baeldung/spring/cloud/ribbon/client/ServerLocationAppIntegrationTest.java b/spring-cloud-modules/spring-cloud-ribbon-client/src/test/java/com/baeldung/spring/cloud/ribbon/client/ServerLocationAppIntegrationTest.java similarity index 100% rename from spring-cloud/spring-cloud-ribbon-client/src/test/java/com/baeldung/spring/cloud/ribbon/client/ServerLocationAppIntegrationTest.java rename to spring-cloud-modules/spring-cloud-ribbon-client/src/test/java/com/baeldung/spring/cloud/ribbon/client/ServerLocationAppIntegrationTest.java diff --git a/spring-cloud/spring-cloud-ribbon-client/src/test/java/com/baeldung/spring/cloud/ribbon/client/TestConfig.java b/spring-cloud-modules/spring-cloud-ribbon-client/src/test/java/com/baeldung/spring/cloud/ribbon/client/TestConfig.java similarity index 100% rename from spring-cloud/spring-cloud-ribbon-client/src/test/java/com/baeldung/spring/cloud/ribbon/client/TestConfig.java rename to spring-cloud-modules/spring-cloud-ribbon-client/src/test/java/com/baeldung/spring/cloud/ribbon/client/TestConfig.java diff --git a/spring-cloud/spring-cloud-ribbon-retry/README.md b/spring-cloud-modules/spring-cloud-ribbon-retry/README.md similarity index 100% rename from spring-cloud/spring-cloud-ribbon-retry/README.md rename to spring-cloud-modules/spring-cloud-ribbon-retry/README.md diff --git a/spring-cloud/spring-cloud-ribbon-retry/pom.xml b/spring-cloud-modules/spring-cloud-ribbon-retry/pom.xml similarity index 96% rename from spring-cloud/spring-cloud-ribbon-retry/pom.xml rename to spring-cloud-modules/spring-cloud-ribbon-retry/pom.xml index f167aaa56e..501dfec7dc 100644 --- a/spring-cloud/spring-cloud-ribbon-retry/pom.xml +++ b/spring-cloud-modules/spring-cloud-ribbon-retry/pom.xml @@ -11,7 +11,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-ribbon-retry/ribbon-client-service/pom.xml b/spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-client-service/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-ribbon-retry/ribbon-client-service/pom.xml rename to spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-client-service/pom.xml diff --git a/spring-cloud/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/RibbonClientApp.java b/spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/RibbonClientApp.java similarity index 100% rename from spring-cloud/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/RibbonClientApp.java rename to spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/RibbonClientApp.java diff --git a/spring-cloud/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/backoff/ExponentialBackoffRetryFactory.java b/spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/backoff/ExponentialBackoffRetryFactory.java similarity index 100% rename from spring-cloud/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/backoff/ExponentialBackoffRetryFactory.java rename to spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/backoff/ExponentialBackoffRetryFactory.java diff --git a/spring-cloud/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/backoff/ExponentialRandomBackoffRetryFactory.java b/spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/backoff/ExponentialRandomBackoffRetryFactory.java similarity index 100% rename from spring-cloud/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/backoff/ExponentialRandomBackoffRetryFactory.java rename to spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/backoff/ExponentialRandomBackoffRetryFactory.java diff --git a/spring-cloud/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/backoff/FixedBackoffRetryFactory.java b/spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/backoff/FixedBackoffRetryFactory.java similarity index 100% rename from spring-cloud/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/backoff/FixedBackoffRetryFactory.java rename to spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/backoff/FixedBackoffRetryFactory.java diff --git a/spring-cloud/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/config/RibbonConfiguration.java b/spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/config/RibbonConfiguration.java similarity index 100% rename from spring-cloud/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/config/RibbonConfiguration.java rename to spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/config/RibbonConfiguration.java diff --git a/spring-cloud/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/config/WeatherClientRibbonConfiguration.java b/spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/config/WeatherClientRibbonConfiguration.java similarity index 100% rename from spring-cloud/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/config/WeatherClientRibbonConfiguration.java rename to spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/config/WeatherClientRibbonConfiguration.java diff --git a/spring-cloud/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/controller/RibbonClientController.java b/spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/controller/RibbonClientController.java similarity index 100% rename from spring-cloud/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/controller/RibbonClientController.java rename to spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/controller/RibbonClientController.java diff --git a/spring-cloud/spring-cloud-ribbon-retry/ribbon-client-service/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-client-service/src/main/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-ribbon-retry/ribbon-client-service/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-client-service/src/main/resources/application.yml diff --git a/spring-cloud/spring-cloud-ribbon-retry/ribbon-client-service/src/test/java/com/baeldung/spring/cloud/ribbon/retry/RibbonRetryFailureManualTest.java b/spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-client-service/src/test/java/com/baeldung/spring/cloud/ribbon/retry/RibbonRetryFailureManualTest.java similarity index 100% rename from spring-cloud/spring-cloud-ribbon-retry/ribbon-client-service/src/test/java/com/baeldung/spring/cloud/ribbon/retry/RibbonRetryFailureManualTest.java rename to spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-client-service/src/test/java/com/baeldung/spring/cloud/ribbon/retry/RibbonRetryFailureManualTest.java diff --git a/spring-cloud/spring-cloud-ribbon-retry/ribbon-client-service/src/test/java/com/baeldung/spring/cloud/ribbon/retry/RibbonRetrySuccessManualTest.java b/spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-client-service/src/test/java/com/baeldung/spring/cloud/ribbon/retry/RibbonRetrySuccessManualTest.java similarity index 100% rename from spring-cloud/spring-cloud-ribbon-retry/ribbon-client-service/src/test/java/com/baeldung/spring/cloud/ribbon/retry/RibbonRetrySuccessManualTest.java rename to spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-client-service/src/test/java/com/baeldung/spring/cloud/ribbon/retry/RibbonRetrySuccessManualTest.java diff --git a/spring-cloud/spring-cloud-ribbon-retry/ribbon-weather-service/pom.xml b/spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-weather-service/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-ribbon-retry/ribbon-weather-service/pom.xml rename to spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-weather-service/pom.xml diff --git a/spring-cloud/spring-cloud-ribbon-retry/ribbon-weather-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/RibbonWeatherServiceApp.java b/spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-weather-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/RibbonWeatherServiceApp.java similarity index 100% rename from spring-cloud/spring-cloud-ribbon-retry/ribbon-weather-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/RibbonWeatherServiceApp.java rename to spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-weather-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/RibbonWeatherServiceApp.java diff --git a/spring-cloud/spring-cloud-ribbon-retry/ribbon-weather-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/WeatherController.java b/spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-weather-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/WeatherController.java similarity index 100% rename from spring-cloud/spring-cloud-ribbon-retry/ribbon-weather-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/WeatherController.java rename to spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-weather-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/WeatherController.java diff --git a/spring-cloud/spring-cloud-ribbon-retry/ribbon-weather-service/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-weather-service/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-ribbon-retry/ribbon-weather-service/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-weather-service/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-security/README.md b/spring-cloud-modules/spring-cloud-security/README.md similarity index 100% rename from spring-cloud/spring-cloud-security/README.md rename to spring-cloud-modules/spring-cloud-security/README.md diff --git a/spring-cloud/spring-cloud-security/alias.rtf b/spring-cloud-modules/spring-cloud-security/alias.rtf similarity index 100% rename from spring-cloud/spring-cloud-security/alias.rtf rename to spring-cloud-modules/spring-cloud-security/alias.rtf diff --git a/spring-cloud/spring-cloud-security/auth-client/pom.xml b/spring-cloud-modules/spring-cloud-security/auth-client/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-security/auth-client/pom.xml rename to spring-cloud-modules/spring-cloud-security/auth-client/pom.xml diff --git a/spring-cloud/spring-cloud-security/auth-client/src/main/java/com/baeldung/CloudSite.java b/spring-cloud-modules/spring-cloud-security/auth-client/src/main/java/com/baeldung/CloudSite.java similarity index 100% rename from spring-cloud/spring-cloud-security/auth-client/src/main/java/com/baeldung/CloudSite.java rename to spring-cloud-modules/spring-cloud-security/auth-client/src/main/java/com/baeldung/CloudSite.java diff --git a/spring-cloud/spring-cloud-security/auth-client/src/main/java/com/baeldung/config/SiteSecurityConfigurer.java b/spring-cloud-modules/spring-cloud-security/auth-client/src/main/java/com/baeldung/config/SiteSecurityConfigurer.java similarity index 100% rename from spring-cloud/spring-cloud-security/auth-client/src/main/java/com/baeldung/config/SiteSecurityConfigurer.java rename to spring-cloud-modules/spring-cloud-security/auth-client/src/main/java/com/baeldung/config/SiteSecurityConfigurer.java diff --git a/spring-cloud/spring-cloud-security/auth-client/src/main/java/com/baeldung/controller/CloudSiteController.java b/spring-cloud-modules/spring-cloud-security/auth-client/src/main/java/com/baeldung/controller/CloudSiteController.java similarity index 100% rename from spring-cloud/spring-cloud-security/auth-client/src/main/java/com/baeldung/controller/CloudSiteController.java rename to spring-cloud-modules/spring-cloud-security/auth-client/src/main/java/com/baeldung/controller/CloudSiteController.java diff --git a/spring-cloud/spring-cloud-security/auth-client/src/main/java/com/baeldung/filters/SimpleFilter.java b/spring-cloud-modules/spring-cloud-security/auth-client/src/main/java/com/baeldung/filters/SimpleFilter.java similarity index 100% rename from spring-cloud/spring-cloud-security/auth-client/src/main/java/com/baeldung/filters/SimpleFilter.java rename to spring-cloud-modules/spring-cloud-security/auth-client/src/main/java/com/baeldung/filters/SimpleFilter.java diff --git a/spring-cloud/spring-cloud-security/auth-client/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-security/auth-client/src/main/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-security/auth-client/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-security/auth-client/src/main/resources/application.yml diff --git a/spring-cloud/spring-cloud-security/auth-client/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-security/auth-client/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-security/auth-client/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-security/auth-client/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-security/auth-client/src/main/resources/templates/personinfo.html b/spring-cloud-modules/spring-cloud-security/auth-client/src/main/resources/templates/personinfo.html similarity index 100% rename from spring-cloud/spring-cloud-security/auth-client/src/main/resources/templates/personinfo.html rename to spring-cloud-modules/spring-cloud-security/auth-client/src/main/resources/templates/personinfo.html diff --git a/spring-cloud/spring-cloud-security/auth-client/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-security/auth-client/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-security/auth-client/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-security/auth-client/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-security/auth-client/src/test/java/com/baeldung/example/springoath2/Springoath2ApplicationIntegrationTest.java b/spring-cloud-modules/spring-cloud-security/auth-client/src/test/java/com/baeldung/example/springoath2/Springoath2ApplicationIntegrationTest.java similarity index 100% rename from spring-cloud/spring-cloud-security/auth-client/src/test/java/com/baeldung/example/springoath2/Springoath2ApplicationIntegrationTest.java rename to spring-cloud-modules/spring-cloud-security/auth-client/src/test/java/com/baeldung/example/springoath2/Springoath2ApplicationIntegrationTest.java diff --git a/spring-cloud/spring-cloud-security/auth-resource/pom.xml b/spring-cloud-modules/spring-cloud-security/auth-resource/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-security/auth-resource/pom.xml rename to spring-cloud-modules/spring-cloud-security/auth-resource/pom.xml diff --git a/spring-cloud/spring-cloud-security/auth-resource/src/main/java/com/baeldung/Application.java b/spring-cloud-modules/spring-cloud-security/auth-resource/src/main/java/com/baeldung/Application.java similarity index 100% rename from spring-cloud/spring-cloud-security/auth-resource/src/main/java/com/baeldung/Application.java rename to spring-cloud-modules/spring-cloud-security/auth-resource/src/main/java/com/baeldung/Application.java diff --git a/spring-cloud/spring-cloud-security/auth-resource/src/main/java/com/baeldung/config/ResourceConfigurer.java b/spring-cloud-modules/spring-cloud-security/auth-resource/src/main/java/com/baeldung/config/ResourceConfigurer.java similarity index 100% rename from spring-cloud/spring-cloud-security/auth-resource/src/main/java/com/baeldung/config/ResourceConfigurer.java rename to spring-cloud-modules/spring-cloud-security/auth-resource/src/main/java/com/baeldung/config/ResourceConfigurer.java diff --git a/spring-cloud/spring-cloud-security/auth-resource/src/main/java/com/baeldung/controller/PersonInfoController.java b/spring-cloud-modules/spring-cloud-security/auth-resource/src/main/java/com/baeldung/controller/PersonInfoController.java similarity index 100% rename from spring-cloud/spring-cloud-security/auth-resource/src/main/java/com/baeldung/controller/PersonInfoController.java rename to spring-cloud-modules/spring-cloud-security/auth-resource/src/main/java/com/baeldung/controller/PersonInfoController.java diff --git a/spring-cloud/spring-cloud-security/auth-resource/src/main/java/com/baeldung/controller/ResourceController.java b/spring-cloud-modules/spring-cloud-security/auth-resource/src/main/java/com/baeldung/controller/ResourceController.java similarity index 100% rename from spring-cloud/spring-cloud-security/auth-resource/src/main/java/com/baeldung/controller/ResourceController.java rename to spring-cloud-modules/spring-cloud-security/auth-resource/src/main/java/com/baeldung/controller/ResourceController.java diff --git a/spring-cloud/spring-cloud-security/auth-resource/src/main/java/com/baeldung/model/Person.java b/spring-cloud-modules/spring-cloud-security/auth-resource/src/main/java/com/baeldung/model/Person.java similarity index 100% rename from spring-cloud/spring-cloud-security/auth-resource/src/main/java/com/baeldung/model/Person.java rename to spring-cloud-modules/spring-cloud-security/auth-resource/src/main/java/com/baeldung/model/Person.java diff --git a/spring-cloud/spring-cloud-security/auth-resource/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-security/auth-resource/src/main/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-security/auth-resource/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-security/auth-resource/src/main/resources/application.yml diff --git a/spring-cloud/spring-cloud-security/auth-resource/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-security/auth-resource/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-security/auth-resource/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-security/auth-resource/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-security/auth-resource/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-security/auth-resource/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-security/auth-resource/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-security/auth-resource/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-security/auth-resource/src/test/java/com/baeldung/service/personservice/PersonserviceApplicationIntegrationTest.java b/spring-cloud-modules/spring-cloud-security/auth-resource/src/test/java/com/baeldung/service/personservice/PersonserviceApplicationIntegrationTest.java similarity index 100% rename from spring-cloud/spring-cloud-security/auth-resource/src/test/java/com/baeldung/service/personservice/PersonserviceApplicationIntegrationTest.java rename to spring-cloud-modules/spring-cloud-security/auth-resource/src/test/java/com/baeldung/service/personservice/PersonserviceApplicationIntegrationTest.java diff --git a/spring-cloud/spring-cloud-security/auth-server/pom.xml b/spring-cloud-modules/spring-cloud-security/auth-server/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-security/auth-server/pom.xml rename to spring-cloud-modules/spring-cloud-security/auth-server/pom.xml diff --git a/spring-cloud/spring-cloud-security/auth-server/src/main/java/com/baeldung/AuthServer.java b/spring-cloud-modules/spring-cloud-security/auth-server/src/main/java/com/baeldung/AuthServer.java similarity index 100% rename from spring-cloud/spring-cloud-security/auth-server/src/main/java/com/baeldung/AuthServer.java rename to spring-cloud-modules/spring-cloud-security/auth-server/src/main/java/com/baeldung/AuthServer.java diff --git a/spring-cloud/spring-cloud-security/auth-server/src/main/java/com/baeldung/config/AuthServerConfigurer.java b/spring-cloud-modules/spring-cloud-security/auth-server/src/main/java/com/baeldung/config/AuthServerConfigurer.java similarity index 100% rename from spring-cloud/spring-cloud-security/auth-server/src/main/java/com/baeldung/config/AuthServerConfigurer.java rename to spring-cloud-modules/spring-cloud-security/auth-server/src/main/java/com/baeldung/config/AuthServerConfigurer.java diff --git a/spring-cloud/spring-cloud-security/auth-server/src/main/java/com/baeldung/config/WebMvcConfig.java b/spring-cloud-modules/spring-cloud-security/auth-server/src/main/java/com/baeldung/config/WebMvcConfig.java similarity index 100% rename from spring-cloud/spring-cloud-security/auth-server/src/main/java/com/baeldung/config/WebMvcConfig.java rename to spring-cloud-modules/spring-cloud-security/auth-server/src/main/java/com/baeldung/config/WebMvcConfig.java diff --git a/spring-cloud/spring-cloud-security/auth-server/src/main/java/com/baeldung/config/WebSecurityConfigurer.java b/spring-cloud-modules/spring-cloud-security/auth-server/src/main/java/com/baeldung/config/WebSecurityConfigurer.java similarity index 100% rename from spring-cloud/spring-cloud-security/auth-server/src/main/java/com/baeldung/config/WebSecurityConfigurer.java rename to spring-cloud-modules/spring-cloud-security/auth-server/src/main/java/com/baeldung/config/WebSecurityConfigurer.java diff --git a/spring-cloud/spring-cloud-security/auth-server/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-security/auth-server/src/main/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-security/auth-server/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-security/auth-server/src/main/resources/application.yml diff --git a/spring-cloud/spring-cloud-security/auth-server/src/main/resources/certificate/mykeystore.jks b/spring-cloud-modules/spring-cloud-security/auth-server/src/main/resources/certificate/mykeystore.jks similarity index 100% rename from spring-cloud/spring-cloud-security/auth-server/src/main/resources/certificate/mykeystore.jks rename to spring-cloud-modules/spring-cloud-security/auth-server/src/main/resources/certificate/mykeystore.jks diff --git a/spring-cloud/spring-cloud-security/auth-server/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-security/auth-server/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-security/auth-server/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-security/auth-server/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-security/auth-server/src/main/resources/templates/login.html b/spring-cloud-modules/spring-cloud-security/auth-server/src/main/resources/templates/login.html similarity index 100% rename from spring-cloud/spring-cloud-security/auth-server/src/main/resources/templates/login.html rename to spring-cloud-modules/spring-cloud-security/auth-server/src/main/resources/templates/login.html diff --git a/spring-cloud/spring-cloud-security/auth-server/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-security/auth-server/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-security/auth-server/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-security/auth-server/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-security/mykeystore.jks b/spring-cloud-modules/spring-cloud-security/mykeystore.jks similarity index 100% rename from spring-cloud/spring-cloud-security/mykeystore.jks rename to spring-cloud-modules/spring-cloud-security/mykeystore.jks diff --git a/spring-cloud/spring-cloud-security/pom.xml b/spring-cloud-modules/spring-cloud-security/pom.xml similarity index 95% rename from spring-cloud/spring-cloud-security/pom.xml rename to spring-cloud-modules/spring-cloud-security/pom.xml index 001c9a5c7e..43eb6e61e8 100644 --- a/spring-cloud/spring-cloud-security/pom.xml +++ b/spring-cloud-modules/spring-cloud-security/pom.xml @@ -10,7 +10,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-security/pubkey.txt b/spring-cloud-modules/spring-cloud-security/pubkey.txt similarity index 100% rename from spring-cloud/spring-cloud-security/pubkey.txt rename to spring-cloud-modules/spring-cloud-security/pubkey.txt diff --git a/spring-cloud/spring-cloud-sentinel/README.md b/spring-cloud-modules/spring-cloud-sentinel/README.md similarity index 100% rename from spring-cloud/spring-cloud-sentinel/README.md rename to spring-cloud-modules/spring-cloud-sentinel/README.md diff --git a/spring-cloud/spring-cloud-sentinel/pom.xml b/spring-cloud-modules/spring-cloud-sentinel/pom.xml similarity index 95% rename from spring-cloud/spring-cloud-sentinel/pom.xml rename to spring-cloud-modules/spring-cloud-sentinel/pom.xml index f26a13f6f8..bd2630c78d 100644 --- a/spring-cloud/spring-cloud-sentinel/pom.xml +++ b/spring-cloud-modules/spring-cloud-sentinel/pom.xml @@ -10,7 +10,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-sentinel/src/main/java/com/baeldung/spring/cloud/sentinel/SentinelApplication.java b/spring-cloud-modules/spring-cloud-sentinel/src/main/java/com/baeldung/spring/cloud/sentinel/SentinelApplication.java similarity index 100% rename from spring-cloud/spring-cloud-sentinel/src/main/java/com/baeldung/spring/cloud/sentinel/SentinelApplication.java rename to spring-cloud-modules/spring-cloud-sentinel/src/main/java/com/baeldung/spring/cloud/sentinel/SentinelApplication.java diff --git a/spring-cloud/spring-cloud-sentinel/src/main/java/com/baeldung/spring/cloud/sentinel/config/SentinelAspectConfiguration.java b/spring-cloud-modules/spring-cloud-sentinel/src/main/java/com/baeldung/spring/cloud/sentinel/config/SentinelAspectConfiguration.java similarity index 100% rename from spring-cloud/spring-cloud-sentinel/src/main/java/com/baeldung/spring/cloud/sentinel/config/SentinelAspectConfiguration.java rename to spring-cloud-modules/spring-cloud-sentinel/src/main/java/com/baeldung/spring/cloud/sentinel/config/SentinelAspectConfiguration.java diff --git a/spring-cloud/spring-cloud-sentinel/src/main/java/com/baeldung/spring/cloud/sentinel/controller/GreetingController.java b/spring-cloud-modules/spring-cloud-sentinel/src/main/java/com/baeldung/spring/cloud/sentinel/controller/GreetingController.java similarity index 100% rename from spring-cloud/spring-cloud-sentinel/src/main/java/com/baeldung/spring/cloud/sentinel/controller/GreetingController.java rename to spring-cloud-modules/spring-cloud-sentinel/src/main/java/com/baeldung/spring/cloud/sentinel/controller/GreetingController.java diff --git a/spring-cloud/spring-cloud-sentinel/src/main/java/com/baeldung/spring/cloud/sentinel/service/GreetingService.java b/spring-cloud-modules/spring-cloud-sentinel/src/main/java/com/baeldung/spring/cloud/sentinel/service/GreetingService.java similarity index 100% rename from spring-cloud/spring-cloud-sentinel/src/main/java/com/baeldung/spring/cloud/sentinel/service/GreetingService.java rename to spring-cloud-modules/spring-cloud-sentinel/src/main/java/com/baeldung/spring/cloud/sentinel/service/GreetingService.java diff --git a/spring-cloud/spring-cloud-stream-starters/README.md b/spring-cloud-modules/spring-cloud-stream-starters/README.md similarity index 100% rename from spring-cloud/spring-cloud-stream-starters/README.md rename to spring-cloud-modules/spring-cloud-stream-starters/README.md diff --git a/spring-cloud/spring-cloud-stream-starters/bash/hadoop.sh b/spring-cloud-modules/spring-cloud-stream-starters/bash/hadoop.sh similarity index 100% rename from spring-cloud/spring-cloud-stream-starters/bash/hadoop.sh rename to spring-cloud-modules/spring-cloud-stream-starters/bash/hadoop.sh diff --git a/spring-cloud/spring-cloud-stream-starters/hdfs/application.properties b/spring-cloud-modules/spring-cloud-stream-starters/hdfs/application.properties similarity index 100% rename from spring-cloud/spring-cloud-stream-starters/hdfs/application.properties rename to spring-cloud-modules/spring-cloud-stream-starters/hdfs/application.properties diff --git a/spring-cloud/spring-cloud-stream-starters/hdfs/hdfs.sh b/spring-cloud-modules/spring-cloud-stream-starters/hdfs/hdfs.sh similarity index 100% rename from spring-cloud/spring-cloud-stream-starters/hdfs/hdfs.sh rename to spring-cloud-modules/spring-cloud-stream-starters/hdfs/hdfs.sh diff --git a/spring-cloud/spring-cloud-stream-starters/twitter/application.properties b/spring-cloud-modules/spring-cloud-stream-starters/twitter/application.properties similarity index 100% rename from spring-cloud/spring-cloud-stream-starters/twitter/application.properties rename to spring-cloud-modules/spring-cloud-stream-starters/twitter/application.properties diff --git a/spring-cloud/spring-cloud-stream-starters/twitter/twitter.sh b/spring-cloud-modules/spring-cloud-stream-starters/twitter/twitter.sh similarity index 100% rename from spring-cloud/spring-cloud-stream-starters/twitter/twitter.sh rename to spring-cloud-modules/spring-cloud-stream-starters/twitter/twitter.sh diff --git a/spring-cloud/spring-cloud-stream-starters/twitterhdfs/.gitignore b/spring-cloud-modules/spring-cloud-stream-starters/twitterhdfs/.gitignore similarity index 100% rename from spring-cloud/spring-cloud-stream-starters/twitterhdfs/.gitignore rename to spring-cloud-modules/spring-cloud-stream-starters/twitterhdfs/.gitignore diff --git a/spring-cloud/spring-cloud-stream-starters/twitterhdfs/pom.xml b/spring-cloud-modules/spring-cloud-stream-starters/twitterhdfs/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-stream-starters/twitterhdfs/pom.xml rename to spring-cloud-modules/spring-cloud-stream-starters/twitterhdfs/pom.xml diff --git a/spring-cloud/spring-cloud-stream-starters/twitterhdfs/src/main/java/com/baeldung/twitterhdfs/aggregate/AggregateApp.java b/spring-cloud-modules/spring-cloud-stream-starters/twitterhdfs/src/main/java/com/baeldung/twitterhdfs/aggregate/AggregateApp.java similarity index 100% rename from spring-cloud/spring-cloud-stream-starters/twitterhdfs/src/main/java/com/baeldung/twitterhdfs/aggregate/AggregateApp.java rename to spring-cloud-modules/spring-cloud-stream-starters/twitterhdfs/src/main/java/com/baeldung/twitterhdfs/aggregate/AggregateApp.java diff --git a/spring-cloud/spring-cloud-stream-starters/twitterhdfs/src/main/java/com/baeldung/twitterhdfs/processor/ProcessorApp.java b/spring-cloud-modules/spring-cloud-stream-starters/twitterhdfs/src/main/java/com/baeldung/twitterhdfs/processor/ProcessorApp.java similarity index 100% rename from spring-cloud/spring-cloud-stream-starters/twitterhdfs/src/main/java/com/baeldung/twitterhdfs/processor/ProcessorApp.java rename to spring-cloud-modules/spring-cloud-stream-starters/twitterhdfs/src/main/java/com/baeldung/twitterhdfs/processor/ProcessorApp.java diff --git a/spring-cloud/spring-cloud-stream-starters/twitterhdfs/src/main/java/com/baeldung/twitterhdfs/sink/SinkApp.java b/spring-cloud-modules/spring-cloud-stream-starters/twitterhdfs/src/main/java/com/baeldung/twitterhdfs/sink/SinkApp.java similarity index 100% rename from spring-cloud/spring-cloud-stream-starters/twitterhdfs/src/main/java/com/baeldung/twitterhdfs/sink/SinkApp.java rename to spring-cloud-modules/spring-cloud-stream-starters/twitterhdfs/src/main/java/com/baeldung/twitterhdfs/sink/SinkApp.java diff --git a/spring-cloud/spring-cloud-stream-starters/twitterhdfs/src/main/java/com/baeldung/twitterhdfs/source/SourceApp.java b/spring-cloud-modules/spring-cloud-stream-starters/twitterhdfs/src/main/java/com/baeldung/twitterhdfs/source/SourceApp.java similarity index 100% rename from spring-cloud/spring-cloud-stream-starters/twitterhdfs/src/main/java/com/baeldung/twitterhdfs/source/SourceApp.java rename to spring-cloud-modules/spring-cloud-stream-starters/twitterhdfs/src/main/java/com/baeldung/twitterhdfs/source/SourceApp.java diff --git a/spring-cloud/spring-cloud-stream-starters/twitterhdfs/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-stream-starters/twitterhdfs/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-stream-starters/twitterhdfs/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-stream-starters/twitterhdfs/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-stream-starters/twitterhdfs/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-stream-starters/twitterhdfs/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-stream-starters/twitterhdfs/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-stream-starters/twitterhdfs/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-stream-starters/twitterhdfs/src/test/java/com/baeldung/twitterhdfs/aggregate/SpringContextTest.java b/spring-cloud-modules/spring-cloud-stream-starters/twitterhdfs/src/test/java/com/baeldung/twitterhdfs/aggregate/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-stream-starters/twitterhdfs/src/test/java/com/baeldung/twitterhdfs/aggregate/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-stream-starters/twitterhdfs/src/test/java/com/baeldung/twitterhdfs/aggregate/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-stream/README.md b/spring-cloud-modules/spring-cloud-stream/README.md similarity index 100% rename from spring-cloud/spring-cloud-stream/README.md rename to spring-cloud-modules/spring-cloud-stream/README.md diff --git a/spring-cloud/spring-cloud-stream/pom.xml b/spring-cloud-modules/spring-cloud-stream/pom.xml similarity index 96% rename from spring-cloud/spring-cloud-stream/pom.xml rename to spring-cloud-modules/spring-cloud-stream/pom.xml index 96a7ad012b..1eed9ae8a9 100644 --- a/spring-cloud/spring-cloud-stream/pom.xml +++ b/spring-cloud-modules/spring-cloud-stream/pom.xml @@ -10,7 +10,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/README.md b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kafka/README.md similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/README.md rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kafka/README.md diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/pom.xml b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kafka/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/pom.xml rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kafka/pom.xml diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/AvroKafkaApplication.java b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/AvroKafkaApplication.java similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/AvroKafkaApplication.java rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/AvroKafkaApplication.java diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/config/SchemRegistryConfig.java b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/config/SchemRegistryConfig.java similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/config/SchemRegistryConfig.java rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/config/SchemRegistryConfig.java diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/consumer/AvroConsumer.java b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/consumer/AvroConsumer.java similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/consumer/AvroConsumer.java rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/consumer/AvroConsumer.java diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/controller/AvroController.java b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/controller/AvroController.java similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/controller/AvroController.java rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/controller/AvroController.java diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/producer/AvroProducer.java b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/producer/AvroProducer.java similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/producer/AvroProducer.java rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/producer/AvroProducer.java diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/resources/application.yaml b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kafka/src/main/resources/application.yaml similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/resources/application.yaml rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kafka/src/main/resources/application.yaml diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/resources/employee-key-schema.avsc b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kafka/src/main/resources/employee-key-schema.avsc similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/resources/employee-key-schema.avsc rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kafka/src/main/resources/employee-key-schema.avsc diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/resources/employee-schema.avsc b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kafka/src/main/resources/employee-schema.avsc similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/resources/employee-schema.avsc rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kafka/src/main/resources/employee-schema.avsc diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-kinesis/pom.xml b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kinesis/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-kinesis/pom.xml rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kinesis/pom.xml diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-kinesis/src/main/java/com/baeldung/KinesisApplication.java b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kinesis/src/main/java/com/baeldung/KinesisApplication.java similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-kinesis/src/main/java/com/baeldung/KinesisApplication.java rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kinesis/src/main/java/com/baeldung/KinesisApplication.java diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-kinesis/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kinesis/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-kinesis/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kinesis/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-kinesis/src/test/java/com/baeldung/KinesisApplicationIntegrationTest.java b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kinesis/src/test/java/com/baeldung/KinesisApplicationIntegrationTest.java similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-kinesis/src/test/java/com/baeldung/KinesisApplicationIntegrationTest.java rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kinesis/src/test/java/com/baeldung/KinesisApplicationIntegrationTest.java diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-kinesis/src/test/resources/application.properties b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kinesis/src/test/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-kinesis/src/test/resources/application.properties rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kinesis/src/test/resources/application.properties diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/pom.xml b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-rabbit/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/pom.xml rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-rabbit/pom.xml diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsServiceApplication.java b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsServiceApplication.java similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsServiceApplication.java rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsServiceApplication.java diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsWithConditionsServiceApplication.java b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsWithConditionsServiceApplication.java similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsWithConditionsServiceApplication.java rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsWithConditionsServiceApplication.java diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/MyLoggerServiceApplication.java b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/MyLoggerServiceApplication.java similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/MyLoggerServiceApplication.java rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/MyLoggerServiceApplication.java diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/messages/TextPlainMessageConverter.java b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/messages/TextPlainMessageConverter.java similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/messages/TextPlainMessageConverter.java rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/messages/TextPlainMessageConverter.java diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/model/LogMessage.java b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/model/LogMessage.java similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/model/LogMessage.java rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/model/LogMessage.java diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/processor/MyProcessor.java b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/processor/MyProcessor.java similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/processor/MyProcessor.java rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/processor/MyProcessor.java diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/resources/application.yml diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsServiceApplicationIntegrationTest.java b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsServiceApplicationIntegrationTest.java similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsServiceApplicationIntegrationTest.java rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsServiceApplicationIntegrationTest.java diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsWithConditionsServiceIntegrationTest.java b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsWithConditionsServiceIntegrationTest.java similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsWithConditionsServiceIntegrationTest.java rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsWithConditionsServiceIntegrationTest.java diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MyLoggerApplicationIntegrationTest.java b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MyLoggerApplicationIntegrationTest.java similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MyLoggerApplicationIntegrationTest.java rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MyLoggerApplicationIntegrationTest.java diff --git a/spring-cloud/spring-cloud-task/README.md b/spring-cloud-modules/spring-cloud-task/README.md similarity index 100% rename from spring-cloud/spring-cloud-task/README.md rename to spring-cloud-modules/spring-cloud-task/README.md diff --git a/spring-cloud/spring-cloud-task/pom.xml b/spring-cloud-modules/spring-cloud-task/pom.xml similarity index 96% rename from spring-cloud/spring-cloud-task/pom.xml rename to spring-cloud-modules/spring-cloud-task/pom.xml index e1567b300f..bbe5d6d49d 100644 --- a/spring-cloud/spring-cloud-task/pom.xml +++ b/spring-cloud-modules/spring-cloud-task/pom.xml @@ -11,7 +11,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-task/springcloudtaskbatch/.gitignore b/spring-cloud-modules/spring-cloud-task/springcloudtaskbatch/.gitignore similarity index 100% rename from spring-cloud/spring-cloud-task/springcloudtaskbatch/.gitignore rename to spring-cloud-modules/spring-cloud-task/springcloudtaskbatch/.gitignore diff --git a/spring-cloud/spring-cloud-task/springcloudtaskbatch/pom.xml b/spring-cloud-modules/spring-cloud-task/springcloudtaskbatch/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-task/springcloudtaskbatch/pom.xml rename to spring-cloud-modules/spring-cloud-task/springcloudtaskbatch/pom.xml diff --git a/spring-cloud/spring-cloud-task/springcloudtaskbatch/src/main/java/com/baeldung/task/HelloWorldTaskConfigurer.java b/spring-cloud-modules/spring-cloud-task/springcloudtaskbatch/src/main/java/com/baeldung/task/HelloWorldTaskConfigurer.java similarity index 100% rename from spring-cloud/spring-cloud-task/springcloudtaskbatch/src/main/java/com/baeldung/task/HelloWorldTaskConfigurer.java rename to spring-cloud-modules/spring-cloud-task/springcloudtaskbatch/src/main/java/com/baeldung/task/HelloWorldTaskConfigurer.java diff --git a/spring-cloud/spring-cloud-task/springcloudtaskbatch/src/main/java/com/baeldung/task/JobConfiguration.java b/spring-cloud-modules/spring-cloud-task/springcloudtaskbatch/src/main/java/com/baeldung/task/JobConfiguration.java similarity index 100% rename from spring-cloud/spring-cloud-task/springcloudtaskbatch/src/main/java/com/baeldung/task/JobConfiguration.java rename to spring-cloud-modules/spring-cloud-task/springcloudtaskbatch/src/main/java/com/baeldung/task/JobConfiguration.java diff --git a/spring-cloud/spring-cloud-task/springcloudtaskbatch/src/main/java/com/baeldung/task/TaskDemo.java b/spring-cloud-modules/spring-cloud-task/springcloudtaskbatch/src/main/java/com/baeldung/task/TaskDemo.java similarity index 100% rename from spring-cloud/spring-cloud-task/springcloudtaskbatch/src/main/java/com/baeldung/task/TaskDemo.java rename to spring-cloud-modules/spring-cloud-task/springcloudtaskbatch/src/main/java/com/baeldung/task/TaskDemo.java diff --git a/spring-cloud/spring-cloud-task/springcloudtaskbatch/src/main/java/com/baeldung/task/TaskListener.java b/spring-cloud-modules/spring-cloud-task/springcloudtaskbatch/src/main/java/com/baeldung/task/TaskListener.java similarity index 100% rename from spring-cloud/spring-cloud-task/springcloudtaskbatch/src/main/java/com/baeldung/task/TaskListener.java rename to spring-cloud-modules/spring-cloud-task/springcloudtaskbatch/src/main/java/com/baeldung/task/TaskListener.java diff --git a/spring-cloud/spring-cloud-task/springcloudtaskbatch/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-task/springcloudtaskbatch/src/main/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-task/springcloudtaskbatch/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-task/springcloudtaskbatch/src/main/resources/application.yml diff --git a/spring-cloud/spring-cloud-task/springcloudtaskbatch/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-task/springcloudtaskbatch/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-task/springcloudtaskbatch/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-task/springcloudtaskbatch/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-task/springcloudtaskbatch/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-task/springcloudtaskbatch/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-task/springcloudtaskbatch/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-task/springcloudtaskbatch/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-task/springcloudtaskbatch/src/test/resources/application.yml b/spring-cloud-modules/spring-cloud-task/springcloudtaskbatch/src/test/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-task/springcloudtaskbatch/src/test/resources/application.yml rename to spring-cloud-modules/spring-cloud-task/springcloudtaskbatch/src/test/resources/application.yml diff --git a/spring-cloud/spring-cloud-task/springcloudtasksink/.gitignore b/spring-cloud-modules/spring-cloud-task/springcloudtasksink/.gitignore similarity index 100% rename from spring-cloud/spring-cloud-task/springcloudtasksink/.gitignore rename to spring-cloud-modules/spring-cloud-task/springcloudtasksink/.gitignore diff --git a/spring-cloud/spring-cloud-task/springcloudtasksink/pom.xml b/spring-cloud-modules/spring-cloud-task/springcloudtasksink/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-task/springcloudtasksink/pom.xml rename to spring-cloud-modules/spring-cloud-task/springcloudtasksink/pom.xml diff --git a/spring-cloud/spring-cloud-task/springcloudtasksink/src/main/java/com/baeldung/SpringCloudTaskFinal/SpringCloudTaskSinkApplication.java b/spring-cloud-modules/spring-cloud-task/springcloudtasksink/src/main/java/com/baeldung/SpringCloudTaskFinal/SpringCloudTaskSinkApplication.java similarity index 100% rename from spring-cloud/spring-cloud-task/springcloudtasksink/src/main/java/com/baeldung/SpringCloudTaskFinal/SpringCloudTaskSinkApplication.java rename to spring-cloud-modules/spring-cloud-task/springcloudtasksink/src/main/java/com/baeldung/SpringCloudTaskFinal/SpringCloudTaskSinkApplication.java diff --git a/spring-cloud/spring-cloud-task/springcloudtasksink/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-task/springcloudtasksink/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-task/springcloudtasksink/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-task/springcloudtasksink/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-task/springcloudtasksink/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-task/springcloudtasksink/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-task/springcloudtasksink/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-task/springcloudtasksink/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-task/springcloudtasksink/src/test/java/com/baeldung/SpringCloudTaskFinal/SpringCloudTaskSinkApplicationIntegrationTest.java b/spring-cloud-modules/spring-cloud-task/springcloudtasksink/src/test/java/com/baeldung/SpringCloudTaskFinal/SpringCloudTaskSinkApplicationIntegrationTest.java similarity index 100% rename from spring-cloud/spring-cloud-task/springcloudtasksink/src/test/java/com/baeldung/SpringCloudTaskFinal/SpringCloudTaskSinkApplicationIntegrationTest.java rename to spring-cloud-modules/spring-cloud-task/springcloudtasksink/src/test/java/com/baeldung/SpringCloudTaskFinal/SpringCloudTaskSinkApplicationIntegrationTest.java diff --git a/spring-cloud/spring-cloud-task/springcloudtasksink/src/test/java/com/baeldung/SpringCloudTaskFinal/TaskSinkConfiguration.java b/spring-cloud-modules/spring-cloud-task/springcloudtasksink/src/test/java/com/baeldung/SpringCloudTaskFinal/TaskSinkConfiguration.java similarity index 100% rename from spring-cloud/spring-cloud-task/springcloudtasksink/src/test/java/com/baeldung/SpringCloudTaskFinal/TaskSinkConfiguration.java rename to spring-cloud-modules/spring-cloud-task/springcloudtasksink/src/test/java/com/baeldung/SpringCloudTaskFinal/TaskSinkConfiguration.java diff --git a/spring-cloud/spring-cloud-task/springcloudtasksink/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-task/springcloudtasksink/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-task/springcloudtasksink/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-task/springcloudtasksink/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-vault/.gitignore b/spring-cloud-modules/spring-cloud-vault/.gitignore similarity index 100% rename from spring-cloud/spring-cloud-vault/.gitignore rename to spring-cloud-modules/spring-cloud-vault/.gitignore diff --git a/spring-cloud/spring-cloud-vault/README.md b/spring-cloud-modules/spring-cloud-vault/README.md similarity index 100% rename from spring-cloud/spring-cloud-vault/README.md rename to spring-cloud-modules/spring-cloud-vault/README.md diff --git a/spring-cloud/spring-cloud-vault/database-setup.sql b/spring-cloud-modules/spring-cloud-vault/database-setup.sql similarity index 100% rename from spring-cloud/spring-cloud-vault/database-setup.sql rename to spring-cloud-modules/spring-cloud-vault/database-setup.sql diff --git a/spring-cloud/spring-cloud-vault/pom.xml b/spring-cloud-modules/spring-cloud-vault/pom.xml similarity index 97% rename from spring-cloud/spring-cloud-vault/pom.xml rename to spring-cloud-modules/spring-cloud-vault/pom.xml index f24861ed6e..e4cf020986 100644 --- a/spring-cloud/spring-cloud-vault/pom.xml +++ b/spring-cloud-modules/spring-cloud-vault/pom.xml @@ -11,7 +11,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-vault/sample-policy.hcl b/spring-cloud-modules/spring-cloud-vault/sample-policy.hcl similarity index 100% rename from spring-cloud/spring-cloud-vault/sample-policy.hcl rename to spring-cloud-modules/spring-cloud-vault/sample-policy.hcl diff --git a/spring-cloud/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/AccountRepo.java b/spring-cloud-modules/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/AccountRepo.java similarity index 100% rename from spring-cloud/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/AccountRepo.java rename to spring-cloud-modules/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/AccountRepo.java diff --git a/spring-cloud/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/AccountResource.java b/spring-cloud-modules/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/AccountResource.java similarity index 100% rename from spring-cloud/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/AccountResource.java rename to spring-cloud-modules/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/AccountResource.java diff --git a/spring-cloud/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/SecretResource.java b/spring-cloud-modules/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/SecretResource.java similarity index 100% rename from spring-cloud/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/SecretResource.java rename to spring-cloud-modules/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/SecretResource.java diff --git a/spring-cloud/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/VaultSampleApplication.java b/spring-cloud-modules/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/VaultSampleApplication.java similarity index 100% rename from spring-cloud/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/VaultSampleApplication.java rename to spring-cloud-modules/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/VaultSampleApplication.java diff --git a/spring-cloud/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/domain/Account.java b/spring-cloud-modules/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/domain/Account.java similarity index 100% rename from spring-cloud/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/domain/Account.java rename to spring-cloud-modules/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/domain/Account.java diff --git a/spring-cloud/spring-cloud-vault/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-vault/src/main/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-vault/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-vault/src/main/resources/application.yml diff --git a/spring-cloud/spring-cloud-vault/src/main/resources/vault.jks b/spring-cloud-modules/spring-cloud-vault/src/main/resources/vault.jks similarity index 100% rename from spring-cloud/spring-cloud-vault/src/main/resources/vault.jks rename to spring-cloud-modules/spring-cloud-vault/src/main/resources/vault.jks diff --git a/spring-cloud/spring-cloud-vault/src/test/java/com/baeldung/spring/cloud/vaultsample/SpringContextLiveTest.java b/spring-cloud-modules/spring-cloud-vault/src/test/java/com/baeldung/spring/cloud/vaultsample/SpringContextLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-vault/src/test/java/com/baeldung/spring/cloud/vaultsample/SpringContextLiveTest.java rename to spring-cloud-modules/spring-cloud-vault/src/test/java/com/baeldung/spring/cloud/vaultsample/SpringContextLiveTest.java diff --git a/spring-cloud/spring-cloud-vault/src/test/java/com/baeldung/spring/cloud/vaultsample/VaultSampleApplicationLiveTest.java b/spring-cloud-modules/spring-cloud-vault/src/test/java/com/baeldung/spring/cloud/vaultsample/VaultSampleApplicationLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-vault/src/test/java/com/baeldung/spring/cloud/vaultsample/VaultSampleApplicationLiveTest.java rename to spring-cloud-modules/spring-cloud-vault/src/test/java/com/baeldung/spring/cloud/vaultsample/VaultSampleApplicationLiveTest.java diff --git a/spring-cloud/spring-cloud-vault/src/test/resources/bootstrap.properties b/spring-cloud-modules/spring-cloud-vault/src/test/resources/bootstrap.properties similarity index 100% rename from spring-cloud/spring-cloud-vault/src/test/resources/bootstrap.properties rename to spring-cloud-modules/spring-cloud-vault/src/test/resources/bootstrap.properties diff --git a/spring-cloud/spring-cloud-vault/src/test/resources/vault.jks b/spring-cloud-modules/spring-cloud-vault/src/test/resources/vault.jks similarity index 100% rename from spring-cloud/spring-cloud-vault/src/test/resources/vault.jks rename to spring-cloud-modules/spring-cloud-vault/src/test/resources/vault.jks diff --git a/spring-cloud/spring-cloud-vault/src/test/vault-config/localhost.cert b/spring-cloud-modules/spring-cloud-vault/src/test/vault-config/localhost.cert similarity index 100% rename from spring-cloud/spring-cloud-vault/src/test/vault-config/localhost.cert rename to spring-cloud-modules/spring-cloud-vault/src/test/vault-config/localhost.cert diff --git a/spring-cloud/spring-cloud-vault/src/test/vault-config/localhost.key b/spring-cloud-modules/spring-cloud-vault/src/test/vault-config/localhost.key similarity index 100% rename from spring-cloud/spring-cloud-vault/src/test/vault-config/localhost.key rename to spring-cloud-modules/spring-cloud-vault/src/test/vault-config/localhost.key diff --git a/spring-cloud/spring-cloud-vault/src/test/vault-config/vault-test.hcl b/spring-cloud-modules/spring-cloud-vault/src/test/vault-config/vault-test.hcl similarity index 100% rename from spring-cloud/spring-cloud-vault/src/test/vault-config/vault-test.hcl rename to spring-cloud-modules/spring-cloud-vault/src/test/vault-config/vault-test.hcl diff --git a/spring-cloud/spring-cloud-vault/vault-cheatsheet.txt b/spring-cloud-modules/spring-cloud-vault/vault-cheatsheet.txt similarity index 100% rename from spring-cloud/spring-cloud-vault/vault-cheatsheet.txt rename to spring-cloud-modules/spring-cloud-vault/vault-cheatsheet.txt diff --git a/spring-cloud/spring-cloud-vault/vault-env.bat b/spring-cloud-modules/spring-cloud-vault/vault-env.bat similarity index 100% rename from spring-cloud/spring-cloud-vault/vault-env.bat rename to spring-cloud-modules/spring-cloud-vault/vault-env.bat diff --git a/spring-cloud/spring-cloud-vault/vault-env.sh b/spring-cloud-modules/spring-cloud-vault/vault-env.sh similarity index 100% rename from spring-cloud/spring-cloud-vault/vault-env.sh rename to spring-cloud-modules/spring-cloud-vault/vault-env.sh diff --git a/spring-cloud/spring-cloud-vault/vault-start.bat b/spring-cloud-modules/spring-cloud-vault/vault-start.bat similarity index 100% rename from spring-cloud/spring-cloud-vault/vault-start.bat rename to spring-cloud-modules/spring-cloud-vault/vault-start.bat diff --git a/spring-cloud/spring-cloud-vault/vault-start.sh b/spring-cloud-modules/spring-cloud-vault/vault-start.sh similarity index 100% rename from spring-cloud/spring-cloud-vault/vault-start.sh rename to spring-cloud-modules/spring-cloud-vault/vault-start.sh diff --git a/spring-cloud/spring-cloud-vault/vault-unseal.bat b/spring-cloud-modules/spring-cloud-vault/vault-unseal.bat similarity index 100% rename from spring-cloud/spring-cloud-vault/vault-unseal.bat rename to spring-cloud-modules/spring-cloud-vault/vault-unseal.bat diff --git a/spring-cloud/spring-cloud-vault/vault-unseal.sh b/spring-cloud-modules/spring-cloud-vault/vault-unseal.sh similarity index 100% rename from spring-cloud/spring-cloud-vault/vault-unseal.sh rename to spring-cloud-modules/spring-cloud-vault/vault-unseal.sh diff --git a/spring-cloud/spring-cloud-zookeeper/Greeting/pom.xml b/spring-cloud-modules/spring-cloud-zookeeper/Greeting/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-zookeeper/Greeting/pom.xml rename to spring-cloud-modules/spring-cloud-zookeeper/Greeting/pom.xml diff --git a/spring-cloud/spring-cloud-zookeeper/Greeting/src/main/java/com/baeldung/spring/cloud/greeting/GreetingApplication.java b/spring-cloud-modules/spring-cloud-zookeeper/Greeting/src/main/java/com/baeldung/spring/cloud/greeting/GreetingApplication.java similarity index 100% rename from spring-cloud/spring-cloud-zookeeper/Greeting/src/main/java/com/baeldung/spring/cloud/greeting/GreetingApplication.java rename to spring-cloud-modules/spring-cloud-zookeeper/Greeting/src/main/java/com/baeldung/spring/cloud/greeting/GreetingApplication.java diff --git a/spring-cloud/spring-cloud-zookeeper/Greeting/src/main/java/com/baeldung/spring/cloud/greeting/GreetingController.java b/spring-cloud-modules/spring-cloud-zookeeper/Greeting/src/main/java/com/baeldung/spring/cloud/greeting/GreetingController.java similarity index 100% rename from spring-cloud/spring-cloud-zookeeper/Greeting/src/main/java/com/baeldung/spring/cloud/greeting/GreetingController.java rename to spring-cloud-modules/spring-cloud-zookeeper/Greeting/src/main/java/com/baeldung/spring/cloud/greeting/GreetingController.java diff --git a/spring-cloud/spring-cloud-zookeeper/Greeting/src/main/java/com/baeldung/spring/cloud/greeting/HelloWorldClient.java b/spring-cloud-modules/spring-cloud-zookeeper/Greeting/src/main/java/com/baeldung/spring/cloud/greeting/HelloWorldClient.java similarity index 100% rename from spring-cloud/spring-cloud-zookeeper/Greeting/src/main/java/com/baeldung/spring/cloud/greeting/HelloWorldClient.java rename to spring-cloud-modules/spring-cloud-zookeeper/Greeting/src/main/java/com/baeldung/spring/cloud/greeting/HelloWorldClient.java diff --git a/spring-cloud/spring-cloud-zookeeper/Greeting/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-zookeeper/Greeting/src/main/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-zookeeper/Greeting/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-zookeeper/Greeting/src/main/resources/application.yml diff --git a/spring-cloud/spring-cloud-zookeeper/Greeting/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-zookeeper/Greeting/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-zookeeper/Greeting/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-zookeeper/Greeting/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-zookeeper/Greeting/src/main/resources/templates/greeting-view.html b/spring-cloud-modules/spring-cloud-zookeeper/Greeting/src/main/resources/templates/greeting-view.html similarity index 100% rename from spring-cloud/spring-cloud-zookeeper/Greeting/src/main/resources/templates/greeting-view.html rename to spring-cloud-modules/spring-cloud-zookeeper/Greeting/src/main/resources/templates/greeting-view.html diff --git a/spring-cloud/spring-cloud-zookeeper/Greeting/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-zookeeper/Greeting/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-zookeeper/Greeting/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-zookeeper/Greeting/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-zookeeper/HelloWorld/pom.xml b/spring-cloud-modules/spring-cloud-zookeeper/HelloWorld/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-zookeeper/HelloWorld/pom.xml rename to spring-cloud-modules/spring-cloud-zookeeper/HelloWorld/pom.xml diff --git a/spring-cloud/spring-cloud-zookeeper/HelloWorld/src/main/java/com/baeldung/spring/cloud/helloworld/HelloWorldApplication.java b/spring-cloud-modules/spring-cloud-zookeeper/HelloWorld/src/main/java/com/baeldung/spring/cloud/helloworld/HelloWorldApplication.java similarity index 100% rename from spring-cloud/spring-cloud-zookeeper/HelloWorld/src/main/java/com/baeldung/spring/cloud/helloworld/HelloWorldApplication.java rename to spring-cloud-modules/spring-cloud-zookeeper/HelloWorld/src/main/java/com/baeldung/spring/cloud/helloworld/HelloWorldApplication.java diff --git a/spring-cloud/spring-cloud-zookeeper/HelloWorld/src/main/java/com/baeldung/spring/cloud/helloworld/HelloWorldController.java b/spring-cloud-modules/spring-cloud-zookeeper/HelloWorld/src/main/java/com/baeldung/spring/cloud/helloworld/HelloWorldController.java similarity index 100% rename from spring-cloud/spring-cloud-zookeeper/HelloWorld/src/main/java/com/baeldung/spring/cloud/helloworld/HelloWorldController.java rename to spring-cloud-modules/spring-cloud-zookeeper/HelloWorld/src/main/java/com/baeldung/spring/cloud/helloworld/HelloWorldController.java diff --git a/spring-cloud/spring-cloud-zookeeper/HelloWorld/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-zookeeper/HelloWorld/src/main/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-zookeeper/HelloWorld/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-zookeeper/HelloWorld/src/main/resources/application.yml diff --git a/spring-cloud/spring-cloud-zookeeper/HelloWorld/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-zookeeper/HelloWorld/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-zookeeper/HelloWorld/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-zookeeper/HelloWorld/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-zookeeper/HelloWorld/src/test/java/com/baeldung/spring/cloud/helloworld/SpringContextTest.java b/spring-cloud-modules/spring-cloud-zookeeper/HelloWorld/src/test/java/com/baeldung/spring/cloud/helloworld/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-zookeeper/HelloWorld/src/test/java/com/baeldung/spring/cloud/helloworld/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-zookeeper/HelloWorld/src/test/java/com/baeldung/spring/cloud/helloworld/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-zookeeper/README.md b/spring-cloud-modules/spring-cloud-zookeeper/README.md similarity index 100% rename from spring-cloud/spring-cloud-zookeeper/README.md rename to spring-cloud-modules/spring-cloud-zookeeper/README.md diff --git a/spring-cloud/spring-cloud-zookeeper/pom.xml b/spring-cloud-modules/spring-cloud-zookeeper/pom.xml similarity index 90% rename from spring-cloud/spring-cloud-zookeeper/pom.xml rename to spring-cloud-modules/spring-cloud-zookeeper/pom.xml index 3fb899ec47..a3567adb06 100644 --- a/spring-cloud/spring-cloud-zookeeper/pom.xml +++ b/spring-cloud-modules/spring-cloud-zookeeper/pom.xml @@ -9,7 +9,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/README.md b/spring-cloud-modules/spring-cloud-zuul-eureka-integration/README.md similarity index 100% rename from spring-cloud/spring-cloud-zuul-eureka-integration/README.md rename to spring-cloud-modules/spring-cloud-zuul-eureka-integration/README.md diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-client/pom.xml b/spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-client/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-zuul-eureka-integration/eureka-client/pom.xml rename to spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-client/pom.xml diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/EurekaClientApplication.java b/spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/EurekaClientApplication.java similarity index 100% rename from spring-cloud/spring-cloud-zuul-eureka-integration/eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/EurekaClientApplication.java rename to spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/EurekaClientApplication.java diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/GreetingController.java b/spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/GreetingController.java similarity index 100% rename from spring-cloud/spring-cloud-zuul-eureka-integration/eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/GreetingController.java rename to spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/GreetingController.java diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-client/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-client/src/main/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-zuul-eureka-integration/eureka-client/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-client/src/main/resources/application.yml diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-client/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-client/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-zuul-eureka-integration/eureka-client/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-client/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-client/src/test/java/com/baeldung/spring/cloud/eureka/client/SpringContextTest.java b/spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-client/src/test/java/com/baeldung/spring/cloud/eureka/client/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-zuul-eureka-integration/eureka-client/src/test/java/com/baeldung/spring/cloud/eureka/client/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-client/src/test/java/com/baeldung/spring/cloud/eureka/client/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-server/pom.xml b/spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-server/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-zuul-eureka-integration/eureka-server/pom.xml rename to spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-server/pom.xml diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-server/src/main/java/com/baeldung/spring/cloud/eureka/server/EurekaServerApplication.java b/spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-server/src/main/java/com/baeldung/spring/cloud/eureka/server/EurekaServerApplication.java similarity index 100% rename from spring-cloud/spring-cloud-zuul-eureka-integration/eureka-server/src/main/java/com/baeldung/spring/cloud/eureka/server/EurekaServerApplication.java rename to spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-server/src/main/java/com/baeldung/spring/cloud/eureka/server/EurekaServerApplication.java diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/bin/eureka-server/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-server/src/main/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-zuul-eureka-integration/bin/eureka-server/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-server/src/main/resources/application.yml diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-server/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-server/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-zuul-eureka-integration/eureka-server/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-server/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-server/src/test/java/com/baeldung/spring/cloud/eureka/server/SpringContextTest.java b/spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-server/src/test/java/com/baeldung/spring/cloud/eureka/server/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-zuul-eureka-integration/eureka-server/src/test/java/com/baeldung/spring/cloud/eureka/server/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-server/src/test/java/com/baeldung/spring/cloud/eureka/server/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/pom.xml b/spring-cloud-modules/spring-cloud-zuul-eureka-integration/pom.xml similarity index 94% rename from spring-cloud/spring-cloud-zuul-eureka-integration/pom.xml rename to spring-cloud-modules/spring-cloud-zuul-eureka-integration/pom.xml index ceb85fe080..efc3e155bb 100644 --- a/spring-cloud/spring-cloud-zuul-eureka-integration/pom.xml +++ b/spring-cloud-modules/spring-cloud-zuul-eureka-integration/pom.xml @@ -11,7 +11,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/zuul-server/pom.xml b/spring-cloud-modules/spring-cloud-zuul-eureka-integration/zuul-server/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-zuul-eureka-integration/zuul-server/pom.xml rename to spring-cloud-modules/spring-cloud-zuul-eureka-integration/zuul-server/pom.xml diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/zuul-server/src/main/java/com/baeldung/spring/cloud/zuul/config/ZuulConfig.java b/spring-cloud-modules/spring-cloud-zuul-eureka-integration/zuul-server/src/main/java/com/baeldung/spring/cloud/zuul/config/ZuulConfig.java similarity index 100% rename from spring-cloud/spring-cloud-zuul-eureka-integration/zuul-server/src/main/java/com/baeldung/spring/cloud/zuul/config/ZuulConfig.java rename to spring-cloud-modules/spring-cloud-zuul-eureka-integration/zuul-server/src/main/java/com/baeldung/spring/cloud/zuul/config/ZuulConfig.java diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/zuul-server/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-zuul-eureka-integration/zuul-server/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-zuul-eureka-integration/zuul-server/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-zuul-eureka-integration/zuul-server/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/zuul-server/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-zuul-eureka-integration/zuul-server/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-zuul-eureka-integration/zuul-server/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-zuul-eureka-integration/zuul-server/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/zuul-server/src/test/java/com/baeldung/spring/cloud/zuul/config/SpringContextTest.java b/spring-cloud-modules/spring-cloud-zuul-eureka-integration/zuul-server/src/test/java/com/baeldung/spring/cloud/zuul/config/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-zuul-eureka-integration/zuul-server/src/test/java/com/baeldung/spring/cloud/zuul/config/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-zuul-eureka-integration/zuul-server/src/test/java/com/baeldung/spring/cloud/zuul/config/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-zuul-fallback/README.md b/spring-cloud-modules/spring-cloud-zuul-fallback/README.md similarity index 100% rename from spring-cloud/spring-cloud-zuul-fallback/README.md rename to spring-cloud-modules/spring-cloud-zuul-fallback/README.md diff --git a/spring-cloud/spring-cloud-zuul-fallback/api-gateway/pom.xml b/spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-zuul-fallback/api-gateway/pom.xml rename to spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/pom.xml diff --git a/spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/ApiGatewayApplication.java b/spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/ApiGatewayApplication.java similarity index 100% rename from spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/ApiGatewayApplication.java rename to spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/ApiGatewayApplication.java diff --git a/spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayClientResponse.java b/spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayClientResponse.java similarity index 100% rename from spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayClientResponse.java rename to spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayClientResponse.java diff --git a/spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayServiceFallback.java b/spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayServiceFallback.java similarity index 100% rename from spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayServiceFallback.java rename to spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayServiceFallback.java diff --git a/spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/WeatherServiceFallback.java b/spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/WeatherServiceFallback.java similarity index 100% rename from spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/WeatherServiceFallback.java rename to spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/WeatherServiceFallback.java diff --git a/spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/main/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/main/resources/application.yml diff --git a/spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/test/java/com/baeldung/spring/cloud/apigateway/ApiGatewayApplicationIntegrationTest.java b/spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/test/java/com/baeldung/spring/cloud/apigateway/ApiGatewayApplicationIntegrationTest.java similarity index 100% rename from spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/test/java/com/baeldung/spring/cloud/apigateway/ApiGatewayApplicationIntegrationTest.java rename to spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/test/java/com/baeldung/spring/cloud/apigateway/ApiGatewayApplicationIntegrationTest.java diff --git a/spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/test/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayServiceFallbackUnitTest.java b/spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/test/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayServiceFallbackUnitTest.java similarity index 100% rename from spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/test/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayServiceFallbackUnitTest.java rename to spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/test/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayServiceFallbackUnitTest.java diff --git a/spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/test/java/com/baeldung/spring/cloud/apigateway/fallback/WeatherServiceFallbackUnitTest.java b/spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/test/java/com/baeldung/spring/cloud/apigateway/fallback/WeatherServiceFallbackUnitTest.java similarity index 100% rename from spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/test/java/com/baeldung/spring/cloud/apigateway/fallback/WeatherServiceFallbackUnitTest.java rename to spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/test/java/com/baeldung/spring/cloud/apigateway/fallback/WeatherServiceFallbackUnitTest.java diff --git a/spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/test/resources/logback.xml b/spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/test/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/test/resources/logback.xml rename to spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/test/resources/logback.xml diff --git a/spring-cloud/spring-cloud-zuul-fallback/pom.xml b/spring-cloud-modules/spring-cloud-zuul-fallback/pom.xml similarity index 93% rename from spring-cloud/spring-cloud-zuul-fallback/pom.xml rename to spring-cloud-modules/spring-cloud-zuul-fallback/pom.xml index d55930c6e8..7cddec48fe 100644 --- a/spring-cloud/spring-cloud-zuul-fallback/pom.xml +++ b/spring-cloud-modules/spring-cloud-zuul-fallback/pom.xml @@ -10,7 +10,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT @@ -25,4 +25,4 @@ 3.1.1 - \ No newline at end of file + diff --git a/spring-cloud/spring-cloud-zuul-fallback/weather-service/pom.xml b/spring-cloud-modules/spring-cloud-zuul-fallback/weather-service/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-zuul-fallback/weather-service/pom.xml rename to spring-cloud-modules/spring-cloud-zuul-fallback/weather-service/pom.xml diff --git a/spring-cloud/spring-cloud-zuul-fallback/weather-service/src/main/java/com/baeldung/spring/cloud/weatherservice/WeatherController.java b/spring-cloud-modules/spring-cloud-zuul-fallback/weather-service/src/main/java/com/baeldung/spring/cloud/weatherservice/WeatherController.java similarity index 100% rename from spring-cloud/spring-cloud-zuul-fallback/weather-service/src/main/java/com/baeldung/spring/cloud/weatherservice/WeatherController.java rename to spring-cloud-modules/spring-cloud-zuul-fallback/weather-service/src/main/java/com/baeldung/spring/cloud/weatherservice/WeatherController.java diff --git a/spring-cloud/spring-cloud-zuul-fallback/weather-service/src/main/java/com/baeldung/spring/cloud/weatherservice/WeatherServiceApplication.java b/spring-cloud-modules/spring-cloud-zuul-fallback/weather-service/src/main/java/com/baeldung/spring/cloud/weatherservice/WeatherServiceApplication.java similarity index 100% rename from spring-cloud/spring-cloud-zuul-fallback/weather-service/src/main/java/com/baeldung/spring/cloud/weatherservice/WeatherServiceApplication.java rename to spring-cloud-modules/spring-cloud-zuul-fallback/weather-service/src/main/java/com/baeldung/spring/cloud/weatherservice/WeatherServiceApplication.java diff --git a/spring-cloud/spring-cloud-zuul-fallback/weather-service/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-zuul-fallback/weather-service/src/main/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-zuul-fallback/weather-service/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-zuul-fallback/weather-service/src/main/resources/application.yml diff --git a/spring-cloud/spring-cloud-zuul-fallback/weather-service/src/test/java/com/baeldung/spring/cloud/weatherservice/WeatherControllerIntegrationTest.java b/spring-cloud-modules/spring-cloud-zuul-fallback/weather-service/src/test/java/com/baeldung/spring/cloud/weatherservice/WeatherControllerIntegrationTest.java similarity index 100% rename from spring-cloud/spring-cloud-zuul-fallback/weather-service/src/test/java/com/baeldung/spring/cloud/weatherservice/WeatherControllerIntegrationTest.java rename to spring-cloud-modules/spring-cloud-zuul-fallback/weather-service/src/test/java/com/baeldung/spring/cloud/weatherservice/WeatherControllerIntegrationTest.java diff --git a/spring-cloud/spring-cloud-zuul-fallback/weather-service/src/test/java/com/baeldung/spring/cloud/weatherservice/WeatherServiceApplicationIntegrationTest.java b/spring-cloud-modules/spring-cloud-zuul-fallback/weather-service/src/test/java/com/baeldung/spring/cloud/weatherservice/WeatherServiceApplicationIntegrationTest.java similarity index 100% rename from spring-cloud/spring-cloud-zuul-fallback/weather-service/src/test/java/com/baeldung/spring/cloud/weatherservice/WeatherServiceApplicationIntegrationTest.java rename to spring-cloud-modules/spring-cloud-zuul-fallback/weather-service/src/test/java/com/baeldung/spring/cloud/weatherservice/WeatherServiceApplicationIntegrationTest.java diff --git a/spring-cloud/spring-cloud-zuul/README.md b/spring-cloud-modules/spring-cloud-zuul/README.md similarity index 100% rename from spring-cloud/spring-cloud-zuul/README.md rename to spring-cloud-modules/spring-cloud-zuul/README.md diff --git a/spring-cloud/spring-cloud-zuul/pom.xml b/spring-cloud-modules/spring-cloud-zuul/pom.xml similarity index 97% rename from spring-cloud/spring-cloud-zuul/pom.xml rename to spring-cloud-modules/spring-cloud-zuul/pom.xml index 7e56a8c359..e99cbdf355 100644 --- a/spring-cloud/spring-cloud-zuul/pom.xml +++ b/spring-cloud-modules/spring-cloud-zuul/pom.xml @@ -11,7 +11,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/pom.xml b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-foos-resource/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/pom.xml rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-foos-resource/pom.xml diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/src/main/java/com/baeldung/config/ResourceServerApplication.java b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-foos-resource/src/main/java/com/baeldung/config/ResourceServerApplication.java similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/src/main/java/com/baeldung/config/ResourceServerApplication.java rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-foos-resource/src/main/java/com/baeldung/config/ResourceServerApplication.java diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/src/main/java/com/baeldung/config/ResourceServerWebConfig.java b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-foos-resource/src/main/java/com/baeldung/config/ResourceServerWebConfig.java similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/src/main/java/com/baeldung/config/ResourceServerWebConfig.java rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-foos-resource/src/main/java/com/baeldung/config/ResourceServerWebConfig.java diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/src/main/java/com/baeldung/web/controller/FooController.java b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-foos-resource/src/main/java/com/baeldung/web/controller/FooController.java similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/src/main/java/com/baeldung/web/controller/FooController.java rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-foos-resource/src/main/java/com/baeldung/web/controller/FooController.java diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/src/main/java/com/baeldung/web/dto/Foo.java b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-foos-resource/src/main/java/com/baeldung/web/dto/Foo.java similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/src/main/java/com/baeldung/web/dto/Foo.java rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-foos-resource/src/main/java/com/baeldung/web/dto/Foo.java diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-foos-resource/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-foos-resource/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-foos-resource/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-foos-resource/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-foos-resource/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-foos-resource/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-post-filter/.gitignore b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-post-filter/.gitignore similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-post-filter/.gitignore rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-post-filter/.gitignore diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-post-filter/pom.xml b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-post-filter/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-post-filter/pom.xml rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-post-filter/pom.xml diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-post-filter/src/main/java/com/baeldung/ZuulPostFilterApplication.java b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-post-filter/src/main/java/com/baeldung/ZuulPostFilterApplication.java similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-post-filter/src/main/java/com/baeldung/ZuulPostFilterApplication.java rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-post-filter/src/main/java/com/baeldung/ZuulPostFilterApplication.java diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-post-filter/src/main/java/com/baeldung/controllers/GreetingController.java b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-post-filter/src/main/java/com/baeldung/controllers/GreetingController.java similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-post-filter/src/main/java/com/baeldung/controllers/GreetingController.java rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-post-filter/src/main/java/com/baeldung/controllers/GreetingController.java diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-post-filter/src/main/java/com/baeldung/filters/ResponseLogFilter.java b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-post-filter/src/main/java/com/baeldung/filters/ResponseLogFilter.java similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-post-filter/src/main/java/com/baeldung/filters/ResponseLogFilter.java rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-post-filter/src/main/java/com/baeldung/filters/ResponseLogFilter.java diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-post-filter/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-post-filter/src/main/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-post-filter/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-post-filter/src/main/resources/application.yml diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-post-filter/src/test/java/com/baeldung/ZuulPostFilterLiveTest.java b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-post-filter/src/test/java/com/baeldung/ZuulPostFilterLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-post-filter/src/test/java/com/baeldung/ZuulPostFilterLiveTest.java rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-post-filter/src/test/java/com/baeldung/ZuulPostFilterLiveTest.java diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/pom.xml b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-rate-limiting/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/pom.xml rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-rate-limiting/pom.xml diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/src/main/java/com/baeldung/spring/cloud/zuulratelimitdemo/ZuulRatelimitDemoApplication.java b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-rate-limiting/src/main/java/com/baeldung/spring/cloud/zuulratelimitdemo/ZuulRatelimitDemoApplication.java similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/src/main/java/com/baeldung/spring/cloud/zuulratelimitdemo/ZuulRatelimitDemoApplication.java rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-rate-limiting/src/main/java/com/baeldung/spring/cloud/zuulratelimitdemo/ZuulRatelimitDemoApplication.java diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/src/main/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/GreetingController.java b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-rate-limiting/src/main/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/GreetingController.java similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/src/main/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/GreetingController.java rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-rate-limiting/src/main/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/GreetingController.java diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-rate-limiting/src/main/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-rate-limiting/src/main/resources/application.yml diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/src/test/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/GreetingControllerIntegrationTest.java b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-rate-limiting/src/test/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/GreetingControllerIntegrationTest.java similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/src/test/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/GreetingControllerIntegrationTest.java rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-rate-limiting/src/test/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/GreetingControllerIntegrationTest.java diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/src/test/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/SpringContextTest.java b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-rate-limiting/src/test/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/src/test/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-rate-limiting/src/test/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/src/test/resources/application.properties b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-rate-limiting/src/test/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/src/test/resources/application.properties rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-rate-limiting/src/test/resources/application.properties diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/src/test/resources/logback.xml b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-rate-limiting/src/test/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/src/test/resources/logback.xml rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-rate-limiting/src/test/resources/logback.xml diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-ui/README.md b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/README.md similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-ui/README.md rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/README.md diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-ui/pom.xml b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-ui/pom.xml rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/pom.xml diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/config/CustomZuulFilter.java b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/config/CustomZuulFilter.java similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/config/CustomZuulFilter.java rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/config/CustomZuulFilter.java diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/config/UiApplication.java b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/config/UiApplication.java similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/config/UiApplication.java rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/config/UiApplication.java diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/config/UiWebConfig.java b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/config/UiWebConfig.java similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/config/UiWebConfig.java rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/config/UiWebConfig.java diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/spring/cloud/zuul/filter/CustomZuulErrorApplication.java b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/spring/cloud/zuul/filter/CustomZuulErrorApplication.java similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/spring/cloud/zuul/filter/CustomZuulErrorApplication.java rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/spring/cloud/zuul/filter/CustomZuulErrorApplication.java diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/spring/cloud/zuul/filter/CustomZuulErrorFilter.java b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/spring/cloud/zuul/filter/CustomZuulErrorFilter.java similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/spring/cloud/zuul/filter/CustomZuulErrorFilter.java rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/spring/cloud/zuul/filter/CustomZuulErrorFilter.java diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/spring/cloud/zuul/filter/ZuulConfiguration.java b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/spring/cloud/zuul/filter/ZuulConfiguration.java similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/spring/cloud/zuul/filter/ZuulConfiguration.java rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/spring/cloud/zuul/filter/ZuulConfiguration.java diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/main/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/main/resources/application.yml diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/resources/templates/index.html b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/main/resources/templates/index.html similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/resources/templates/index.html rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/main/resources/templates/index.html diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/webapp/resources/angular-utf8-base64.min.js b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/main/webapp/resources/angular-utf8-base64.min.js similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/webapp/resources/angular-utf8-base64.min.js rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/main/webapp/resources/angular-utf8-base64.min.js diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/test/java/com/baeldung/spring/cloud/zuul/filter/CustomZuulErrorFilterLiveTest.java b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/test/java/com/baeldung/spring/cloud/zuul/filter/CustomZuulErrorFilterLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/test/java/com/baeldung/spring/cloud/zuul/filter/CustomZuulErrorFilterLiveTest.java rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/test/java/com/baeldung/spring/cloud/zuul/filter/CustomZuulErrorFilterLiveTest.java diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/test/java/com/baeldung/web/LiveTest.java b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/test/java/com/baeldung/web/LiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/test/java/com/baeldung/web/LiveTest.java rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/test/java/com/baeldung/web/LiveTest.java diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/test/resources/.gitignore b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/test/resources/.gitignore similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/test/resources/.gitignore rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/test/resources/.gitignore diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/test/resources/persistence-mysql.properties b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/test/resources/persistence-mysql.properties similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/test/resources/persistence-mysql.properties rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/test/resources/persistence-mysql.properties diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/bin/eureka-client/pom.xml b/spring-cloud/spring-cloud-zuul-eureka-integration/bin/eureka-client/pom.xml deleted file mode 100644 index 5c9f85d06e..0000000000 --- a/spring-cloud/spring-cloud-zuul-eureka-integration/bin/eureka-client/pom.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - 4.0.0 - eureka-client - 1.0.0-SNAPSHOT - eureka-client - jar - Spring Cloud Eureka Sample Client - - - com.baeldung.spring.cloud - spring-cloud-zuul-eureka-integration - 1.0.0-SNAPSHOT - - - - - - org.springframework.cloud - spring-cloud-starter-parent - ${spring-cloud-dependencies.version} - pom - import - - - - - - - org.springframework.cloud - spring-cloud-starter-eureka - ${spring-cloud-starter-eureka.version} - - - org.springframework.boot - spring-boot-starter-web - - - - \ No newline at end of file diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/bin/eureka-client/src/main/resources/application.yml b/spring-cloud/spring-cloud-zuul-eureka-integration/bin/eureka-client/src/main/resources/application.yml deleted file mode 100644 index 08624aa159..0000000000 --- a/spring-cloud/spring-cloud-zuul-eureka-integration/bin/eureka-client/src/main/resources/application.yml +++ /dev/null @@ -1,13 +0,0 @@ -spring: - application: - name: spring-cloud-eureka-client - -server: - port: 0 - -eureka: - client: - serviceUrl: - defaultZone: ${EUREKA_URI:http://localhost:8761/eureka} - instance: - preferIpAddress: true \ No newline at end of file diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/bin/eureka-server/pom.xml b/spring-cloud/spring-cloud-zuul-eureka-integration/bin/eureka-server/pom.xml deleted file mode 100644 index 2d2a94d779..0000000000 --- a/spring-cloud/spring-cloud-zuul-eureka-integration/bin/eureka-server/pom.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - 4.0.0 - eureka-server - 1.0.0-SNAPSHOT - eureka-server - jar - Spring Cloud Eureka Server Demo - - - com.baeldung.spring.cloud - spring-cloud-zuul-eureka-integration - 1.0.0-SNAPSHOT - - - - - - org.springframework.cloud - spring-cloud-starter-parent - ${spring-cloud-dependencies.version} - pom - import - - - - - - - org.springframework.cloud - spring-cloud-starter-eureka-server - ${spring-cloud-starter-eureka.version} - - - commons-configuration - commons-configuration - ${commons-config.version} - - - - \ No newline at end of file diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/bin/pom.xml b/spring-cloud/spring-cloud-zuul-eureka-integration/bin/pom.xml deleted file mode 100644 index 81a4b9202c..0000000000 --- a/spring-cloud/spring-cloud-zuul-eureka-integration/bin/pom.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - 4.0.0 - spring-cloud-zuul-eureka-integration - 1.0.0-SNAPSHOT - Spring Cloud Zuul and Eureka Integration - pom - Spring Cloud Zuul and Eureka Integration - - - com.baeldung.spring.cloud - spring-cloud - 1.0.0-SNAPSHOT - .. - - - - zuul-server - eureka-server - eureka-client - - - - 3.7.0 - 1.4.2.RELEASE - 1.10 - - - \ No newline at end of file diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/bin/zuul-server/pom.xml b/spring-cloud/spring-cloud-zuul-eureka-integration/bin/zuul-server/pom.xml deleted file mode 100644 index 37fe4815bb..0000000000 --- a/spring-cloud/spring-cloud-zuul-eureka-integration/bin/zuul-server/pom.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - 4.0.0 - zuul-server - - - com.baeldung.spring.cloud - spring-cloud-zuul-eureka-integration - 1.0.0-SNAPSHOT - - - - - - org.springframework.cloud - spring-cloud-starter-parent - ${spring-cloud-dependencies.version} - pom - import - - - - - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.cloud - spring-cloud-starter-zuul - - - org.springframework.cloud - spring-cloud-starter-eureka - - - commons-configuration - commons-configuration - ${commons-config.version} - - - org.springframework.boot - spring-boot-starter-security - - - - \ No newline at end of file diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/bin/zuul-server/src/main/resources/application.properties b/spring-cloud/spring-cloud-zuul-eureka-integration/bin/zuul-server/src/main/resources/application.properties deleted file mode 100644 index cb1dca78c2..0000000000 --- a/spring-cloud/spring-cloud-zuul-eureka-integration/bin/zuul-server/src/main/resources/application.properties +++ /dev/null @@ -1,9 +0,0 @@ -server.port=8762 -spring.application.name=zuul-server -eureka.instance.preferIpAddress=true -eureka.client.registerWithEureka=true -eureka.client.fetchRegistry=true -eureka.serviceurl.defaultzone=http://localhost:8761/eureka/ -management.security.enabled=false -security.basic.enabled=false -hystrix.command.default.execution.timeout.enabled=false diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-server/src/main/resources/application.yml b/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-server/src/main/resources/application.yml deleted file mode 100644 index 49c3179bb5..0000000000 --- a/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-server/src/main/resources/application.yml +++ /dev/null @@ -1,7 +0,0 @@ -server: - port: 8761 - -eureka: - client: - registerWithEureka: false - fetchRegistry: false \ No newline at end of file From 4785a247953adce670d84c0a8150a18852a25592 Mon Sep 17 00:00:00 2001 From: maryarm <45322329+maryarm@users.noreply.github.com> Date: Tue, 31 May 2022 05:00:17 +0200 Subject: [PATCH 097/100] BAEL-5266: Netflix sidecar demo applications created. (#12183) * BAEL-5266: Netflix sidecar demo applications created. * BAEL-5266: Changed NodeJS endpoint to hello * BAEL-5266: Removed .gitignore files as the .gitignore is already available in project scope. --- .../echo-demo/pom.xml | 48 +++++++++++++++++ .../baeldung/cloud/echo/EchoApplication.java | 48 +++++++++++++++++ .../src/main/resources/application.yml | 14 +++++ .../cloud/echo/SpringContextTest.java | 11 ++++ .../spring-cloud-netflix-sidecar/pom.xml | 27 ++++++++++ .../sidecar-demo/nodejs/hello.js | 19 +++++++ .../sidecar-demo/pom.xml | 52 +++++++++++++++++++ .../cloud/sidecar/SidecarApplication.java | 13 +++++ .../src/main/resources/application.yml | 17 ++++++ .../cloud/sidecar/SpringContextTest.java | 11 ++++ 10 files changed, 260 insertions(+) create mode 100644 spring-cloud/spring-cloud-netflix-sidecar/echo-demo/pom.xml create mode 100644 spring-cloud/spring-cloud-netflix-sidecar/echo-demo/src/main/java/com/baeldung/cloud/echo/EchoApplication.java create mode 100644 spring-cloud/spring-cloud-netflix-sidecar/echo-demo/src/main/resources/application.yml create mode 100644 spring-cloud/spring-cloud-netflix-sidecar/echo-demo/src/test/java/com/baeldung/cloud/echo/SpringContextTest.java create mode 100644 spring-cloud/spring-cloud-netflix-sidecar/pom.xml create mode 100644 spring-cloud/spring-cloud-netflix-sidecar/sidecar-demo/nodejs/hello.js create mode 100644 spring-cloud/spring-cloud-netflix-sidecar/sidecar-demo/pom.xml create mode 100644 spring-cloud/spring-cloud-netflix-sidecar/sidecar-demo/src/main/java/com/baeldung/cloud/sidecar/SidecarApplication.java create mode 100644 spring-cloud/spring-cloud-netflix-sidecar/sidecar-demo/src/main/resources/application.yml create mode 100644 spring-cloud/spring-cloud-netflix-sidecar/sidecar-demo/src/test/java/com/baeldung/cloud/sidecar/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-netflix-sidecar/echo-demo/pom.xml b/spring-cloud/spring-cloud-netflix-sidecar/echo-demo/pom.xml new file mode 100644 index 0000000000..60b6eab020 --- /dev/null +++ b/spring-cloud/spring-cloud-netflix-sidecar/echo-demo/pom.xml @@ -0,0 +1,48 @@ + + + 4.0.0 + echo-demo + echo-demo + Demo for echo endpoint + + com.baeldung.cloud + spring-cloud-netflix-sidecar + 0.0.1-SNAPSHOT + ../pom.xml + + + + org.springframework.boot + spring-boot-starter-actuator + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.cloud + spring-cloud-starter-netflix-zuul + 2.2.10.RELEASE + + + org.springframework.cloud + spring-cloud-starter-netflix-eureka-client + 2.2.10.RELEASE + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + diff --git a/spring-cloud/spring-cloud-netflix-sidecar/echo-demo/src/main/java/com/baeldung/cloud/echo/EchoApplication.java b/spring-cloud/spring-cloud-netflix-sidecar/echo-demo/src/main/java/com/baeldung/cloud/echo/EchoApplication.java new file mode 100644 index 0000000000..d869ba8f65 --- /dev/null +++ b/spring-cloud/spring-cloud-netflix-sidecar/echo-demo/src/main/java/com/baeldung/cloud/echo/EchoApplication.java @@ -0,0 +1,48 @@ +package com.baeldung.cloud.echo; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.ServiceInstance; +import org.springframework.cloud.client.discovery.DiscoveryClient; +import org.springframework.cloud.netflix.eureka.EnableEurekaClient; +import org.springframework.cloud.netflix.zuul.EnableZuulProxy; +import org.springframework.context.annotation.Bean; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.client.RestTemplate; + +import java.util.List; + +@SpringBootApplication +@EnableEurekaClient +@EnableZuulProxy +@RestController +public class EchoApplication { + @Autowired + DiscoveryClient discoveryClient; + @Autowired + RestTemplate restTemplate; + + @Bean + public RestTemplate restTemplate() { + return new RestTemplate(); + } + + @GetMapping("/hello/{me}") + public ResponseEntity echo(@PathVariable("me") String me) { + List instances = discoveryClient.getInstances("sidecar"); + if (instances.isEmpty()) { + return ResponseEntity.status(HttpStatus.SERVICE_UNAVAILABLE).body("hello service is down"); + } + String url = instances.get(0).getUri().toString(); + return ResponseEntity.ok(restTemplate.getForObject(url + "/hello/" + me, String.class)); + } + + public static void main(String[] args) { + SpringApplication.run(EchoApplication.class, args); + } +} diff --git a/spring-cloud/spring-cloud-netflix-sidecar/echo-demo/src/main/resources/application.yml b/spring-cloud/spring-cloud-netflix-sidecar/echo-demo/src/main/resources/application.yml new file mode 100644 index 0000000000..7b13600b73 --- /dev/null +++ b/spring-cloud/spring-cloud-netflix-sidecar/echo-demo/src/main/resources/application.yml @@ -0,0 +1,14 @@ +server.port: 8085 +spring: + application: + name: echo +eureka: + instance: + hostname: localhost + leaseRenewalIntervalInSeconds: 1 + leaseExpirationDurationInSeconds: 2 + client: + service-url: + defaultZone: http://127.0.0.1:8761/eureka + healthcheck: + enabled: true diff --git a/spring-cloud/spring-cloud-netflix-sidecar/echo-demo/src/test/java/com/baeldung/cloud/echo/SpringContextTest.java b/spring-cloud/spring-cloud-netflix-sidecar/echo-demo/src/test/java/com/baeldung/cloud/echo/SpringContextTest.java new file mode 100644 index 0000000000..af4ba8c71a --- /dev/null +++ b/spring-cloud/spring-cloud-netflix-sidecar/echo-demo/src/test/java/com/baeldung/cloud/echo/SpringContextTest.java @@ -0,0 +1,11 @@ +package com.baeldung.cloud.echo; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +public class SpringContextTest { + @Test + void contextLoads() { + } +} diff --git a/spring-cloud/spring-cloud-netflix-sidecar/pom.xml b/spring-cloud/spring-cloud-netflix-sidecar/pom.xml new file mode 100644 index 0000000000..254a0376b6 --- /dev/null +++ b/spring-cloud/spring-cloud-netflix-sidecar/pom.xml @@ -0,0 +1,27 @@ + + + 4.0.0 + com.baeldung.cloud + spring-cloud-netflix-sidecar + 0.0.1-SNAPSHOT + pom + spring-cloud-netflix-sidecar + Netflix Sidecar project for Spring Boot + + + com.baeldung + parent-boot-2 + 0.0.1-SNAPSHOT + ../../parent-boot-2 + + + sidecar-demo + echo-demo + + + 2.2.10.RELEASE + 2.3.12.RELEASE + + \ No newline at end of file diff --git a/spring-cloud/spring-cloud-netflix-sidecar/sidecar-demo/nodejs/hello.js b/spring-cloud/spring-cloud-netflix-sidecar/sidecar-demo/nodejs/hello.js new file mode 100644 index 0000000000..207bd5449b --- /dev/null +++ b/spring-cloud/spring-cloud-netflix-sidecar/sidecar-demo/nodejs/hello.js @@ -0,0 +1,19 @@ +const express = require('express') +const app = express() +const port = 3000 + +app.get('/', (req, res) => { + res.send('Hello World!') +}) + +app.get('/health', (req, res) => { + res.send({ "status":"UP"}) +}) + +app.get('/hello/:me', (req, res) => { + res.send('Hello ' + req.params.me + '!') +}) + +app.listen(port, () => { + console.log(`Hello app listening on port ${port}`) +}) \ No newline at end of file diff --git a/spring-cloud/spring-cloud-netflix-sidecar/sidecar-demo/pom.xml b/spring-cloud/spring-cloud-netflix-sidecar/sidecar-demo/pom.xml new file mode 100644 index 0000000000..22032d5081 --- /dev/null +++ b/spring-cloud/spring-cloud-netflix-sidecar/sidecar-demo/pom.xml @@ -0,0 +1,52 @@ + + + 4.0.0 + sidecar-demo + sidecar-demo + Sidecar demo for hello endpoint + + com.baeldung.cloud + spring-cloud-netflix-sidecar + 0.0.1-SNAPSHOT + ../pom.xml + + + + org.springframework.boot + spring-boot-starter-actuator + + + org.springframework.cloud + spring-cloud-netflix-sidecar + ${netflix.cloud.version} + + + io.projectreactor + reactor-core + + + org.springframework.boot + spring-boot-starter-test + test + + + org.junit.jupiter + junit-jupiter + test + + + org.mockito + mockito-junit-jupiter + test + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + diff --git a/spring-cloud/spring-cloud-netflix-sidecar/sidecar-demo/src/main/java/com/baeldung/cloud/sidecar/SidecarApplication.java b/spring-cloud/spring-cloud-netflix-sidecar/sidecar-demo/src/main/java/com/baeldung/cloud/sidecar/SidecarApplication.java new file mode 100644 index 0000000000..83508e73d2 --- /dev/null +++ b/spring-cloud/spring-cloud-netflix-sidecar/sidecar-demo/src/main/java/com/baeldung/cloud/sidecar/SidecarApplication.java @@ -0,0 +1,13 @@ +package com.baeldung.cloud.sidecar; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.netflix.sidecar.EnableSidecar; + +@SpringBootApplication +@EnableSidecar +public class SidecarApplication { + public static void main(String[] args) { + SpringApplication.run(SidecarApplication.class, args); + } +} diff --git a/spring-cloud/spring-cloud-netflix-sidecar/sidecar-demo/src/main/resources/application.yml b/spring-cloud/spring-cloud-netflix-sidecar/sidecar-demo/src/main/resources/application.yml new file mode 100644 index 0000000000..29e03551c2 --- /dev/null +++ b/spring-cloud/spring-cloud-netflix-sidecar/sidecar-demo/src/main/resources/application.yml @@ -0,0 +1,17 @@ +server.port: 8084 +spring: + application: + name: sidecar +eureka: + instance: + hostname: localhost + leaseRenewalIntervalInSeconds: 1 + leaseExpirationDurationInSeconds: 2 + client: + service-url: + defaultZone: http://127.0.0.1:8761/eureka + healthcheck: + enabled: true +sidecar: + port: 3000 + health-uri: http://localhost:3000/health diff --git a/spring-cloud/spring-cloud-netflix-sidecar/sidecar-demo/src/test/java/com/baeldung/cloud/sidecar/SpringContextTest.java b/spring-cloud/spring-cloud-netflix-sidecar/sidecar-demo/src/test/java/com/baeldung/cloud/sidecar/SpringContextTest.java new file mode 100644 index 0000000000..66f818d9b8 --- /dev/null +++ b/spring-cloud/spring-cloud-netflix-sidecar/sidecar-demo/src/test/java/com/baeldung/cloud/sidecar/SpringContextTest.java @@ -0,0 +1,11 @@ +package com.baeldung.cloud.sidecar; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +public class SpringContextTest { + @Test + void contextLoads() { + } +} From 97b2c4d6eaeae8cd426ee4bf533143027f02c5f5 Mon Sep 17 00:00:00 2001 From: ACHRAF TAITAI <43656331+achraftt@users.noreply.github.com> Date: Tue, 31 May 2022 08:21:51 +0200 Subject: [PATCH 098/100] Update spring-cloud-consul module and article (#12279) --- spring-cloud-modules/spring-cloud-consul/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-modules/spring-cloud-consul/pom.xml b/spring-cloud-modules/spring-cloud-consul/pom.xml index 52da6ff763..02823d3e07 100644 --- a/spring-cloud-modules/spring-cloud-consul/pom.xml +++ b/spring-cloud-modules/spring-cloud-consul/pom.xml @@ -55,7 +55,7 @@ - 2.2.3.RELEASE + 3.1.1 0.3.1 com.baeldung.spring.cloud.consul.discovery.DiscoveryClientApplication From aef4affc28b0f2949c841fe04dba79bddf31c6a5 Mon Sep 17 00:00:00 2001 From: Muhammad Abdullah Azam Khan Date: Wed, 1 Jun 2022 01:35:54 +0400 Subject: [PATCH 099/100] Expose GraphQL field with different name (#12289) --- spring-boot-modules/spring-boot-libraries/README.md | 1 + .../src/main/java/com/baeldung/graphql/PostResolver.java | 5 +++++ .../src/main/resources/graphql/post.graphqls | 1 + 3 files changed, 7 insertions(+) diff --git a/spring-boot-modules/spring-boot-libraries/README.md b/spring-boot-modules/spring-boot-libraries/README.md index b72815e4a9..cc7e511ac8 100644 --- a/spring-boot-modules/spring-boot-libraries/README.md +++ b/spring-boot-modules/spring-boot-libraries/README.md @@ -14,6 +14,7 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring - [Spring Boot and Caffeine Cache](https://www.baeldung.com/spring-boot-caffeine-cache) - [Spring Boot and Togglz Aspect](https://www.baeldung.com/spring-togglz) - [Getting Started with GraphQL and Spring Boot](https://www.baeldung.com/spring-graphql) +- [Expose GraphQL Field with Different Name](https://www.baeldung.com/expose-graphql-field-with-different-name) - More articles: [[next -->]](/spring-boot-modules/spring-boot-libraries-2) ### GraphQL sample queries diff --git a/spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/graphql/PostResolver.java b/spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/graphql/PostResolver.java index 329d1f469a..d4dff23a29 100644 --- a/spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/graphql/PostResolver.java +++ b/spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/graphql/PostResolver.java @@ -12,4 +12,9 @@ public class PostResolver implements GraphQLResolver { public Author getAuthor(Post post) { return authorDao.getAuthor(post.getAuthorId()).orElseThrow(RuntimeException::new); } + + public Author getFirst_author(Post post) { + return authorDao.getAuthor(post.getAuthorId()).orElseThrow(RuntimeException::new); + } + } diff --git a/spring-boot-modules/spring-boot-libraries/src/main/resources/graphql/post.graphqls b/spring-boot-modules/spring-boot-libraries/src/main/resources/graphql/post.graphqls index 0e42f7255c..e426f3508f 100644 --- a/spring-boot-modules/spring-boot-libraries/src/main/resources/graphql/post.graphqls +++ b/spring-boot-modules/spring-boot-libraries/src/main/resources/graphql/post.graphqls @@ -4,6 +4,7 @@ type Post { text: String! category: String author: Author! + first_author: Author! } type Author { From fcdf53f3e459d7301105c7da2634426efbf99d93 Mon Sep 17 00:00:00 2001 From: Kai Yuan Date: Wed, 1 Jun 2022 05:58:26 +0200 Subject: [PATCH 100/100] BAEL-5623 reverse list article (#12253) * reverse list article * fix the package --- .../list/reverse/ReverseArrayList.java | 23 ++++++++++ .../reverse/ReverseArrayListUnitTest.java | 46 +++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 core-java-modules/core-java-collections-list-4/src/main/java/com/baeldung/list/reverse/ReverseArrayList.java create mode 100644 core-java-modules/core-java-collections-list-4/src/test/java/com/baeldung/list/reverse/ReverseArrayListUnitTest.java diff --git a/core-java-modules/core-java-collections-list-4/src/main/java/com/baeldung/list/reverse/ReverseArrayList.java b/core-java-modules/core-java-collections-list-4/src/main/java/com/baeldung/list/reverse/ReverseArrayList.java new file mode 100644 index 0000000000..a97633b904 --- /dev/null +++ b/core-java-modules/core-java-collections-list-4/src/main/java/com/baeldung/list/reverse/ReverseArrayList.java @@ -0,0 +1,23 @@ +package com.baeldung.list.reverse; + +import java.util.List; + +public class ReverseArrayList { + private ReverseArrayList() { + throw new RuntimeException("This class cannot be instantiated."); + } + + public static void reverseWithRecursion(List list) { + if (list.size() > 1) { + T value = list.remove(0); + reverseWithRecursion(list); + list.add(value); + } + } + + public static void reverseWithLoop(List list) { + for (int i = 0, j = list.size() - 1; i < j; i++) { + list.add(i, list.remove(j)); + } + } +} diff --git a/core-java-modules/core-java-collections-list-4/src/test/java/com/baeldung/list/reverse/ReverseArrayListUnitTest.java b/core-java-modules/core-java-collections-list-4/src/test/java/com/baeldung/list/reverse/ReverseArrayListUnitTest.java new file mode 100644 index 0000000000..bf5bf43d13 --- /dev/null +++ b/core-java-modules/core-java-collections-list-4/src/test/java/com/baeldung/list/reverse/ReverseArrayListUnitTest.java @@ -0,0 +1,46 @@ +package com.baeldung.list.reverse; + +import static org.assertj.core.api.Assertions.assertThat; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import org.junit.jupiter.api.Test; + +class ReverseArrayListUnitTest { + + private static final List EXPECTED = new ArrayList<>(Arrays.asList(7, 6, 5, 4, 3, 2, 1)); + + @Test + void givenArrayList_whenCallReverseMethod_thenListReversedInPlace() { + List aList = new ArrayList<>(Arrays.asList(1, 2, 3, 4, 5, 6, 7)); + Collections.reverse(aList); + assertThat(aList).isEqualTo(EXPECTED); + } + + @Test + void givenArrayList_whenCallReverseMethod_thenListReversedAsaNewList() { + List originalList = new ArrayList<>(Arrays.asList(1, 2, 3, 4, 5, 6, 7)); + List aNewList = new ArrayList<>(originalList); + Collections.reverse(aNewList); + + assertThat(aNewList).isNotEqualTo(originalList) + .isEqualTo(EXPECTED); + } + + @Test + void givenArrayList_whenCallReverseWithRecur_thenListReversedInPlace() { + List aList = new ArrayList<>(Arrays.asList(1, 2, 3, 4, 5, 6, 7)); + ReverseArrayList.reverseWithRecursion(aList); + assertThat(aList).isEqualTo(EXPECTED); + } + + @Test + void givenArrayList_whenCallReverseWithLoop_thenListReversedInPlace() { + List aList = new ArrayList<>(Arrays.asList(1, 2, 3, 4, 5, 6, 7)); + ReverseArrayList.reverseWithLoop(aList); + assertThat(aList).isEqualTo(EXPECTED); + } +} \ No newline at end of file