Skip to content

Commit d2df724

Browse files
en-milieen-milie
committed
Refactor to avoid cyclic dependencies
1 parent 171e757 commit d2df724

File tree

79 files changed

+298
-391
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+298
-391
lines changed

‎src/main/java/com/endava/cats/ReflectionConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import com.endava.cats.model.CatsTestCase;
1616
import com.endava.cats.model.CatsTestCaseSummary;
1717
import com.endava.cats.model.CatsTestReport;
18-
import com.endava.cats.model.KeyValuePair;
18+
import com.endava.cats.util.KeyValuePair;
1919
import com.endava.cats.model.TimeExecution;
2020
import com.endava.cats.model.TimeExecutionDetails;
2121
import com.github.javafaker.Address;

‎src/main/java/com/endava/cats/aop/DryRunAspect.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.endava.cats.annotations.DryRun;
44
import com.endava.cats.args.FilterArguments;
55
import com.endava.cats.args.ReportingArguments;
6-
import com.endava.cats.json.JsonUtils;
6+
import com.endava.cats.util.JsonUtils;
77
import com.endava.cats.model.CatsResponse;
88
import com.endava.cats.model.FuzzingData;
99
import com.endava.cats.util.CatsUtil;

‎src/main/java/com/endava/cats/args/ProcessingArguments.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.endava.cats.args;
22

3-
import com.endava.cats.json.JsonUtils;
3+
import com.endava.cats.util.JsonUtils;
44
import jakarta.inject.Singleton;
55
import lombok.Getter;
66
import lombok.Setter;

