move more files

getyourguide · Nov 22, 2023 · 06ef4a5 · 06ef4a5
1 parent ea0943d
commit 06ef4a5
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 12 deletions.
diff --git a/...ava/com/getyourguide/openapi/validation/integration/ExceptionsNoExceptionHandlerTest.java b/...ava/com/getyourguide/openapi/validation/integration/ExceptionsNoExceptionHandlerTest.java
@@ -6,9 +6,9 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-import com.getyourguide.openapi.validation.integration.exception.WithResponseStatusException;
-import com.getyourguide.openapi.validation.integration.exception.WithoutResponseStatusException;
-import com.getyourguide.openapi.validation.test.openapi.TestViolationLogger;
+import com.getyourguide.openapi.validation.test.TestViolationLogger;
+import com.getyourguide.openapi.validation.test.exception.WithResponseStatusException;
+import com.getyourguide.openapi.validation.test.exception.WithoutResponseStatusException;
 import jakarta.servlet.ServletException;
 import java.util.Optional;
 import org.hamcrest.Matchers;

diff --git a/...a/com/getyourguide/openapi/validation/integration/ExceptionsWithExceptionHandlerTest.java b/...a/com/getyourguide/openapi/validation/integration/ExceptionsWithExceptionHandlerTest.java
@@ -6,9 +6,9 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-import com.getyourguide.openapi.validation.test.openapi.TestViolationLogger;
+import com.getyourguide.openapi.validation.test.TestViolationLogger;
+import com.getyourguide.openapi.validation.test.exception.WithResponseStatusException;
 import com.getyourguide.openapi.validation.test.openapi.web.model.BadRequestResponse;
-import com.getyourguide.openapi.validation.integration.exception.WithResponseStatusException;
 import java.util.Optional;
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.BeforeEach;

diff --git a/...ava/com/getyourguide/openapi/validation/integration/OpenApiValidationIntegrationTest.java b/...ava/com/getyourguide/openapi/validation/integration/OpenApiValidationIntegrationTest.java
@@ -10,7 +10,7 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 import com.getyourguide.openapi.validation.api.model.OpenApiViolation;
-import com.getyourguide.openapi.validation.test.openapi.TestViolationLogger;
+import com.getyourguide.openapi.validation.test.TestViolationLogger;
 import java.util.List;
 import java.util.Optional;
 import javax.annotation.Nullable;

diff --git a/...est/java/com/getyourguide/openapi/validation/integration/SpringBootTestConfiguration.java b/...est/java/com/getyourguide/openapi/validation/integration/SpringBootTestConfiguration.java
@@ -1,7 +1,7 @@
 package com.getyourguide.openapi.validation.integration;
 
 import com.getyourguide.openapi.validation.api.log.ViolationLogger;
-import com.getyourguide.openapi.validation.test.openapi.TestViolationLogger;
+import com.getyourguide.openapi.validation.test.TestViolationLogger;
 import org.springframework.boot.SpringBootConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigurationExcludeFilter;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;

diff --git a/...ava/com/getyourguide/openapi/validation/integration/controller/DefaultRestController.java b/...ava/com/getyourguide/openapi/validation/integration/controller/DefaultRestController.java
@@ -1,10 +1,10 @@
 package com.getyourguide.openapi.validation.integration.controller;
 
+import com.getyourguide.openapi.validation.test.exception.WithResponseStatusException;
+import com.getyourguide.openapi.validation.test.exception.WithoutResponseStatusException;
 import com.getyourguide.openapi.validation.test.openapi.web.DefaultApi;
 import com.getyourguide.openapi.validation.test.openapi.web.model.PostTestRequest;
 import com.getyourguide.openapi.validation.test.openapi.web.model.TestResponse;
-import com.getyourguide.openapi.validation.integration.exception.WithResponseStatusException;
-import com.getyourguide.openapi.validation.integration.exception.WithoutResponseStatusException;
 import java.time.LocalDate;
 import java.util.Objects;
 import org.springframework.http.ResponseEntity;

diff --git a/test/test-utils/build.gradle b/test/test-utils/build.gradle
@@ -13,4 +13,6 @@ dependencies {
 
     // TODO use spotbugs instead and also apply to all modules?
     implementation(libs.find.bugs)
+
+    compileOnly 'org.springframework:spring-web'
 }
diff --git a/...ion/test/openapi/TestViolationLogger.java → .../validation/test/TestViolationLogger.java b/...ion/test/openapi/TestViolationLogger.java → .../validation/test/TestViolationLogger.java
@@ -1,4 +1,4 @@
-package com.getyourguide.openapi.validation.test.openapi;
+package com.getyourguide.openapi.validation.test;
 
 import com.getyourguide.openapi.validation.api.log.ViolationLogger;
 import com.getyourguide.openapi.validation.api.model.OpenApiViolation;

diff --git a/...xception/WithResponseStatusException.java → ...xception/WithResponseStatusException.java b/...xception/WithResponseStatusException.java → ...xception/WithResponseStatusException.java
@@ -1,4 +1,4 @@
-package com.getyourguide.openapi.validation.integration.exception;
+package com.getyourguide.openapi.validation.test.exception;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ResponseStatus;

diff --git a/...ption/WithoutResponseStatusException.java → ...ption/WithoutResponseStatusException.java b/...ption/WithoutResponseStatusException.java → ...ption/WithoutResponseStatusException.java
@@ -1,4 +1,4 @@
-package com.getyourguide.openapi.validation.integration.exception;
+package com.getyourguide.openapi.validation.test.exception;
 
 public class WithoutResponseStatusException extends RuntimeException {