Skip to content

ref #2420 - adds propertyName to annotatedType #2909

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 10, 2018
Merged

ref #2420 - adds propertyName to annotatedType #2909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 23 additions & 0 deletions modules/swagger-core/src/main/java/io/swagger/v3/core/converter/AnnotatedType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ public class AnnotatedType {
private JsonView jsonViewAnnotation;
private boolean skipSchemaName;
private boolean skipJsonIdentity;
private String propertyName;

public AnnotatedType() {
}
Expand Down Expand Up @@ -174,6 +175,28 @@ public AnnotatedType jsonViewAnnotation(JsonView jsonViewAnnotation) {
return this;
}

/**
* @since 2.0.4
*/
public String getPropertyName() {
return propertyName;
}

/**
* @since 2.0.4
*/
public void setPropertyName(String propertyName) {
this.propertyName = propertyName;
}

/**
* @since 2.0.4
*/
public AnnotatedType propertyName(String propertyName) {
this.propertyName = propertyName;
return this;
}

@Override
public boolean equals(Object o) {
if (this == o) {
Expand Down
12 changes: 10 additions & 2 deletions modules/swagger-core/src/main/java/io/swagger/v3/core/jackson/ModelResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ public Schema resolve(AnnotatedType annotatedType, ModelConverterContext context
.name(annotatedType.getName())
.resolveAsRef(annotatedType.isResolveAsRef())
.jsonViewAnnotation(annotatedType.getJsonViewAnnotation())
.propertyName(annotatedType.getPropertyName())
.skipOverride(true);
if (resolvedArrayAnnotation != null) {
ArraySchema schema = new ArraySchema();
Expand Down Expand Up @@ -323,6 +324,7 @@ public Schema resolve(AnnotatedType annotatedType, ModelConverterContext context
.schemaProperty(annotatedType.isSchemaProperty())
.resolveAsRef(annotatedType.isResolveAsRef())
.jsonViewAnnotation(annotatedType.getJsonViewAnnotation())
.propertyName(annotatedType.getPropertyName())
.skipOverride(true);
return context.resolve(aType);
}
Expand Down Expand Up @@ -357,6 +359,7 @@ public Schema resolve(AnnotatedType annotatedType, ModelConverterContext context
.skipSchemaName(true)
.resolveAsRef(annotatedType.isResolveAsRef())
.jsonViewAnnotation(annotatedType.getJsonViewAnnotation())
.propertyName(annotatedType.getPropertyName())
.parent(annotatedType.getParent()));
if (addPropertiesSchema != null) {
if (StringUtils.isNotBlank(addPropertiesSchema.getName())) {
Expand Down Expand Up @@ -386,6 +389,7 @@ public Schema resolve(AnnotatedType annotatedType, ModelConverterContext context
.ctxAnnotations(schemaAnnotations)
.skipSchemaName(true)
.resolveAsRef(annotatedType.isResolveAsRef())
.propertyName(annotatedType.getPropertyName())
.jsonViewAnnotation(annotatedType.getJsonViewAnnotation())
.parent(annotatedType.getParent()));

Expand Down Expand Up @@ -444,6 +448,7 @@ public Schema resolve(AnnotatedType annotatedType, ModelConverterContext context
.name(annotatedType.getName())
.resolveAsRef(annotatedType.isResolveAsRef())
.jsonViewAnnotation(annotatedType.getJsonViewAnnotation())
.propertyName(annotatedType.getPropertyName())
.skipOverride(true);
model = context.resolve(aType);
return model;
Expand Down Expand Up @@ -569,7 +574,8 @@ public Schema resolve(AnnotatedType annotatedType, ModelConverterContext context
.resolveAsRef(annotatedType.isResolveAsRef())
.jsonViewAnnotation(annotatedType.getJsonViewAnnotation())
.skipSchemaName(true)
.schemaProperty(true);
.schemaProperty(true)
.propertyName(propName);

final AnnotatedMember propMember = member;
aType.jsonUnwrappedHandler((t) -> {
Expand Down Expand Up @@ -918,7 +924,8 @@ protected Schema processAsId(String propertyName, AnnotatedType type,
.type(propType)
.ctxAnnotations(annotations)
.jsonViewAnnotation(type.getJsonViewAnnotation())
.schemaProperty(true);
.schemaProperty(true)
.propertyName(type.getPropertyName());

return context.resolve(aType);
}
Expand Down Expand Up @@ -1026,6 +1033,7 @@ private static AnnotatedType removeJsonIdentityAnnotations(AnnotatedType type) {
.skipSchemaName(type.isSkipSchemaName())
.type(type.getType())
.skipJsonIdentity(true)
.propertyName(type.getPropertyName())
.ctxAnnotations(AnnotationsUtils.removeAnnotations(type.getCtxAnnotations(), JsonIdentityInfo.class, JsonIdentityReference.class));
}
}
Expand Down