Skip to content

Commit b18d562

Browse files
committed
chore: apply prettier
1 parent d1fcf09 commit b18d562

File tree

5 files changed

+47
-47
lines changed

5 files changed

+47
-47
lines changed

example/src/test/java/com/toedter/spring/hateoas/jsonapi/example/JsonApiSpringBootMockMvcTesterIntegrationTest.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,16 @@
1616

1717
package com.toedter.spring.hateoas.jsonapi.example;
1818

19+
import static com.toedter.spring.hateoas.jsonapi.MediaTypes.JSON_API;
20+
import static org.assertj.core.api.Assertions.assertThat;
21+
import static org.mockito.ArgumentMatchers.any;
22+
1923
import com.toedter.spring.hateoas.jsonapi.example.director.Director;
2024
import com.toedter.spring.hateoas.jsonapi.example.director.DirectorRepository;
2125
import com.toedter.spring.hateoas.jsonapi.example.movie.Movie;
2226
import com.toedter.spring.hateoas.jsonapi.example.movie.MovieRepository;
27+
import java.util.Collections;
28+
import java.util.Optional;
2329
import org.junit.jupiter.api.DisplayName;
2430
import org.junit.jupiter.api.DisplayNameGeneration;
2531
import org.junit.jupiter.api.DisplayNameGenerator;
@@ -32,13 +38,6 @@
3238
import org.springframework.test.web.servlet.assertj.MockMvcTester;
3339
import org.springframework.web.context.WebApplicationContext;
3440

35-
import java.util.Collections;
36-
import java.util.Optional;
37-
38-
import static com.toedter.spring.hateoas.jsonapi.MediaTypes.JSON_API;
39-
import static org.assertj.core.api.Assertions.assertThat;
40-
import static org.mockito.ArgumentMatchers.any;
41-
4241
/**
4342
* @author Kai Toedter
4443
*/

lib/src/test/java/com/toedter/spring/hateoas/jsonapi/JacksonJsonApiIntegrationTest.java

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
package com.toedter.spring.hateoas.jsonapi;
1818

19+
import static org.assertj.core.api.Assertions.assertThat;
20+
1921
import com.fasterxml.jackson.annotation.JsonIgnore;
2022
import com.fasterxml.jackson.annotation.JsonInclude;
2123
import com.toedter.spring.hateoas.jsonapi.support.Address;
@@ -53,6 +55,21 @@
5355
import com.toedter.spring.hateoas.jsonapi.support.polymorphism.SuperEChild2;
5456
import com.toedter.spring.hateoas.jsonapi.support.polymorphism.SuperEntity;
5557
import jakarta.persistence.Id;
58+
import java.io.File;
59+
import java.io.IOException;
60+
import java.net.URI;
61+
import java.time.Instant;
62+
import java.util.ArrayList;
63+
import java.util.Arrays;
64+
import java.util.Collection;
65+
import java.util.Collections;
66+
import java.util.HashMap;
67+
import java.util.Iterator;
68+
import java.util.List;
69+
import java.util.Map;
70+
import java.util.Objects;
71+
import java.util.Set;
72+
import java.util.UUID;
5673
import lombok.Getter;
5774
import org.junit.jupiter.api.Assertions;
5875
import org.junit.jupiter.api.BeforeEach;
@@ -74,24 +91,6 @@
7491
import tools.jackson.databind.JavaType;
7592
import tools.jackson.databind.json.JsonMapper;
7693

