Change numeric fields to be used as Numbers instead of Strings

Endava · May 11, 2022 · 7628067 · 7628067
1 parent 34055d0
commit 7628067
Show file tree

Hide file tree

Showing 141 changed files with 278 additions and 307 deletions.
diff --git a/src/main/java/com/endava/cats/fuzzer/fields/BooleanFieldsFuzzer.java b/src/main/java/com/endava/cats/fuzzer/fields/BooleanFieldsFuzzer.java
@@ -1,7 +1,7 @@
 package com.endava.cats.fuzzer.fields;
 
-import com.endava.cats.args.FilesArguments;
 import com.endava.cats.annotations.FieldFuzzer;
+import com.endava.cats.args.FilesArguments;
 import com.endava.cats.fuzzer.fields.base.BaseBoundaryFieldFuzzer;
 import com.endava.cats.generator.simple.StringGenerator;
 import com.endava.cats.io.ServiceCaller;

diff --git a/src/main/java/com/endava/cats/fuzzer/fields/DecimalFieldsLeftBoundaryFuzzer.java b/src/main/java/com/endava/cats/fuzzer/fields/DecimalFieldsLeftBoundaryFuzzer.java
@@ -1,7 +1,7 @@
 package com.endava.cats.fuzzer.fields;
 
-import com.endava.cats.args.FilesArguments;
 import com.endava.cats.annotations.FieldFuzzer;
+import com.endava.cats.args.FilesArguments;
 import com.endava.cats.fuzzer.fields.base.BaseBoundaryFieldFuzzer;
 import com.endava.cats.generator.simple.NumberGenerator;
 import com.endava.cats.io.ServiceCaller;
@@ -29,7 +29,7 @@ public List<Class<? extends Schema>> getSchemasThatTheFuzzerWillApplyTo() {
     }
 
     @Override
