Skip to content

Commit 0eb4407

Browse files
committed
moved wiremoock option to base java generator class.
1 parent 769e264 commit 0eb4407

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

src/main/java/io/swagger/codegen/v3/generators/java/AbstractJavaCodegen.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ public abstract class AbstractJavaCodegen extends DefaultCodegenConfig {
6060
public static final String ERROR_ON_UNKNOWN_ENUM = "errorOnUnknownEnum";
6161
public static final String CHECK_DUPLICATED_MODEL_NAME = "checkDuplicatedModelName";
6262

63+
public static final String WIREMOCK_OPTION = "wiremock";
64+
6365
protected String dateLibrary = "threetenbp";
6466
protected boolean java8Mode = false;
6567
protected boolean java11Mode = false;
@@ -190,6 +192,8 @@ public AbstractJavaCodegen() {
190192
cliOptions.add(java11Mode);
191193

192194
cliOptions.add(CliOption.newBoolean(CHECK_DUPLICATED_MODEL_NAME, "Check if there are duplicated model names (ignoring case)"));
195+
196+
cliOptions.add(CliOption.newBoolean(WIREMOCK_OPTION, "Use wiremock to generate endpoint calls to mock on generated tests."));
193197
}
194198

195199
@Override
@@ -356,6 +360,11 @@ public void processOpts() {
356360
additionalProperties.put(ERROR_ON_UNKNOWN_ENUM, errorOnUnknownEnum);
357361
}
358362

363+
if (additionalProperties.containsKey(WIREMOCK_OPTION)) {
364+
final boolean useWireMock = additionalProperties.get(WIREMOCK_OPTION) != null && Boolean.parseBoolean(additionalProperties.get(WIREMOCK_OPTION).toString());
365+
additionalProperties.put(WIREMOCK_OPTION, useWireMock);
366+
}
367+
359368
if (this instanceof NotNullAnnotationFeatures) {
360369
notNullOption = (NotNullAnnotationFeatures)this;
361370
if (additionalProperties.containsKey(NOT_NULL_JACKSON_ANNOTATION)) {

src/main/java/io/swagger/codegen/v3/generators/java/JavaClientCodegen.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,6 @@ public class JavaClientCodegen extends AbstractJavaCodegen implements BeanValida
5353
public static final String RETROFIT_1 = "retrofit";
5454
public static final String RETROFIT_2 = "retrofit2";
5555

56-
public static final String WIREMOCK_OPTION = "wiremock";
57-
5856
protected String gradleWrapperPackage = "gradle.wrapper";
5957
protected boolean useRxJava = false;
6058
protected boolean useRxJava2 = false;
@@ -89,8 +87,6 @@ public JavaClientCodegen() {
8987
cliOptions.add(CliOption.newBoolean(USE_GZIP_FEATURE, "Send gzip-encoded requests"));
9088
cliOptions.add(CliOption.newBoolean(USE_RUNTIME_EXCEPTION, "Use RuntimeException instead of Exception"));
9189

92-
cliOptions.add(CliOption.newBoolean(WIREMOCK_OPTION, "Use wiremock to generate endpoint calls to mock on generated tests."));
93-
9490
supportedLibraries.put("jersey1", "HTTP client: Jersey client 1.19.4. JSON processing: Jackson 2.10.1. Enable gzip request encoding using '-DuseGzipFeature=true'.");
9591
supportedLibraries.put("feign", "HTTP client: OpenFeign 9.4.0. JSON processing: Jackson 2.10.1");
9692
supportedLibraries.put("jersey2", "HTTP client: Jersey client 2.26. JSON processing: Jackson 2.10.1");
@@ -177,11 +173,6 @@ public void processOpts() {
177173
this.setUseRuntimeException(convertPropertyToBooleanAndWriteBack(USE_RUNTIME_EXCEPTION));
178174
}
179175

180-
if (additionalProperties.containsKey(WIREMOCK_OPTION)) {
181-
final boolean useWireMock = additionalProperties.get(WIREMOCK_OPTION) != null && Boolean.parseBoolean(additionalProperties.get(WIREMOCK_OPTION).toString());
182-
additionalProperties.put(WIREMOCK_OPTION, useWireMock);
183-
}
184-
185176
final String invokerFolder = (sourceFolder + File.separator + invokerPackage).replace(".", File.separator);
186177
final String authFolder = (sourceFolder + File.separator + invokerPackage + ".auth").replace(".", File.separator);
187178
final String apiFolder = (sourceFolder + File.separator + apiPackage).replace(".", File.separator);

0 commit comments

Comments
 (0)