Skip to content

Commit 48696b5

Browse files
committed
fix #4370 - bundle oneOf/anyOf/allOf as with explict prefix
1 parent e7d277e commit 48696b5

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

modules/swagger-core/src/main/java/io/swagger/v3/core/jackson/ModelResolver.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -804,7 +804,7 @@ public Schema resolve(AnnotatedType annotatedType, ModelConverterContext context
804804
.collect(Collectors.toList());
805805
allOfFiltered.forEach(c -> {
806806
Schema allOfRef = context.resolve(new AnnotatedType().type(c).jsonViewAnnotation(annotatedType.getJsonViewAnnotation()));
807-
Schema refSchema = new Schema().$ref(allOfRef.getName());
807+
Schema refSchema = new Schema().$ref(Components.COMPONENTS_SCHEMAS_REF + allOfRef.getName());
808808
if (StringUtils.isBlank(allOfRef.getName())) {
809809
refSchema = allOfRef;
810810
}
@@ -826,7 +826,7 @@ public Schema resolve(AnnotatedType annotatedType, ModelConverterContext context
826826
anyOfFiltered.forEach(c -> {
827827
Schema anyOfRef = context.resolve(new AnnotatedType().type(c).jsonViewAnnotation(annotatedType.getJsonViewAnnotation()));
828828
if (StringUtils.isNotBlank(anyOfRef.getName())) {
829-
composedSchema.addAnyOfItem(new Schema().$ref(anyOfRef.getName()));
829+
composedSchema.addAnyOfItem(new Schema().$ref(Components.COMPONENTS_SCHEMAS_REF + anyOfRef.getName()));
830830
} else {
831831
composedSchema.addAnyOfItem(anyOfRef);
832832
}
@@ -848,7 +848,7 @@ public Schema resolve(AnnotatedType annotatedType, ModelConverterContext context
848848
if (StringUtils.isBlank(oneOfRef.getName())) {
849849
composedSchema.addOneOfItem(oneOfRef);
850850
} else {
851-
composedSchema.addOneOfItem(new Schema().$ref(oneOfRef.getName()));
851+
composedSchema.addOneOfItem(new Schema().$ref(Components.COMPONENTS_SCHEMAS_REF + oneOfRef.getName()));
852852
}
853853
// remove shared properties defined in the parent
854854
if (isSubtype(beanDesc.getClassInfo(), c)) {

0 commit comments

Comments
 (0)