Skip to content

Commit 809180a

Browse files
dabernidaberni
committed
Optimize imports
1 parent 1240d10 commit 809180a

49 files changed

Lines changed: 21 additions & 159 deletions

File tree

Some content is hidden

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

‎modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -568,12 +568,8 @@ public void processOpts() {
568568
(sourceFolder + File.separator + apiPackage).replace(".", java.io.File.separator), "ApiUtil.java"));
569569
}
570570

571-
if (!delegatePattern || delegateMethod) {
572-
additionalProperties.put("jdk8-no-delegate", true);
573-
}
574-
575571
if (delegatePattern && !delegateMethod) {
576-
additionalProperties.put("isDelegate", "true");
572+
additionalProperties.put("isDelegate", true);
577573
apiTemplateFiles.put("apiDelegate.mustache", "Delegate.java");
578574
}
579575

‎modules/openapi-generator/src/main/resources/JavaSpring/api.mustache‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,16 @@ import io.swagger.v3.oas.annotations.media.ExampleObject;
2424
{{#swagger1AnnotationLibrary}}
2525
import io.swagger.annotations.*;
2626
{{/swagger1AnnotationLibrary}}
27-
{{#jdk8-no-delegate}}
27+
{{^isDelegate}}
28+
{{#jdk8-default-interface}}
2829
{{#virtualService}}
2930
import io.virtualan.annotation.ApiVirtual;
3031
import io.virtualan.annotation.VirtualService;
3132
{{/virtualService}}
3233
import org.springframework.http.HttpStatus;
3334
import org.springframework.http.MediaType;
34-
{{/jdk8-no-delegate}}
35+
{{/jdk8-default-interface}}
36+
{{/isDelegate}}
3537
{{^useResponseEntity}}
3638
import org.springframework.http.HttpStatus;
3739
{{/useResponseEntity}}
@@ -48,11 +50,13 @@ import org.springframework.web.bind.annotation.RestController;
4850
{{/useResponseEntity}}
4951
{{/useSpringController}}
5052
import org.springframework.web.bind.annotation.*;
51-
{{#jdk8-no-delegate}}
52-
{{^reactive}}
53+
{{#jdk8-default-interface}}
54+
{{^isDelegate}}
55+
{{^reactive}}
5356
import org.springframework.web.context.request.NativeWebRequest;
54-
{{/reactive}}
55-
{{/jdk8-no-delegate}}
57+
{{/reactive}}
58+
{{/isDelegate}}
59+
{{/jdk8-default-interface}}
5660
import org.springframework.web.multipart.MultipartFile;
5761
{{#reactive}}
5862
import org.springframework.web.server.ServerWebExchange;
@@ -67,14 +71,14 @@ import {{javaxPackage}}.validation.constraints.*;
6771
{{/useBeanValidation}}
6872
import java.util.List;
6973
import java.util.Map;
70-
{{#jdk8-no-delegate}}
74+
{{^isDelegate}}
7175
import java.util.Optional;
72-
{{/jdk8-no-delegate}}
73-
{{^jdk8-no-delegate}}
76+
{{/isDelegate}}
77+
{{#isDelegate}}
7478
{{#useOptional}}
7579
import java.util.Optional;
7680
{{/useOptional}}
77-
{{/jdk8-no-delegate}}
81+
{{/isDelegate}}
7882
{{#async}}
7983
import java.util.concurrent.CompletableFuture;
8084
{{/async}}

‎modules/openapi-generator/src/main/resources/java-pkmst/apiController.mustache‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
package {{package}};
22

3-
{{^jdk8-no-delegate}}
3+
{{^isDelegate}}
44
{{#imports}}import {{import}};
55
{{/imports}}
66

77
import io.swagger.annotations.*;
88

99
import org.springframework.http.HttpStatus;
1010
import org.springframework.http.ResponseEntity;
11-
{{/jdk8-no-delegate}}
11+
{{/isDelegate}}
1212
import org.springframework.stereotype.Controller;
13-
{{^jdk8-no-delegate}}
13+
{{^isDelegate}}
1414
import org.springframework.web.bind.annotation.PathVariable;
1515
import org.springframework.web.bind.annotation.RequestBody;
1616
import org.springframework.web.bind.annotation.RequestHeader;
@@ -26,7 +26,7 @@ import java.util.Optional;
2626
{{#async}}
2727
import java.util.concurrent.Callable;
2828
{{/async}}
29-
{{/jdk8-no-delegate}}
29+
{{/isDelegate}}
3030
{{^useSpringCloudClient}}
3131
import com.fasterxml.jackson.databind.ObjectMapper;
3232
import java.io.IOException;
@@ -60,7 +60,7 @@ public class {{classname}}Controller implements {{classname}} {
6060
}
6161

6262
{{/isDelegate}}
63-
{{^jdk8-no-delegate}}
63+
{{^isDelegate}}
6464
{{#operation}}
6565
public {{#async}}Callable<{{/async}}ResponseEntity<{{>returnTypes}}>{{#async}}>{{/async}} {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}},
6666
{{/allParams}}@RequestHeader(value = "Accept", required = false) String accept) throws Exception {
@@ -111,6 +111,6 @@ public class {{classname}}Controller implements {{classname}} {
111111
}
112112

113113
{{/operation}}
114-
{{/jdk8-no-delegate}}
114+
{{/isDelegate}}
115115
}
116116
{{/operations}}

‎samples/client/petstore/spring-cloud-auth/src/main/java/org/openapitools/api/SomeApi.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,9 @@
55
*/
66
package org.openapitools.api;
77

8-
import org.springframework.http.HttpStatus;
9-
import org.springframework.http.MediaType;
108
import org.springframework.http.ResponseEntity;
119
import org.springframework.validation.annotation.Validated;
1210
import org.springframework.web.bind.annotation.*;
13-
import org.springframework.web.context.request.NativeWebRequest;
1411
import org.springframework.web.multipart.MultipartFile;
1512

1613
import javax.validation.Valid;

‎samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,9 @@
1010
import org.springframework.lang.Nullable;
1111
import java.time.OffsetDateTime;
1212
import io.swagger.annotations.*;
13-
import org.springframework.http.HttpStatus;
14-
import org.springframework.http.MediaType;
1513
import org.springframework.http.ResponseEntity;
1614
import org.springframework.validation.annotation.Validated;
1715
import org.springframework.web.bind.annotation.*;
18-
import org.springframework.web.context.request.NativeWebRequest;
1916
import org.springframework.web.multipart.MultipartFile;
2017

2118
import javax.validation.Valid;

‎samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/PetApi.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,9 @@
2020
import io.swagger.v3.oas.annotations.tags.Tag;
2121
import io.swagger.v3.oas.annotations.enums.ParameterIn;
2222
import io.swagger.v3.oas.annotations.media.ExampleObject;
23-
import org.springframework.http.HttpStatus;
24-
import org.springframework.http.MediaType;
2523
import org.springframework.http.ResponseEntity;
2624
import org.springframework.validation.annotation.Validated;
2725
import org.springframework.web.bind.annotation.*;
28-
import org.springframework.web.context.request.NativeWebRequest;
2926
import org.springframework.web.multipart.MultipartFile;
3027

3128
import javax.validation.Valid;

‎samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/StoreApi.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,9 @@
1919
import io.swagger.v3.oas.annotations.tags.Tag;
2020
import io.swagger.v3.oas.annotations.enums.ParameterIn;
2121
import io.swagger.v3.oas.annotations.media.ExampleObject;
22-
import org.springframework.http.HttpStatus;
23-
import org.springframework.http.MediaType;
2422
import org.springframework.http.ResponseEntity;
2523
import org.springframework.validation.annotation.Validated;
2624
import org.springframework.web.bind.annotation.*;
27-
import org.springframework.web.context.request.NativeWebRequest;
2825
import org.springframework.web.multipart.MultipartFile;
2926

3027
import javax.validation.Valid;

‎samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/UserApi.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,9 @@
1919
import io.swagger.v3.oas.annotations.tags.Tag;
2020
import io.swagger.v3.oas.annotations.enums.ParameterIn;
2121
import io.swagger.v3.oas.annotations.media.ExampleObject;
22-
import org.springframework.http.HttpStatus;
23-
import org.springframework.http.MediaType;
2422
import org.springframework.http.ResponseEntity;
2523
import org.springframework.validation.annotation.Validated;
2624
import org.springframework.web.bind.annotation.*;
27-
import org.springframework.web.context.request.NativeWebRequest;
2825
import org.springframework.web.multipart.MultipartFile;
2926

3027
import javax.validation.Valid;

‎samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/PetApi.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,9 @@
99
import org.springframework.lang.Nullable;
1010
import org.openapitools.model.Pet;
1111
import io.swagger.annotations.*;
12-
import org.springframework.http.HttpStatus;
13-
import org.springframework.http.MediaType;
1412
import org.springframework.http.ResponseEntity;
1513
import org.springframework.validation.annotation.Validated;
1614
import org.springframework.web.bind.annotation.*;
17-
import org.springframework.web.context.request.NativeWebRequest;
1815
import org.springframework.web.multipart.MultipartFile;
1916

2017
import javax.validation.Valid;

‎samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/StoreApi.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,9 @@
88
import java.util.Map;
99
import org.openapitools.model.Order;
1010
import io.swagger.annotations.*;
11-
import org.springframework.http.HttpStatus;
12-
import org.springframework.http.MediaType;
1311
import org.springframework.http.ResponseEntity;
1412
import org.springframework.validation.annotation.Validated;
1513
import org.springframework.web.bind.annotation.*;
16-
import org.springframework.web.context.request.NativeWebRequest;
1714
import org.springframework.web.multipart.MultipartFile;
1815

1916
import javax.validation.Valid;

0 commit comments

Comments
 (0)