diff --git a/htmx-nima/pom.xml b/htmx-nima/pom.xml index 71e467ed8..397dd1316 100644 --- a/htmx-nima/pom.xml +++ b/htmx-nima/pom.xml @@ -26,7 +26,7 @@ io.helidon.webserver helidon-webserver - 4.1.3 + 4.1.4 diff --git a/http-generator-core/pom.xml b/http-generator-core/pom.xml index f5cbba44c..6fea1e154 100644 --- a/http-generator-core/pom.xml +++ b/http-generator-core/pom.xml @@ -34,12 +34,6 @@ provided - - io.swagger.core.v3 - swagger-annotations - ${swagger.version} - provided - io.swagger.core.v3 swagger-models diff --git a/http-generator-core/src/main/java/io/avaje/http/generator/core/openapi/OpenAPISerializer.java b/http-generator-core/src/main/java/io/avaje/http/generator/core/openapi/OpenAPISerializer.java index 9b24d6037..0899323a7 100644 --- a/http-generator-core/src/main/java/io/avaje/http/generator/core/openapi/OpenAPISerializer.java +++ b/http-generator-core/src/main/java/io/avaje/http/generator/core/openapi/OpenAPISerializer.java @@ -3,9 +3,20 @@ import java.lang.reflect.Field; import java.util.Collection; import java.util.Map; +import java.util.Set; final class OpenAPISerializer { + private static final Set IGNORED_FIELDS = Set.of( + "SCHEMA_RESOLUTION_PROPERTY", + "BIND_TYPE_AND_TYPES", + "BINARY_STRING_CONVERSION_PROPERTY", + "COMPONENTS_SCHEMAS_REF", + "APPLY_SCHEMA_RESOLUTION_PROPERTY", + "exampleSetFlag", + "types", + "specVersion"); + private OpenAPISerializer() {} /** @@ -65,13 +76,8 @@ static String serialize(Object obj) throws IllegalAccessException { for (final Field field : fields) { // skip JsonIgnored fields - if ("SCHEMA_RESOLUTION_PROPERTY".equals(field.getName()) - || "BIND_TYPE_AND_TYPES".equals(field.getName()) - || "BINARY_STRING_CONVERSION_PROPERTY".equals(field.getName()) - || "COMPONENTS_SCHEMAS_REF".equals(field.getName()) - || "exampleSetFlag".equals(field.getName()) - || "types".equals(field.getName()) - || "specVersion".equals(field.getName())) { + if (IGNORED_FIELDS + .contains(field.getName())) { continue; } diff --git a/pom.xml b/pom.xml index 39f9b3599..320cdd772 100644 --- a/pom.xml +++ b/pom.xml @@ -19,9 +19,9 @@ true - 2.2.25 + 2.2.26 2.14.2 - 1.34 + 1.35 ${project.build.directory}${file.separator}module-info.shade diff --git a/tests/pom.xml b/tests/pom.xml index 520a329bf..b4c892a83 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -17,7 +17,7 @@ 2.18.1 2.5 10.5 - 4.1.3 + 4.1.4 6.3.0 diff --git a/tests/test-javalin-jsonb/pom.xml b/tests/test-javalin-jsonb/pom.xml index 028e40e02..ae3a0c81d 100644 --- a/tests/test-javalin-jsonb/pom.xml +++ b/tests/test-javalin-jsonb/pom.xml @@ -13,7 +13,7 @@ true org.example.myapp.Main - 2.2.25 + 2.2.26 1.3.71 diff --git a/tests/test-javalin/pom.xml b/tests/test-javalin/pom.xml index 070793d6c..2647c2470 100644 --- a/tests/test-javalin/pom.xml +++ b/tests/test-javalin/pom.xml @@ -12,7 +12,7 @@ true org.example.myapp.Main - 2.2.25 + 2.2.26 1.3.71 diff --git a/tests/test-jex/pom.xml b/tests/test-jex/pom.xml index 44821ce3d..d5889c04b 100644 --- a/tests/test-jex/pom.xml +++ b/tests/test-jex/pom.xml @@ -13,7 +13,7 @@ true org.example.myapp.Main 2.5 - 2.2.25 + 2.2.26 diff --git a/tests/test-sigma/pom.xml b/tests/test-sigma/pom.xml index a3ba24260..fd0f01ce7 100644 --- a/tests/test-sigma/pom.xml +++ b/tests/test-sigma/pom.xml @@ -13,7 +13,7 @@ 17 true - 2.2.25 + 2.2.26 1.3.71