Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -828,7 +828,7 @@ public Schema resolve(AnnotatedType annotatedType, ModelConverterContext context
if (reResolvedProperty.isPresent()) {
property = reResolvedProperty.get();
}
reResolvedProperty = AnnotationsUtils.getArraySchema(ctxArraySchema, annotatedType.getComponents(), null, openapi31, property, true);
reResolvedProperty = AnnotationsUtils.getArraySchema(ctxArraySchema, annotatedType.getComponents(), null, openapi31, property);
if (reResolvedProperty.isPresent()) {
property = reResolvedProperty.get();
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package io.swagger.v3.core.converting;

import io.swagger.v3.core.converter.ModelConverters;
import io.swagger.v3.core.converter.ResolvedSchema;
import io.swagger.v3.core.oas.models.ModelWithArrayOfSubclasses;
import io.swagger.v3.core.util.Json31;
import static org.testng.Assert.assertNotNull;
import org.testng.annotations.Test;


public class ArrayOfSubclassTest {

@Test
public void extractSuclassArray() {
ResolvedSchema schema = ModelConverters.getInstance(true).readAllAsResolvedSchema(ModelWithArrayOfSubclasses.Holder.class);
assertNotNull(schema);
System.out.println(Json31.pretty(schema));
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.google.common.collect.ImmutableSet;
import io.swagger.v3.core.converter.ModelConverters;
import io.swagger.v3.core.converter.ResolvedSchema;
import io.swagger.v3.core.matchers.SerializationMatchers;
import io.swagger.v3.core.oas.models.Cat;
import io.swagger.v3.core.oas.models.ClientOptInput;
Expand All @@ -15,6 +16,7 @@
import io.swagger.v3.core.oas.models.ModelPropertyName;
import io.swagger.v3.core.oas.models.ModelWithAltPropertyName;
import io.swagger.v3.core.oas.models.ModelWithApiModel;
import io.swagger.v3.core.oas.models.ModelWithArrayOfSubclasses;
import io.swagger.v3.core.oas.models.ModelWithEnumArray;
import io.swagger.v3.core.oas.models.ModelWithFormattedStrings;
import io.swagger.v3.core.oas.models.ModelWithNumbers;
Expand Down Expand Up @@ -269,6 +271,11 @@ public void scanModel() {
assertEquals(model.get("Model1155").getProperties().keySet(), ImmutableSet.of("valid", "value", "is", "get",
"isA", "getA", "is_persistent", "gettersAndHaters"));
}

@Test
public void extractSuclassArray() {
ResolvedSchema schema = ModelConverters.getInstance().readAllAsResolvedSchema(ModelWithArrayOfSubclasses.class);
}

@Test(description = "it should scan a model with numbers")
public void scanModelWithNumbers() throws IOException {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
package io.swagger.v3.core.oas.models;

import io.swagger.v3.oas.annotations.media.ArraySchema;
import io.swagger.v3.oas.annotations.media.DiscriminatorMapping;
import io.swagger.v3.oas.annotations.media.Schema;

public class ModelWithArrayOfSubclasses {

@Schema(description = "The holder")
public class Holder extends SubB {
}

@Schema(
discriminatorProperty = "name"
, discriminatorMapping = {
@DiscriminatorMapping(schema = SubA.class, value = "a")
, @DiscriminatorMapping(schema = SubB.class, value = "b")
}
, description = "Stuff"
)
public class Base {

private String name;

public String getName() {
return name;
}
}

@Schema(description = "The SubA class")
public class SubA extends Base {

private Long count;

public Long getCount() {
return count;
}
}

@Schema(description = "The SubB class")
public class SubB extends Base {

private String friend;
private Base[] baseArray;

public String getFriend() {
return friend;
}

@ArraySchema(
schema = @Schema(implementation = Base.class)
, arraySchema = @Schema(
type = "array"
, description = "Thingy"
)
, minItems = 0
, uniqueItems = true
)
public Base[] getBaseArray() {
return baseArray;
}

}

}
Loading