[20808] add Autowired annotations guard to skip generation (#21198)

annotation import and usage is not generated when API is not a Spring Bean

Author: ondrej-simon

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

@@ -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;
@@ -46,7 +48,9 @@ public class {{classname}} {
         this(new ApiClient());
     }
 
+{{#generateClientAsBean}}
     @Autowired
+{{/generateClientAsBean}}
     public {{classname}}(ApiClient apiClient) {
         this.apiClient = apiClient;
     }

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

@@ -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;
@@ -48,7 +50,9 @@ public class {{classname}} {
         this(new ApiClient());
     }
 
+{{#generateClientAsBean}}
     @Autowired
+{{/generateClientAsBean}}
     public {{classname}}(ApiClient apiClient) {
         this.apiClient = apiClient;
     }

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

@@ -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;
@@ -32,7 +31,6 @@ public AuthApi() {
         this(new ApiClient());
     }
 
-    @Autowired
     public AuthApi(ApiClient apiClient) {
         this.apiClient = apiClient;
     }

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

@@ -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;
@@ -36,7 +35,6 @@ public BodyApi() {
         this(new ApiClient());
     }
 
-    @Autowired
     public BodyApi(ApiClient apiClient) {
         this.apiClient = apiClient;
     }

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

@@ -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;
@@ -33,7 +32,6 @@ public FormApi() {
         this(new ApiClient());
     }
 
-    @Autowired
     public FormApi(ApiClient apiClient) {
         this.apiClient = apiClient;
     }

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

@@ -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;
@@ -33,7 +32,6 @@ public HeaderApi() {
         this(new ApiClient());
     }
 
-    @Autowired
     public HeaderApi(ApiClient apiClient) {
         this.apiClient = apiClient;
     }

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

@@ -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;
@@ -33,7 +32,6 @@ public PathApi() {
         this(new ApiClient());
     }
 
-    @Autowired
     public PathApi(ApiClient apiClient) {
         this.apiClient = apiClient;
     }

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

@@ -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;
@@ -39,7 +38,6 @@ public QueryApi() {
         this(new ApiClient());
     }
 
-    @Autowired
     public QueryApi(ApiClient apiClient) {
         this.apiClient = apiClient;
     }

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

@@ -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;
@@ -33,7 +32,6 @@ public ResourceApi() {
         this(new ApiClient());
     }
 
-    @Autowired
     public ResourceApi(ApiClient apiClient) {
         this.apiClient = apiClient;
     }

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

@@ -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;
@@ -35,7 +34,6 @@ public ResourceApi() {
         this(new ApiClient());
     }
 
-    @Autowired
     public ResourceApi(ApiClient apiClient) {
         this.apiClient = apiClient;
     }