-    public String getBoundaryValue(Schema schema) {
+    public Number getBoundaryValue(Schema schema) {
         return NumberGenerator.generateLeftBoundaryDecimalValue(schema);
     }
 

diff --git a/src/main/java/com/endava/cats/fuzzer/fields/DecimalFieldsRightBoundaryFuzzer.java b/src/main/java/com/endava/cats/fuzzer/fields/DecimalFieldsRightBoundaryFuzzer.java
@@ -1,7 +1,7 @@
 package com.endava.cats.fuzzer.fields;
 
-import com.endava.cats.args.FilesArguments;
 import com.endava.cats.annotations.FieldFuzzer;
+import com.endava.cats.args.FilesArguments;
 import com.endava.cats.fuzzer.fields.base.BaseBoundaryFieldFuzzer;
 import com.endava.cats.generator.simple.NumberGenerator;
 import com.endava.cats.io.ServiceCaller;
@@ -29,7 +29,7 @@ public List<Class<? extends Schema>> getSchemasThatTheFuzzerWillApplyTo() {
     }
 
     @Override
-    public String getBoundaryValue(Schema schema) {
+    public Number getBoundaryValue(Schema schema) {
         return NumberGenerator.generateRightBoundaryDecimalValue(schema);
     }
 

diff --git a/src/main/java/com/endava/cats/fuzzer/fields/DecimalValuesInIntegerFieldsFuzzer.java b/src/main/java/com/endava/cats/fuzzer/fields/DecimalValuesInIntegerFieldsFuzzer.java
@@ -1,7 +1,7 @@
 package com.endava.cats.fuzzer.fields;
 
-import com.endava.cats.args.FilesArguments;
 import com.endava.cats.annotations.FieldFuzzer;
+import com.endava.cats.args.FilesArguments;
 import com.endava.cats.fuzzer.fields.base.BaseBoundaryFieldFuzzer;
 import com.endava.cats.generator.simple.NumberGenerator;
 import com.endava.cats.io.ServiceCaller;
@@ -35,7 +35,7 @@ public List<Class<? extends Schema>> getSchemasThatTheFuzzerWillApplyTo() {
     }
 
     @Override
-    public String getBoundaryValue(Schema schema) {
+    public Number getBoundaryValue(Schema schema) {
         return NumberGenerator.generateDecimalValue(schema);
     }
 

diff --git a/src/main/java/com/endava/cats/fuzzer/fields/ExtremeNegativeValueDecimalFieldsFuzzer.java b/src/main/java/com/endava/cats/fuzzer/fields/ExtremeNegativeValueDecimalFieldsFuzzer.java
@@ -1,7 +1,7 @@
 package com.endava.cats.fuzzer.fields;
 
-import com.endava.cats.args.FilesArguments;
 import com.endava.cats.annotations.FieldFuzzer;
+import com.endava.cats.args.FilesArguments;
 import com.endava.cats.fuzzer.fields.base.BaseBoundaryFieldFuzzer;
 import com.endava.cats.generator.simple.NumberGenerator;
 import com.endava.cats.io.ServiceCaller;
@@ -34,7 +34,7 @@ public List<Class<? extends Schema>> getSchemasThatTheFuzzerWillApplyTo() {
     }
 
     @Override
-    public String getBoundaryValue(Schema schema) {
+    public Object getBoundaryValue(Schema schema) {
         return NumberGenerator.getExtremeNegativeDecimalValue(schema);
     }
 

diff --git a/src/main/java/com/endava/cats/fuzzer/fields/ExtremeNegativeValueIntegerFieldsFuzzer.java b/src/main/java/com/endava/cats/fuzzer/fields/ExtremeNegativeValueIntegerFieldsFuzzer.java
@@ -1,7 +1,7 @@
 package com.endava.cats.fuzzer.fields;
 
-import com.endava.cats.args.FilesArguments;
 import com.endava.cats.annotations.FieldFuzzer;
+import com.endava.cats.args.FilesArguments;
 import com.endava.cats.fuzzer.fields.base.BaseBoundaryFieldFuzzer;
 import com.endava.cats.generator.simple.NumberGenerator;
 import com.endava.cats.io.ServiceCaller;
@@ -34,7 +34,7 @@ public List<Class<? extends Schema>> getSchemasThatTheFuzzerWillApplyTo() {
     }
 
     @Override
-    public String getBoundaryValue(Schema schema) {
+    public Number getBoundaryValue(Schema schema) {
         return NumberGenerator.getExtremeNegativeIntegerValue(schema);
     }
 

diff --git a/src/main/java/com/endava/cats/fuzzer/fields/ExtremePositiveValueDecimalFieldsFuzzer.java b/src/main/java/com/endava/cats/fuzzer/fields/ExtremePositiveValueDecimalFieldsFuzzer.java
@@ -1,7 +1,7 @@
 package com.endava.cats.fuzzer.fields;
 
-import com.endava.cats.args.FilesArguments;
 import com.endava.cats.annotations.FieldFuzzer;
+import com.endava.cats.args.FilesArguments;
 import com.endava.cats.fuzzer.fields.base.BaseBoundaryFieldFuzzer;
 import com.endava.cats.generator.simple.NumberGenerator;
 import com.endava.cats.io.ServiceCaller;
@@ -35,7 +35,7 @@ public List<Class<? extends Schema>> getSchemasThatTheFuzzerWillApplyTo() {
     }
 
     @Override
-    public String getBoundaryValue(Schema schema) {
+    public Number getBoundaryValue(Schema schema) {
         return NumberGenerator.getExtremePositiveDecimalValue(schema);
     }
 

diff --git a/src/main/java/com/endava/cats/fuzzer/fields/ExtremePositiveValueInIntegerFieldsFuzzer.java b/src/main/java/com/endava/cats/fuzzer/fields/ExtremePositiveValueInIntegerFieldsFuzzer.java
@@ -1,7 +1,7 @@
 package com.endava.cats.fuzzer.fields;
 
-import com.endava.cats.args.FilesArguments;
 import com.endava.cats.annotations.FieldFuzzer;
+import com.endava.cats.args.FilesArguments;
 import com.endava.cats.fuzzer.fields.base.BaseBoundaryFieldFuzzer;
 import com.endava.cats.generator.simple.NumberGenerator;
 import com.endava.cats.io.ServiceCaller;
@@ -34,7 +34,7 @@ public List<Class<? extends Schema>> getSchemasThatTheFuzzerWillApplyTo() {
     }
 
     @Override
-    public String getBoundaryValue(Schema schema) {
+    public Number getBoundaryValue(Schema schema) {
         return NumberGenerator.getExtremePositiveIntegerValue(schema);
     }
 

diff --git a/src/main/java/com/endava/cats/fuzzer/fields/IntegerFieldsLeftBoundaryFuzzer.java b/src/main/java/com/endava/cats/fuzzer/fields/IntegerFieldsLeftBoundaryFuzzer.java
@@ -1,7 +1,7 @@
 package com.endava.cats.fuzzer.fields;
 
-import com.endava.cats.args.FilesArguments;
 import com.endava.cats.annotations.FieldFuzzer;
+import com.endava.cats.args.FilesArguments;
 import com.endava.cats.fuzzer.fields.base.BaseBoundaryFieldFuzzer;
 import com.endava.cats.generator.simple.NumberGenerator;
 import com.endava.cats.io.ServiceCaller;
@@ -29,7 +29,7 @@ public List<Class<? extends Schema>> getSchemasThatTheFuzzerWillApplyTo() {
     }
 
     @Override
-    public String getBoundaryValue(Schema schema) {
+    public Number getBoundaryValue(Schema schema) {
         return NumberGenerator.generateLeftBoundaryIntegerValue(schema);
     }
 

diff --git a/src/main/java/com/endava/cats/fuzzer/fields/IntegerFieldsRightBoundaryFuzzer.java b/src/main/java/com/endava/cats/fuzzer/fields/IntegerFieldsRightBoundaryFuzzer.java
@@ -1,7 +1,7 @@
 package com.endava.cats.fuzzer.fields;
 
-import com.endava.cats.args.FilesArguments;
 import com.endava.cats.annotations.FieldFuzzer;
+import com.endava.cats.args.FilesArguments;
 import com.endava.cats.fuzzer.fields.base.BaseBoundaryFieldFuzzer;
 import com.endava.cats.generator.simple.NumberGenerator;
 import com.endava.cats.io.ServiceCaller;
@@ -29,7 +29,7 @@ public List<Class<? extends Schema>> getSchemasThatTheFuzzerWillApplyTo() {
     }
 
     @Override
-    public String getBoundaryValue(Schema schema) {
+    public Number getBoundaryValue(Schema schema) {
         return NumberGenerator.generateRightBoundaryIntegerValue(schema);
     }
 

diff --git a/src/main/java/com/endava/cats/fuzzer/fields/InvalidValuesInEnumsFieldsFuzzer.java b/src/main/java/com/endava/cats/fuzzer/fields/InvalidValuesInEnumsFieldsFuzzer.java
@@ -1,7 +1,7 @@
 package com.endava.cats.fuzzer.fields;
 
-import com.endava.cats.args.FilesArguments;
 import com.endava.cats.annotations.FieldFuzzer;
+import com.endava.cats.args.FilesArguments;
 import com.endava.cats.fuzzer.fields.base.BaseBoundaryFieldFuzzer;
 import com.endava.cats.generator.simple.StringGenerator;
 import com.endava.cats.io.ServiceCaller;

diff --git a/src/main/java/com/endava/cats/fuzzer/fields/MaxLengthExactValuesInStringFieldsFuzzer.java b/src/main/java/com/endava/cats/fuzzer/fields/MaxLengthExactValuesInStringFieldsFuzzer.java
@@ -1,7 +1,7 @@
 package com.endava.cats.fuzzer.fields;
 
-import com.endava.cats.args.FilesArguments;
 import com.endava.cats.annotations.FieldFuzzer;
+import com.endava.cats.args.FilesArguments;
 import com.endava.cats.fuzzer.fields.base.ExactValuesInFieldsFuzzer;
 import com.endava.cats.io.ServiceCaller;
 import com.endava.cats.report.TestCaseListener;

diff --git a/src/main/java/com/endava/cats/fuzzer/fields/MaximumExactValuesInNumericFieldsFuzzer.java b/src/main/java/com/endava/cats/fuzzer/fields/MaximumExactValuesInNumericFieldsFuzzer.java
@@ -1,7 +1,7 @@
 package com.endava.cats.fuzzer.fields;
 
-import com.endava.cats.args.FilesArguments;
 import com.endava.cats.annotations.FieldFuzzer;
+import com.endava.cats.args.FilesArguments;
 import com.endava.cats.fuzzer.fields.base.ExactValuesInFieldsFuzzer;
 import com.endava.cats.io.ServiceCaller;
 import com.endava.cats.report.TestCaseListener;

diff --git a/src/main/java/com/endava/cats/fuzzer/fields/MinLengthExactValuesInStringFieldsFuzzer.java b/src/main/java/com/endava/cats/fuzzer/fields/MinLengthExactValuesInStringFieldsFuzzer.java
@@ -1,7 +1,7 @@
 package com.endava.cats.fuzzer.fields;
 
-import com.endava.cats.args.FilesArguments;
 import com.endava.cats.annotations.FieldFuzzer;
+import com.endava.cats.args.FilesArguments;
 import com.endava.cats.fuzzer.fields.base.ExactValuesInFieldsFuzzer;
 import com.endava.cats.io.ServiceCaller;
 import com.endava.cats.report.TestCaseListener;

diff --git a/src/main/java/com/endava/cats/fuzzer/fields/MinimumExactValuesInNumericFieldsFuzzer.java b/src/main/java/com/endava/cats/fuzzer/fields/MinimumExactValuesInNumericFieldsFuzzer.java
@@ -1,7 +1,7 @@
 package com.endava.cats.fuzzer.fields;
 
-import com.endava.cats.args.FilesArguments;
 import com.endava.cats.annotations.FieldFuzzer;
+import com.endava.cats.args.FilesArguments;
 import com.endava.cats.fuzzer.fields.base.ExactValuesInFieldsFuzzer;
 import com.endava.cats.io.ServiceCaller;
 import com.endava.cats.report.TestCaseListener;

diff --git a/src/main/java/com/endava/cats/fuzzer/fields/RemoveFieldsFuzzer.java b/src/main/java/com/endava/cats/fuzzer/fields/RemoveFieldsFuzzer.java
@@ -10,8 +10,8 @@
 import com.endava.cats.io.ServiceData;
 import com.endava.cats.model.CatsResponse;
 import com.endava.cats.model.FuzzingData;
-import com.endava.cats.report.TestCaseListener;
 import com.endava.cats.model.util.JsonUtils;
+import com.endava.cats.report.TestCaseListener;
 import io.github.ludovicianul.prettylogger.PrettyLogger;
 import io.github.ludovicianul.prettylogger.PrettyLoggerFactory;
 

diff --git a/src/main/java/com/endava/cats/fuzzer/fields/StringFieldsLeftBoundaryFuzzer.java b/src/main/java/com/endava/cats/fuzzer/fields/StringFieldsLeftBoundaryFuzzer.java
@@ -1,7 +1,7 @@
 package com.endava.cats.fuzzer.fields;
 
-import com.endava.cats.args.FilesArguments;
 import com.endava.cats.annotations.FieldFuzzer;
+import com.endava.cats.args.FilesArguments;
 import com.endava.cats.fuzzer.fields.base.BaseBoundaryFieldFuzzer;
 import com.endava.cats.generator.simple.StringGenerator;
 import com.endava.cats.io.ServiceCaller;

diff --git a/src/main/java/com/endava/cats/fuzzer/fields/StringFieldsRightBoundaryFuzzer.java b/src/main/java/com/endava/cats/fuzzer/fields/StringFieldsRightBoundaryFuzzer.java
@@ -1,7 +1,7 @@
 package com.endava.cats.fuzzer.fields;
 
-import com.endava.cats.args.FilesArguments;
 import com.endava.cats.annotations.FieldFuzzer;
+import com.endava.cats.args.FilesArguments;
 import com.endava.cats.fuzzer.fields.base.BaseBoundaryFieldFuzzer;
 import com.endava.cats.generator.simple.StringGenerator;
 import com.endava.cats.io.ServiceCaller;

diff --git a/src/main/java/com/endava/cats/fuzzer/fields/StringFormatAlmostValidValuesFuzzer.java b/src/main/java/com/endava/cats/fuzzer/fields/StringFormatAlmostValidValuesFuzzer.java
@@ -1,7 +1,7 @@
 package com.endava.cats.fuzzer.fields;
 
-import com.endava.cats.args.FilesArguments;
 import com.endava.cats.annotations.FieldFuzzer;
+import com.endava.cats.args.FilesArguments;
 import com.endava.cats.fuzzer.fields.base.BaseBoundaryFieldFuzzer;
 import com.endava.cats.generator.format.FormatGenerator;
 import com.endava.cats.io.ServiceCaller;

diff --git a/src/main/java/com/endava/cats/fuzzer/fields/StringFormatTotallyWrongValuesFuzzer.java b/src/main/java/com/endava/cats/fuzzer/fields/StringFormatTotallyWrongValuesFuzzer.java
@@ -1,7 +1,7 @@
 package com.endava.cats.fuzzer.fields;
 
-import com.endava.cats.args.FilesArguments;
 import com.endava.cats.annotations.FieldFuzzer;
+import com.endava.cats.args.FilesArguments;
 import com.endava.cats.fuzzer.fields.base.BaseBoundaryFieldFuzzer;
 import com.endava.cats.generator.format.FormatGenerator;
 import com.endava.cats.io.ServiceCaller;

diff --git a/src/main/java/com/endava/cats/fuzzer/fields/StringsInNumericFieldsFuzzer.java b/src/main/java/com/endava/cats/fuzzer/fields/StringsInNumericFieldsFuzzer.java
@@ -1,7 +1,7 @@
 package com.endava.cats.fuzzer.fields;
 
-import com.endava.cats.args.FilesArguments;
 import com.endava.cats.annotations.FieldFuzzer;
+import com.endava.cats.args.FilesArguments;
 import com.endava.cats.fuzzer.fields.base.BaseBoundaryFieldFuzzer;
 import com.endava.cats.generator.simple.StringGenerator;
 import com.endava.cats.io.ServiceCaller;

diff --git a/src/main/java/com/endava/cats/fuzzer/fields/VeryLargeUnicodeValuesInFieldsFuzzer.java b/src/main/java/com/endava/cats/fuzzer/fields/VeryLargeUnicodeValuesInFieldsFuzzer.java
@@ -1,15 +1,15 @@
 package com.endava.cats.fuzzer.fields;
 
+import com.endava.cats.annotations.FieldFuzzer;
 import com.endava.cats.args.FilesArguments;
 import com.endava.cats.args.ProcessingArguments;
-import com.endava.cats.annotations.FieldFuzzer;
 import com.endava.cats.fuzzer.fields.base.ExpectOnly4XXBaseFieldsFuzzer;
 import com.endava.cats.io.ServiceCaller;
 import com.endava.cats.model.FuzzingData;
 import com.endava.cats.model.FuzzingStrategy;
+import com.endava.cats.model.util.PayloadUtils;
 import com.endava.cats.report.TestCaseListener;
 import com.endava.cats.util.CatsUtil;
-import com.endava.cats.model.util.PayloadUtils;
 
 import javax.inject.Singleton;
 import java.util.List;

diff --git a/src/main/java/com/endava/cats/fuzzer/fields/VeryLargeValuesInFieldsFuzzer.java b/src/main/java/com/endava/cats/fuzzer/fields/VeryLargeValuesInFieldsFuzzer.java
@@ -1,8 +1,8 @@
 package com.endava.cats.fuzzer.fields;
 
+import com.endava.cats.annotations.FieldFuzzer;
 import com.endava.cats.args.FilesArguments;
 import com.endava.cats.args.ProcessingArguments;
-import com.endava.cats.annotations.FieldFuzzer;
 import com.endava.cats.fuzzer.fields.base.ExpectOnly4XXBaseFieldsFuzzer;
 import com.endava.cats.generator.simple.StringGenerator;
 import com.endava.cats.io.ServiceCaller;

diff --git a/src/main/java/com/endava/cats/fuzzer/fields/base/BaseBoundaryFieldFuzzer.java b/src/main/java/com/endava/cats/fuzzer/fields/base/BaseBoundaryFieldFuzzer.java
@@ -102,7 +102,7 @@ private boolean isRequestSchemaMatchingFuzzerType(Schema schema) {
      * @param schema used to extract boundary information
      * @return a value to be used for fuzzing
      */
-    public abstract String getBoundaryValue(Schema schema);
+    public abstract Object getBoundaryValue(Schema schema);
 
     /**
      * Override this to provide information about whether the current field has boundaries defined or not. For example a String

diff --git a/src/main/java/com/endava/cats/fuzzer/fields/base/BaseFieldsFuzzer.java b/src/main/java/com/endava/cats/fuzzer/fields/base/BaseFieldsFuzzer.java
@@ -77,7 +77,7 @@ protected void process(FuzzingData data, String fuzzedField, FuzzingStrategy fuz
         if (this.isFuzzingPossible(data, fuzzedField, fuzzingStrategy)) {
             logger.debug("Fuzzing possible...");
             FuzzingResult fuzzingResult = catsUtil.replaceField(data.getPayload(), fuzzedField, fuzzingStrategy);
-            boolean isFuzzedValueMatchingPattern = this.isFuzzedValueMatchingPattern(fuzzingResult.getFuzzedValue(), data, fuzzedField);
+            boolean isFuzzedValueMatchingPattern = this.isFuzzedValueMatchingPattern(String.valueOf(fuzzingResult.getFuzzedValue()), data, fuzzedField);
 
             ServiceData serviceData = ServiceData.builder().relativePath(data.getPath())
                     .headers(data.getHeaders()).payload(fuzzingResult.getJson()).httpMethod(data.getMethod())
@@ -92,7 +92,7 @@ protected void process(FuzzingData data, String fuzzedField, FuzzingStrategy fuz
         } else {
             logger.debug("Fuzzing not possible!");
             FuzzingStrategy strategy = this.createSkipStrategy(fuzzingStrategy);
-            testCaseListener.skipTest(logger, strategy.process(""));
+            testCaseListener.skipTest(logger, (String) strategy.process(""));
         }
     }
 

diff --git a/.../com/endava/cats/fuzzer/fields/leading/LeadingControlCharsInFieldsTrimValidateFuzzer.java b/.../com/endava/cats/fuzzer/fields/leading/LeadingControlCharsInFieldsTrimValidateFuzzer.java
@@ -1,15 +1,15 @@
 package com.endava.cats.fuzzer.fields.leading;
 
-import com.endava.cats.args.FilesArguments;
 import com.endava.cats.annotations.ControlCharFuzzer;
 import com.endava.cats.annotations.FieldFuzzer;
 import com.endava.cats.annotations.TrimAndValidate;
+import com.endava.cats.args.FilesArguments;
 import com.endava.cats.fuzzer.fields.base.InvisibleCharsBaseTrimValidateFuzzer;
 import com.endava.cats.io.ServiceCaller;
 import com.endava.cats.model.FuzzingStrategy;
+import com.endava.cats.model.util.PayloadUtils;
 import com.endava.cats.report.TestCaseListener;
 import com.endava.cats.util.CatsUtil;
-import com.endava.cats.model.util.PayloadUtils;
 
 import javax.inject.Singleton;
 import java.util.List;

diff --git a/.../com/endava/cats/fuzzer/fields/leading/LeadingControlCharsInFieldsValidateTrimFuzzer.java b/.../com/endava/cats/fuzzer/fields/leading/LeadingControlCharsInFieldsValidateTrimFuzzer.java
@@ -1,9 +1,9 @@
 package com.endava.cats.fuzzer.fields.leading;
 
-import com.endava.cats.args.FilesArguments;
 import com.endava.cats.annotations.ControlCharFuzzer;
 import com.endava.cats.annotations.FieldFuzzer;
 import com.endava.cats.annotations.ValidateAndTrim;
+import com.endava.cats.args.FilesArguments;
 import com.endava.cats.http.ResponseCodeFamily;
 import com.endava.cats.io.ServiceCaller;
 import com.endava.cats.report.TestCaseListener;

diff --git a/...ava/cats/fuzzer/fields/leading/LeadingMultiCodePointEmojisInFieldsTrimValidateFuzzer.java b/...ava/cats/fuzzer/fields/leading/LeadingMultiCodePointEmojisInFieldsTrimValidateFuzzer.java
@@ -1,15 +1,15 @@
 package com.endava.cats.fuzzer.fields.leading;
 
-import com.endava.cats.args.FilesArguments;
 import com.endava.cats.annotations.EmojiFuzzer;
 import com.endava.cats.annotations.FieldFuzzer;
 import com.endava.cats.annotations.TrimAndValidate;
+import com.endava.cats.args.FilesArguments;
 import com.endava.cats.fuzzer.fields.base.InvisibleCharsBaseTrimValidateFuzzer;
 import com.endava.cats.io.ServiceCaller;
 import com.endava.cats.model.FuzzingStrategy;
+import com.endava.cats.model.util.PayloadUtils;
 import com.endava.cats.report.TestCaseListener;
 import com.endava.cats.util.CatsUtil;
-import com.endava.cats.model.util.PayloadUtils;
 
 import javax.inject.Singleton;
 import java.util.List;

diff --git a/...ava/cats/fuzzer/fields/leading/LeadingMultiCodePointEmojisInFieldsValidateTrimFuzzer.java b/...ava/cats/fuzzer/fields/leading/LeadingMultiCodePointEmojisInFieldsValidateTrimFuzzer.java
@@ -1,9 +1,9 @@
 package com.endava.cats.fuzzer.fields.leading;
 
-import com.endava.cats.args.FilesArguments;
 import com.endava.cats.annotations.EmojiFuzzer;
 import com.endava.cats.annotations.FieldFuzzer;
 import com.endava.cats.annotations.ValidateAndTrim;
+import com.endava.cats.args.FilesArguments;
 import com.endava.cats.http.ResponseCodeFamily;
 import com.endava.cats.io.ServiceCaller;
 import com.endava.cats.report.TestCaseListener;