diff --git a/spotify-web-api-open-api/pom.xml b/spotify-web-api-open-api/pom.xml index aa8582fe..8c520df1 100644 --- a/spotify-web-api-open-api/pom.xml +++ b/spotify-web-api-open-api/pom.xml @@ -21,7 +21,7 @@ 2.1.36 - 1.5.9 + 2.0.0 de.sonallux.spotify.openapi diff --git a/spotify-web-api-open-api/src/main/java/de/sonallux/spotify/openapi/CLI.java b/spotify-web-api-open-api/src/main/java/de/sonallux/spotify/openapi/CLI.java index eaa335bd..dc7c7935 100644 --- a/spotify-web-api-open-api/src/main/java/de/sonallux/spotify/openapi/CLI.java +++ b/spotify-web-api-open-api/src/main/java/de/sonallux/spotify/openapi/CLI.java @@ -3,9 +3,9 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; -import com.networknt.schema.JsonSchema; -import com.networknt.schema.JsonSchemaFactory; -import com.networknt.schema.SpecVersionDetector; +import com.networknt.schema.Schema; +import com.networknt.schema.SchemaRegistry; +import com.networknt.schema.SpecificationVersion; import de.sonallux.json.ReferenceValidator; import io.swagger.v3.core.util.Yaml; import io.swagger.v3.parser.OpenAPIV3Parser; @@ -108,13 +108,12 @@ private static void validateOpenAPI(JsonNode node) { System.exit(1); } - private static JsonSchema loadOpenApiJsonSchema() { + private static Schema loadOpenApiJsonSchema() { try { var mapper = new ObjectMapper(); var schemaJsonNode = mapper.readTree(CLI.class.getResourceAsStream("/open-api-spec-schema.json")); - return JsonSchemaFactory - .getInstance(SpecVersionDetector.detect(schemaJsonNode)) + return SchemaRegistry.withDefaultDialect(SpecificationVersion.DRAFT_4) .getSchema(schemaJsonNode); } catch (IOException e) { log.error("Failed to load OpenAPI schema", e);