Skip to content

Commit 72a40fc

Browse files
ondrej-simonondrej-simon
committed
[20808] add Autowired annotations guard to skip generation
annotation import and usage is not generated when API is not a Spring Bean
1 parent e22d079 commit 72a40fc

File tree

68 files changed

+8
-132
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+8
-132
lines changed

‎modules/openapi-generator/src/main/resources/Java/libraries/restclient/api.mustache

+4
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ import {{javaxPackage}}.validation.constraints.*;
1818
import {{javaxPackage}}.validation.Valid;
1919

2020
{{/useBeanValidation}}
21+
{{#generateClientAsBean}}
2122
import org.springframework.beans.factory.annotation.Autowired;
23+
{{/generateClientAsBean}}
2224
import org.springframework.core.io.FileSystemResource;
2325
import org.springframework.core.ParameterizedTypeReference;
2426
import org.springframework.http.HttpHeaders;
@@ -46,7 +48,9 @@ public class {{classname}} {
4648
this(new ApiClient());
4749
}
4850

51+
{{#generateClientAsBean}}
4952
@Autowired
53+
{{/generateClientAsBean}}
5054
public {{classname}}(ApiClient apiClient) {
5155
this.apiClient = apiClient;
5256
}

‎modules/openapi-generator/src/main/resources/Java/libraries/webclient/api.mustache

+4
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ import {{javaxPackage}}.validation.constraints.*;
1818
import {{javaxPackage}}.validation.Valid;
1919

2020
{{/useBeanValidation}}
21+
{{#generateClientAsBean}}
2122
import org.springframework.beans.factory.annotation.Autowired;
23+
{{/generateClientAsBean}}
2224
import org.springframework.core.io.FileSystemResource;
2325
import org.springframework.core.ParameterizedTypeReference;
2426
import org.springframework.http.HttpHeaders;
@@ -48,7 +50,9 @@ public class {{classname}} {
4850
this(new ApiClient());
4951
}
5052

53+
{{#generateClientAsBean}}
5154
@Autowired
55+
{{/generateClientAsBean}}
5256
public {{classname}}(ApiClient apiClient) {
5357
this.apiClient = apiClient;
5458
}

‎samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/api/AuthApi.java

-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import java.util.Arrays;
1212
import java.util.stream.Collectors;
1313

14-
import org.springframework.beans.factory.annotation.Autowired;
1514
import org.springframework.core.io.FileSystemResource;
1615
import org.springframework.core.ParameterizedTypeReference;
1716
import org.springframework.http.HttpHeaders;
@@ -32,7 +31,6 @@ public AuthApi() {
3231
this(new ApiClient());
3332
}
3433

35-
@Autowired
3634
public AuthApi(ApiClient apiClient) {
3735
this.apiClient = apiClient;
3836
}

‎samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/api/BodyApi.java

-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import java.util.Arrays;
1616
import java.util.stream.Collectors;
1717

18-
import org.springframework.beans.factory.annotation.Autowired;
1918
import org.springframework.core.io.FileSystemResource;
2019
import org.springframework.core.ParameterizedTypeReference;
2120
import org.springframework.http.HttpHeaders;
@@ -36,7 +35,6 @@ public BodyApi() {
3635
this(new ApiClient());
3736
}
3837

39-
@Autowired
4038
public BodyApi(ApiClient apiClient) {
4139
this.apiClient = apiClient;
4240
}

‎samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/api/FormApi.java

-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import java.util.Arrays;
1313
import java.util.stream.Collectors;
1414

15-
import org.springframework.beans.factory.annotation.Autowired;
1615
import org.springframework.core.io.FileSystemResource;
1716
import org.springframework.core.ParameterizedTypeReference;
1817
import org.springframework.http.HttpHeaders;
@@ -33,7 +32,6 @@ public FormApi() {
3332
this(new ApiClient());
3433
}
3534

36-
@Autowired
3735
public FormApi(ApiClient apiClient) {
3836
this.apiClient = apiClient;
3937
}

‎samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/api/HeaderApi.java

-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import java.util.Arrays;
1313
import java.util.stream.Collectors;
1414

15-
import org.springframework.beans.factory.annotation.Autowired;
1615
import org.springframework.core.io.FileSystemResource;
1716
import org.springframework.core.ParameterizedTypeReference;
1817
import org.springframework.http.HttpHeaders;
@@ -33,7 +32,6 @@ public HeaderApi() {
3332
this(new ApiClient());
3433
}
3534

36-
@Autowired
3735
public HeaderApi(ApiClient apiClient) {
3836
this.apiClient = apiClient;
3937
}

‎samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/api/PathApi.java

-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import java.util.Arrays;
1313
import java.util.stream.Collectors;
1414

15-
import org.springframework.beans.factory.annotation.Autowired;
1615
import org.springframework.core.io.FileSystemResource;
1716
import org.springframework.core.ParameterizedTypeReference;
1817
import org.springframework.http.HttpHeaders;
@@ -33,7 +32,6 @@ public PathApi() {
3332
this(new ApiClient());
3433
}
3534

36-
@Autowired
3735
public PathApi(ApiClient apiClient) {
3836
this.apiClient = apiClient;
3937
}

‎samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/api/QueryApi.java

-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import java.util.Arrays;
1919
import java.util.stream.Collectors;
2020

21-
import org.springframework.beans.factory.annotation.Autowired;
2221
import org.springframework.core.io.FileSystemResource;
2322
import org.springframework.core.ParameterizedTypeReference;
2423
import org.springframework.http.HttpHeaders;
@@ -39,7 +38,6 @@ public QueryApi() {
3938
this(new ApiClient());
4039
}
4140

42-
@Autowired
4341
public QueryApi(ApiClient apiClient) {
4442
this.apiClient = apiClient;
4543
}

‎samples/client/others/java/restclient-useAbstractionForFiles/src/main/java/org/openapitools/client/api/ResourceApi.java

-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import java.util.Arrays;
1313
import java.util.stream.Collectors;
1414

15-
import org.springframework.beans.factory.annotation.Autowired;
1615
import org.springframework.core.io.FileSystemResource;
1716
import org.springframework.core.ParameterizedTypeReference;
1817
import org.springframework.http.HttpHeaders;
@@ -33,7 +32,6 @@ public ResourceApi() {
3332
this(new ApiClient());
3433
}
3534

36-
@Autowired
3735
public ResourceApi(ApiClient apiClient) {
3836
this.apiClient = apiClient;
3937
}

‎samples/client/others/java/webclient-useAbstractionForFiles/src/main/java/org/openapitools/client/api/ResourceApi.java

-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import java.util.Arrays;
1313
import java.util.stream.Collectors;
1414

15-
import org.springframework.beans.factory.annotation.Autowired;
1615
import org.springframework.core.io.FileSystemResource;
1716
import org.springframework.core.ParameterizedTypeReference;
1817
import org.springframework.http.HttpHeaders;
@@ -35,7 +34,6 @@ public ResourceApi() {
3534
this(new ApiClient());
3635
}
3736

38-
@Autowired
3937
public ResourceApi(ApiClient apiClient) {
4038
this.apiClient = apiClient;
4139
}

‎samples/client/petstore/java/restclient-nullable-arrays/src/main/java/org/openapitools/client/api/DefaultApi.java

-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import java.util.Arrays;
1313
import java.util.stream.Collectors;
1414

15-
import org.springframework.beans.factory.annotation.Autowired;
1615
import org.springframework.core.io.FileSystemResource;
1716
import org.springframework.core.ParameterizedTypeReference;
1817
import org.springframework.http.HttpHeaders;
@@ -33,7 +32,6 @@ public DefaultApi() {
3332
this(new ApiClient());
3433
}
3534

36-
@Autowired
3735
public DefaultApi(ApiClient apiClient) {
3836
this.apiClient = apiClient;
3937
}

‎samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/api/AnotherFakeApi.java

-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import java.util.Arrays;
1313
import java.util.stream.Collectors;
1414

15-
import org.springframework.beans.factory.annotation.Autowired;
1615
import org.springframework.core.io.FileSystemResource;
1716
import org.springframework.core.ParameterizedTypeReference;
1817
import org.springframework.http.HttpHeaders;
@@ -33,7 +32,6 @@ public AnotherFakeApi() {
3332
this(new ApiClient());
3433
}
3534

36-
@Autowired
3735
public AnotherFakeApi(ApiClient apiClient) {
3836
this.apiClient = apiClient;
3937
}

‎samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/api/DefaultApi.java

-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import java.util.Arrays;
1313
import java.util.stream.Collectors;
1414

15-
import org.springframework.beans.factory.annotation.Autowired;
1615
import org.springframework.core.io.FileSystemResource;
1716
import org.springframework.core.ParameterizedTypeReference;
1817
import org.springframework.http.HttpHeaders;
@@ -33,7 +32,6 @@ public DefaultApi() {
3332
this(new ApiClient());
3433
}
3534

36-
@Autowired
3735
public DefaultApi(ApiClient apiClient) {
3836
this.apiClient = apiClient;
3937
}

‎samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/api/FakeApi.java

-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import java.util.Arrays;
2727
import java.util.stream.Collectors;
2828

29-
import org.springframework.beans.factory.annotation.Autowired;
3029
import org.springframework.core.io.FileSystemResource;
3130
import org.springframework.core.ParameterizedTypeReference;
3231
import org.springframework.http.HttpHeaders;
@@ -47,7 +46,6 @@ public FakeApi() {
4746
this(new ApiClient());
4847
}
4948

50-
@Autowired
5149
public FakeApi(ApiClient apiClient) {
5250
this.apiClient = apiClient;
5351
}

‎samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java

-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import java.util.Arrays;
1313
import java.util.stream.Collectors;
1414

15-
import org.springframework.beans.factory.annotation.Autowired;
1615
import org.springframework.core.io.FileSystemResource;
1716
import org.springframework.core.ParameterizedTypeReference;
1817
import org.springframework.http.HttpHeaders;
@@ -33,7 +32,6 @@ public FakeClassnameTags123Api() {
3332
this(new ApiClient());
3433
}
3534

36-
@Autowired
3735
public FakeClassnameTags123Api(ApiClient apiClient) {
3836
this.apiClient = apiClient;
3937
}

‎samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/api/PetApi.java

-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import java.util.Arrays;
1616
import java.util.stream.Collectors;
1717

18-
import org.springframework.beans.factory.annotation.Autowired;
1918
import org.springframework.core.io.FileSystemResource;
2019
import org.springframework.core.ParameterizedTypeReference;
2120
import org.springframework.http.HttpHeaders;
@@ -36,7 +35,6 @@ public PetApi() {
3635
this(new ApiClient());
3736
}
3837

39-
@Autowired
4038
public PetApi(ApiClient apiClient) {
4139
this.apiClient = apiClient;
4240
}

‎samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/api/StoreApi.java

-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import java.util.Arrays;
1313
import java.util.stream.Collectors;
1414

15-
import org.springframework.beans.factory.annotation.Autowired;
1615
import org.springframework.core.io.FileSystemResource;
1716
import org.springframework.core.ParameterizedTypeReference;
1817
import org.springframework.http.HttpHeaders;
@@ -33,7 +32,6 @@ public StoreApi() {
3332
this(new ApiClient());
3433
}
3534

36-
@Autowired
3735
public StoreApi(ApiClient apiClient) {
3836
this.apiClient = apiClient;
3937
}

‎samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/api/UserApi.java

-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import java.util.Arrays;
1414
import java.util.stream.Collectors;
1515

16-
import org.springframework.beans.factory.annotation.Autowired;
1716
import org.springframework.core.io.FileSystemResource;
1817
import org.springframework.core.ParameterizedTypeReference;
1918
import org.springframework.http.HttpHeaders;
@@ -34,7 +33,6 @@ public UserApi() {
3433
this(new ApiClient());
3534
}
3635

37-
@Autowired
3836
public UserApi(ApiClient apiClient) {
3937
this.apiClient = apiClient;
4038
}

‎samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/api/AnotherFakeApi.java

-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import java.util.Arrays;
1313
import java.util.stream.Collectors;
1414

15-
import org.springframework.beans.factory.annotation.Autowired;
1615
import org.springframework.core.io.FileSystemResource;
1716
import org.springframework.core.ParameterizedTypeReference;
1817
import org.springframework.http.HttpHeaders;
@@ -33,7 +32,6 @@ public AnotherFakeApi() {
3332
this(new ApiClient());
3433
}
3534

36-
@Autowired
3735
public AnotherFakeApi(ApiClient apiClient) {
3836
this.apiClient = apiClient;
3937
}

‎samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/api/DefaultApi.java

-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import java.util.Arrays;
1313
import java.util.stream.Collectors;
1414

15-
import org.springframework.beans.factory.annotation.Autowired;
1615
import org.springframework.core.io.FileSystemResource;
1716
import org.springframework.core.ParameterizedTypeReference;
1817
import org.springframework.http.HttpHeaders;
@@ -33,7 +32,6 @@ public DefaultApi() {
3332
this(new ApiClient());
3433
}
3534

36-
@Autowired
3735
public DefaultApi(ApiClient apiClient) {
3836
this.apiClient = apiClient;
3937
}

‎samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/api/FakeApi.java

-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import java.util.Arrays;
2727
import java.util.stream.Collectors;
2828

29-
import org.springframework.beans.factory.annotation.Autowired;
3029
import org.springframework.core.io.FileSystemResource;
3130
import org.springframework.core.ParameterizedTypeReference;
3231
import org.springframework.http.HttpHeaders;
@@ -47,7 +46,6 @@ public FakeApi() {
4746
this(new ApiClient());
4847
}
4948

50-
@Autowired
5149
public FakeApi(ApiClient apiClient) {
5250
this.apiClient = apiClient;
5351
}

‎samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java

-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import java.util.Arrays;
1313
import java.util.stream.Collectors;
1414

15-
import org.springframework.beans.factory.annotation.Autowired;
1615
import org.springframework.core.io.FileSystemResource;
1716
import org.springframework.core.ParameterizedTypeReference;
1817
import org.springframework.http.HttpHeaders;
@@ -33,7 +32,6 @@ public FakeClassnameTags123Api() {
3332
this(new ApiClient());
3433
}
3534

36-
@Autowired
3735
public FakeClassnameTags123Api(ApiClient apiClient) {
3836
this.apiClient = apiClient;
3937
}

‎samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/api/PetApi.java

-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import java.util.Arrays;
1616
import java.util.stream.Collectors;
1717

18-
import org.springframework.beans.factory.annotation.Autowired;
1918
import org.springframework.core.io.FileSystemResource;
2019
import org.springframework.core.ParameterizedTypeReference;
2120
import org.springframework.http.HttpHeaders;
@@ -36,7 +35,6 @@ public PetApi() {
3635
this(new ApiClient());
3736
}
3837

39-
@Autowired
4038
public PetApi(ApiClient apiClient) {
4139
this.apiClient = apiClient;
4240
}

‎samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/api/StoreApi.java

-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import java.util.Arrays;
1313
import java.util.stream.Collectors;
1414

15-
import org.springframework.beans.factory.annotation.Autowired;
1615
import org.springframework.core.io.FileSystemResource;
1716
import org.springframework.core.ParameterizedTypeReference;
1817
import org.springframework.http.HttpHeaders;
@@ -33,7 +32,6 @@ public StoreApi() {
3332
this(new ApiClient());
3433
}
3534

36-
@Autowired
3735
public StoreApi(ApiClient apiClient) {
3836
this.apiClient = apiClient;
3937
}

0 commit comments

Comments
 (0)