Skip to content
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

[Java/Spring] Revert to fully qualified import for org.springframework.core.io.Resource #11461

Merged
merged 2 commits into from
Jan 31, 2022
Merged

[Java/Spring] Revert to fully qualified import for org.springframework.core.io.Resource #11461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7bd1040
Revert to fully qualified import for org.springframework.core.io.Reso…
cachescrubber Jan 30, 2022
4be2624
Generate Samples
cachescrubber Jan 30, 2022
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 @@ -404,8 +404,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");
importMapping.put("Pageable", "org.springframework.data.domain.Pageable");
importMapping.put("DateTimeFormat", "org.springframework.format.annotation.DateTimeFormat");
importMapping.put("ApiIgnore", "springfox.documentation.annotations.ApiIgnore");
Expand Down
4 changes: 2 additions & 2 deletions ...enapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -792,14 +792,14 @@ public void testConfigFileGeneration() {
public void testTypeMappings() {
final SpringCodegen codegen = new SpringCodegen();
codegen.processOpts();
Assert.assertEquals(codegen.typeMapping().get("file"), "Resource");
Assert.assertEquals(codegen.typeMapping().get("file"), "org.springframework.core.io.Resource");
}

@Test
public void testImportMappings() {
final SpringCodegen codegen = new SpringCodegen();
codegen.processOpts();
Assert.assertEquals(codegen.importMapping().get("Resource"), "org.springframework.core.io.Resource");
Assert.assertEquals(codegen.importMapping().get("org.springframework.core.io.Resource"), "org.springframework.core.io.Resource");
Assert.assertEquals(codegen.importMapping().get("Pageable"), "org.springframework.data.domain.Pageable");
Assert.assertEquals(codegen.importMapping().get("DateTimeFormat"), "org.springframework.format.annotation.DateTimeFormat");
Assert.assertEquals(codegen.importMapping().get("ApiIgnore"), "springfox.documentation.annotations.ApiIgnore");
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 ...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 @@ -9,7 +9,6 @@
import org.openapitools.model.ModelApiResponse;
import org.springframework.data.domain.Pageable;
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 ...penapi3/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.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
Expand Down
1 change: 0 additions & 1 deletion ...client/petstore/spring-cloud-oas3-fakeapi/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 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.v3.oas.annotations.Operation;
Expand Down
1 change: 0 additions & 1 deletion .../client/petstore/spring-cloud-oas3-fakeapi/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.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
Expand Down
9 changes: 4 additions & 5 deletions ...t/petstore/spring-cloud-oas3-fakeapi/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.OffsetDateTime;
import java.util.Arrays;
import java.util.UUID;
import org.springframework.core.io.Resource;
import org.springframework.format.annotation.DateTimeFormat;
import org.openapitools.jackson.nullable.JsonNullable;
import java.time.OffsetDateTime;
Expand Down Expand Up @@ -53,7 +52,7 @@ public class FormatTest {
private byte[] _byte;

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

@JsonProperty("date")
@DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
Expand Down Expand Up @@ -234,7 +233,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 @@ -245,11 +244,11 @@ public FormatTest binary(Resource binary) {
*/
@Valid
@Schema(name = "binary", required = false)
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 ...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 @@ -9,7 +9,6 @@
import org.springframework.data.domain.Pageable;
import org.springdoc.api.annotations.ParameterObject;
import org.openapitools.model.Pet;
import org.springframework.core.io.Resource;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
Expand Down
1 change: 0 additions & 1 deletion samples/openapi3/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.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
Expand Down
1 change: 0 additions & 1 deletion samples/openapi3/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.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
Expand Down
1 change: 0 additions & 1 deletion ...api3/server/petstore/spring-boot-springdoc/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.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
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 @@ -14,7 +14,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.v3.oas.annotations.Operation;
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 @@ -9,7 +9,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.v3.oas.annotations.Operation;
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.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
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.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
Expand Down
9 changes: 4 additions & 5 deletions ...pringboot-beanvalidation-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 @@ -7,7 +7,6 @@
import java.math.BigDecimal;
import java.util.Arrays;
import java.util.UUID;
import org.springframework.core.io.Resource;
import org.springframework.format.annotation.DateTimeFormat;
import org.threeten.bp.LocalDate;
import org.threeten.bp.OffsetDateTime;
Expand Down Expand Up @@ -51,7 +50,7 @@ public class FormatTest {
private byte[] _byte;

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

@JsonProperty("date")
@DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
Expand Down Expand Up @@ -232,7 +231,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 @@ -243,11 +242,11 @@ public FormatTest binary(Resource binary) {
*/
@Valid
@Schema(name = "binary", required = false)
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 ...napi3/server/petstore/springboot-delegate/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 @@ -14,7 +14,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.v3.oas.annotations.Operation;
Expand Down
1 change: 0 additions & 1 deletion ...rver/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,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 org.springframework.http.HttpStatus;
Expand Down
1 change: 0 additions & 1 deletion ...enapi3/server/petstore/springboot-delegate/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.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
Expand Down
1 change: 0 additions & 1 deletion ...erver/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiDelegate.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 org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
Expand Down
9 changes: 4 additions & 5 deletions .../server/petstore/springboot-delegate/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.OffsetDateTime;
import java.util.Arrays;
import java.util.UUID;
import org.springframework.core.io.Resource;
import org.springframework.format.annotation.DateTimeFormat;
import org.openapitools.jackson.nullable.JsonNullable;
import java.time.OffsetDateTime;
Expand Down Expand Up @@ -53,7 +52,7 @@ public class FormatTest {
private byte[] _byte;

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

@JsonProperty("date")
@DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
Expand Down Expand Up @@ -234,7 +233,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 @@ -245,11 +244,11 @@ public FormatTest binary(Resource binary) {
*/
@Valid
@Schema(name = "binary", required = false)
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/springboot-implicitHeaders/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 @@ -14,7 +14,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.v3.oas.annotations.Operation;
Expand Down
1 change: 0 additions & 1 deletion ...server/petstore/springboot-implicitHeaders/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.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
Expand Down
9 changes: 4 additions & 5 deletions .../petstore/springboot-implicitHeaders/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.OffsetDateTime;
import java.util.Arrays;
import java.util.UUID;
import org.springframework.core.io.Resource;
import org.springframework.format.annotation.DateTimeFormat;
import org.openapitools.jackson.nullable.JsonNullable;
import java.time.OffsetDateTime;
Expand Down Expand Up @@ -53,7 +52,7 @@ public class FormatTest {
private byte[] _byte;

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

@JsonProperty("date")
@DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
Expand Down Expand Up @@ -234,7 +233,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 @@ -245,11 +244,11 @@ public FormatTest binary(Resource binary) {
*/
@Valid
@Schema(name = "binary", required = false)
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 ...napi3/server/petstore/springboot-reactive/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 @@ -14,7 +14,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.v3.oas.annotations.Operation;
Expand Down
1 change: 0 additions & 1 deletion ...rver/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,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 org.springframework.http.HttpStatus;
Expand Down
1 change: 0 additions & 1 deletion ...enapi3/server/petstore/springboot-reactive/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.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
Expand Down
1 change: 0 additions & 1 deletion ...erver/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiDelegate.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 org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
Expand Down
Loading