-
-
Notifications
You must be signed in to change notification settings - Fork 6.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[kotlin-server] add support for jakarta ee namespace (#15593)
- Loading branch information
1 parent
48ef91a
commit 9890f07
Showing
9 changed files
with
198 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...erator/src/main/resources/kotlin-server/libraries/jaxrs-spec/generatedAnnotation.mustache
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| @javax.annotation.Generated(value = arrayOf("{{generatorClass}}"){{^hideGenerationTimestamp}}, date = "{{generatedDate}}"{{/hideGenerationTimestamp}}) | ||
| @{{javaxPackage}}.annotation.Generated(value = arrayOf("{{generatorClass}}"){{^hideGenerationTimestamp}}, date = "{{generatedDate}}"{{/hideGenerationTimestamp}}) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
167 changes: 167 additions & 0 deletions
167
...napi-generator/src/test/java/org/openapitools/codegen/kotlin/KotlinServerCodegenTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,167 @@ | ||
| package org.openapitools.codegen.kotlin; | ||
|
|
||
| import org.junit.Test; | ||
| import org.openapitools.codegen.ClientOptInput; | ||
| import org.openapitools.codegen.DefaultGenerator; | ||
| import org.openapitools.codegen.TestUtils; | ||
| import org.openapitools.codegen.languages.KotlinServerCodegen; | ||
|
|
||
| import java.io.File; | ||
| import java.io.IOException; | ||
| import java.nio.file.Files; | ||
| import java.nio.file.Path; | ||
| import java.nio.file.Paths; | ||
|
|
||
| import static org.openapitools.codegen.CodegenConstants.LIBRARY; | ||
| import static org.openapitools.codegen.languages.AbstractKotlinCodegen.USE_JAKARTA_EE; | ||
| import static org.openapitools.codegen.languages.KotlinServerCodegen.Constants.JAXRS_SPEC; | ||
| import static org.openapitools.codegen.TestUtils.assertFileContains; | ||
| import static org.openapitools.codegen.TestUtils.assertFileNotContains; | ||
| import static org.openapitools.codegen.languages.features.BeanValidationFeatures.USE_BEANVALIDATION; | ||
|
|
||
| public class KotlinServerCodegenTest { | ||
|
|
||
| @Test | ||
| public void javaxImports() throws IOException { | ||
| File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); | ||
| output.deleteOnExit(); | ||
|
|
||
| KotlinServerCodegen codegen = new KotlinServerCodegen(); | ||
| codegen.setOutputDir(output.getAbsolutePath()); | ||
| codegen.additionalProperties().put(LIBRARY, JAXRS_SPEC); | ||
|
|
||
| new DefaultGenerator().opts(new ClientOptInput() | ||
| .openAPI(TestUtils.parseSpec("src/test/resources/3_0/petstore.yaml")) | ||
| .config(codegen)) | ||
| .generate(); | ||
|
|
||
| String outputPath = output.getAbsolutePath() + "/src/main/kotlin/org/openapitools/server"; | ||
| Path petApi = Paths.get(outputPath + "/apis/PetApi.kt"); | ||
| assertFileNotContains( | ||
| petApi, | ||
| "import jakarta.ws.rs.*", | ||
| "import jakarta.ws.rs.core.Response", | ||
| "@jakarta.annotation.Generated(value = arrayOf(\"org.openapitools.codegen.languages.KotlinServerCodegen\"))" | ||
| ); | ||
| assertFileContains( | ||
| petApi, | ||
| "import javax.ws.rs.*", | ||
| "import javax.ws.rs.core.Response", | ||
| "@javax.annotation.Generated(value = arrayOf(\"org.openapitools.codegen.languages.KotlinServerCodegen\"))" | ||
| ); | ||
| } | ||
|
|
||
| @Test | ||
| public void jakartaEeImports() throws IOException { | ||
| File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); | ||
| output.deleteOnExit(); | ||
|
|
||
| KotlinServerCodegen codegen = new KotlinServerCodegen(); | ||
| codegen.setOutputDir(output.getAbsolutePath()); | ||
| codegen.additionalProperties().put(USE_JAKARTA_EE, true); | ||
| codegen.additionalProperties().put(LIBRARY, JAXRS_SPEC); | ||
|
|
||
| new DefaultGenerator().opts(new ClientOptInput() | ||
| .openAPI(TestUtils.parseSpec("src/test/resources/3_0/petstore.yaml")) | ||
| .config(codegen)) | ||
| .generate(); | ||
|
|
||
| String outputPath = output.getAbsolutePath() + "/src/main/kotlin/org/openapitools/server"; | ||
| Path petApi = Paths.get(outputPath + "/apis/PetApi.kt"); | ||
| assertFileContains( | ||
| petApi, | ||
| "import jakarta.ws.rs.*", | ||
| "import jakarta.ws.rs.core.Response", | ||
| "@jakarta.annotation.Generated(value = arrayOf(\"org.openapitools.codegen.languages.KotlinServerCodegen\"))" | ||
| ); | ||
| assertFileNotContains( | ||
| petApi, | ||
| "import javax.ws.rs.*", | ||
| "import javax.ws.rs.core.Response", | ||
| "@javax.annotation.Generated(value = arrayOf(\"org.openapitools.codegen.languages.KotlinServerCodegen\"))" | ||
| ); | ||
| } | ||
|
|
||
| @Test | ||
| public void beanValidationJavaxImports() throws IOException { | ||
| File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); | ||
| output.deleteOnExit(); | ||
|
|
||
| KotlinServerCodegen codegen = new KotlinServerCodegen(); | ||
| codegen.setOutputDir(output.getAbsolutePath()); | ||
| codegen.additionalProperties().put(LIBRARY, JAXRS_SPEC); | ||
| codegen.additionalProperties().put(USE_BEANVALIDATION, true); | ||
|
|
||
| new DefaultGenerator().opts(new ClientOptInput() | ||
| .openAPI(TestUtils.parseSpec("src/test/resources/3_0/petstore.yaml")) | ||
| .config(codegen)) | ||
| .generate(); | ||
|
|
||
| String outputPath = output.getAbsolutePath() + "/src/main/kotlin/org/openapitools/server"; | ||
| Path petApi = Paths.get(outputPath + "/apis/PetApi.kt"); | ||
| assertFileNotContains( | ||
| petApi, | ||
| "import jakarta.validation.Valid", | ||
| "import jakarta.validation.Valid" | ||
| ); | ||
| assertFileContains( | ||
| petApi, | ||
| "import javax.validation.constraints.*", | ||
| "import javax.validation.Valid" | ||
| ); | ||
|
|
||
| Path petModel = Paths.get(outputPath + "/models/Pet.kt"); | ||
| assertFileNotContains( | ||
| petApi, | ||
| "import jakarta.validation.Valid", | ||
| "import jakarta.validation.Valid" | ||
| ); | ||
| assertFileContains( | ||
| petApi, | ||
| "import javax.validation.constraints.*", | ||
| "import javax.validation.Valid" | ||
| ); | ||
| } | ||
|
|
||
| @Test | ||
| public void beanValidationJakartaEeImports() throws IOException { | ||
| File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); | ||
| output.deleteOnExit(); | ||
|
|
||
| KotlinServerCodegen codegen = new KotlinServerCodegen(); | ||
| codegen.setOutputDir(output.getAbsolutePath()); | ||
| codegen.additionalProperties().put(USE_JAKARTA_EE, true); | ||
| codegen.additionalProperties().put(LIBRARY, JAXRS_SPEC); | ||
| codegen.additionalProperties().put(USE_BEANVALIDATION, true); | ||
|
|
||
| new DefaultGenerator().opts(new ClientOptInput() | ||
| .openAPI(TestUtils.parseSpec("src/test/resources/3_0/petstore.yaml")) | ||
| .config(codegen)) | ||
| .generate(); | ||
|
|
||
| String outputPath = output.getAbsolutePath() + "/src/main/kotlin/org/openapitools/server"; | ||
| Path petApi = Paths.get(outputPath + "/apis/PetApi.kt"); | ||
| assertFileContains( | ||
| petApi, | ||
| "import jakarta.validation.Valid", | ||
| "import jakarta.validation.Valid" | ||
| ); | ||
| assertFileNotContains( | ||
| petApi, | ||
| "import javax.validation.constraints.*", | ||
| "import javax.validation.Valid" | ||
| ); | ||
|
|
||
| Path petModel = Paths.get(outputPath + "/models/Pet.kt"); | ||
| assertFileContains( | ||
| petModel, | ||
| "import jakarta.validation.Valid", | ||
| "import jakarta.validation.Valid" | ||
| ); | ||
| assertFileNotContains( | ||
| petModel, | ||
| "import javax.validation.constraints.*", | ||
| "import javax.validation.Valid" | ||
| ); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters