From 83aa21c8c40f8d102ee5de17e81717f837c6fa94 Mon Sep 17 00:00:00 2001 From: Kai Moritz Date: Sun, 14 Mar 2021 10:00:24 +0100 Subject: [PATCH] WIP --- .../adapter/RemoteUsersServiceConsumer.java | 6 +++--- .../demos/{consumer => pwreset}/adapter/UserDTO.java | 2 +- .../juplo/demos/{consumer => pwreset}/domain/User.java | 2 +- .../demos/{consumer => pwreset}/domain/UsersService.java | 2 +- .../adapter/RemoteUsersServiceConsumerIT.java | 9 ++------- 5 files changed, 8 insertions(+), 13 deletions(-) rename pwreset/src/main/java/de/juplo/demos/{consumer => pwreset}/adapter/RemoteUsersServiceConsumer.java (88%) rename pwreset/src/main/java/de/juplo/demos/{consumer => pwreset}/adapter/UserDTO.java (72%) rename pwreset/src/main/java/de/juplo/demos/{consumer => pwreset}/domain/User.java (78%) rename pwreset/src/main/java/de/juplo/demos/{consumer => pwreset}/domain/UsersService.java (73%) rename pwreset/src/test/java/de/juplo/demos/{consumer => pwreset}/adapter/RemoteUsersServiceConsumerIT.java (86%) diff --git a/pwreset/src/main/java/de/juplo/demos/consumer/adapter/RemoteUsersServiceConsumer.java b/pwreset/src/main/java/de/juplo/demos/pwreset/adapter/RemoteUsersServiceConsumer.java similarity index 88% rename from pwreset/src/main/java/de/juplo/demos/consumer/adapter/RemoteUsersServiceConsumer.java rename to pwreset/src/main/java/de/juplo/demos/pwreset/adapter/RemoteUsersServiceConsumer.java index 8cbc3eb..27fdc8f 100644 --- a/pwreset/src/main/java/de/juplo/demos/consumer/adapter/RemoteUsersServiceConsumer.java +++ b/pwreset/src/main/java/de/juplo/demos/pwreset/adapter/RemoteUsersServiceConsumer.java @@ -1,7 +1,7 @@ -package de.juplo.demos.consumer.adapter; +package de.juplo.demos.pwreset.adapter; -import de.juplo.demos.consumer.domain.User; -import de.juplo.demos.consumer.domain.UsersService; +import de.juplo.demos.pwreset.domain.User; +import de.juplo.demos.pwreset.domain.UsersService; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/pwreset/src/main/java/de/juplo/demos/consumer/adapter/UserDTO.java b/pwreset/src/main/java/de/juplo/demos/pwreset/adapter/UserDTO.java similarity index 72% rename from pwreset/src/main/java/de/juplo/demos/consumer/adapter/UserDTO.java rename to pwreset/src/main/java/de/juplo/demos/pwreset/adapter/UserDTO.java index bcf2692..4f6bd38 100644 --- a/pwreset/src/main/java/de/juplo/demos/consumer/adapter/UserDTO.java +++ b/pwreset/src/main/java/de/juplo/demos/pwreset/adapter/UserDTO.java @@ -1,4 +1,4 @@ -package de.juplo.demos.consumer.adapter; +package de.juplo.demos.pwreset.adapter; import lombok.Setter; diff --git a/pwreset/src/main/java/de/juplo/demos/consumer/domain/User.java b/pwreset/src/main/java/de/juplo/demos/pwreset/domain/User.java similarity index 78% rename from pwreset/src/main/java/de/juplo/demos/consumer/domain/User.java rename to pwreset/src/main/java/de/juplo/demos/pwreset/domain/User.java index 521ad27..3d970bd 100644 --- a/pwreset/src/main/java/de/juplo/demos/consumer/domain/User.java +++ b/pwreset/src/main/java/de/juplo/demos/pwreset/domain/User.java @@ -1,4 +1,4 @@ -package de.juplo.demos.consumer.domain; +package de.juplo.demos.pwreset.domain; import lombok.Builder; import lombok.Data; diff --git a/pwreset/src/main/java/de/juplo/demos/consumer/domain/UsersService.java b/pwreset/src/main/java/de/juplo/demos/pwreset/domain/UsersService.java similarity index 73% rename from pwreset/src/main/java/de/juplo/demos/consumer/domain/UsersService.java rename to pwreset/src/main/java/de/juplo/demos/pwreset/domain/UsersService.java index f6738e9..0a07a1f 100644 --- a/pwreset/src/main/java/de/juplo/demos/consumer/domain/UsersService.java +++ b/pwreset/src/main/java/de/juplo/demos/pwreset/domain/UsersService.java @@ -1,4 +1,4 @@ -package de.juplo.demos.consumer.domain; +package de.juplo.demos.pwreset.domain; import java.util.Optional; diff --git a/pwreset/src/test/java/de/juplo/demos/consumer/adapter/RemoteUsersServiceConsumerIT.java b/pwreset/src/test/java/de/juplo/demos/pwreset/adapter/RemoteUsersServiceConsumerIT.java similarity index 86% rename from pwreset/src/test/java/de/juplo/demos/consumer/adapter/RemoteUsersServiceConsumerIT.java rename to pwreset/src/test/java/de/juplo/demos/pwreset/adapter/RemoteUsersServiceConsumerIT.java index f3786af..fb784ad 100644 --- a/pwreset/src/test/java/de/juplo/demos/consumer/adapter/RemoteUsersServiceConsumerIT.java +++ b/pwreset/src/test/java/de/juplo/demos/pwreset/adapter/RemoteUsersServiceConsumerIT.java @@ -1,4 +1,4 @@ -package de.juplo.demos.consumer.adapter; +package de.juplo.demos.pwreset.adapter; import au.com.dius.pact.consumer.MockServer; import au.com.dius.pact.consumer.dsl.PactDslWithProvider; @@ -6,17 +6,12 @@ import au.com.dius.pact.consumer.junit5.PactConsumerTestExt; import au.com.dius.pact.consumer.junit5.PactTestFor; import au.com.dius.pact.core.model.RequestResponsePact; import au.com.dius.pact.core.model.annotations.Pact; -import de.juplo.demos.consumer.domain.User; -import org.junit.jupiter.api.BeforeEach; +import de.juplo.demos.pwreset.domain.User; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.web.client.RestTemplateBuilder; -import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.web.client.RestTemplate; -import java.io.IOException; import java.util.Map; import java.util.Optional; import java.util.UUID; -- 2.20.1