Skip to content

Commit 66d2c00

Browse files
committed
fixed generator option tests
1 parent b88fcdb commit 66d2c00

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,6 @@ public AbstractJavaCodegen() {
215215
cliOptions.add(CliOption.newBoolean(CHECK_DUPLICATED_MODEL_NAME, "Check if there are duplicated model names (ignoring case)"));
216216
cliOptions.add(CliOption.newString(ADDITIONAL_MODEL_TYPE_ANNOTATIONS, "Additional annotations for model type(class level annotations)"));
217217

218-
cliOptions.add(CliOption.newBoolean(JAKARTA, "Use Jakarta EE (package jakarta.*) instead of Java EE (javax.*)"));
219-
220218
CliOption jeeSpec = CliOption.newBoolean(JAKARTA, "Use Jakarta EE (package jakarta.*) instead of Java EE (javax.*)");
221219
Map<String, String> jeeSpecModeOptions = new HashMap<String, String>();
222220
jeeSpecModeOptions.put("true", "Use Jakarta EE (package jakarta.*)");

modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaOptionsProvider.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ public class JavaOptionsProvider implements OptionsProvider {
3737
public static final String USE_BEANVALIDATION = "false";
3838
public static final String ALLOW_UNICODE_IDENTIFIERS_VALUE = "false";
3939
public static final String ADDITIONAL_MODEL_TYPE_ANNOTATIONS = "@TestAnnotation";
40+
public static final String JAKARTA_VALUE = "false";
4041

4142

4243
private ImmutableMap<String, String> options;
@@ -80,6 +81,7 @@ public JavaOptionsProvider() {
8081
.put(JavaClientCodegen.CHECK_DUPLICATED_MODEL_NAME, "false")
8182
//.put("supportJava6", "true")
8283
.put(JavaClientCodegen.ADDITIONAL_MODEL_TYPE_ANNOTATIONS, ADDITIONAL_MODEL_TYPE_ANNOTATIONS)
84+
.put(JavaClientCodegen.JAKARTA, JAKARTA_VALUE)
8385
.build();
8486
}
8587

modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JaxRSServerOptionsProvider.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ public class JaxRSServerOptionsProvider implements OptionsProvider {
4343
public static final String WITH_XML_VALUE = "false";
4444
public static final String USE_TAGS = "useTags";
4545
public static final String ADDITIONAL_MODEL_TYPE_ANNOTATIONS = "@TestAnnotation";
46+
public static final String JAKARTA_VALUE = "false";
4647

4748

4849
@Override
@@ -96,7 +97,8 @@ public Map<String, String> createOptions() {
9697
.put(CodegenConstants.ALLOW_UNICODE_IDENTIFIERS, ALLOW_UNICODE_IDENTIFIERS_VALUE)
9798
.put(JavaJerseyServerCodegen.USE_TAGS, USE_TAGS)
9899
.put(JavaClientCodegen.CHECK_DUPLICATED_MODEL_NAME, "false")
99-
.put(JavaClientCodegen.ADDITIONAL_MODEL_TYPE_ANNOTATIONS, ADDITIONAL_MODEL_TYPE_ANNOTATIONS);
100+
.put(JavaClientCodegen.ADDITIONAL_MODEL_TYPE_ANNOTATIONS, ADDITIONAL_MODEL_TYPE_ANNOTATIONS)
101+
.put(JavaClientCodegen.JAKARTA, JAKARTA_VALUE);
100102

101103
return builder.build();
102104
}

0 commit comments

Comments
 (0)