Skip to content

Commit c229638

Browse files
HugoMarioHugoMario
committed
renamed modelFromProperty (ObjectSchema) method and allow it to accept generic schema.
1 parent 56751fa commit c229638

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

‎modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/util/InlineModelResolver.java

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public void flatten(OpenAPI openAPI) {
7979
if (op.getProperties() != null && op.getProperties().size() > 0) {
8080
flattenProperties(op.getProperties(), pathname);
8181
String modelName = resolveModelName(op.getTitle(), "body");
82-
Schema innerModel = modelFromProperty(op, modelName);
82+
Schema innerModel = createModelFromProperty(op, modelName);
8383
String existing = matchGenerated(innerModel);
8484
if (existing != null) {
8585
am.setItems(new Schema().$ref(existing));
@@ -120,7 +120,7 @@ public void flatten(OpenAPI openAPI) {
120120
if (op.getProperties() != null && op.getProperties().size() > 0) {
121121
flattenProperties(op.getProperties(), pathname);
122122
String modelName = resolveModelName(op.getTitle(), parameter.getName());
123-
Schema innerModel = modelFromProperty(op, modelName);
123+
Schema innerModel = createModelFromProperty(op, modelName);
124124
String existing = matchGenerated(innerModel);
125125
if (existing != null) {
126126
am.setItems(new Schema().$ref(existing));
@@ -150,7 +150,7 @@ public void flatten(OpenAPI openAPI) {
150150
ObjectSchema op = (ObjectSchema) property;
151151
if (op.getProperties() != null && op.getProperties().size() > 0) {
152152
String modelName = resolveModelName(op.getTitle(), "inline_response_" + key);
153-
Schema model = modelFromProperty(op, modelName);
153+
Schema model = createModelFromProperty(op, modelName);
154154
String existing = matchGenerated(model);
155155
if (existing != null) {
156156
media.setSchema(this.makeRefProperty(existing, property));
@@ -170,12 +170,12 @@ public void flatten(OpenAPI openAPI) {
170170
flattenProperties(op.getProperties(), pathname);
171171
String modelName = resolveModelName(op.getTitle(),
172172
"inline_response_" + key);
173-
Schema innerModel = modelFromProperty(op, modelName);
173+
Schema innerModel = createModelFromProperty(inner, modelName);
174174
String existing = matchGenerated(innerModel);
175175
if (existing != null) {
176-
ap.setItems(this.makeRefProperty(existing, op));
176+
ap.setItems(this.makeRefProperty(existing, inner));
177177
} else {
178-
ap.setItems(this.makeRefProperty(modelName, op));
178+
ap.setItems(this.makeRefProperty(modelName, inner));
179179
addGenerated(modelName, innerModel);
180180
openAPI.getComponents().addSchemas(modelName, innerModel);
181181
}
@@ -190,7 +190,7 @@ public void flatten(OpenAPI openAPI) {
190190
flattenProperties(op.getProperties(), pathname);
191191
String modelName = resolveModelName(op.getTitle(),
192192
"inline_response_" + key);
193-
Schema innerModel = modelFromProperty(op, modelName);
193+
Schema innerModel = createModelFromProperty(op, modelName);
194194
String existing = matchGenerated(innerModel);
195195
if (existing != null) {
196196
property.setAdditionalProperties(new Schema().$ref(existing));
@@ -228,7 +228,7 @@ public void flatten(OpenAPI openAPI) {
228228
ObjectSchema op = (ObjectSchema) inner;
229229
if (op.getProperties() != null && op.getProperties().size() > 0) {
230230
String innerModelName = resolveModelName(op.getTitle(), modelName + "_inner");
231-
Schema innerModel = modelFromProperty(op, innerModelName);
231+
Schema innerModel = createModelFromProperty(op, innerModelName);
232232
String existing = matchGenerated(innerModel);
233233
if (existing == null) {
234234
openAPI.getComponents().addSchemas(innerModelName, innerModel);
@@ -334,7 +334,7 @@ public void flattenProperties(Map<String, Schema> properties, String path) {
334334
ObjectSchema op = (ObjectSchema) property;
335335

336336
String modelName = resolveModelName(op.getTitle(), path + "_" + key);
337-
Schema model = modelFromProperty(op, modelName);
337+
Schema model = createModelFromProperty(op, modelName);
338338

339339
String existing = matchGenerated(model);
340340

@@ -355,7 +355,7 @@ public void flattenProperties(Map<String, Schema> properties, String path) {
355355
if (op.getProperties() != null && op.getProperties().size() > 0) {
356356
flattenProperties(op.getProperties(), path);
357357
String modelName = resolveModelName(op.getTitle(), path + "_" + key);
358-
Schema innerModel = modelFromProperty(op, modelName);
358+
Schema innerModel = createModelFromProperty(op, modelName);
359359
String existing = matchGenerated(innerModel);
360360
if (existing != null) {
361361
ap.setItems(new Schema().$ref(existing));
@@ -374,7 +374,7 @@ public void flattenProperties(Map<String, Schema> properties, String path) {
374374
if (op.getProperties() != null && op.getProperties().size() > 0) {
375375
flattenProperties(op.getProperties(), path);
376376
String modelName = resolveModelName(op.getTitle(), path + "_" + key);
377-
Schema innerModel = modelFromProperty(op, modelName);
377+
Schema innerModel = createModelFromProperty(op, modelName);
378378
String existing = matchGenerated(innerModel);
379379
if (existing != null) {
380380
property.setAdditionalProperties(new Schema().$ref(existing));
@@ -420,26 +420,26 @@ public Schema modelFromProperty(ArraySchema object, @SuppressWarnings("unused")
420420
return null;
421421
}
422422

423-
public Schema modelFromProperty(ObjectSchema object, String path) {
424-
String description = object.getDescription();
423+
public Schema createModelFromProperty(Schema schema, String path) {
424+
String description = schema.getDescription();
425425
String example = null;
426-
List<String> requiredList = object.getRequired();
426+
List<String> requiredList = schema.getRequired();
427427

428428

429-
Object obj = object.getExample();
429+
Object obj = schema.getExample();
430430
if (obj != null) {
431431
example = obj.toString();
432432
}
433-
String name = object.getName();
434-
XML xml = object.getXml();
435-
Map<String, Schema> properties = object.getProperties();
433+
String name = schema.getName();
434+
XML xml = schema.getXml();
435+
Map<String, Schema> properties = schema.getProperties();
436436

437437
Schema model = new Schema();//TODO Verify this!
438438
model.setDescription(description);
439439
model.setExample(example);
440440
model.setName(name);
441441
model.setXml(xml);
442-
model.setType(object.getType());
442+
model.setType(schema.getType());
443443
model.setRequired(requiredList);
444444

445445
if (properties != null) {
@@ -507,4 +507,4 @@ public void setSkipMatches(boolean skipMatches) {
507507
this.skipMatches = skipMatches;
508508
}
509509

510-
}
510+
}

0 commit comments

Comments
 (0)