Skip to content

Commit 0bc7a1e

Browse files
committed
add jakarta implementation
#1054
1 parent 052511a commit 0bc7a1e

File tree

14 files changed

+98
-17
lines changed

14 files changed

+98
-17
lines changed

src/main/resources/handlebars/JavaMicronaut/api.mustache

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,16 @@ import org.slf4j.Logger;
1717
import org.slf4j.LoggerFactory;
1818

1919
{{#useBeanValidation}}
20+
{{#jakarta}}
21+
import jakarta.annotation.Nullable;
22+
import jakarta.validation.Valid;
23+
import jakarta.validation.constraints.*;
24+
{{/jakarta}}
25+
{{^jakarta}}
2026
import javax.annotation.Nullable;
2127
import javax.validation.Valid;
2228
import javax.validation.constraints.*;
29+
{{/jakarta}}
2330
{{/useBeanValidation}}
2431
import java.io.IOException;
2532
import java.util.List;

src/main/resources/handlebars/JavaMicronaut/api_test.mustache

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,12 @@ import io.micronaut.http.HttpStatus;
88
import io.micronaut.test.annotation.MicronautTest;
99
import org.junit.jupiter.api.Test;
1010

11+
{{#jakarta}}
12+
import jakarta.inject.Inject;
13+
{{/jakarta}}
14+
{{^jakarta}}
1115
import javax.inject.Inject;
16+
{{/jakarta}}
1217

1318
import java.util.*;
1419

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

src/main/resources/handlebars/JavaMicronaut/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 io.micronaut.validation.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}}
@@ -18,7 +24,12 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
1824
{{/withXml}}
1925
{{/jackson}}
2026
{{#withXml}}
27+
{{#jakarta}}
28+
import jakarta.xml.bind.annotation.*;
29+
{{/jakarta}}
30+
{{^jakarta}}
2131
import javax.xml.bind.annotation.*;
32+
{{/jakarta}}
2233
{{/withXml}}
2334

2435
{{#models}}

src/main/resources/handlebars/JavaMicronaut/unsupportedOperationExceptionHandler.mustache

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,12 @@ import io.micronaut.http.HttpStatus;
88
import io.micronaut.http.annotation.Produces;
99
import io.micronaut.http.server.exceptions.ExceptionHandler;
1010

11+
{{#jakarta}}
12+
import jakarta.inject.Singleton;
13+
{{/jakarta}}
14+
{{^jakarta}}
1115
import javax.inject.Singleton;
16+
{{/jakarta}}
1217

1318
@Produces
1419
@Singleton
@@ -19,4 +24,4 @@ public class UnsupportedOperationExceptionHandler implements ExceptionHandler<Un
1924
public HttpResponse handle(HttpRequest request, UnsupportedOperationException exception) {
2025
return HttpResponse.status(HttpStatus.NOT_IMPLEMENTED);
2126
}
22-
}
27+
}

src/main/resources/handlebars/JavaSpring/api.mustache

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,14 @@ import org.springframework.web.bind.annotation.CookieValue;
4747
import javax.servlet.http.HttpServletRequest;
4848
{{/jdk8-no-delegate}}
4949
{{#useBeanValidation}}
50+
{{#jakarta}}
51+
import jakarta.validation.Valid;
52+
import jakarta.validation.constraints.*;
53+
{{/jakarta}}
54+
{{^jakarta}}
5055
import javax.validation.Valid;
5156
import javax.validation.constraints.*;
57+
{{/jakarta}}
5258
{{/useBeanValidation}}
5359
{{#jdk8-no-delegate}}
5460
import java.io.IOException;

src/main/resources/handlebars/JavaSpring/apiController.mustache

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,14 @@ import org.springframework.web.bind.annotation.RestController;
4141
import org.springframework.web.multipart.MultipartFile;
4242

4343
{{#useBeanValidation}}
44-
import javax.validation.constraints.*;
45-
import javax.validation.Valid;
44+
{{#jakarta}}
45+
import jakarta.validation.Valid;
46+
import jakarta.validation.constraints.*;
47+
{{/jakarta}}
48+
{{^jakarta}}
49+
import javax.validation.Valid;
50+
import javax.validation.constraints.*;
51+
{{/jakarta}}
4652
{{/useBeanValidation}}
4753
{{/fullController}}
4854
{{^isDelegate}}

src/main/resources/handlebars/JavaSpring/apiOriginFilter.mustache

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,17 @@ 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}}
9-
public class ApiOriginFilter implements javax.servlet.Filter {
15+
public class ApiOriginFilter implements Filter {
1016
@Override
1117
public void doFilter(ServletRequest request, ServletResponse response,
1218
FilterChain chain) throws IOException, ServletException {

src/main/resources/handlebars/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;
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
{{^hideGenerationTimestamp}}
2-
@javax.annotation.Generated(value = "{{generatorClass}}", date = "{{generatedDate}}")
3-
{{/hideGenerationTimestamp}}
1+
{{^hideGenerationTimestamp}}@{{#jakarta}}jakarta{{/jakarta}}{{^jakarta}}javax{{/jakarta}}.annotation.Generated(value = "{{generatorClass}}", date = "{{generatedDate}}"){{/hideGenerationTimestamp}}

0 commit comments

Comments
 (0)