[Java/Spring] all-of and one-of Improvements and Fixes #12075
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,157 @@ | ||
| package org.openapitools.model; | ||
|
|
||
| import java.net.URI; | ||
| import java.util.Objects; | ||
| import com.fasterxml.jackson.annotation.JsonIgnoreProperties; | ||
| import com.fasterxml.jackson.annotation.JsonProperty; | ||
| import com.fasterxml.jackson.annotation.JsonCreator; | ||
| import com.fasterxml.jackson.annotation.JsonSubTypes; | ||
| import com.fasterxml.jackson.annotation.JsonTypeInfo; | ||
| import org.openapitools.model.EntityRef; | ||
| import org.openapitools.jackson.nullable.JsonNullable; | ||
| import java.time.OffsetDateTime; | ||
| import javax.validation.Valid; | ||
| import javax.validation.constraints.*; | ||
| import io.swagger.v3.oas.annotations.media.Schema; | ||
|
|
||
|
|
||
| import java.util.*; | ||
| import javax.annotation.Generated; | ||
|
|
||
| /** | ||
| * BarRef | ||
| */ | ||
|
|
||
|
|
||
| @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") | ||
| public class BarRef extends EntityRef implements BarRefOrValue { | ||
|
|
||
| @JsonProperty("href") | ||
| private String href; | ||
|
|
||
| @JsonProperty("@schemaLocation") | ||
| private String atSchemaLocation; | ||
|
|
||
| @JsonProperty("@baseType") | ||
| private String atBaseType; | ||
|
|
||
| @JsonProperty("@type") | ||
| private String atType; | ||
|
|
||
| public BarRef href(String href) { | ||
| this.href = href; | ||
| return this; | ||
| } | ||
|
|
||
| /** | ||
| * Hyperlink reference | ||
| * @return href | ||
| */ | ||
|
|
||
| @Schema(name = "href", description = "Hyperlink reference", required = false) | ||
| public String getHref() { | ||
| return href; | ||
| } | ||
|
|
||
| public void setHref(String href) { | ||
| this.href = href; | ||
| } | ||
|
|
||
| public BarRef atSchemaLocation(String atSchemaLocation) { | ||
| this.atSchemaLocation = atSchemaLocation; | ||
| return this; | ||
| } | ||
|
|
||
| /** | ||
| * A URI to a JSON-Schema file that defines additional attributes and relationships | ||
| * @return atSchemaLocation | ||
| */ | ||
|
|
||
| @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", required = false) | ||
| public String getAtSchemaLocation() { | ||
| return atSchemaLocation; | ||
| } | ||
|
|
||
| public void setAtSchemaLocation(String atSchemaLocation) { | ||
| this.atSchemaLocation = atSchemaLocation; | ||
| } | ||
|
|
||
| public BarRef atBaseType(String atBaseType) { | ||
| this.atBaseType = atBaseType; | ||
| return this; | ||
| } | ||
|
|
||
| /** | ||
| * When sub-classing, this defines the super-class | ||
| * @return atBaseType | ||
| */ | ||
|
|
||
| @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", required = false) | ||
| public String getAtBaseType() { | ||
| return atBaseType; | ||
| } | ||
|
|
||
| public void setAtBaseType(String atBaseType) { | ||
| this.atBaseType = atBaseType; | ||
| } | ||
|
|
||
| public BarRef atType(String atType) { | ||
| this.atType = atType; | ||
| return this; | ||
| } | ||
|
|
||
| /** | ||
| * When sub-classing, this defines the sub-class Extensible name | ||
| * @return atType | ||
| */ | ||
| @NotNull | ||
| @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", required = true) | ||
| public String getAtType() { | ||
| return atType; | ||
| } | ||
|
|
||
| public void setAtType(String atType) { | ||
| this.atType = atType; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object o) { | ||
| if (this == o) { | ||
| return true; | ||
| } | ||
| if (o == null || getClass() != o.getClass()) { | ||
| return false; | ||
| } | ||
| return true; | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return Objects.hash(href, atSchemaLocation, atBaseType, atTypesuper.hashCode()); | ||
|
There was a problem hiding this comment. The Bug caused by |
||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| StringBuilder sb = new StringBuilder(); | ||
| sb.append("class BarRef {\n"); | ||
| sb.append(" ").append(toIndentedString(super.toString())).append("\n"); | ||
| sb.append(" href: ").append(toIndentedString(href)).append("\n"); | ||
| sb.append(" atSchemaLocation: ").append(toIndentedString(atSchemaLocation)).append("\n"); | ||
| sb.append(" atBaseType: ").append(toIndentedString(atBaseType)).append("\n"); | ||
| sb.append(" atType: ").append(toIndentedString(atType)).append("\n"); | ||
| sb.append("}"); | ||
| return sb.toString(); | ||
| } | ||
|
|
||
| /** | ||
| * Convert the given object to string with each line indented by 4 spaces | ||
| * (except the first line). | ||
| */ | ||
| private String toIndentedString(Object o) { | ||
| if (o == null) { | ||
| return "null"; | ||
| } | ||
| return o.toString().replace("\n", "\n "); | ||
| } | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| package org.openapitools.model; | ||
|
|
||
| import java.net.URI; | ||
| import java.util.Objects; | ||
| import com.fasterxml.jackson.annotation.JsonIgnoreProperties; | ||
| import com.fasterxml.jackson.annotation.JsonProperty; | ||
| import com.fasterxml.jackson.annotation.JsonCreator; | ||
| import com.fasterxml.jackson.annotation.JsonSubTypes; | ||
| import com.fasterxml.jackson.annotation.JsonTypeInfo; | ||
| import org.openapitools.model.Bar; | ||
| import org.openapitools.model.BarRef; | ||
| import org.openapitools.jackson.nullable.JsonNullable; | ||
| import java.time.OffsetDateTime; | ||
| import javax.validation.Valid; | ||
| import javax.validation.constraints.*; | ||
| import io.swagger.v3.oas.annotations.media.Schema; | ||
|
|
||
|
|
||
| import java.util.*; | ||
| import javax.annotation.Generated; | ||
|
|
||
|
|
||
| @JsonIgnoreProperties( | ||
| value = "@type", // ignore manually set @type, it will be automatically generated by Jackson during serialization | ||
| allowSetters = true // allows the @type to be set during deserialization | ||
| ) | ||
| @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "@type", visible = true) | ||
| @JsonSubTypes({ | ||
| @JsonSubTypes.Type(value = Bar.class, name = "Bar"), | ||
| @JsonSubTypes.Type(value = BarRef.class, name = "BarRef") | ||
| }) | ||
|
|
||
| @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") | ||
| public interface BarRefOrValue { | ||
| public String getAtType(); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This properties are pulled in from EntityRef (and Entity) (caused by org.openapitools.codegen.utils.OneOfImplementorAdditionalData#addFromInterfaceModel) and should not be present here.