Skip to content

Commit fd06f61

Browse files
HugoMarioHugoMario
committed
update spring templates to work with jakarta option
1 parent db1aaa9 commit fd06f61

File tree

10 files changed

+92
-6
lines changed

10 files changed

+92
-6
lines changed

‎modules/swagger-codegen/src/main/resources/JavaSpring/api.mustache‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,14 @@ import org.springframework.web.multipart.MultipartFile;
3333
import javax.servlet.http.HttpServletRequest;
3434
{{/jdk8-no-delegate}}
3535
{{#useBeanValidation}}
36+
{{#jakarta}}
37+
import jakarta.validation.Valid;
38+
import jakarta.validation.constraints.*;
39+
{{/jakarta}}
40+
{{^jakarta}}
3641
import javax.validation.Valid;
3742
import javax.validation.constraints.*;
43+
{{/jakarta}}
3844
{{/useBeanValidation}}
3945
{{#jdk8-no-delegate}}
4046
import java.io.IOException;

‎modules/swagger-codegen/src/main/resources/JavaSpring/apiController.mustache‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,24 @@ import org.springframework.web.bind.annotation.RequestParam;
2323
import org.springframework.web.bind.annotation.RequestPart;
2424
import org.springframework.web.multipart.MultipartFile;
2525

26-
{{#useBeanValidation}}
27-
import javax.validation.constraints.*;
26+
{{#useBeanValidation}}
27+
{{#jakarta}}
28+
import jakarta.validation.Valid;
29+
import jakarta.validation.constraints.*;
30+
{{/jakarta}}
31+
{{^jakarta}}
2832
import javax.validation.Valid;
29-
{{/useBeanValidation}}
33+
import javax.validation.constraints.*;
34+
{{/jakarta}}
35+
{{/useBeanValidation}}
3036
{{/isJava8or11}}
3137
{{^isDelegate}}
38+
{{#jakarta}}
39+
import jakarta.servlet.http.HttpServletRequest;
40+
{{/jakarta}}
41+
{{^jakarta}}
3242
import javax.servlet.http.HttpServletRequest;
43+
{{/jakarta}}
3344
{{#isJava8or11}}
3445
import java.util.Optional;
3546
{{/isJava8or11}}

‎modules/swagger-codegen/src/main/resources/JavaSpring/apiDelegate.mustache‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,12 @@ import java.io.IOException;
1818
{{/isJava8or11}}
1919

2020
{{#isJava8or11}}
21+
{{#jakarta}}
22+
import jakarta.servlet.http.HttpServletRequest;
23+
{{/jakarta}}
24+
{{^jakarta}}
2125
import javax.servlet.http.HttpServletRequest;
26+
{{/jakarta}}
2227
{{/isJava8or11}}
2328
import java.util.List;
2429
{{#isJava8or11}}

‎modules/swagger-codegen/src/main/resources/JavaSpring/apiOriginFilter.mustache‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,14 @@ package {{apiPackage}};
22

33
import java.io.IOException;
44

5+
{{#jakarta}}
6+
import jakarta.servlet.*;
7+
import jakarta.servlet.http.HttpServletResponse;
8+
{{/jakarta}}
9+
{{^jakarta}}
510
import javax.servlet.*;
611
import javax.servlet.http.HttpServletResponse;
12+
{{/jakarta}}
713

814
{{>generatedAnnotation}}
915
public class ApiOriginFilter implements javax.servlet.Filter {

‎modules/swagger-codegen/src/main/resources/JavaSpring/apiResponseMessage.mustache‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,19 @@
11
package {{apiPackage}};
22

3+
{{#jakarta}}
4+
import jakarta.xml.bind.annotation.XmlTransient;
5+
{{/jakarta}}
6+
{{^jakarta}}
37
import javax.xml.bind.annotation.XmlTransient;
8+
{{/jakarta}}
49

510
{{>generatedAnnotation}}
11+
{{#jakarta}}
12+
@jakarta.xml.bind.annotation.XmlRootElement
13+
{{/jakarta}}
14+
{{^jakarta}}
615
@javax.xml.bind.annotation.XmlRootElement
16+
{{/jakarta}}
717
public class ApiResponseMessage {
818
public static final int ERROR = 1;
919
public static final int WARNING = 2;

‎modules/swagger-codegen/src/main/resources/JavaSpring/generatedAnnotation.mustache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{{^hideGenerationTimestamp}}
2-
@javax.annotation.Generated(value = "{{generatorClass}}", date = "{{generatedDate}}")
2+
@{{#jakarta}}jakarta{{/jakarta}}{{^jakarta}}javax{{/jakarta}}.annotation.Generated(value = "{{generatorClass}}", date = "{{generatedDate}}")
33
{{/hideGenerationTimestamp}}

‎modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-boot/pom.mustache‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<dependency>
4646
<groupId>com.sun.xml.ws</groupId>
4747
<artifactId>jaxws-rt</artifactId>
48-
<version>2.3.3</version>
48+
<version>{{#jakarta}}4.0.0{{/jakarta}}{{^jakarta}}2.3.3{{/jakarta}}</version>
4949
<type>pom</type>
5050
</dependency>
5151
</dependencies>
@@ -108,10 +108,18 @@
108108
{{/threetenbp}}
109109
{{#useBeanValidation}}
110110
<!-- Bean Validation API support -->
111+
{{#jakarta}}
112+
<dependency>
113+
<groupId>jakarta.validation</groupId>
114+
<artifactId>jakarta.validation-api</artifactId>
115+
</dependency>
116+
{{/jakarta}}
117+
{{^jakarta}}
111118
<dependency>
112119
<groupId>javax.validation</groupId>
113120
<artifactId>validation-api</artifactId>
114121
</dependency>
122+
{{/jakarta}}
115123
{{/useBeanValidation}}
116124
{{#notNullJacksonAnnotation}}
117125
<dependency>

‎modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,22 @@
8686
{{/threetenbp}}
8787
{{#useBeanValidation}}
8888
<!-- Bean Validation API support -->
89+
{{#jakarta}}
90+
<dependency>
91+
<groupId>jakarta.validation</groupId>
92+
<artifactId>jakarta.validation-api</artifactId>
93+
<version>3.0.2</version>
94+
<scope>provided</scope>
95+
</dependency>
96+
{{/jakarta}}
97+
{{^jakarta}}
8998
<dependency>
9099
<groupId>javax.validation</groupId>
91100
<artifactId>validation-api</artifactId>
92101
<version>1.1.0.Final</version>
93102
<scope>provided</scope>
94103
</dependency>
104+
{{/jakarta}}
95105
{{/useBeanValidation}}
96106
{{#notNullJacksonAnnotation}}
97107
<dependency>

‎modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-mvc/pom.mustache‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,19 +174,38 @@
174174
<version>${junit-version}</version>
175175
<scope>test</scope>
176176
</dependency>
177+
{{#jakarta}}
178+
<dependency>
179+
<groupId>jakarta.servlet</groupId>
180+
<artifactId>jakarta-api</artifactId>
181+
<version>${servlet-api-version}</version>
182+
</dependency>
183+
{{/jakarta}}
184+
{{^jakarta}}
177185
<dependency>
178186
<groupId>javax.servlet</groupId>
179187
<artifactId>servlet-api</artifactId>
180188
<version>${servlet-api-version}</version>
181189
</dependency>
190+
{{/jakarta}}
182191
{{#useBeanValidation}}
183192
<!-- Bean Validation API support -->
193+
{{#jakarta}}
194+
<dependency>
195+
<groupId>jakarta.validation</groupId>
196+
<artifactId>jakarta.validation-api</artifactId>
197+
<version>3.0.2</version>
198+
<scope>provided</scope>
199+
</dependency>
200+
{{/jakarta}}
201+
{{^jakarta}}
184202
<dependency>
185203
<groupId>javax.validation</groupId>
186204
<artifactId>validation-api</artifactId>
187205
<version>1.1.0.Final</version>
188206
<scope>provided</scope>
189207
</dependency>
208+
{{/jakarta}}
190209
{{/useBeanValidation}}
191210
{{#notNullJacksonAnnotation}}
192211
<dependency>
@@ -238,7 +257,7 @@
238257
<jetty-version>9.3.27.v20190418</jetty-version>
239258
<slf4j-version>1.7.21</slf4j-version>
240259
<junit-version>4.13.1</junit-version>
241-
<servlet-api-version>2.5</servlet-api-version>
260+
<servlet-api-version>{{#jakarta}}6.0.0{{/jakarta}}{{^jakarta}}2.5{{/jakarta}}</servlet-api-version>
242261
<springfox-version>2.7.0</springfox-version>
243262
<jackson-version>2.11.4</jackson-version>
244263
<jackson-threetenbp-version>2.6.4</jackson-threetenbp-version>

‎modules/swagger-codegen/src/main/resources/JavaSpring/model.mustache‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,14 @@ import java.io.Serializable;
88
{{/serializableModel}}
99
{{#useBeanValidation}}
1010
import org.springframework.validation.annotation.Validated;
11+
{{#jakarta}}
12+
import jakarta.validation.Valid;
13+
import jakarta.validation.constraints.*;
14+
{{/jakarta}}
15+
{{^jakarta}}
1116
import javax.validation.Valid;
1217
import javax.validation.constraints.*;
18+
{{/jakarta}}
1319
{{/useBeanValidation}}
1420
{{#jackson}}
1521
{{#withXml}}
@@ -19,7 +25,12 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
1925
{{/withXml}}
2026
{{/jackson}}
2127
{{#withXml}}
28+
{{#jakarta}}
29+
import jakarta.xml.bind.annotation.*;
30+
{{/jakarta}}
31+
{{^jakarta}}
2232
import javax.xml.bind.annotation.*;
33+
{{/jakarta}}
2334
{{/withXml}}
2435

2536
{{#models}}

0 commit comments

Comments
 (0)