Skip to content

Commit 98a78d3

Browse files
committed
refactor: Replace inline FQN type references with proper imports
1 parent 3b8f989 commit 98a78d3

4 files changed

Lines changed: 18 additions & 18 deletions

File tree

src/test/java/com/retailsvc/http/DecoratorAndInterceptorIT.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@
77
import java.net.URI;
88
import java.net.http.HttpClient;
99
import java.net.http.HttpRequest;
10+
import java.net.http.HttpResponse;
1011
import java.util.List;
1112
import java.util.Map;
13+
import java.util.concurrent.CopyOnWriteArrayList;
1214
import org.junit.jupiter.api.Test;
1315

1416
class DecoratorAndInterceptorIT extends ServerBaseTest {
@@ -66,7 +68,7 @@ void interceptorBindsScopedValueVisibleToHandler() throws Exception {
6668

6769
@Test
6870
void interceptorsRunInRegistrationOrder() throws Exception {
69-
List<String> trace = new java.util.concurrent.CopyOnWriteArrayList<>();
71+
List<String> trace = new CopyOnWriteArrayList<>();
7072
RequestHandler ok =
7173
req -> {
7274
trace.add("handler");
@@ -99,7 +101,7 @@ void interceptorsRunInRegistrationOrder() throws Exception {
99101
.containsExactly("outer-before", "inner-before", "handler", "inner-after", "outer-after");
100102
}
101103

102-
private java.net.http.HttpResponse<String> call(String path) throws Exception {
104+
private HttpResponse<String> call(String path) throws Exception {
103105
return HttpClient.newHttpClient()
104106
.send(
105107
HttpRequest.newBuilder()

src/test/java/com/retailsvc/http/OpenApiServerIT.java

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -605,8 +605,7 @@ class FormatEmail {
605605

606606
@Test
607607
void formatEmailShouldReturnBadRequestOnInvalidEmail() {
608-
try (var server =
609-
newServer(Map.of("format-email", req -> com.retailsvc.http.Response.status(200)));
608+
try (var server = newServer(Map.of("format-email", req -> Response.status(200)));
610609
var client = httpClient()) {
611610

612611
var request = newRequest(server, path + "?addr=not-an-email", "GET", noBody());
@@ -630,8 +629,7 @@ void formatEmailShouldReturnBadRequestOnInvalidEmail() {
630629

631630
@Test
632631
void formatEmailShouldReturnOkOnValidEmail() {
633-
try (var server =
634-
newServer(Map.of("format-email", req -> com.retailsvc.http.Response.status(200)));
632+
try (var server = newServer(Map.of("format-email", req -> Response.status(200)));
635633
var client = httpClient()) {
636634

637635
var request = newRequest(server, path + "?addr=user%40example.com", "GET", noBody());
@@ -657,8 +655,7 @@ class FormatByte {
657655

658656
@Test
659657
void formatByteShouldReturnBadRequestOnInvalidBase64() {
660-
try (var server =
661-
newServer(Map.of("format-byte", req -> com.retailsvc.http.Response.status(200)));
658+
try (var server = newServer(Map.of("format-byte", req -> Response.status(200)));
662659
var client = httpClient()) {
663660

664661
var request = newRequest(server, path + "?data=not%20base64!!", "GET", noBody());
@@ -682,8 +679,7 @@ void formatByteShouldReturnBadRequestOnInvalidBase64() {
682679

683680
@Test
684681
void formatByteShouldReturnOkOnValidBase64() {
685-
try (var server =
686-
newServer(Map.of("format-byte", req -> com.retailsvc.http.Response.status(200)));
682+
try (var server = newServer(Map.of("format-byte", req -> Response.status(200)));
687683
var client = httpClient()) {
688684

689685
var request = newRequest(server, path + "?data=aGVsbG8%3D", "GET", noBody());
@@ -709,8 +705,7 @@ class FormatInt32 {
709705

710706
@Test
711707
void formatInt32ShouldReturnBadRequestOnOverflow() {
712-
try (var server =
713-
newServer(Map.of("format-int32", req -> com.retailsvc.http.Response.status(200)));
708+
try (var server = newServer(Map.of("format-int32", req -> Response.status(200)));
714709
var client = httpClient()) {
715710

716711
var request = newRequest(server, path + "?n=2147483648", "GET", noBody());
@@ -734,8 +729,7 @@ void formatInt32ShouldReturnBadRequestOnOverflow() {
734729

735730
@Test
736731
void formatInt32ShouldReturnOkOnValidValue() {
737-
try (var server =
738-
newServer(Map.of("format-int32", req -> com.retailsvc.http.Response.status(200)));
732+
try (var server = newServer(Map.of("format-int32", req -> Response.status(200)));
739733
var client = httpClient()) {
740734

741735
var request = newRequest(server, path + "?n=42", "GET", noBody());

src/test/java/com/retailsvc/http/TypeMapperRegistrationTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import java.net.http.HttpRequest;
1212
import java.net.http.HttpRequest.BodyPublishers;
1313
import java.nio.charset.StandardCharsets;
14+
import java.util.List;
1415
import java.util.Map;
1516
import java.util.concurrent.atomic.AtomicBoolean;
1617
import org.junit.jupiter.api.Test;
@@ -59,7 +60,7 @@ void userSuppliedMapperOverridesDefault() throws Exception {
5960
@Override
6061
public Object readFrom(byte[] b, String h) {
6162
readFromCalled.set(true);
62-
return Map.of("aList", java.util.List.of("x"), "feelingGood", true);
63+
return Map.of("aList", List.of("x"), "feelingGood", true);
6364
}
6465

6566
@Override

src/test/java/com/retailsvc/http/spec/SpecFromPathTest.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
package com.retailsvc.http.spec;
22

33
import static org.assertj.core.api.Assertions.assertThat;
4+
import static org.assertj.core.api.Assertions.assertThatThrownBy;
45

6+
import java.nio.file.Files;
57
import java.nio.file.Path;
68
import org.junit.jupiter.api.Test;
9+
import org.junit.jupiter.api.io.TempDir;
710

811
class SpecFromPathTest {
912

@@ -29,11 +32,11 @@ void loadsYamlSpecViaSnakeYaml() throws Exception {
2932
}
3033

3134
@Test
32-
void rejectsUnknownExtension(@org.junit.jupiter.api.io.TempDir Path tmp) throws Exception {
35+
void rejectsUnknownExtension(@TempDir Path tmp) throws Exception {
3336
Path unknown = tmp.resolve("spec.txt");
34-
java.nio.file.Files.writeString(unknown, "{}");
37+
Files.writeString(unknown, "{}");
3538

36-
org.assertj.core.api.Assertions.assertThatThrownBy(() -> Spec.fromPath(unknown))
39+
assertThatThrownBy(() -> Spec.fromPath(unknown))
3740
.isInstanceOf(IllegalStateException.class)
3841
.hasMessageContaining("Unrecognised OpenAPI spec extension");
3942
}

0 commit comments

Comments
 (0)