77-
import java.io.File;
78-
import java.io.IOException;
79-
import java.net.URI;
80-
import java.time.Instant;
81-
import java.util.ArrayList;
82-
import java.util.Arrays;
83-
import java.util.Collection;
84-
import java.util.Collections;
85-
import java.util.HashMap;
86-
import java.util.Iterator;
87-
import java.util.List;
88-
import java.util.Map;
89-
import java.util.Objects;
90-
import java.util.Set;
91-
import java.util.UUID;
92-
93-
import static org.assertj.core.api.Assertions.assertThat;
94-
9594
@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
9695
@DisplayName("JacksonJsonApi Integration Test")
9796
class JacksonJsonApiIntegrationTest extends JsonApiTestBase {

lib/src/test/java/com/toedter/spring/hateoas/jsonapi/JsonApiErrorsIntegrationTest.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616

1717
package com.toedter.spring.hateoas.jsonapi;
1818

19+
import static org.assertj.core.api.Assertions.assertThat;
20+
21+
import java.util.HashMap;
1922
import org.junit.jupiter.api.BeforeEach;
2023
import org.junit.jupiter.api.DisplayName;
2124
import org.junit.jupiter.api.DisplayNameGeneration;
@@ -24,10 +27,6 @@
2427
import tools.jackson.databind.SerializationFeature;
2528
import tools.jackson.databind.json.JsonMapper;
2629

27-
import java.util.HashMap;
28-
29-
import static org.assertj.core.api.Assertions.assertThat;
30-
3130
@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
3231
@DisplayName("JsonApiErrors Test")
3332
class JsonApiErrorsIntegrationTest extends JsonApiTestBase {

lib/src/test/java/com/toedter/spring/hateoas/jsonapi/JsonApiTestBase.java

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,21 @@
1616

1717
package com.toedter.spring.hateoas.jsonapi;
1818

19+
import static org.assertj.core.api.Assertions.assertThat;
20+
1921
import dev.harrel.json.providers.jackson3.Jackson3Node;
2022
import dev.harrel.jsonschema.Error;
2123
import dev.harrel.jsonschema.JsonNodeFactory;
2224
import dev.harrel.jsonschema.Validator;
2325
import dev.harrel.jsonschema.ValidatorFactory;
24-
import org.springframework.beans.factory.ObjectProvider;
25-
import org.springframework.core.io.ClassPathResource;
26-
import tools.jackson.databind.JsonNode;
27-
import tools.jackson.databind.json.JsonMapper;
28-
2926
import java.io.File;
3027
import java.io.IOException;
3128
import java.io.InputStream;
3229
import java.net.URI;
33-
34-
import static org.assertj.core.api.Assertions.assertThat;
30+
import org.springframework.beans.factory.ObjectProvider;
31+
import org.springframework.core.io.ClassPathResource;
32+
import tools.jackson.databind.JsonNode;
33+
import tools.jackson.databind.json.JsonMapper;
3534

3635
/**
3736
* @author Kai Toedter
@@ -52,19 +51,26 @@ void compareWithFile(String json, String fileName, boolean validateSchema)
5251

5352
if (validateSchema) {
5453
// Load the JSON schema from resources
55-
InputStream schemaStream = new ClassPathResource("jsonapi-schema.json", getClass()).getInputStream();
54+
InputStream schemaStream = new ClassPathResource(
55+
"jsonapi-schema.json",
56+
getClass()
57+
).getInputStream();
5658
String schemaString = new String(schemaStream.readAllBytes());
5759

5860
JsonNodeFactory factory = new Jackson3Node.Factory();
5961
Validator validator = new ValidatorFactory()
60-
.withJsonNodeFactory(factory)
61-
.createValidator();
62+
.withJsonNodeFactory(factory)
63+
.createValidator();
6264

63-
tools.jackson.databind.JsonNode providerSchemaNode = new JsonMapper().readTree(schemaString);
65+
tools.jackson.databind.JsonNode providerSchemaNode =
66+
new JsonMapper().readTree(schemaString);
6467
URI schemaUri = validator.registerSchema(providerSchemaNode);
6568

66-
Validator.Result validatenResult = validator.validate(schemaUri, actualJsonNode);
67-
if(!validatenResult.isValid()) {
69+
Validator.Result validatenResult = validator.validate(
70+
schemaUri,
71+
actualJsonNode
72+
);
73+
if (!validatenResult.isValid()) {
6874
for (Error error : validatenResult.getErrors()) {
6975
System.out.println("Validation error: " + error.getError());
7076
}

lib/src/test/java/com/toedter/spring/hateoas/jsonapi/JsonApiWebFluxIntegrationTest.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
package com.toedter.spring.hateoas.jsonapi;
1818

19-
import static com.toedter.spring.hateoas.jsonapi.MediaTypes.JSON_API;
20-
2119
import com.toedter.spring.hateoas.jsonapi.support.WebFluxMovieController;
2220
import org.junit.jupiter.api.BeforeEach;
2321
import org.junit.jupiter.api.DisplayName;
@@ -39,9 +37,10 @@
3937
import org.springframework.test.context.web.WebAppConfiguration;
4038
import org.springframework.test.web.reactive.server.EntityExchangeResult;
4139
import org.springframework.test.web.reactive.server.WebTestClient;
42-
import org.springframework.test.web.servlet.MockMvc;
4340
import org.springframework.web.reactive.config.EnableWebFlux;
4441

42+
import static com.toedter.spring.hateoas.jsonapi.MediaTypes.JSON_API;
43+
4544
/**
4645
* @author Kai Toedter
4746
*/
@@ -55,8 +54,6 @@ class JsonApiWebFluxIntegrationTest extends JsonApiTestBase {
5554
@Autowired
5655
WebTestClient testClient;
5756

58-
MockMvc mockMvc;
59-
6057
@BeforeEach
6158
void setUp() {
6259
WebFluxMovieController.reset();

0 commit comments

Comments
 (0)