Skip to content

[Java][WebClient|RestClient][20808] add Autowired annotations guard to skip generation when not generating Spring bean #21198

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Java][WebClient|RestClient][20808] add Autowired annotations guard to skip generation when not generating Spring bean #21198

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
4 changes: 4 additions & 0 deletions modules/openapi-generator/src/main/resources/Java/libraries/restclient/api.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ import {{javaxPackage}}.validation.constraints.*;
import {{javaxPackage}}.validation.Valid;

{{/useBeanValidation}}
{{#generateClientAsBean}}
import org.springframework.beans.factory.annotation.Autowired;
{{/generateClientAsBean}}
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.http.HttpHeaders;
Expand Down Expand Up @@ -46,7 +48,9 @@ public class {{classname}} {
this(new ApiClient());
}

{{#generateClientAsBean}}
@Autowired
{{/generateClientAsBean}}
public {{classname}}(ApiClient apiClient) {
this.apiClient = apiClient;
}
Expand Down
4 changes: 4 additions & 0 deletions modules/openapi-generator/src/main/resources/Java/libraries/webclient/api.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ import {{javaxPackage}}.validation.constraints.*;
import {{javaxPackage}}.validation.Valid;

{{/useBeanValidation}}
{{#generateClientAsBean}}
import org.springframework.beans.factory.annotation.Autowired;
{{/generateClientAsBean}}
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.http.HttpHeaders;
Expand Down Expand Up @@ -48,7 +50,9 @@ public class {{classname}} {
this(new ApiClient());
}

{{#generateClientAsBean}}
@Autowired
{{/generateClientAsBean}}
public {{classname}}(ApiClient apiClient) {
this.apiClient = apiClient;
}
Expand Down
2 changes: 0 additions & 2 deletions ...es/client/echo_api/java/restclient/src/main/java/org/openapitools/client/api/AuthApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import java.util.Arrays;
import java.util.stream.Collectors;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.http.HttpHeaders;
Expand All @@ -32,7 +31,6 @@ public AuthApi() {
this(new ApiClient());
}

@Autowired
public AuthApi(ApiClient apiClient) {
this.apiClient = apiClient;
}
Expand Down
2 changes: 0 additions & 2 deletions ...es/client/echo_api/java/restclient/src/main/java/org/openapitools/client/api/BodyApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import java.util.Arrays;
import java.util.stream.Collectors;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.http.HttpHeaders;
Expand All @@ -36,7 +35,6 @@ public BodyApi() {
this(new ApiClient());
}

@Autowired
public BodyApi(ApiClient apiClient) {
this.apiClient = apiClient;
}
Expand Down
2 changes: 0 additions & 2 deletions ...es/client/echo_api/java/restclient/src/main/java/org/openapitools/client/api/FormApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import java.util.Arrays;
import java.util.stream.Collectors;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.http.HttpHeaders;
Expand All @@ -33,7 +32,6 @@ public FormApi() {
this(new ApiClient());
}

@Autowired
public FormApi(ApiClient apiClient) {
this.apiClient = apiClient;
}
Expand Down
2 changes: 0 additions & 2 deletions .../client/echo_api/java/restclient/src/main/java/org/openapitools/client/api/HeaderApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import java.util.Arrays;
import java.util.stream.Collectors;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.http.HttpHeaders;
Expand All @@ -33,7 +32,6 @@ public HeaderApi() {
this(new ApiClient());
}

@Autowired
public HeaderApi(ApiClient apiClient) {
this.apiClient = apiClient;
}
Expand Down
2 changes: 0 additions & 2 deletions ...es/client/echo_api/java/restclient/src/main/java/org/openapitools/client/api/PathApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import java.util.Arrays;
import java.util.stream.Collectors;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.http.HttpHeaders;
Expand All @@ -33,7 +32,6 @@ public PathApi() {
this(new ApiClient());
}

@Autowired
public PathApi(ApiClient apiClient) {
this.apiClient = apiClient;
}
Expand Down
2 changes: 0 additions & 2 deletions ...s/client/echo_api/java/restclient/src/main/java/org/openapitools/client/api/QueryApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import java.util.Arrays;
import java.util.stream.Collectors;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.http.HttpHeaders;
Expand All @@ -39,7 +38,6 @@ public QueryApi() {
this(new ApiClient());
}

@Autowired
public QueryApi(ApiClient apiClient) {
this.apiClient = apiClient;
}
Expand Down
2 changes: 0 additions & 2 deletions ...tclient-useAbstractionForFiles/src/main/java/org/openapitools/client/api/ResourceApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import java.util.Arrays;
import java.util.stream.Collectors;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.http.HttpHeaders;
Expand All @@ -33,7 +32,6 @@ public ResourceApi() {
this(new ApiClient());
}

@Autowired
public ResourceApi(ApiClient apiClient) {
this.apiClient = apiClient;
}
Expand Down
2 changes: 0 additions & 2 deletions ...bclient-useAbstractionForFiles/src/main/java/org/openapitools/client/api/ResourceApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import java.util.Arrays;
import java.util.stream.Collectors;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.http.HttpHeaders;
Expand All @@ -35,7 +34,6 @@ public ResourceApi() {
this(new ApiClient());
}

@Autowired
public ResourceApi(ApiClient apiClient) {
this.apiClient = apiClient;
}
Expand Down
2 changes: 0 additions & 2 deletions ...java/restclient-nullable-arrays/src/main/java/org/openapitools/client/api/DefaultApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import java.util.Arrays;
import java.util.stream.Collectors;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.http.HttpHeaders;
Expand All @@ -33,7 +32,6 @@ public DefaultApi() {
this(new ApiClient());
}

@Autowired
public DefaultApi(ApiClient apiClient) {
this.apiClient = apiClient;
}
Expand Down
2 changes: 0 additions & 2 deletions ...re/java/restclient-swagger2/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import java.util.Arrays;
import java.util.stream.Collectors;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.http.HttpHeaders;
Expand All @@ -33,7 +32,6 @@ public AnotherFakeApi() {
this(new ApiClient());
}

@Autowired
public AnotherFakeApi(ApiClient apiClient) {
this.apiClient = apiClient;
}
Expand Down
2 changes: 0 additions & 2 deletions ...tstore/java/restclient-swagger2/src/main/java/org/openapitools/client/api/DefaultApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import java.util.Arrays;
import java.util.stream.Collectors;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.http.HttpHeaders;
Expand All @@ -33,7 +32,6 @@ public DefaultApi() {
this(new ApiClient());
}

@Autowired
public DefaultApi(ApiClient apiClient) {
this.apiClient = apiClient;
}
Expand Down
2 changes: 0 additions & 2 deletions .../petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/api/FakeApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import java.util.Arrays;
import java.util.stream.Collectors;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.http.HttpHeaders;
Expand All @@ -47,7 +46,6 @@ public FakeApi() {
this(new ApiClient());
}

@Autowired
public FakeApi(ApiClient apiClient) {
this.apiClient = apiClient;
}
Expand Down
2 changes: 0 additions & 2 deletions ...estclient-swagger2/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import java.util.Arrays;
import java.util.stream.Collectors;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.http.HttpHeaders;
Expand All @@ -33,7 +32,6 @@ public FakeClassnameTags123Api() {
this(new ApiClient());
}

@Autowired
public FakeClassnameTags123Api(ApiClient apiClient) {
this.apiClient = apiClient;
}
Expand Down
2 changes: 0 additions & 2 deletions ...t/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/api/PetApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import java.util.Arrays;
import java.util.stream.Collectors;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.http.HttpHeaders;
Expand All @@ -36,7 +35,6 @@ public PetApi() {
this(new ApiClient());
}

@Autowired
public PetApi(ApiClient apiClient) {
this.apiClient = apiClient;
}
Expand Down
2 changes: 0 additions & 2 deletions ...petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/api/StoreApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import java.util.Arrays;
import java.util.stream.Collectors;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.http.HttpHeaders;
Expand All @@ -33,7 +32,6 @@ public StoreApi() {
this(new ApiClient());
}

@Autowired
public StoreApi(ApiClient apiClient) {
this.apiClient = apiClient;
}
Expand Down
2 changes: 0 additions & 2 deletions .../petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/api/UserApi.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.Arrays;
import java.util.stream.Collectors;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.http.HttpHeaders;
Expand All @@ -34,7 +33,6 @@ public UserApi() {
this(new ApiClient());
}

@Autowired
public UserApi(ApiClient apiClient) {
this.apiClient = apiClient;
}
Expand Down
2 changes: 0 additions & 2 deletions ...ngleRequestParameter-static/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import java.util.Arrays;
import java.util.stream.Collectors;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.http.HttpHeaders;
Expand All @@ -33,7 +32,6 @@ public AnotherFakeApi() {
this(new ApiClient());
}

@Autowired
public AnotherFakeApi(ApiClient apiClient) {
this.apiClient = apiClient;
}
Expand Down
2 changes: 0 additions & 2 deletions ...seSingleRequestParameter-static/src/main/java/org/openapitools/client/api/DefaultApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import java.util.Arrays;
import java.util.stream.Collectors;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.http.HttpHeaders;
Expand All @@ -33,7 +32,6 @@ public DefaultApi() {
this(new ApiClient());
}

@Autowired
public DefaultApi(ApiClient apiClient) {
this.apiClient = apiClient;
}
Expand Down
2 changes: 0 additions & 2 deletions ...t-useSingleRequestParameter-static/src/main/java/org/openapitools/client/api/FakeApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import java.util.Arrays;
import java.util.stream.Collectors;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.http.HttpHeaders;
Expand All @@ -47,7 +46,6 @@ public FakeApi() {
this(new ApiClient());
}

@Autowired
public FakeApi(ApiClient apiClient) {
this.apiClient = apiClient;
}
Expand Down
2 changes: 0 additions & 2 deletions ...stParameter-static/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import java.util.Arrays;
import java.util.stream.Collectors;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.http.HttpHeaders;
Expand All @@ -33,7 +32,6 @@ public FakeClassnameTags123Api() {
this(new ApiClient());
}

@Autowired
public FakeClassnameTags123Api(ApiClient apiClient) {
this.apiClient = apiClient;
}
Expand Down
2 changes: 0 additions & 2 deletions ...nt-useSingleRequestParameter-static/src/main/java/org/openapitools/client/api/PetApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import java.util.Arrays;
import java.util.stream.Collectors;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.http.HttpHeaders;
Expand All @@ -36,7 +35,6 @@ public PetApi() {
this(new ApiClient());
}

@Autowired
public PetApi(ApiClient apiClient) {
this.apiClient = apiClient;
}
Expand Down
2 changes: 0 additions & 2 deletions ...-useSingleRequestParameter-static/src/main/java/org/openapitools/client/api/StoreApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import java.util.Arrays;
import java.util.stream.Collectors;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.http.HttpHeaders;
Expand All @@ -33,7 +32,6 @@ public StoreApi() {
this(new ApiClient());
}

@Autowired
public StoreApi(ApiClient apiClient) {
this.apiClient = apiClient;
}
Expand Down
Loading