‎src/main/java/com/endava/cats/command/CatsCommand.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ void doFirst() throws IOException {
317317
//this is a hack to set terminal width here in order to avoid importing a full-blown library like jline
318318
// just for getting the terminal width
319319
ConsoleUtils.initTerminalWidth(spec);
320-
this.processLogLevelArgument();
320+
reportingArguments.processLogData();
321321
apiArguments.validateRequired(spec);
322322
apiArguments.validateValidServer(spec);
323323
filesArguments.loadConfig();
@@ -339,11 +339,6 @@ private void printConfiguration(OpenAPI openAPI) {
339339
logger.config(ansi().bold().a("Total number of OpenAPI operations: {}").reset().toString(), ansi().fg(Ansi.Color.BLUE).a(nofOfOperations));
340340
}
341341

342-
343-
private void processLogLevelArgument() {
344-
reportingArguments.processLogData();
345-
}
346-
347342
private void fuzzPath(Map.Entry<String, PathItem> pathItemEntry, OpenAPI openAPI) {
348343
/* WE NEED TO ITERATE THROUGH EACH HTTP OPERATION CORRESPONDING TO THE CURRENT PATH ENTRY*/
349344
String ansiString = ansi().bold().a("Start fuzzing path {}").reset().toString();

‎src/main/java/com/endava/cats/command/InfoCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.endava.cats.command;
22

3-
import com.endava.cats.json.JsonUtils;
3+
import com.endava.cats.util.JsonUtils;
44
import com.endava.cats.util.ConsoleUtils;
55
import com.endava.cats.util.VersionProvider;
66
import io.github.ludovicianul.prettylogger.PrettyLogger;

‎src/main/java/com/endava/cats/command/ListCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import com.endava.cats.fuzzer.special.mutators.api.Mutator;
1616
import com.endava.cats.generator.format.api.OpenAPIFormat;
1717
import com.endava.cats.http.HttpMethod;
18-
import com.endava.cats.json.JsonUtils;
18+
import com.endava.cats.util.JsonUtils;
1919
import com.endava.cats.model.FuzzingData;
2020
import com.endava.cats.openapi.OpenApiUtils;
2121
import com.endava.cats.util.ConsoleUtils;

‎src/main/java/com/endava/cats/command/ReplayCommand.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
import com.endava.cats.args.AuthArguments;
44
import com.endava.cats.dsl.CatsDSLParser;
55
import com.endava.cats.io.ServiceCaller;
6-
import com.endava.cats.json.JsonUtils;
6+
import com.endava.cats.util.JsonUtils;
77
import com.endava.cats.model.CatsResponse;
88
import com.endava.cats.model.CatsTestCase;
9-
import com.endava.cats.model.KeyValuePair;
9+
import com.endava.cats.util.KeyValuePair;
1010
import com.endava.cats.report.TestCaseListener;
1111
import com.endava.cats.util.CatsUtil;
1212
import com.endava.cats.util.VersionProvider;

‎src/main/java/com/endava/cats/command/StatsCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.endava.cats.command;
22

3-
import com.endava.cats.json.JsonUtils;
3+
import com.endava.cats.util.JsonUtils;
44
import com.endava.cats.openapi.OpenApiUtils;
55
import com.endava.cats.util.CatsModelUtils;
66
import com.endava.cats.util.VersionProvider;

‎src/main/java/com/endava/cats/command/TemplateFuzzCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import com.endava.cats.dsl.CatsDSLParser;
1010
import com.endava.cats.fuzzer.special.TemplateFuzzer;
1111
import com.endava.cats.http.HttpMethod;
12-
import com.endava.cats.json.JsonUtils;
12+
import com.endava.cats.util.JsonUtils;
1313
import com.endava.cats.model.CatsHeader;
1414
import com.endava.cats.model.FuzzingData;
1515
import com.endava.cats.report.TestCaseListener;

‎src/main/java/com/endava/cats/command/ValidateCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.endava.cats.command;
22

33
import com.endava.cats.command.model.ValidContractEntry;
4-
import com.endava.cats.json.JsonUtils;
4+
import com.endava.cats.util.JsonUtils;
55
import com.endava.cats.openapi.OpenApiParseResult;
66
import com.endava.cats.openapi.OpenApiUtils;
77
import com.endava.cats.util.VersionProvider;

‎src/main/java/com/endava/cats/factory/FuzzingDataFactory.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
import com.endava.cats.context.CatsGlobalContext;
77
import com.endava.cats.generator.format.api.ValidDataFormat;
88
import com.endava.cats.http.HttpMethod;
9-
import com.endava.cats.json.JsonUtils;
9+
import com.endava.cats.util.JsonUtils;
1010
import com.endava.cats.model.CatsHeader;
1111
import com.endava.cats.model.FuzzingData;
12-
import com.endava.cats.model.KeyValuePair;
12+
import com.endava.cats.util.KeyValuePair;
1313
import com.endava.cats.model.generator.OpenAPIModelGenerator;
1414
import com.endava.cats.openapi.OpenApiUtils;
1515
import com.endava.cats.util.CatsModelUtils;

‎src/main/java/com/endava/cats/fuzzer/executor/FieldsIteratorExecutor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ private FuzzingResult getFuzzingResult(FieldsIteratorExecutorContext context, St
135135
if (context.isSimpleReplaceField()) {
136136
return CatsUtil.justReplaceField(context.getFuzzingData().getPayload(), fuzzedField, strategy.getData());
137137
}
138-
return CatsUtil.replaceField(context.getFuzzingData().getPayload(), fuzzedField, strategy);
138+
return FuzzingStrategy.replaceField(context.getFuzzingData().getPayload(), fuzzedField, strategy);
139139
}
140140

141141
/**

‎src/main/java/com/endava/cats/fuzzer/fields/AbugidasInStringFieldsSanitizeValidateFuzzer.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import com.endava.cats.io.ServiceCaller;
1111
import com.endava.cats.model.FuzzingData;
1212
import com.endava.cats.report.TestCaseListener;
13-
import com.endava.cats.strategy.CommonWithinMethods;
1413
import com.endava.cats.strategy.FuzzingStrategy;
1514
import io.swagger.v3.oas.models.media.Schema;
1615
import jakarta.inject.Singleton;
@@ -39,7 +38,7 @@ protected AbugidasInStringFieldsSanitizeValidateFuzzer(ServiceCaller sc, TestCas
3938
@Override
4039
public List<FuzzingStrategy> getFieldFuzzingStrategy(FuzzingData data, String fuzzedField) {
4140
Schema<?> fuzzedFieldSchema = data.getRequestPropertyTypes().get(fuzzedField);
42-
return CommonWithinMethods.getFuzzingStrategies(fuzzedFieldSchema, UnicodeGenerator.getAbugidasChars(), false);
41+
return FuzzingStrategy.getFuzzingStrategies(fuzzedFieldSchema, UnicodeGenerator.getAbugidasChars(), false);
4342
}
4443

4544
@Override

‎src/main/java/com/endava/cats/fuzzer/fields/DefaultValuesInFieldsFuzzer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import com.endava.cats.fuzzer.executor.FieldsIteratorExecutor;
66
import com.endava.cats.fuzzer.executor.FieldsIteratorExecutorContext;
77
import com.endava.cats.http.ResponseCodeFamilyPredefined;
8-
import com.endava.cats.json.JsonUtils;
8+
import com.endava.cats.util.JsonUtils;
99
import com.endava.cats.model.FuzzingData;
1010
import com.endava.cats.strategy.FuzzingStrategy;
1111
import com.endava.cats.util.ConsoleUtils;

‎src/main/java/com/endava/cats/fuzzer/fields/ExamplesFieldsFuzzer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import com.endava.cats.fuzzer.executor.SimpleExecutor;
66
import com.endava.cats.fuzzer.executor.SimpleExecutorContext;
77
import com.endava.cats.http.ResponseCodeFamilyPredefined;
8-
import com.endava.cats.json.JsonUtils;
8+
import com.endava.cats.util.JsonUtils;
99
import com.endava.cats.model.FuzzingData;
1010
import com.endava.cats.util.ConsoleUtils;
1111
import io.github.ludovicianul.prettylogger.PrettyLogger;

‎src/main/java/com/endava/cats/fuzzer/fields/IterateThroughEnumValuesFieldsFuzzer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import com.endava.cats.fuzzer.executor.FieldsIteratorExecutor;
66
import com.endava.cats.fuzzer.executor.FieldsIteratorExecutorContext;
77
import com.endava.cats.http.ResponseCodeFamilyPredefined;
8-
import com.endava.cats.json.JsonUtils;
8+
import com.endava.cats.util.JsonUtils;
99
import com.endava.cats.model.FuzzingData;
1010
import com.endava.cats.strategy.FuzzingStrategy;
1111
import com.endava.cats.util.ConsoleUtils;

‎src/main/java/com/endava/cats/fuzzer/fields/NewFieldsFuzzer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import com.endava.cats.http.ResponseCodeFamilyPredefined;
88
import com.endava.cats.io.ServiceCaller;
99
import com.endava.cats.io.ServiceData;
10-
import com.endava.cats.json.JsonUtils;
10+
import com.endava.cats.util.JsonUtils;
1111
import com.endava.cats.model.CatsResponse;
1212
import com.endava.cats.model.FuzzingData;
1313
import com.endava.cats.report.TestCaseListener;

‎src/main/java/com/endava/cats/fuzzer/fields/OverflowArraySizeFieldsFuzzer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import com.endava.cats.args.ProcessingArguments;
55
import com.endava.cats.fuzzer.executor.FieldsIteratorExecutor;
66
import com.endava.cats.fuzzer.fields.base.BaseReplaceFieldsFuzzer;
7-
import com.endava.cats.json.JsonUtils;
7+
import com.endava.cats.util.JsonUtils;
88
import com.endava.cats.model.FuzzingData;
99
import io.swagger.v3.oas.models.media.Schema;
1010
import jakarta.inject.Singleton;

‎src/main/java/com/endava/cats/fuzzer/fields/OverflowMapSizeFieldsFuzzer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import com.endava.cats.args.ProcessingArguments;
55
import com.endava.cats.fuzzer.executor.FieldsIteratorExecutor;
66
import com.endava.cats.fuzzer.fields.base.BaseReplaceFieldsFuzzer;
7-
import com.endava.cats.json.JsonUtils;
7+
import com.endava.cats.util.JsonUtils;
88
import com.endava.cats.model.FuzzingData;
99
import io.swagger.v3.oas.models.media.Schema;
1010
import jakarta.inject.Singleton;

‎src/main/java/com/endava/cats/fuzzer/fields/RemoveFieldsFuzzer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import com.endava.cats.http.ResponseCodeFamily;
99
import com.endava.cats.io.ServiceCaller;
1010
import com.endava.cats.io.ServiceData;
11-
import com.endava.cats.json.JsonUtils;
11+
import com.endava.cats.util.JsonUtils;
1212
import com.endava.cats.model.CatsResponse;
1313
import com.endava.cats.model.FuzzingData;
1414
import com.endava.cats.report.TestCaseListener;

‎src/main/java/com/endava/cats/fuzzer/fields/ReplaceArraysWithPrimitivesFieldsFuzzer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.endava.cats.annotations.FieldFuzzer;
44
import com.endava.cats.fuzzer.executor.FieldsIteratorExecutor;
55
import com.endava.cats.fuzzer.fields.base.BaseReplaceFieldsFuzzer;
6-
import com.endava.cats.json.JsonUtils;
6+
import com.endava.cats.util.JsonUtils;
77
import com.endava.cats.model.FuzzingData;
88
import jakarta.inject.Singleton;
99

‎src/main/java/com/endava/cats/fuzzer/fields/ReplaceArraysWithSimpleObjectsFieldsFuzzer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.endava.cats.annotations.FieldFuzzer;
44
import com.endava.cats.fuzzer.executor.FieldsIteratorExecutor;
55
import com.endava.cats.fuzzer.fields.base.BaseReplaceFieldsFuzzer;
6-
import com.endava.cats.json.JsonUtils;
6+
import com.endava.cats.util.JsonUtils;
77
import com.endava.cats.model.FuzzingData;
88
import jakarta.inject.Singleton;
99

‎src/main/java/com/endava/cats/fuzzer/fields/ReplaceObjectsWithArraysFieldsFuzzer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.endava.cats.annotations.FieldFuzzer;
44
import com.endava.cats.fuzzer.executor.FieldsIteratorExecutor;
55
import com.endava.cats.fuzzer.fields.base.BaseReplaceFieldsFuzzer;
6-
import com.endava.cats.json.JsonUtils;
6+
import com.endava.cats.util.JsonUtils;
77
import com.endava.cats.model.FuzzingData;
88
import jakarta.inject.Singleton;
99

‎src/main/java/com/endava/cats/fuzzer/fields/ReplaceObjectsWithPrimitivesFieldsFuzzer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.endava.cats.annotations.FieldFuzzer;
44
import com.endava.cats.fuzzer.executor.FieldsIteratorExecutor;
55
import com.endava.cats.fuzzer.fields.base.BaseReplaceFieldsFuzzer;
6-
import com.endava.cats.json.JsonUtils;
6+
import com.endava.cats.util.JsonUtils;
77
import com.endava.cats.model.FuzzingData;
88
import jakarta.inject.Singleton;
99

‎src/main/java/com/endava/cats/fuzzer/fields/ReplacePrimitivesWithArraysFieldsFuzzer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.endava.cats.annotations.FieldFuzzer;
44
import com.endava.cats.fuzzer.executor.FieldsIteratorExecutor;
55
import com.endava.cats.fuzzer.fields.base.BaseReplaceFieldsFuzzer;
6-
import com.endava.cats.json.JsonUtils;
6+
import com.endava.cats.util.JsonUtils;
77
import com.endava.cats.model.FuzzingData;
88
import jakarta.inject.Singleton;
99

‎src/main/java/com/endava/cats/fuzzer/fields/ReplacePrimitivesWithObjectsFieldsFuzzer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.endava.cats.annotations.FieldFuzzer;
44
import com.endava.cats.fuzzer.executor.FieldsIteratorExecutor;
55
import com.endava.cats.fuzzer.fields.base.BaseReplaceFieldsFuzzer;
6-
import com.endava.cats.json.JsonUtils;
6+
import com.endava.cats.util.JsonUtils;
77
import com.endava.cats.model.FuzzingData;
88
import jakarta.inject.Singleton;
99

‎src/main/java/com/endava/cats/fuzzer/fields/base/BaseBoundaryFieldFuzzer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.endava.cats.args.FilesArguments;
44
import com.endava.cats.generator.format.api.InvalidDataFormat;
55
import com.endava.cats.io.ServiceCaller;
6-
import com.endava.cats.json.JsonUtils;
6+
import com.endava.cats.util.JsonUtils;
77
import com.endava.cats.model.FuzzingData;
88
import com.endava.cats.report.TestCaseListener;
99
import com.endava.cats.strategy.FuzzingStrategy;

‎src/main/java/com/endava/cats/fuzzer/fields/base/BaseFieldsFuzzer.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,13 @@
66
import com.endava.cats.http.ResponseCodeFamily;
77
import com.endava.cats.io.ServiceCaller;
88
import com.endava.cats.io.ServiceData;
9-
import com.endava.cats.json.JsonUtils;
9+
import com.endava.cats.util.JsonUtils;
1010
import com.endava.cats.model.CatsResponse;
1111
import com.endava.cats.model.FuzzingConstraints;
1212
import com.endava.cats.model.FuzzingData;
1313
import com.endava.cats.report.TestCaseListener;
1414
import com.endava.cats.strategy.FuzzingStrategy;
1515
import com.endava.cats.util.CatsModelUtils;
16-
import com.endava.cats.util.CatsUtil;
1716
import com.endava.cats.util.ConsoleUtils;
1817
import com.endava.cats.util.FuzzingResult;
1918
import io.github.ludovicianul.prettylogger.PrettyLogger;
@@ -98,7 +97,7 @@ protected void process(FuzzingData data, String fuzzedField, FuzzingStrategy fuz
9897
testCaseListener.addScenario(logger, "Send [{}] in request fields: field [{}], value [{}], is required [{}]",
9998
this.typeOfDataSentToTheService(), fuzzedField, fuzzingStrategy.truncatedValue(), fuzzingConstraints.getRequiredString());
10099
logger.debug("Fuzzing possible...");
101-
FuzzingResult fuzzingResult = CatsUtil.replaceField(data.getPayload(), fuzzedField, fuzzingStrategy);
100+
FuzzingResult fuzzingResult = FuzzingStrategy.replaceField(data.getPayload(), fuzzedField, fuzzingStrategy);
102101
boolean isFuzzedValueMatchingPattern = this.isFuzzedValueMatchingPattern(fuzzingResult.fuzzedValue(), data, fuzzedField);
103102

104103
ServiceData serviceData = ServiceData.builder().relativePath(data.getPath())

‎src/main/java/com/endava/cats/fuzzer/fields/within/WithinControlCharsInStringFieldsSanitizeValidateFuzzer.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import com.endava.cats.io.ServiceCaller;
1010
import com.endava.cats.model.FuzzingData;
1111
import com.endava.cats.report.TestCaseListener;
12-
import com.endava.cats.strategy.CommonWithinMethods;
1312
import com.endava.cats.strategy.FuzzingStrategy;
1413
import io.swagger.v3.oas.models.media.Schema;
1514
import jakarta.inject.Singleton;
@@ -39,7 +38,7 @@ protected WithinControlCharsInStringFieldsSanitizeValidateFuzzer(ServiceCaller s
3938
@Override
4039
public List<FuzzingStrategy> getFieldFuzzingStrategy(FuzzingData data, String fuzzedField) {
4140
Schema<?> fuzzedFieldSchema = data.getRequestPropertyTypes().get(fuzzedField);
42-
return CommonWithinMethods.getFuzzingStrategies(fuzzedFieldSchema, this.getInvisibleChars(), false);
41+
return FuzzingStrategy.getFuzzingStrategies(fuzzedFieldSchema, this.getInvisibleChars(), false);
4342
}
4443

4544
@Override

‎src/main/java/com/endava/cats/fuzzer/fields/within/WithinControlCharsInStringFieldsValidateSanitizeFuzzer.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import com.endava.cats.io.ServiceCaller;
1212
import com.endava.cats.model.FuzzingData;
1313
import com.endava.cats.report.TestCaseListener;
14-
import com.endava.cats.strategy.CommonWithinMethods;
1514
import com.endava.cats.strategy.FuzzingStrategy;
1615
import io.swagger.v3.oas.models.media.Schema;
1716
import jakarta.inject.Singleton;
@@ -56,7 +55,7 @@ public ResponseCodeFamily getExpectedHttpCodeWhenOptionalFieldsAreFuzzed() {
5655
@Override
5756
public List<FuzzingStrategy> getFieldFuzzingStrategy(FuzzingData data, String fuzzedField) {
5857
Schema<?> fuzzedFieldSchema = data.getRequestPropertyTypes().get(fuzzedField);
59-
return CommonWithinMethods.getFuzzingStrategies(fuzzedFieldSchema, this.getInvisibleChars(), true);
58+
return FuzzingStrategy.getFuzzingStrategies(fuzzedFieldSchema, this.getInvisibleChars(), true);
6059
}
6160

6261
@Override

‎src/main/java/com/endava/cats/fuzzer/fields/within/WithinMultiCodePointEmojisInStringFieldsTrimValidateFuzzer.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import com.endava.cats.io.ServiceCaller;
1010
import com.endava.cats.model.FuzzingData;
1111
import com.endava.cats.report.TestCaseListener;
12-
import com.endava.cats.strategy.CommonWithinMethods;
1312
import com.endava.cats.strategy.FuzzingStrategy;
1413
import io.swagger.v3.oas.models.media.Schema;
1514
import jakarta.inject.Singleton;
@@ -39,7 +38,7 @@ protected WithinMultiCodePointEmojisInStringFieldsTrimValidateFuzzer(ServiceCall
3938
@Override
4039
public List<FuzzingStrategy> getFieldFuzzingStrategy(FuzzingData data, String fuzzedField) {
4140
Schema<?> fuzzedFieldSchema = data.getRequestPropertyTypes().get(fuzzedField);
42-
return CommonWithinMethods.getFuzzingStrategies(fuzzedFieldSchema, this.getInvisibleChars(), false);
41+
return FuzzingStrategy.getFuzzingStrategies(fuzzedFieldSchema, this.getInvisibleChars(), false);
4342
}
4443

4544
@Override

‎src/main/java/com/endava/cats/fuzzer/fields/within/WithinMultiCodePointEmojisInStringFieldsValidateTrimFuzzer.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import com.endava.cats.io.ServiceCaller;
1212
import com.endava.cats.model.FuzzingData;
1313
import com.endava.cats.report.TestCaseListener;
14-
import com.endava.cats.strategy.CommonWithinMethods;
1514
import com.endava.cats.strategy.FuzzingStrategy;
1615
import io.swagger.v3.oas.models.media.Schema;
1716
import jakarta.inject.Singleton;
@@ -56,7 +55,7 @@ public ResponseCodeFamily getExpectedHttpCodeWhenOptionalFieldsAreFuzzed() {
5655
@Override
5756
public List<FuzzingStrategy> getFieldFuzzingStrategy(FuzzingData data, String fuzzedField) {
5857
Schema<?> fuzzedFieldSchema = data.getRequestPropertyTypes().get(fuzzedField);
59-
return CommonWithinMethods.getFuzzingStrategies(fuzzedFieldSchema, this.getInvisibleChars(), true);
58+
return FuzzingStrategy.getFuzzingStrategies(fuzzedFieldSchema, this.getInvisibleChars(), true);
6059
}
6160

6261
@Override

‎src/main/java/com/endava/cats/fuzzer/fields/within/WithinSingleCodePointEmojisInStringFieldsTrimValidateFuzzer.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import com.endava.cats.io.ServiceCaller;
1010
import com.endava.cats.model.FuzzingData;
1111
import com.endava.cats.report.TestCaseListener;
12-
import com.endava.cats.strategy.CommonWithinMethods;
1312
import com.endava.cats.strategy.FuzzingStrategy;
1413
import io.swagger.v3.oas.models.media.Schema;
1514
import jakarta.inject.Singleton;
@@ -39,7 +38,7 @@ protected WithinSingleCodePointEmojisInStringFieldsTrimValidateFuzzer(ServiceCal
3938
@Override
4039
public List<FuzzingStrategy> getFieldFuzzingStrategy(FuzzingData data, String fuzzedField) {
4140
Schema<?> fuzzedFieldSchema = data.getRequestPropertyTypes().get(fuzzedField);
42-
return CommonWithinMethods.getFuzzingStrategies(fuzzedFieldSchema, this.getInvisibleChars(), false);
41+
return FuzzingStrategy.getFuzzingStrategies(fuzzedFieldSchema, this.getInvisibleChars(), false);
4342
}
4443

4544
@Override

‎src/main/java/com/endava/cats/fuzzer/fields/within/WithinSingleCodePointEmojisInStringFieldsValidateTrimFuzzer.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import com.endava.cats.io.ServiceCaller;
1212
import com.endava.cats.model.FuzzingData;
1313
import com.endava.cats.report.TestCaseListener;
14-
import com.endava.cats.strategy.CommonWithinMethods;
1514
import com.endava.cats.strategy.FuzzingStrategy;
1615
import io.swagger.v3.oas.models.media.Schema;
1716
import jakarta.inject.Singleton;
@@ -57,7 +56,7 @@ public ResponseCodeFamily getExpectedHttpCodeWhenOptionalFieldsAreFuzzed() {
5756
@Override
5857
public List<FuzzingStrategy> getFieldFuzzingStrategy(FuzzingData data, String fuzzedField) {
5958
Schema<?> fuzzedFieldSchema = data.getRequestPropertyTypes().get(fuzzedField);
60-
return CommonWithinMethods.getFuzzingStrategies(fuzzedFieldSchema, this.getInvisibleChars(), true);
59+
return FuzzingStrategy.getFuzzingStrategies(fuzzedFieldSchema, this.getInvisibleChars(), true);
6160
}
6261

6362
@Override

0 commit comments

Comments
 (0)