From 99bfefab8ce0ebf820f90ae6c035fb1a0305f6a4 Mon Sep 17 00:00:00 2001 From: sullis Date: Sat, 5 Mar 2022 20:41:40 -0800 Subject: [PATCH] [java] JAX-RS jersey3 --- .../codegen/languages/JavaJerseyServerCodegen.java | 2 ++ .../codegen/java/jaxrs/JavaJerseyServerCodegenTest.java | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJerseyServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJerseyServerCodegen.java index 9f92940ae97a..4e8e4ace676f 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJerseyServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJerseyServerCodegen.java @@ -30,6 +30,7 @@ public class JavaJerseyServerCodegen extends AbstractJavaJAXRSServerCodegen { protected static final String LIBRARY_JERSEY1 = "jersey1"; protected static final String LIBRARY_JERSEY2 = "jersey2"; + protected static final String LIBRARY_JERSEY3 = "jersey3"; /** * Default library template to use. (Default: jersey2) @@ -59,6 +60,7 @@ public class JavaJerseyServerCodegen extends AbstractJavaJAXRSServerCodegen { CliOption library = new CliOption(CodegenConstants.LIBRARY, CodegenConstants.LIBRARY_DESC).defaultValue(DEFAULT_JERSEY_LIBRARY); supportedLibraries.put(LIBRARY_JERSEY1, "Jersey core 1.x"); supportedLibraries.put(LIBRARY_JERSEY2, "Jersey core 2.x"); + supportedLibraries.put(LIBRARY_JERSEY3, "Jersey core 3.x"); library.setEnum(supportedLibraries); cliOptions.add(library); diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJerseyServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJerseyServerCodegenTest.java index 1596c572867e..1b870254bc5f 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJerseyServerCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJerseyServerCodegenTest.java @@ -3,6 +3,7 @@ package org.openapitools.codegen.java.jaxrs; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; import io.swagger.parser.OpenAPIParser; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.servers.Server; @@ -31,6 +32,7 @@ import java.nio.file.Files; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.function.Function; import java.util.stream.Collectors; @@ -47,6 +49,7 @@ public class JavaJerseyServerCodegenTest extends JavaJaxrsBaseTest { Assert.assertEquals(codegen.getName(), "jaxrs-jersey"); Assert.assertEquals(codegen.getTemplatingEngine().getClass(), MustacheEngineAdapter.class); Assert.assertEquals(codegen.getDateLibrary(), "legacy"); + Assert.assertEquals(codegen.supportedLibraries().keySet(), ImmutableSet.of("jersey1", "jersey2", "jersey3")); Assert.assertNull(codegen.getInputSpec()); codegen.processOpts(); @@ -136,8 +139,9 @@ public class JavaJerseyServerCodegenTest extends JavaJaxrsBaseTest { @DataProvider(name = "codegenParameterMatrix") public Object[][] codegenParameterMatrix() { + final Set libraries = new JavaJerseyServerCodegen().supportedLibraries().keySet(); final List rows = new ArrayList(); - for (final String jerseyLibrary: ImmutableList.of("jersey1", "jersey2")) { + for (final String jerseyLibrary: libraries) { for (final String dateLibrary: ImmutableList.of("joda", "java8")) { rows.add(new Object[] { jerseyLibrary, dateLibrary }); }