Skip to content

[Spring] openapi-generator generates an incorrect stub for types named "Resource #8178

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
wing328 merged 3 commits into from
Dec 14, 2020
Merged

[Spring] openapi-generator generates an incorrect stub for types named "Resource #8178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0e5af17
Initial push for fix #1680
jburgess Apr 8, 2020
a6f530d
fix yaml
wing328 Dec 14, 2020
096883e
update samples
wing328 Dec 14, 2020
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
4 changes: 2 additions & 2 deletions ...les/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,8 +336,8 @@ public void processOpts() {
}
additionalProperties.put(UNHANDLED_EXCEPTION_HANDLING, this.isUnhandledException());

typeMapping.put("file", "Resource");
importMapping.put("Resource", "org.springframework.core.io.Resource");
typeMapping.put("file", "org.springframework.core.io.Resource");
importMapping.put("org.springframework.core.io.Resource", "org.springframework.core.io.Resource");

if (useOptional) {
writePropertyBack(USE_OPTIONAL, useOptional);
Expand Down
1 change: 0 additions & 1 deletion samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

import org.openapitools.model.ModelApiResponse;
import org.openapitools.model.Pet;
import org.springframework.core.io.Resource;
import io.swagger.annotations.*;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
Expand Down
1 change: 0 additions & 1 deletion ...s/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/PetApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

import org.openapitools.model.ModelApiResponse;
import org.openapitools.model.Pet;
import org.springframework.core.io.Resource;
import io.swagger.annotations.*;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
Expand Down
1 change: 0 additions & 1 deletion ...ient/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

import org.openapitools.model.ModelApiResponse;
import org.openapitools.model.Pet;
import org.springframework.core.io.Resource;
import io.swagger.annotations.*;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
Expand Down
1 change: 0 additions & 1 deletion samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

import org.openapitools.model.ModelApiResponse;
import org.openapitools.model.Pet;
import org.springframework.core.io.Resource;
import io.swagger.annotations.*;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
Expand Down
1 change: 0 additions & 1 deletion samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

import org.openapitools.model.ModelApiResponse;
import org.openapitools.model.Pet;
import org.springframework.core.io.Resource;
import io.swagger.annotations.*;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
Expand Down
1 change: 0 additions & 1 deletion samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import org.openapitools.model.ModelApiResponse;
import java.time.OffsetDateTime;
import org.openapitools.model.OuterComposite;
import org.springframework.core.io.Resource;
import org.openapitools.model.User;
import org.openapitools.model.XmlItem;
import io.swagger.annotations.*;
Expand Down
1 change: 0 additions & 1 deletion samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

import org.openapitools.model.ModelApiResponse;
import org.openapitools.model.Pet;
import org.springframework.core.io.Resource;
import java.util.Set;
import io.swagger.annotations.*;
import org.springframework.http.HttpStatus;
Expand Down
9 changes: 4 additions & 5 deletions .../server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/FormatTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import java.time.LocalDate;
import java.time.OffsetDateTime;
import java.util.UUID;
import org.springframework.core.io.Resource;
import org.openapitools.jackson.nullable.JsonNullable;
import javax.validation.Valid;
import javax.validation.constraints.*;
Expand Down Expand Up @@ -44,7 +43,7 @@ public class FormatTest {
private byte[] _byte;

@JsonProperty("binary")
private Resource binary;
private org.springframework.core.io.Resource binary;

@JsonProperty("date")
@org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE)
Expand Down Expand Up @@ -236,7 +235,7 @@ public void setByte(byte[] _byte) {
this._byte = _byte;
}

public FormatTest binary(Resource binary) {
public FormatTest binary(org.springframework.core.io.Resource binary) {
this.binary = binary;
return this;
}
Expand All @@ -249,11 +248,11 @@ public FormatTest binary(Resource binary) {

@Valid

public Resource getBinary() {
public org.springframework.core.io.Resource getBinary() {
return binary;
}

public void setBinary(Resource binary) {
public void setBinary(org.springframework.core.io.Resource binary) {
this.binary = binary;
}

Expand Down
1 change: 0 additions & 1 deletion ...rver/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import java.util.Map;
import org.openapitools.model.ModelApiResponse;
import org.openapitools.model.OuterComposite;
import org.springframework.core.io.Resource;
import org.openapitools.model.User;
import org.openapitools.model.XmlItem;
import io.swagger.annotations.*;
Expand Down
1 change: 0 additions & 1 deletion ...erver/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/PetApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

import org.openapitools.model.ModelApiResponse;
import org.openapitools.model.Pet;
import org.springframework.core.io.Resource;
import java.util.Set;
import io.swagger.annotations.*;
import org.springframework.http.HttpStatus;
Expand Down
9 changes: 4 additions & 5 deletions ...petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/FormatTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.UUID;
import org.springframework.core.io.Resource;
import org.openapitools.jackson.nullable.JsonNullable;
import javax.validation.Valid;
import javax.validation.constraints.*;
Expand Down Expand Up @@ -44,7 +43,7 @@ public class FormatTest {
private byte[] _byte;

@JsonProperty("binary")
private Resource binary;
private org.springframework.core.io.Resource binary;

@JsonProperty("date")
@org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE)
Expand Down Expand Up @@ -236,7 +235,7 @@ public void setByte(byte[] _byte) {
this._byte = _byte;
}

public FormatTest binary(Resource binary) {
public FormatTest binary(org.springframework.core.io.Resource binary) {
this.binary = binary;
return this;
}
Expand All @@ -249,11 +248,11 @@ public FormatTest binary(Resource binary) {

@Valid

public Resource getBinary() {
public org.springframework.core.io.Resource getBinary() {
return binary;
}

public void setBinary(Resource binary) {
public void setBinary(org.springframework.core.io.Resource binary) {
this.binary = binary;
}

Expand Down
1 change: 0 additions & 1 deletion ...es/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/FakeApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import org.openapitools.model.ModelApiResponse;
import java.time.OffsetDateTime;
import org.openapitools.model.OuterComposite;
import org.springframework.core.io.Resource;
import org.openapitools.model.User;
import org.openapitools.model.XmlItem;
import io.swagger.annotations.*;
Expand Down
1 change: 0 additions & 1 deletion ...les/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/PetApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

import org.openapitools.model.ModelApiResponse;
import org.openapitools.model.Pet;
import org.springframework.core.io.Resource;
import java.util.Set;
import io.swagger.annotations.*;
import org.springframework.http.HttpStatus;
Expand Down
9 changes: 4 additions & 5 deletions ...rver/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/FormatTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import java.time.LocalDate;
import java.time.OffsetDateTime;
import java.util.UUID;
import org.springframework.core.io.Resource;
import javax.validation.Valid;
import javax.validation.constraints.*;

Expand Down Expand Up @@ -43,7 +42,7 @@ public class FormatTest {
private byte[] _byte;

@JsonProperty("binary")
private Resource binary;
private org.springframework.core.io.Resource binary;

@JsonProperty("date")
@org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE)
Expand Down Expand Up @@ -235,7 +234,7 @@ public void setByte(byte[] _byte) {
this._byte = _byte;
}

public FormatTest binary(Resource binary) {
public FormatTest binary(org.springframework.core.io.Resource binary) {
this.binary = binary;
return this;
}
Expand All @@ -248,11 +247,11 @@ public FormatTest binary(Resource binary) {

@Valid

public Resource getBinary() {
public org.springframework.core.io.Resource getBinary() {
return binary;
}

public void setBinary(Resource binary) {
public void setBinary(org.springframework.core.io.Resource binary) {
this.binary = binary;
}

Expand Down
1 change: 0 additions & 1 deletion ...erver/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import org.openapitools.model.ModelApiResponse;
import java.time.OffsetDateTime;
import org.openapitools.model.OuterComposite;
import org.springframework.core.io.Resource;
import org.openapitools.model.User;
import org.openapitools.model.XmlItem;
import io.swagger.annotations.*;
Expand Down
1 change: 0 additions & 1 deletion ...server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/PetApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

import org.openapitools.model.ModelApiResponse;
import org.openapitools.model.Pet;
import org.springframework.core.io.Resource;
import io.swagger.annotations.*;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
Expand Down
9 changes: 4 additions & 5 deletions .../petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/FormatTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import java.time.LocalDate;
import java.time.OffsetDateTime;
import java.util.UUID;
import org.springframework.core.io.Resource;
import org.openapitools.jackson.nullable.JsonNullable;
import javax.validation.Valid;
import javax.validation.constraints.*;
Expand Down Expand Up @@ -44,7 +43,7 @@ public class FormatTest {
private byte[] _byte;

@JsonProperty("binary")
private Resource binary;
private org.springframework.core.io.Resource binary;

@JsonProperty("date")
@org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE)
Expand Down Expand Up @@ -236,7 +235,7 @@ public void setByte(byte[] _byte) {
this._byte = _byte;
}

public FormatTest binary(Resource binary) {
public FormatTest binary(org.springframework.core.io.Resource binary) {
this.binary = binary;
return this;
}
Expand All @@ -249,11 +248,11 @@ public FormatTest binary(Resource binary) {

@Valid

public Resource getBinary() {
public org.springframework.core.io.Resource getBinary() {
return binary;
}

public void setBinary(Resource binary) {
public void setBinary(org.springframework.core.io.Resource binary) {
this.binary = binary;
}

Expand Down
1 change: 0 additions & 1 deletion samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import org.openapitools.model.ModelApiResponse;
import java.time.OffsetDateTime;
import org.openapitools.model.OuterComposite;
import org.springframework.core.io.Resource;
import org.openapitools.model.User;
import org.openapitools.model.XmlItem;
import io.swagger.annotations.*;
Expand Down
1 change: 0 additions & 1 deletion samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

import org.openapitools.model.ModelApiResponse;
import org.openapitools.model.Pet;
import org.springframework.core.io.Resource;
import java.util.Set;
import io.swagger.annotations.*;
import org.springframework.http.HttpStatus;
Expand Down
9 changes: 4 additions & 5 deletions samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/FormatTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import java.time.LocalDate;
import java.time.OffsetDateTime;
import java.util.UUID;
import org.springframework.core.io.Resource;
import org.openapitools.jackson.nullable.JsonNullable;
import javax.validation.Valid;
import javax.validation.constraints.*;
Expand Down Expand Up @@ -46,7 +45,7 @@ public class FormatTest {
private byte[] _byte;

@JsonProperty("binary")
private Resource binary;
private org.springframework.core.io.Resource binary;

@JsonProperty("date")
@org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE)
Expand Down Expand Up @@ -238,7 +237,7 @@ public void setByte(byte[] _byte) {
this._byte = _byte;
}

public FormatTest binary(Resource binary) {
public FormatTest binary(org.springframework.core.io.Resource binary) {
this.binary = binary;
return this;
}
Expand All @@ -251,11 +250,11 @@ public FormatTest binary(Resource binary) {

@Valid

public Resource getBinary() {
public org.springframework.core.io.Resource getBinary() {
return binary;
}

public void setBinary(Resource binary) {
public void setBinary(org.springframework.core.io.Resource binary) {
this.binary = binary;
}

Expand Down
1 change: 0 additions & 1 deletion ...ore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import org.openapitools.model.ModelApiResponse;
import org.threeten.bp.OffsetDateTime;
import org.openapitools.model.OuterComposite;
import org.springframework.core.io.Resource;
import org.openapitools.model.User;
import org.openapitools.model.XmlItem;
import io.swagger.annotations.*;
Expand Down
1 change: 0 additions & 1 deletion ...boot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApiController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import org.openapitools.model.ModelApiResponse;
import org.threeten.bp.OffsetDateTime;
import org.openapitools.model.OuterComposite;
import org.springframework.core.io.Resource;
import org.openapitools.model.User;
import org.openapitools.model.XmlItem;
import io.swagger.annotations.*;
Expand Down
1 change: 0 additions & 1 deletion ...tore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

import org.openapitools.model.ModelApiResponse;
import org.openapitools.model.Pet;
import org.springframework.core.io.Resource;
import java.util.Set;
import io.swagger.annotations.*;
import org.springframework.http.ResponseEntity;
Expand Down
1 change: 0 additions & 1 deletion ...gboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApiController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import org.openapitools.model.ModelApiResponse;
import org.openapitools.model.Pet;
import org.springframework.core.io.Resource;
import java.util.Set;
import io.swagger.annotations.*;
import org.springframework.http.HttpStatus;
Expand Down
Loading