Corrections in dependencies

micronaut-projects · Oct 25, 2023 · a00b700 · a00b700
1 parent f932de1
commit a00b700
Show file tree

Hide file tree

Showing 47 changed files with 9 additions and 119 deletions.
diff --git a/openapi-adoc/build.gradle b/openapi-adoc/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'io.micronaut.build.internal.openapi-module'
+    id 'io.micronaut.build.internal.openapi-simple-module'
 }
 
 micronautBuild {

diff --git a/openapi-annotations/build.gradle b/openapi-annotations/build.gradle
@@ -1,8 +1,7 @@
 plugins {
-    id 'io.micronaut.build.internal.openapi-module'
+    id 'io.micronaut.build.internal.openapi-simple-module'
 }
 
 dependencies {
     api(libs.managed.swagger.annotations)
 }
-
diff --git a/openapi-common/build.gradle b/openapi-common/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id "io.micronaut.build.internal.binary-compatibility-check"
-    id 'io.micronaut.build.internal.openapi-module'
+    id 'io.micronaut.build.internal.openapi-simple-module'
 }
 
 micronautBuild {
@@ -14,7 +14,6 @@ dependencies {
     api(libs.jackson.dataformat.yaml)
     api(libs.jackson.datatype.jsr310)
     api(libs.managed.swagger.models)
-    api(libs.managed.javadoc.parser)
 }
 
 test {

diff --git a/openapi-common/src/main/java/io/micronaut/openapi/OpenApiUtils.java b/openapi-common/src/main/java/io/micronaut/openapi/OpenApiUtils.java
@@ -18,15 +18,13 @@
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
-import io.micronaut.core.annotation.Internal;
 import io.micronaut.openapi.swagger.core.util.ObjectMapperFactory;
 
 /**
  * Convert utilities methods.
  *
  * @since 4.4.1
  */
-@Internal
 public final class OpenApiUtils {
 
     /**

diff --git a/...ommon/src/main/java/io/micronaut/openapi/swagger/core/jackson/ApiResponsesSerializer.java b/...ommon/src/main/java/io/micronaut/openapi/swagger/core/jackson/ApiResponsesSerializer.java
@@ -18,7 +18,6 @@
 import java.io.IOException;
 import java.util.Map.Entry;
 
-import io.micronaut.core.annotation.Internal;
 import io.swagger.v3.oas.models.responses.ApiResponse;
 import io.swagger.v3.oas.models.responses.ApiResponses;
 
@@ -31,7 +30,6 @@
  *
  * @since 4.6.0
  */
-@Internal
 public class ApiResponsesSerializer extends JsonSerializer<ApiResponses> {
 
     @Override

diff --git a/...pi-common/src/main/java/io/micronaut/openapi/swagger/core/jackson/CallbackSerializer.java b/...pi-common/src/main/java/io/micronaut/openapi/swagger/core/jackson/CallbackSerializer.java
@@ -18,8 +18,6 @@
 import java.io.IOException;
 import java.util.Map.Entry;
 
-import io.micronaut.core.annotation.Internal;
-import io.micronaut.core.util.StringUtils;
 import io.swagger.v3.oas.models.PathItem;
 import io.swagger.v3.oas.models.callbacks.Callback;
 
@@ -32,7 +30,6 @@
  *
  * @since 4.6.0
  */
-@Internal
 public class CallbackSerializer extends JsonSerializer<Callback> {
 
     @Override
@@ -43,7 +40,7 @@ public void serialize(Callback value, JsonGenerator jgen, SerializerProvider pro
             jgen.writeStartObject();
 
             // not a ref
-            if (!StringUtils.hasText(value.get$ref())) {
+            if (value.get$ref() == null || value.get$ref().isBlank()) {
                 if (!value.isEmpty()) {
                     // write map
                     for (Entry<String, PathItem> entry : value.entrySet()) {
@@ -58,7 +55,7 @@ public void serialize(Callback value, JsonGenerator jgen, SerializerProvider pro
             }
             jgen.writeEndObject();
         } else {
-            if (value == null || !StringUtils.hasText(value.get$ref())) {
+            if (value == null || value.get$ref() == null || value.get$ref().isBlank()) {
                 provider.defaultSerializeValue(value, jgen);
             } else { // handle ref schema serialization skipping all other props
                 jgen.writeStartObject();

diff --git a/...api-common/src/main/java/io/micronaut/openapi/swagger/core/jackson/ExampleSerializer.java b/...api-common/src/main/java/io/micronaut/openapi/swagger/core/jackson/ExampleSerializer.java
@@ -17,7 +17,6 @@
 
 import java.io.IOException;
 
-import io.micronaut.core.annotation.Internal;
 import io.swagger.v3.oas.models.examples.Example;
 
 import com.fasterxml.jackson.core.JsonGenerator;
@@ -31,7 +30,6 @@
  *
  * @since 5.0.0
  */
-@Internal
 public class ExampleSerializer extends JsonSerializer<Example> implements ResolvableSerializer {
 
     private JsonSerializer<Object> defaultSerializer;

diff --git a/...i-common/src/main/java/io/micronaut/openapi/swagger/core/jackson/MediaTypeSerializer.java b/...i-common/src/main/java/io/micronaut/openapi/swagger/core/jackson/MediaTypeSerializer.java
@@ -17,7 +17,6 @@
 
 import java.io.IOException;
 
-import io.micronaut.core.annotation.Internal;
 import io.swagger.v3.oas.models.media.MediaType;
 
 import com.fasterxml.jackson.core.JsonGenerator;
@@ -31,7 +30,6 @@
  *
  * @since 4.6.0
  */
-@Internal
 public class MediaTypeSerializer extends JsonSerializer<MediaType> implements ResolvableSerializer {
 
     private JsonSerializer<Object> defaultSerializer;

diff --git a/openapi-common/src/main/java/io/micronaut/openapi/swagger/core/jackson/PathsSerializer.java b/openapi-common/src/main/java/io/micronaut/openapi/swagger/core/jackson/PathsSerializer.java
@@ -18,7 +18,6 @@
 import java.io.IOException;
 import java.util.Map.Entry;
 
-import io.micronaut.core.annotation.Internal;
 import io.swagger.v3.oas.models.PathItem;
 import io.swagger.v3.oas.models.Paths;
 
@@ -31,7 +30,6 @@
  *
  * @since 4.6.0
  */
-@Internal
 public class PathsSerializer extends JsonSerializer<Paths> {
 
     @Override

diff --git a/...pi-common/src/main/java/io/micronaut/openapi/swagger/core/jackson/Schema31Serializer.java b/...pi-common/src/main/java/io/micronaut/openapi/swagger/core/jackson/Schema31Serializer.java
@@ -17,7 +17,6 @@
 
 import java.io.IOException;
 
-import io.micronaut.core.annotation.Internal;
 import io.swagger.v3.oas.models.media.Schema;
 
 import com.fasterxml.jackson.core.JsonGenerator;
@@ -31,7 +30,6 @@
  *
  * @since 4.6.0
  */
-@Internal
 public class Schema31Serializer extends JsonSerializer<Schema> implements ResolvableSerializer {
 
     private JsonSerializer<Object> defaultSerializer;

diff --git a/openapi-common/src/main/java/io/micronaut/openapi/swagger/core/jackson/SchemaSerializer.java b/openapi-common/src/main/java/io/micronaut/openapi/swagger/core/jackson/SchemaSerializer.java
@@ -17,8 +17,6 @@
 
 import java.io.IOException;
 
-import io.micronaut.core.annotation.Internal;
-import io.micronaut.core.util.StringUtils;
 import io.swagger.v3.oas.models.media.Schema;
 
 import com.fasterxml.jackson.core.JsonGenerator;
@@ -32,7 +30,6 @@
  *
  * @since 4.6.0
  */
-@Internal
 public class SchemaSerializer extends JsonSerializer<Schema> implements ResolvableSerializer {
 
     private JsonSerializer<Object> defaultSerializer;
@@ -51,7 +48,7 @@ public void resolve(SerializerProvider serializerProvider) throws JsonMappingExc
     @Override
     public void serialize(Schema value, JsonGenerator jgen, SerializerProvider provider) throws IOException {
 
-        if (!StringUtils.hasText(value.get$ref())) {
+        if (value.get$ref() == null || value.get$ref().isBlank()) {
 
             if (value.getExampleSetFlag() && value.getExample() == null) {
                 jgen.writeStartObject();

diff --git a/...mmon/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/Components31Mixin.java b/...mmon/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/Components31Mixin.java
@@ -17,7 +17,6 @@
 
 import java.util.Map;
 
-import io.micronaut.core.annotation.Internal;
 import io.micronaut.openapi.swagger.core.jackson.CallbackSerializer;
 import io.swagger.v3.oas.models.callbacks.Callback;
 
@@ -30,7 +29,6 @@
  *
  * @since 4.6.0
  */
-@Internal
 public abstract class Components31Mixin {
 
     @JsonAnyGetter

diff --git a/...common/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/ComponentsMixin.java b/...common/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/ComponentsMixin.java
@@ -17,7 +17,6 @@
 
 import java.util.Map;
 
-import io.micronaut.core.annotation.Internal;
 import io.micronaut.openapi.swagger.core.jackson.CallbackSerializer;
 import io.swagger.v3.oas.models.PathItem;
 import io.swagger.v3.oas.models.callbacks.Callback;
@@ -32,7 +31,6 @@
  *
  * @since 4.6.0
  */
-@Internal
 public abstract class ComponentsMixin {
 
     @JsonAnyGetter

diff --git a/...common/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/DateSchemaMixin.java b/...common/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/DateSchemaMixin.java
@@ -17,8 +17,6 @@
 
 import java.util.Map;
 
-import io.micronaut.core.annotation.Internal;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -28,7 +26,6 @@
  *
  * @since 4.6.0
  */
-@Internal
 public abstract class DateSchemaMixin {
 
     @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd")

diff --git a/...n/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/Discriminator31Mixin.java b/...n/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/Discriminator31Mixin.java
@@ -17,8 +17,6 @@
 
 import java.util.Map;
 
-import io.micronaut.core.annotation.Internal;
-
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 
@@ -27,7 +25,6 @@
  *
  * @since 4.6.0
  */
-@Internal
 public abstract class Discriminator31Mixin {
 
     @JsonAnyGetter

diff --git a/...mon/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/DiscriminatorMixin.java b/...mon/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/DiscriminatorMixin.java
@@ -17,16 +17,13 @@
 
 import java.util.Map;
 
-import io.micronaut.core.annotation.Internal;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
 /**
  * This class is copied from swagger-core library.
  *
  * @since 4.6.0
  */
-@Internal
 public abstract class DiscriminatorMixin {
 
     @JsonIgnore

diff --git a/...pi-common/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/ExampleMixin.java b/...pi-common/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/ExampleMixin.java
@@ -17,8 +17,6 @@
 
 import java.util.Map;
 
-import io.micronaut.core.annotation.Internal;
-
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -30,7 +28,6 @@
  *
  * @since 4.6.0
  */
-@Internal
 public abstract class ExampleMixin {
 
     @JsonAnyGetter

diff --git a/...common/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/ExtensionsMixin.java b/...common/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/ExtensionsMixin.java
@@ -17,8 +17,6 @@
 
 import java.util.Map;
 
-import io.micronaut.core.annotation.Internal;
-
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 
@@ -27,7 +25,6 @@
  *
  * @since 4.6.0
  */
-@Internal
 public abstract class ExtensionsMixin {
 
     @JsonAnyGetter

diff --git a/...api-common/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/Info31Mixin.java b/...api-common/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/Info31Mixin.java
@@ -17,8 +17,6 @@
 
 import java.util.Map;
 
-import io.micronaut.core.annotation.Internal;
-
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 
@@ -27,7 +25,6 @@
  *
  * @since 4.6.0
  */
-@Internal
 public abstract class Info31Mixin {
 
     @JsonAnyGetter

diff --git a/openapi-common/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/InfoMixin.java b/openapi-common/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/InfoMixin.java
@@ -17,8 +17,6 @@
 
 import java.util.Map;
 
-import io.micronaut.core.annotation.Internal;
-
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -28,7 +26,6 @@
  *
  * @since 4.6.0
  */
-@Internal
 public abstract class InfoMixin {
 
     @JsonAnyGetter

diff --git a/...pi-common/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/LicenseMixin.java b/...pi-common/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/LicenseMixin.java
@@ -17,8 +17,6 @@
 
 import java.util.Map;
 
-import io.micronaut.core.annotation.Internal;
-
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -28,7 +26,6 @@
  *
  * @since 4.6.0
  */
-@Internal
 public abstract class LicenseMixin {
 
     @JsonAnyGetter

diff --git a/...-common/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/MediaTypeMixin.java b/...-common/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/MediaTypeMixin.java
@@ -17,8 +17,6 @@
 
 import java.util.Map;
 
-import io.micronaut.core.annotation.Internal;
-
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -30,7 +28,6 @@
  *
  * @since 4.6.0
  */
-@Internal
 public abstract class MediaTypeMixin {
 
     @JsonAnyGetter

diff --git a/...-common/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/OpenAPI31Mixin.java b/...-common/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/OpenAPI31Mixin.java
@@ -17,7 +17,6 @@
 
 import java.util.Map;
 
-import io.micronaut.core.annotation.Internal;
 import io.micronaut.openapi.swagger.core.jackson.PathsSerializer;
 import io.swagger.v3.oas.models.Paths;
 
@@ -30,7 +29,6 @@
  *
  * @since 4.6.0
  */
-@Internal
 public abstract class OpenAPI31Mixin {
 
     @JsonAnyGetter