Skip to content

Commit 4280681

Browse files
committed
feature/add-skip-x-implements
1 parent 607427d commit 4280681

3 files changed

Lines changed: 6 additions & 1 deletion

File tree

modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,8 @@
9696
public class DefaultCodegen implements CodegenConfig {
9797
private final Logger LOGGER = LoggerFactory.getLogger(DefaultCodegen.class);
9898

99+
public static final Pattern SPLIT_ON_SEMICOLON_OR_NEWLINE_REGEX = Pattern.compile("\\s*(;|\\r?\\n)\\s*"); // Splits on semicolon or new line, ignoring surrounding whitespace
100+
99101
public static FeatureSet DefaultFeatureSet;
100102

101103
// A cache of sanitized words. The sanitizeName() method is invoked many times with the same

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -453,6 +453,9 @@ public void processOpts() {
453453
convertPropertyToTypeAndWriteBack(ADDITIONAL_ENUM_TYPE_ANNOTATIONS,
454454
annotations -> Arrays.asList(annotations.split(";")),
455455
this::setAdditionalEnumTypeAnnotations);
456+
convertPropertyToTypeAndWriteBack(SKIP_X_IMPLEMENTS,
457+
interfacesToSkipImplementing -> Arrays.asList(SPLIT_ON_SEMICOLON_OR_NEWLINE_REGEX.split(interfacesToSkipImplementing.trim())),
458+
this::setSkipXImplements);
456459

457460
if (additionalProperties.containsKey(CodegenConstants.INVOKER_PACKAGE)) {
458461
this.setInvokerPackage((String) additionalProperties.get(CodegenConstants.INVOKER_PACKAGE));

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ public void processOpts() {
513513

514514
if (additionalProperties.containsKey(ADDITIONAL_MODEL_TYPE_ANNOTATIONS)) {
515515
String additionalAnnotationsList = additionalProperties.get(ADDITIONAL_MODEL_TYPE_ANNOTATIONS).toString();
516-
this.setAdditionalModelTypeAnnotations(Arrays.asList(additionalAnnotationsList.trim().split("\\s*(;|\\r?\\n)\\s*")));
516+
this.setAdditionalModelTypeAnnotations(Arrays.asList(SPLIT_ON_SEMICOLON_OR_NEWLINE_REGEX.split(additionalAnnotationsList.trim())));
517517
}
518518

519519
additionalProperties.put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, getSortParamsByRequiredFlag());

0 commit comments

Comments
 (0)