Skip to content

Commit 4ea265f

Browse files
pk-workpk-work
committed
refactor: apply spotless formatter
1 parent aaccfea commit 4ea265f

File tree

102 files changed

+1587
-1708
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+1587
-1708
lines changed

‎src/main/java/io/vertx/openapi/contract/Location.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
package io.vertx.openapi.contract;
1414

1515
import io.vertx.codegen.annotations.VertxGen;
16-
1716
import java.util.Arrays;
1817
import java.util.function.Predicate;
1918

@@ -24,9 +23,8 @@ public enum Location {
2423
public static Location parse(String location) {
2524
Predicate<String> eq = Predicate.isEqual(location);
2625
// Contract validation happened before, so it will find one of these values.
27-
return location == null ?
28-
null :
29-
Arrays.stream(Location.values()).filter(l -> eq.test(l.toString())).findFirst().orElse(null);
26+
return location == null ? null
27+
: Arrays.stream(Location.values()).filter(l -> eq.test(l.toString())).findFirst().orElse(null);
3028
}
3129

3230
@Override

‎src/main/java/io/vertx/openapi/contract/MediaType.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import io.vertx.codegen.annotations.VertxGen;
1616
import io.vertx.json.schema.JsonSchema;
1717
import io.vertx.openapi.contract.impl.VendorSpecificJson;
18-
1918
import java.util.List;
2019

2120
/**
@@ -36,7 +35,7 @@ public interface MediaType extends OpenAPIObject {
3635
String TEXT_PLAIN = "text/plain";
3736
String TEXT_PLAIN_UTF8 = TEXT_PLAIN + "; charset=utf-8";
3837
List<String> SUPPORTED_MEDIA_TYPES = List.of(APPLICATION_JSON, APPLICATION_JSON_UTF8, MULTIPART_FORM_DATA,
39-
APPLICATION_HAL_JSON, APPLICATION_OCTET_STREAM, TEXT_PLAIN, TEXT_PLAIN_UTF8);
38+
APPLICATION_HAL_JSON, APPLICATION_OCTET_STREAM, TEXT_PLAIN, TEXT_PLAIN_UTF8);
4039

4140
static boolean isMediaTypeSupported(String type) {
4241
return SUPPORTED_MEDIA_TYPES.contains(type.toLowerCase()) || isVendorSpecificJson(type);

‎src/main/java/io/vertx/openapi/contract/OAuthFlow.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
import io.vertx.codegen.annotations.Nullable;
1919
import io.vertx.codegen.annotations.VertxGen;
20-
2120
import java.util.Set;
2221

2322
/**

‎src/main/java/io/vertx/openapi/contract/OpenAPIContract.java‎

Lines changed: 37 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@
1212

1313
package io.vertx.openapi.contract;
1414

15+
import static io.vertx.core.Future.failedFuture;
16+
import static io.vertx.openapi.contract.OpenAPIContractException.createInvalidContract;
17+
import static io.vertx.openapi.impl.Utils.readYamlOrJson;
18+
import static java.util.Collections.emptyMap;
19+
1520
import io.vertx.codegen.annotations.Nullable;
1621
import io.vertx.codegen.annotations.VertxGen;
1722
import io.vertx.core.Future;
@@ -24,17 +29,11 @@
2429
import io.vertx.json.schema.JsonSchemaValidationException;
2530
import io.vertx.json.schema.SchemaRepository;
2631
import io.vertx.openapi.contract.impl.OpenAPIContractImpl;
27-
2832
import java.util.ArrayList;
2933
import java.util.HashMap;
3034
import java.util.List;
3135
import java.util.Map;
3236

33-
import static io.vertx.core.Future.failedFuture;
34-
import static io.vertx.openapi.contract.OpenAPIContractException.createInvalidContract;
35-
import static io.vertx.openapi.impl.Utils.readYamlOrJson;
36-
import static java.util.Collections.emptyMap;
37-
3837
@VertxGen
3938
public interface OpenAPIContract {
4039

@@ -72,7 +71,7 @@ static Future<OpenAPIContract> from(Vertx vertx, JsonObject unresolvedContract)
7271
* @return A succeeded {@link Future} holding an {@link OpenAPIContract} instance, otherwise a failed {@link Future}.
7372
*/
7473
static Future<OpenAPIContract> from(Vertx vertx, String unresolvedContractPath,
75-
Map<String, String> additionalContractFiles) {
74+
Map<String, String> additionalContractFiles) {
7675

7776
Map<String, Future<JsonObject>> jsonFilesFuture = new HashMap<>();
7877
jsonFilesFuture.put(unresolvedContractPath, readYamlOrJson(vertx, unresolvedContractPath));
@@ -97,7 +96,7 @@ static Future<OpenAPIContract> from(Vertx vertx, String unresolvedContractPath,
9796
* @return A succeeded {@link Future} holding an {@link OpenAPIContract} instance, otherwise a failed {@link Future}.
9897
*/
9998
static Future<OpenAPIContract> from(Vertx vertx, JsonObject unresolvedContract,
100-
Map<String, JsonObject> additionalContractFiles) {
99+
Map<String, JsonObject> additionalContractFiles) {
101100
if (unresolvedContract == null) {
102101
return failedFuture(createInvalidContract("Spec must not be null"));
103102
}
@@ -109,36 +108,36 @@ static Future<OpenAPIContract> from(Vertx vertx, JsonObject unresolvedContract,
109108
Promise<OpenAPIContract> promise = ctx.promise();
110109

111110
version.getRepository(vertx, baseUri)
112-
.compose(repository -> {
113-
List<Future<?>> validationFutures = new ArrayList<>(additionalContractFiles.size());
114-
for (String ref : additionalContractFiles.keySet()) {
115-
// Todo: As soon a more modern Java version is used the validate part could be extracted in a private static
116-
// method and reused below.
117-
JsonObject file = additionalContractFiles.get(ref);
118-
Future<?> validationFuture = version.validateAdditionalContractFile(vertx, repository, file)
119-
.compose(v -> vertx.executeBlocking(() -> repository.dereference(ref, JsonSchema.of(ref, file))));
120-
121-
validationFutures.add(validationFuture);
122-
}
123-
return Future.all(validationFutures).map(repository);
124-
}).compose(repository ->
125-
version.validateContract(vertx, repository, unresolvedContract).compose(res -> {
126-
try {
127-
res.checkValidity();
128-
return version.resolve(vertx, repository, unresolvedContract);
129-
} catch (JsonSchemaValidationException | UnsupportedOperationException e) {
130-
return failedFuture(createInvalidContract(null, e));
131-
}
132-
})
133-
.map(resolvedSpec -> (OpenAPIContract) new OpenAPIContractImpl(resolvedSpec, version, repository))
134-
).recover(e -> {
135-
//Convert any non-openapi exceptions into an OpenAPIContractException
136-
if(e instanceof OpenAPIContractException) {
137-
return failedFuture(e);
138-
}
139-
140-
return failedFuture(createInvalidContract("Found issue in specification for reference: " + e.getMessage(), e));
141-
}).onComplete(promise);
111+
.compose(repository -> {
112+
List<Future<?>> validationFutures = new ArrayList<>(additionalContractFiles.size());
113+
for (String ref : additionalContractFiles.keySet()) {
114+
// Todo: As soon a more modern Java version is used the validate part could be extracted in a private static
115+
// method and reused below.
116+
JsonObject file = additionalContractFiles.get(ref);
117+
Future<?> validationFuture = version.validateAdditionalContractFile(vertx, repository, file)
118+
.compose(v -> vertx.executeBlocking(() -> repository.dereference(ref, JsonSchema.of(ref, file))));
119+
120+
validationFutures.add(validationFuture);
121+
}
122+
return Future.all(validationFutures).map(repository);
123+
}).compose(repository -> version.validateContract(vertx, repository, unresolvedContract).compose(res -> {
124+
try {
125+
res.checkValidity();
126+
return version.resolve(vertx, repository, unresolvedContract);
127+
} catch (JsonSchemaValidationException | UnsupportedOperationException e) {
128+
return failedFuture(createInvalidContract(null, e));
129+
}
130+
})
131+
.map(resolvedSpec -> (OpenAPIContract) new OpenAPIContractImpl(resolvedSpec, version, repository)))
132+
.recover(e -> {
133+
// Convert any non-openapi exceptions into an OpenAPIContractException
134+
if (e instanceof OpenAPIContractException) {
135+
return failedFuture(e);
136+
}
137+
138+
return failedFuture(
139+
createInvalidContract("Found issue in specification for reference: " + e.getMessage(), e));
140+
}).onComplete(promise);
142141

143142
return promise.future();
144143
}

‎src/main/java/io/vertx/openapi/contract/OpenAPIContractException.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ public static OpenAPIContractException createInvalidContract(String reason, Thro
3636

3737
public static OpenAPIContractException createUnsupportedVersion(String version) {
3838
return new OpenAPIContractException("The version of the passed OpenAPI contract is not supported: " + version,
39-
UNSUPPORTED_SPEC, null);
39+
UNSUPPORTED_SPEC, null);
4040
}
4141

4242
public static OpenAPIContractException createUnsupportedFeature(String feature) {
4343
return new OpenAPIContractException(
44-
"The passed OpenAPI contract contains a feature that is not supported: " + feature, UNSUPPORTED_FEATURE, null);
44+
"The passed OpenAPI contract contains a feature that is not supported: " + feature, UNSUPPORTED_FEATURE, null);
4545
}
4646

4747
public static OpenAPIContractException createInvalidStyle(Location in, String allowedStyles) {

‎src/main/java/io/vertx/openapi/contract/OpenAPIObject.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,13 @@
1212

1313
package io.vertx.openapi.contract;
1414

15+
import static java.util.function.Function.identity;
16+
1517
import io.vertx.core.json.JsonObject;
1618
import io.vertx.json.schema.internal.JsonObjectProxy;
17-
1819
import java.util.Map;
1920
import java.util.stream.Collectors;
2021

21-
import static java.util.function.Function.identity;
22-
2322
public interface OpenAPIObject {
2423

2524
/**
@@ -48,6 +47,6 @@ public interface OpenAPIObject {
4847
*/
4948
default Map<String, Object> getExtensions() {
5049
return getOpenAPIModel().fieldNames().stream().filter(fieldName -> fieldName.startsWith("x-"))
51-
.collect(Collectors.toMap(identity(), getOpenAPIModel()::getValue));
50+
.collect(Collectors.toMap(identity(), getOpenAPIModel()::getValue));
5251
}
5352
}

‎src/main/java/io/vertx/openapi/contract/OpenAPIVersion.java‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@
1212

1313
package io.vertx.openapi.contract;
1414

15+
import static io.vertx.json.schema.Draft.DRAFT202012;
16+
import static io.vertx.json.schema.Draft.DRAFT4;
17+
import static io.vertx.json.schema.OutputFormat.Basic;
18+
import static io.vertx.openapi.contract.OpenAPIContractException.createInvalidContract;
19+
import static io.vertx.openapi.contract.OpenAPIContractException.createUnsupportedVersion;
20+
1521
import io.vertx.core.Future;
1622
import io.vertx.core.Vertx;
1723
import io.vertx.core.json.JsonObject;
@@ -23,28 +29,20 @@
2329
import io.vertx.json.schema.OutputUnit;
2430
import io.vertx.json.schema.SchemaRepository;
2531
import io.vertx.openapi.impl.OpenAPIFormatValidator;
26-
2732
import java.util.ArrayList;
2833
import java.util.Arrays;
2934
import java.util.List;
3035
import java.util.Optional;
3136

32-
import static io.vertx.json.schema.Draft.DRAFT202012;
33-
import static io.vertx.json.schema.Draft.DRAFT4;
34-
import static io.vertx.json.schema.OutputFormat.Basic;
35-
import static io.vertx.openapi.contract.OpenAPIContractException.createInvalidContract;
36-
import static io.vertx.openapi.contract.OpenAPIContractException.createUnsupportedVersion;
37-
3837
public enum OpenAPIVersion {
3938
V3_0("3.0.", DRAFT4, "https://spec.openapis.org/oas/3.0/schema/2021-09-28",
40-
new OpenAPIFormatValidator()),
39+
new OpenAPIFormatValidator()),
4140
V3_1("3.1.", DRAFT202012,
42-
"https://spec.openapis.org/oas/3.1/schema/2022-10-07",
43-
new OpenAPIFormatValidator(),
44-
"https://spec.openapis.org/oas/3.1/dialect/base",
45-
"https://spec.openapis.org/oas/3.1/meta/base",
46-
"https://spec.openapis.org/oas/3.1/schema-base/2022-10-07"
47-
);
41+
"https://spec.openapis.org/oas/3.1/schema/2022-10-07",
42+
new OpenAPIFormatValidator(),
43+
"https://spec.openapis.org/oas/3.1/dialect/base",
44+
"https://spec.openapis.org/oas/3.1/meta/base",
45+
"https://spec.openapis.org/oas/3.1/schema-base/2022-10-07");
4846

4947
// VisibleForTesting
5048
final List<String> schemaFiles;
@@ -53,7 +51,8 @@ public enum OpenAPIVersion {
5351
private final String mainSchemaFile;
5452
private final JsonFormatValidator formatValidator;
5553

56-
OpenAPIVersion(String schemaVersion, Draft draft, String mainSchemaFile, JsonFormatValidator formatValidator, String... additionalSchemaFiles) {
54+
OpenAPIVersion(String schemaVersion, Draft draft, String mainSchemaFile, JsonFormatValidator formatValidator,
55+
String... additionalSchemaFiles) {
5756
this.schemaVersion = schemaVersion;
5857
this.draft = draft;
5958
this.mainSchemaFile = mainSchemaFile;
@@ -68,7 +67,7 @@ public List<String> schemaFiles() {
6867

6968
public static OpenAPIVersion fromContract(JsonObject contract) {
7069
String version = Optional.ofNullable(contract).map(spec -> spec.getString("openapi"))
71-
.orElseThrow(() -> createInvalidContract("Field \"openapi\" is missing"));
70+
.orElseThrow(() -> createInvalidContract("Field \"openapi\" is missing"));
7271

7372
if (version.startsWith(V3_0.schemaVersion)) {
7473
return V3_0;
@@ -93,8 +92,8 @@ public Future<OutputUnit> validateContract(Vertx vertx, SchemaRepository repo, J
9392
*/
9493
public Future<Void> validateAdditionalContractFile(Vertx vertx, SchemaRepository repo, JsonObject file) {
9594
return vertx.executeBlocking(() -> repo.validator(draft.getIdentifier()).validate(file))
96-
.compose(this::checkOutputUnit)
97-
.mapEmpty();
95+
.compose(this::checkOutputUnit)
96+
.mapEmpty();
9897
}
9998

10099
private Future<Void> checkOutputUnit(OutputUnit ou) {

‎src/main/java/io/vertx/openapi/contract/Operation.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import io.vertx.codegen.annotations.Nullable;
1616
import io.vertx.codegen.annotations.VertxGen;
1717
import io.vertx.core.http.HttpMethod;
18-
1918
import java.util.List;
2019

2120
/**

‎src/main/java/io/vertx/openapi/contract/Path.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
package io.vertx.openapi.contract;
1414

1515
import io.vertx.codegen.annotations.VertxGen;
16-
1716
import java.util.List;
1817

1918
/**

‎src/main/java/io/vertx/openapi/contract/RequestBody.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
package io.vertx.openapi.contract;
1414

1515
import io.vertx.codegen.annotations.VertxGen;
16-
1716
import java.util.Map;
1817

1918
/**

0 commit comments

Comments
 (0)