Skip to content

Commit

Permalink
new development version + swagger dependencies upgrade
Browse files Browse the repository at this point in the history
Signed-off-by: Bartosz Michalik <[email protected]>
  • Loading branch information
bartoszm committed Dec 28, 2022
1 parent b11ac1a commit ab2ab2c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<groupId>com.amartus.sonata</groupId>
<artifactId>blender</artifactId>
<description>SonataBlendingTool</description>
<version>1.9.4</version>
<version>1.9.5-SNAPSHOT</version>
<properties>
<openapi.generator.version>6.2.0</openapi.generator.version>
<jackson.version>2.14.0</jackson.version>
Expand Down Expand Up @@ -61,7 +61,7 @@
<dependency>
<groupId>io.swagger.parser.v3</groupId>
<artifactId>swagger-parser-v3</artifactId>
<version>2.1.1</version>
<version>2.1.8</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.amartus.sonata.blender.parser;

import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import io.swagger.v3.oas.models.media.Schema;
import io.swagger.v3.parser.util.OpenAPIDeserializer;
import org.slf4j.Logger;
Expand All @@ -12,13 +11,13 @@
public class DeserializerProvider {
private static final Logger log = LoggerFactory.getLogger(DeserializerProvider.class);
static class AmartusDeserializer extends OpenAPIDeserializer {
private Optional<String> getByName(ObjectNode node, String name) {
private Optional<String> getByName(JsonNode node, String name) {
return Optional.ofNullable(node.get(name))
.map(JsonNode::textValue);
}

@Override
public Schema getSchema(ObjectNode node, String location, ParseResult result) {
public Schema getSchema(JsonNode node, String location, ParseResult result) {
var schema = super.getSchema(node, location, result);
if (schema.get$ref() != null) {

Expand All @@ -27,7 +26,7 @@ public Schema getSchema(ObjectNode node, String location, ParseResult result) {
schema.setDescription(d);
});
}
getByName(node,"$id").ifPresent(id -> schema.addExtension("x-try-renaming-on", id));
getByName(node, "$id").ifPresent(id -> schema.addExtension("x-try-renaming-on", id));
return schema;
}
}
Expand Down

0 comments on commit ab2ab2c

Please sign in to comment.