springwolf
diff --git a/‎springwolf-add-ons/springwolf-common-model-converters/src/main/java/io/github/springwolf/addons/common_model_converters/converters/monetaryamount/MonetaryAmountConverter.java‎
Lines changed: 25 additions & 5 deletions b/‎springwolf-add-ons/springwolf-common-model-converters/src/main/java/io/github/springwolf/addons/common_model_converters/converters/monetaryamount/MonetaryAmountConverter.java‎
Lines changed: 25 additions & 5 deletions
diff --git a/‎springwolf-add-ons/springwolf-common-model-converters/src/test/java/io/github/springwolf/addons/common_model_converters/converters/monetaryamount/MonetaryAmountConverterTest.java‎
Lines changed: 17 additions & 6 deletions b/‎springwolf-add-ons/springwolf-common-model-converters/src/test/java/io/github/springwolf/addons/common_model_converters/converters/monetaryamount/MonetaryAmountConverterTest.java‎
Lines changed: 17 additions & 6 deletions
diff --git a/‎springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/channel/message/MessagePayload.java‎
Lines changed: 2 additions & 0 deletions b/‎springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/channel/message/MessagePayload.java‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/channel/message/MessageReference.java‎
Lines changed: 1 addition & 0 deletions b/‎springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/channel/message/MessageReference.java‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/schema/SchemaObject.java‎
Lines changed: 2 additions & 0 deletions b/‎springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/schema/SchemaObject.java‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/schema/SchemaReference.java‎
Lines changed: 1 addition & 0 deletions b/‎springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/schema/SchemaReference.java‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/components/ComponentsService.java‎
Lines changed: 2 additions & 0 deletions b/‎springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/components/ComponentsService.java‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/components/DefaultComponentsService.java‎
Lines changed: 55 additions & 8 deletions b/‎springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/components/DefaultComponentsService.java‎
Lines changed: 55 additions & 8 deletions
diff --git a/‎springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/components/headers/AsyncHeadersBuilder.java‎
Lines changed: 2 additions & 1 deletion b/‎springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/components/headers/AsyncHeadersBuilder.java‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/components/headers/AsyncHeadersNotDocumented.java‎
Lines changed: 2 additions & 1 deletion b/‎springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/components/headers/AsyncHeadersNotDocumented.java‎
Lines changed: 2 additions & 1 deletion
@@ -14,12 +14,32 @@ public class MonetaryAmountConverter implements ModelConverter {
 
     @Override
     public Schema resolve(AnnotatedType type, ModelConverterContext context, Iterator<ModelConverter> chain) {
-        JavaType javaType = Json.mapper().constructType(type.getType());
-        if (javaType != null) {
-            Class<?> cls = javaType.getRawClass();
-            if (javax.money.MonetaryAmount.class.isAssignableFrom(cls))
-                type = new AnnotatedType(MonetaryAmount.class).resolveAsRef(true);
+        Class<?> rawClass = getRawClass(type);
+        boolean isMonetaryAmount = isMonetaryAmountType(rawClass);
+
+        if (isMonetaryAmount) {
+            type = new AnnotatedType(MonetaryAmount.class).resolveAsRef(true);
         }
+
+        Schema<?> schema = proceedWithChain(type, context, chain);
+
+        if (isMonetaryAmount && schema != null && rawClass != null) {
+            schema.name(rawClass.getName());
+        }
+
+        return schema;
+    }
+
+    private Class<?> getRawClass(AnnotatedType type) {
+        JavaType javaType = Json.mapper().constructType(type.getType());
+        return javaType != null ? javaType.getRawClass() : null;
+    }
+
+    private Schema proceedWithChain(AnnotatedType type, ModelConverterContext context, Iterator<ModelConverter> chain) {
         return (chain.hasNext()) ? chain.next().resolve(type, context, chain) : null;
     }
+
+    private boolean isMonetaryAmountType(Class<?> rawClass) {
+        return javax.money.MonetaryAmount.class.isAssignableFrom(rawClass);
+    }
 }
@@ -6,26 +6,30 @@
 import io.swagger.v3.oas.models.media.Schema;
 import org.junit.jupiter.api.Test;
 
-import javax.money.MonetaryAmount;
+import java.util.Map;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
 class MonetaryAmountConverterTest {
 
-    private MonetaryAmountConverter modelsConverter = new MonetaryAmountConverter();
+    private final MonetaryAmountConverter modelsConverter = new MonetaryAmountConverter();
 
-    private ModelConverters converters = new ModelConverters();
+    private final ModelConverters converters = new ModelConverters();
 
     @Test
     void testMonetaryAmountConverter() {
-
+        // given
         converters.addConverter(modelsConverter);
 
-        final Schema model =
-                converters.readAll(new AnnotatedType(MonetaryAmount.class)).get("MonetaryAmount");
+        // when
+        final Map<String, Schema> models = converters.readAll(new AnnotatedType(javax.money.MonetaryAmount.class));
+
+        // then
+        final Schema model = models.get("MonetaryAmount");
         assertNotNull(model);
+
         assertEquals(2, model.getProperties().size());
 
         final Schema amountProperty = (Schema) model.getProperties().get("amount");
@@ -36,5 +40,12 @@ void testMonetaryAmountConverter() {
 
         final Schema missingProperty = (Schema) model.getProperties().get("missing");
         assertNull(missingProperty);
+
+        // then
+        final Schema originalModel = models.get("javax.money.MonetaryAmount");
+        assertNotNull(originalModel);
+
+        assertNull(originalModel.getType());
+        assertEquals("#/components/schemas/MonetaryAmount", originalModel.get$ref());
     }
 }
@@ -7,10 +7,12 @@
 import io.github.springwolf.asyncapi.v3.model.schema.SchemaObject;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
+import lombok.ToString;
 
 @Getter
 @JsonSerialize(using = MessagePayloadSerializer.class)
 @EqualsAndHashCode
+@ToString
 public class MessagePayload {
     private MultiFormatSchema multiFormatSchema;
     private SchemaObject schema;
 
@@ -9,6 +9,7 @@
 import lombok.ToString;
 
 @EqualsAndHashCode
+@ToString
 @NoArgsConstructor
 @AllArgsConstructor
 public class MessageReference implements Message, Reference {
 
@@ -10,6 +10,7 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import lombok.ToString;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -31,6 +32,7 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = true)
+@ToString
 public class SchemaObject extends ExtendableObject implements Schema {
     /**
      * Adds support for polymorphism. The discriminator is the schema property name that is used to differentiate
 
@@ -9,6 +9,7 @@
 import lombok.ToString;
 
 @EqualsAndHashCode
+@ToString
 @NoArgsConstructor
 @AllArgsConstructor
 public class SchemaReference implements Schema, Reference {
 
@@ -12,6 +12,8 @@ public interface ComponentsService {
 
     Map<String, SchemaObject> getSchemas();
 
+    SchemaObject resolveSchema(String schemaName);
+
     String registerSchema(SchemaObject headers);
 
     String registerSchema(Class<?> type);
 
@@ -14,6 +14,7 @@
 import io.swagger.v3.oas.models.media.ObjectSchema;
 import io.swagger.v3.oas.models.media.Schema;
 import io.swagger.v3.oas.models.media.StringSchema;
+import jakarta.annotation.Nullable;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 
@@ -60,6 +61,15 @@ public Map<String, SchemaObject> getSchemas() {
                 .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
     }
 
+    @Override
+    @Nullable
+    public SchemaObject resolveSchema(String schemaName) {
+        if (schemas.containsKey(schemaName)) {
+            return swaggerSchemaUtil.mapSchema(schemas.get(schemaName));
+        }
+        return null;
+    }
+
     @Override
     public String registerSchema(SchemaObject headers) {
         log.debug("Registering schema for {}", headers.getTitle());
@@ -81,6 +91,7 @@ public String registerSchema(SchemaObject headers) {
 
     @Override
     public String registerSchema(Class<?> type) {
+        // FIXME: Move this to the new HeadersService
         return this.registerSchema(type, properties.getDocket().getDefaultContentType());
     }
 
@@ -90,13 +101,13 @@ public String registerSchema(Class<?> type, String contentType) {
         String actualContentType =
                 StringUtils.isBlank(contentType) ? properties.getDocket().getDefaultContentType() : contentType;
 
-        Map<String, Schema> schemas = new LinkedHashMap<>(runWithFqnSetting((unused) -> converter.readAll(type)));
+        Map<String, Schema> newSchemas = new LinkedHashMap<>(runWithFqnSetting((unused) -> converter.readAll(type)));
 
-        String schemaName = getSchemaName(type, schemas);
+        String schemaName = getSchemaName(type, newSchemas);
 
-        preProcessSchemas(schemas, schemaName, type);
-        schemas.forEach(this.schemas::putIfAbsent);
-        schemas.values().forEach(schema -> postProcessSchema(schema, actualContentType));
+        preProcessSchemas(newSchemas, schemaName, type);
+        newSchemas.forEach(this.schemas::putIfAbsent);
+        newSchemas.values().forEach(schema -> postProcessSchema(schema, actualContentType));
 
         return schemaName;
     }
@@ -130,11 +141,40 @@ private String getSchemaName(Class<?> type, Map<String, Schema> schemas) {
             return new ArrayList<>(resolvedPayloadModelName).get(0);
         }
 
-        return type.getSimpleName();
+        return getNameFromClass(type);
     }
 
     private void preProcessSchemas(Map<String, Schema> schemas, String schemaName, Class<?> type) {
+        processCommonModelConverters(schemas);
         processAsyncApiPayloadAnnotation(schemas, schemaName, type);
+        processSchemaAnnotation(schemas, schemaName, type);
+    }
+
+    private void processCommonModelConverters(Map<String, Schema> schemas) {
+        schemas.values().stream()
+                .filter(schema -> schema.getType() == null)
+                .filter(schema -> schema.get$ref() != null)
+                .forEach(schema -> {
+                    String targetSchemaName = schema.getName();
+                    String sourceSchemaName = StringUtils.substringAfterLast(schema.get$ref(), "/");
+
+                    Schema<?> actualSchema = schemas.get(sourceSchemaName);
+
+                    if (actualSchema != null) {
+                        schemas.put(targetSchemaName, actualSchema);
+                        schemas.remove(sourceSchemaName);
+                    }
+                });
+    }
+
+    private void processSchemaAnnotation(Map<String, Schema> schemas, String schemaName, Class<?> type) {
+        Schema schemaForType = schemas.get(schemaName);
+        if (schemaForType != null) {
+            var schemaAnnotation = type.getAnnotation(io.swagger.v3.oas.annotations.media.Schema.class);
+            if (schemaAnnotation != null) {
+                schemaForType.setDescription(schemaAnnotation.description());
+            }
+        }
     }
 
     private void processAsyncApiPayloadAnnotation(Map<String, Schema> schemas, String schemaName, Class<?> type) {
@@ -161,9 +201,9 @@ private void processAsyncApiPayloadAnnotation(Map<String, Schema> schemas, Strin
     }
 
     private String registerString() {
-        String schemaName = "String";
+        String schemaName = getNameFromClass(String.class);
         StringSchema schema = new StringSchema();
-        schema.setName(String.class.getName());
+        schema.setName(schemaName);
 
         this.schemas.put(schemaName, schema);
         postProcessSchema(schema, DEFAULT_CONTENT_TYPE);
@@ -181,6 +221,13 @@ private <R> R runWithFqnSetting(Function<Void, R> callable) {
         return result;
     }
 
+    private String getNameFromClass(Class<?> type) {
+        if (properties.isUseFqn()) {
+            return type.getName();
+        }
+        return type.getSimpleName();
+    }
+
     private void postProcessSchema(Schema schema, String contentType) {
         for (SchemasPostProcessor processor : schemaPostProcessors) {
             processor.process(schema, schemas, contentType);
 
@@ -2,7 +2,8 @@
 package io.github.springwolf.core.asyncapi.components.headers;
 
 import io.github.springwolf.asyncapi.v3.model.schema.SchemaObject;
+import io.github.springwolf.core.asyncapi.scanners.common.payload.NamedSchemaObject;
 
 public interface AsyncHeadersBuilder {
-    SchemaObject buildHeaders(Class<?> payloadType);
+    SchemaObject buildHeaders(NamedSchemaObject payloadSchema);
 }
@@ -2,6 +2,7 @@
 package io.github.springwolf.core.asyncapi.components.headers;
 
 import io.github.springwolf.asyncapi.v3.model.schema.SchemaObject;
+import io.github.springwolf.core.asyncapi.scanners.common.payload.NamedSchemaObject;
 
 import java.util.List;
 import java.util.Map;
@@ -22,7 +23,7 @@ public class AsyncHeadersNotDocumented implements AsyncHeadersBuilder {
     }
 
     @Override
-    public SchemaObject buildHeaders(Class<?> payloadType) {
+    public SchemaObject buildHeaders(NamedSchemaObject payloadSchema) {
         return NOT_DOCUMENTED;
     }
 }
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,8 @@`
`2`	`2`	`package io.github.springwolf.core.asyncapi.components.headers;`
`3`	`3`
`4`	`4`	`import io.github.springwolf.asyncapi.v3.model.schema.SchemaObject;`
	`5`	`+import io.github.springwolf.core.asyncapi.scanners.common.payload.NamedSchemaObject;`
`5`	`6`
`6`	`7`	`public interface AsyncHeadersBuilder {`
`7`		`- SchemaObject buildHeaders(Class<?> payloadType);`
	`8`	`+ SchemaObject buildHeaders(NamedSchemaObject payloadSchema);`
`8`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`package io.github.springwolf.core.asyncapi.components.headers;`
`3`	`3`
`4`	`4`	`import io.github.springwolf.asyncapi.v3.model.schema.SchemaObject;`
	`5`	`+import io.github.springwolf.core.asyncapi.scanners.common.payload.NamedSchemaObject;`
`5`	`6`
`6`	`7`	`import java.util.List;`
`7`	`8`	`import java.util.Map;`
`@@ -22,7 +23,7 @@ public class AsyncHeadersNotDocumented implements AsyncHeadersBuilder {`
`22`	`23`	`}`
`23`	`24`
`24`	`25`	`@Override`
`25`		`- public SchemaObject buildHeaders(Class<?> payloadType) {`
	`26`	`+ public SchemaObject buildHeaders(NamedSchemaObject payloadSchema) {`
`26`	`27`	`return NOT_DOCUMENTED;`
`27`	`28`	`}`
`28`	`29`	`}`