Skip to content

Commit d11bd37

Browse files
committed
removed duplicate code based on sonarqube results
1 parent db52f4e commit d11bd37

2 files changed

Lines changed: 18 additions & 49 deletions

File tree

boat-scaffold/src/main/java/com/backbase/oss/codegen/java/BoatWebhooksCodeGen.java

Lines changed: 7 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,13 @@
77
import lombok.Getter;
88
import lombok.Setter;
99
import lombok.extern.slf4j.Slf4j;
10-
import org.openapitools.codegen.*;
10+
import org.openapitools.codegen.CodegenConstants;
11+
import org.openapitools.codegen.CodegenModel;
12+
import org.openapitools.codegen.CodegenOperation;
13+
import org.openapitools.codegen.CodegenParameter;
14+
import org.openapitools.codegen.CodegenProperty;
15+
import org.openapitools.codegen.CliOption;
16+
import org.openapitools.codegen.SupportingFile;
1117
import org.openapitools.codegen.config.GlobalSettings;
1218
import org.openapitools.codegen.languages.SpringCodegen;
1319
import org.openapitools.codegen.templating.mustache.IndentedLambda;
@@ -171,34 +177,6 @@ public void processOpts() {
171177
(sourceFolder + File.separator + modelPackage).replace(".", File.separator),
172178
prehookRequestTemplate + JAVA_EXTENSION));
173179

174-
if (this.additionalProperties.containsKey(USE_CLASS_LEVEL_BEAN_VALIDATION)) {
175-
this.useClassLevelBeanValidation = convertPropertyToBoolean(USE_CLASS_LEVEL_BEAN_VALIDATION);
176-
}
177-
if (this.additionalProperties.containsKey(ADD_SERVLET_REQUEST)) {
178-
this.addServletRequest = convertPropertyToBoolean(ADD_SERVLET_REQUEST);
179-
}
180-
if (this.additionalProperties.containsKey(ADD_BINDING_RESULT)) {
181-
this.addBindingResult = convertPropertyToBoolean(ADD_BINDING_RESULT);
182-
}
183-
if (this.additionalProperties.containsKey(USE_LOMBOK_ANNOTATIONS)) {
184-
this.useLombokAnnotations = convertPropertyToBoolean(USE_LOMBOK_ANNOTATIONS);
185-
}
186-
if (this.additionalProperties.containsKey(USE_WITH_MODIFIERS)) {
187-
this.useWithModifiers = convertPropertyToBoolean(USE_WITH_MODIFIERS);
188-
}
189-
if (this.additionalProperties.containsKey(USE_PROTECTED_FIELDS)) {
190-
this.additionalProperties.put("modelFieldsVisibility", "protected");
191-
} else {
192-
this.additionalProperties.put("modelFieldsVisibility", "private");
193-
}
194-
195-
writePropertyBack(USE_CLASS_LEVEL_BEAN_VALIDATION, this.useClassLevelBeanValidation);
196-
writePropertyBack(ADD_SERVLET_REQUEST, this.addServletRequest);
197-
writePropertyBack(ADD_BINDING_RESULT, this.addBindingResult);
198-
writePropertyBack(USE_LOMBOK_ANNOTATIONS, this.useLombokAnnotations);
199-
writePropertyBack(USE_WITH_MODIFIERS, this.useWithModifiers);
200-
writePropertyBack(USE_PROTECTED_FIELDS, this.useProtectedFields);
201-
202180
this.additionalProperties.put("indent4", new IndentedLambda(4, " ", true, true));
203181
this.additionalProperties.put("newLine4", new BoatSpringCodeGen.NewLineIndent(4, " "));
204182
this.additionalProperties.put("indent8", new IndentedLambda(8, " ", true, true));

boat-scaffold/src/test/java/com/backbase/oss/codegen/java/BoatWebhooksCodeGenTests.java

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,12 @@
1010
import org.apache.commons.io.FileUtils;
1111
import org.junit.jupiter.api.BeforeAll;
1212
import org.junit.jupiter.api.Test;
13-
import org.openapitools.codegen.*;
13+
import org.openapitools.codegen.CodegenModel;;
14+
import org.openapitools.codegen.CodegenOperation;
15+
import org.openapitools.codegen.CodegenProperty;
16+
import org.openapitools.codegen.ClientOptInput;
17+
import org.openapitools.codegen.DefaultGenerator;
18+
import org.openapitools.codegen.SupportingFile;
1419

1520
import java.io.File;
1621
import java.io.IOException;
@@ -19,9 +24,12 @@
1924
import java.nio.file.Paths;
2025
import java.util.*;
2126

22-
import static com.backbase.oss.codegen.java.BoatWebhooksCodeGen.*;
2327
import static org.hamcrest.MatcherAssert.assertThat;
24-
import static org.hamcrest.Matchers.*;
28+
import static org.hamcrest.Matchers.equalTo;
29+
import static org.hamcrest.Matchers.hasEntry;
30+
import static org.hamcrest.Matchers.hasItems;
31+
import static org.hamcrest.Matchers.is;
32+
import static org.hamcrest.Matchers.notNullValue;
2533
import static org.junit.jupiter.api.Assertions.assertEquals;
2634
import static org.mockito.Mockito.mock;
2735
import static org.mockito.Mockito.when;
@@ -37,23 +45,6 @@ static void before() throws IOException {
3745
FileUtils.deleteDirectory(new File(TEST_OUTPUT));
3846
}
3947

40-
@Test
41-
void processOptsUseProtectedFields() {
42-
final BoatWebhooksCodeGen gen = new BoatWebhooksCodeGen();
43-
final Map<String, Object> options = gen.additionalProperties();
44-
45-
options.put(USE_PROTECTED_FIELDS, "true");
46-
options.put(USE_CLASS_LEVEL_BEAN_VALIDATION, "true");
47-
options.put(ADD_SERVLET_REQUEST, "true");
48-
options.put(ADD_BINDING_RESULT, "true");
49-
options.put(USE_LOMBOK_ANNOTATIONS, "true");
50-
options.put(USE_WITH_MODIFIERS, "true");
51-
52-
gen.processOpts();
53-
54-
assertThat(gen.additionalProperties(), hasEntry("modelFieldsVisibility", "protected"));
55-
}
56-
5748
@Test
5849
void newLineIndent() throws IOException {
5950
final BoatSpringCodeGen.NewLineIndent indent = new BoatSpringCodeGen.NewLineIndent(2, "_");

0 commit comments

Comments
 (0)