Uncomment test and fixes to use it plus checkstyle

src/main/java/com/sngular/kloadgen/extractor/extractors/ExtractorFactory.java

@@ -10,7 +10,7 @@
 import com.sngular.kloadgen.exception.KLoadGenException;
 import com.sngular.kloadgen.extractor.extractors.avro.AvroExtractor;
 import com.sngular.kloadgen.extractor.extractors.json.JsonExtractor;
-import com.sngular.kloadgen.extractor.extractors.protobuff.ProtobuffExtractor;
+import com.sngular.kloadgen.extractor.extractors.protobuf.ProtobufExtractor;
 import com.sngular.kloadgen.model.FieldValueMapping;
 import com.sngular.kloadgen.parsedschema.ParsedSchema;
 import com.sngular.kloadgen.schemaregistry.adapter.impl.AbstractParsedSchemaAdapter;
@@ -26,15 +26,15 @@ public final class ExtractorFactory {
 
   private static JsonExtractor jsonExtractor = new JsonExtractor();
 
-  private static ProtobuffExtractor protobuffExtractor = new ProtobuffExtractor();
+  private static ProtobufExtractor protobufExtractor = new ProtobufExtractor();
 
   private ExtractorFactory() {
   }
 
-  public static void configExtractorFactory(final AvroExtractor avroExtractor, final JsonExtractor jsonExtractor, final ProtobuffExtractor protobuffExtractor) {
+  public static void configExtractorFactory(final AvroExtractor avroExtractor, final JsonExtractor jsonExtractor, final ProtobufExtractor protobufExtractor) {
     ExtractorFactory.avroExtractor = avroExtractor;
     ExtractorFactory.jsonExtractor = jsonExtractor;
-    ExtractorFactory.protobuffExtractor = protobuffExtractor;
+    ExtractorFactory.protobufExtractor = protobufExtractor;
   }
 
   public static ExtractorRegistry getExtractor(final String schemaType) {
@@ -43,7 +43,7 @@ public static ExtractorRegistry getExtractor(final String schemaType) {
       final ExtractorRegistry response = switch (SchemaTypeEnum.valueOf(schemaType.toUpperCase())) {
         case JSON -> jsonExtractor;
         case AVRO -> avroExtractor;
-        case PROTOBUF -> protobuffExtractor;
+        case PROTOBUF -> protobufExtractor;
         default -> throw new KLoadGenException(String.format("Schema type not supported %s", schemaType));
       };
       return response;

src/main/java/com/sngular/kloadgen/extractor/extractors/protobuff/AbstractProtoFileExtractor.java → src/main/java/com/sngular/kloadgen/extractor/extractors/protobuf/AbstractProtoFileExtractor.java

@@ -1,4 +1,4 @@
-package com.sngular.kloadgen.extractor.extractors.protobuff;
+package com.sngular.kloadgen.extractor.extractors.protobuf;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;

src/main/java/com/sngular/kloadgen/extractor/extractors/protobuff/ProtoBufApicurioExtractor.java → src/main/java/com/sngular/kloadgen/extractor/extractors/protobuf/ProtoBufApicurioExtractor.java

@@ -1,4 +1,4 @@
-package com.sngular.kloadgen.extractor.extractors.protobuff;
+package com.sngular.kloadgen.extractor.extractors.protobuf;
 
 import java.util.List;
 

src/main/java/com/sngular/kloadgen/extractor/extractors/protobuff/ProtoBufConfluentExtractor.java → src/main/java/com/sngular/kloadgen/extractor/extractors/protobuf/ProtoBufConfluentExtractor.java

@@ -1,4 +1,4 @@
-package com.sngular.kloadgen.extractor.extractors.protobuff;
+package com.sngular.kloadgen.extractor.extractors.protobuf;
 
 import java.util.List;
 

src/main/java/com/sngular/kloadgen/extractor/extractors/protobuff/ProtobuffExtractor.java → src/main/java/com/sngular/kloadgen/extractor/extractors/protobuf/ProtobufExtractor.java

@@ -1,4 +1,4 @@
-package com.sngular.kloadgen.extractor.extractors.protobuff;
+package com.sngular.kloadgen.extractor.extractors.protobuf;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -10,7 +10,7 @@
 import com.sngular.kloadgen.model.FieldValueMapping;
 import com.sngular.kloadgen.parsedschema.ParsedSchema;
 
-public class ProtobuffExtractor implements ExtractorRegistry<ParsedSchema> {
+public class ProtobufExtractor implements ExtractorRegistry<ParsedSchema> {
 
   private static final Map<SchemaRegistryEnum, Extractor> SCHEMA_REGISTRY_MAP = Map.of(SchemaRegistryEnum.CONFLUENT, new ProtoBufConfluentExtractor(),
                                                                                        SchemaRegistryEnum.APICURIO, new ProtoBufApicurioExtractor());

src/main/java/com/sngular/kloadgen/schemaregistry/adapter/impl/ConfluentAbstractParsedSchemaMetadata.java

@@ -1,5 +1,6 @@
 package com.sngular.kloadgen.schemaregistry.adapter.impl;
 
+import com.sngular.kloadgen.parsedschema.IParsedSchema;
 import com.sngular.kloadgen.parsedschema.ParsedSchema;
 import io.confluent.kafka.schemaregistry.protobuf.ProtobufSchema;
 import lombok.Getter;
@@ -16,7 +17,7 @@ public final class ConfluentAbstractParsedSchemaMetadata extends AbstractParsedS
 
   private Object rawSchema;
 
-  private ConfluentAbstractParsedSchemaMetadata(final ParsedSchema parsedSchema) {
+  private ConfluentAbstractParsedSchemaMetadata(final IParsedSchema parsedSchema) {
     this.schemaType = parsedSchema.schemaType();
     this.name = parsedSchema.name();
     this.canonicalString = parsedSchema.canonicalString();
@@ -35,11 +36,7 @@ public ConfluentAbstractParsedSchemaMetadata(final ProtobufSchema schema) {
     this.canonicalString = schema.canonicalString();
   }
 
-  public ConfluentAbstractParsedSchemaMetadata() {
-
-  }
-
-  public static AbstractParsedSchemaAdapter parse(final ParsedSchema parsedSchema) {
+  public static AbstractParsedSchemaAdapter parse(final IParsedSchema parsedSchema) {
     return new ConfluentAbstractParsedSchemaMetadata(parsedSchema);
   }
 

src/main/java/com/sngular/kloadgen/schemaregistry/impl/ConfluentSchemaRegistry.java

@@ -37,14 +37,12 @@ public String getSchemaRegistryUrlKey() {
 
   @Override
   public void setSchemaRegistryClient(final String url, final Map<String, ?> properties) {
-    log.debug("CREATEION");
     this.schemaRegistryClient = new CachedSchemaRegistryClient(List.of(checkPropertyOrVariable(url)), 1000,
                                                                List.of(new AvroSchemaProvider(), new JsonSchemaProvider(), new ProtobufSchemaProvider()), properties);
   }
 
   @Override
   public void setSchemaRegistryClient(final Map<String, ?> properties) {
-    log.debug("CREATITIN");
     final String url = properties.get(this.getSchemaRegistryUrlKey()).toString();
     this.schemaRegistryClient = new CachedSchemaRegistryClient(List.of(checkPropertyOrVariable(url)), 1000,
                                                                List.of(new AvroSchemaProvider(), new JsonSchemaProvider(), new ProtobufSchemaProvider()), properties);

src/test/java/com/sngular/kloadgen/extractor/SchemaExtractorTest.java

@@ -13,13 +13,14 @@
 
 import com.sngular.kloadgen.common.SchemaRegistryEnum;
 import com.sngular.kloadgen.exception.KLoadGenException;
+import com.sngular.kloadgen.parsedschema.ParsedSchema;
 import com.sngular.kloadgen.schemaregistry.adapter.impl.ApicurioAbstractParsedSchemaMetadata;
 import com.sngular.kloadgen.schemaregistry.adapter.impl.BaseParsedSchema;
 import com.sngular.kloadgen.schemaregistry.adapter.impl.ConfluentAbstractParsedSchemaMetadata;
 import com.sngular.kloadgen.testutil.FileHelper;
+import com.sngular.kloadgen.testutil.ParsedSchemaUtil;
 import com.sngular.kloadgen.util.JMeterHelper;
 import com.sngular.kloadgen.util.SchemaRegistryKeyHelper;
-import com.sngular.kloadgen.parsedschema.ParsedSchema;
 import org.apache.jmeter.threads.JMeterContext;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.JMeterVariables;
@@ -105,7 +106,7 @@ void testFlatPropertiesListWithProtobuf() throws IOException {
     properties.setProperty(SchemaRegistryKeyHelper.SCHEMA_REGISTRY_NAME, SchemaRegistryEnum.CONFLUENT.toString());
 
     final ParsedSchema parsedSchema = new ParsedSchema(testFile, "PROTOBUF");
-    final BaseParsedSchema baseParsedSchema = new BaseParsedSchema<>(ConfluentAbstractParsedSchemaMetadata.parse(parsedSchema));
+   final BaseParsedSchema baseParsedSchema = new BaseParsedSchema<>(ConfluentAbstractParsedSchemaMetadata.parse(parsedSchema));
     jmeterContextServiceMockedStatic.when(() -> JMeterContextService.getContext().getProperties()).thenReturn(properties);
     jmeterHelperMockedStatic.when(() -> JMeterHelper.getParsedSchema(Mockito.anyString(), Mockito.any(Properties.class))).thenReturn(baseParsedSchema);
     final var result = SchemaExtractor.flatPropertiesList("protobufSubject");
@@ -121,7 +122,7 @@ void testReadSchemaFile() throws IOException {
     Assertions.assertThat(result).isNotNull();
   }
 
-  /*@Test
+  @Test
   @DisplayName("Test flatPropertiesList throws exception schema type not supported")
   void testFlatPropertiesListWithException() {
 
@@ -136,7 +137,7 @@ void testFlatPropertiesListWithException() {
               .isThrownBy(() -> SchemaExtractor.flatPropertiesList("exceptionSubject")
               ).withMessage(String.format("Schema type not supported %s", parsedSchema.schemaType()));
 
-  }*/
+  }
 
   @Test
   @DisplayName("Test flatPropertiesList with AVRO and CONFLUENT")

src/test/java/com/sngular/kloadgen/extractor/extractors/ExtractorFactoryTest.java

@@ -5,14 +5,21 @@
 import com.sngular.kloadgen.extractor.extractors.avro.AvroConfluentExtractor;
 import com.sngular.kloadgen.extractor.extractors.avro.AvroExtractor;
 import com.sngular.kloadgen.extractor.extractors.json.JsonExtractor;
-import com.sngular.kloadgen.extractor.extractors.protobuff.ProtobuffExtractor;
+import com.sngular.kloadgen.extractor.extractors.protobuf.ProtobufExtractor;
 import com.sngular.kloadgen.model.FieldValueMapping;
+import com.sngular.kloadgen.parsedschema.ParsedSchema;
 import com.sngular.kloadgen.schemaregistry.adapter.impl.BaseParsedSchema;
 import com.sngular.kloadgen.schemaregistry.adapter.impl.ConfluentAbstractParsedSchemaMetadata;
 import com.sngular.kloadgen.testutil.FileHelper;
 import com.sngular.kloadgen.util.JMeterHelper;
 import com.sngular.kloadgen.util.SchemaRegistryKeyHelper;
-import com.sngular.kloadgen.parsedschema.ParsedSchema;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+import java.util.Locale;
+import java.util.Properties;
+
 import org.apache.avro.Schema;
 import org.apache.jmeter.threads.JMeterContext;
 import org.apache.jmeter.threads.JMeterContextService;
@@ -22,26 +29,13 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.mockito.Answers;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
-import org.mockito.MockedStatic;
-import org.mockito.Mockito;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-import java.util.Locale;
-import java.util.Properties;
-
-import static org.mockito.ArgumentMatchers.isA;
-import static org.mockito.Mockito.when;
+import org.mockito.*;
 
 class ExtractorFactoryTest {
 
-  private static final JsonExtractor jsonExtractor = new JsonExtractor();
+  private static final JsonExtractor JSON_EXTRACTOR = new JsonExtractor();
 
-  private static final ProtobuffExtractor protobuffExtractor = new ProtobuffExtractor();
+  private static final ProtobufExtractor PROTOBUF_EXTRACTOR = new ProtobufExtractor();
 
   @Captor
   private ArgumentCaptor<Schema> argumentCaptor = ArgumentCaptor.forClass(Schema.class);
@@ -52,7 +46,7 @@ class ExtractorFactoryTest {
 
   private final Extractor<Schema> avroConfluentExtractor = new AvroConfluentExtractor();
 
-  private MockedStatic<JMeterHelper> jMeterHelperMockedStatic;
+  private MockedStatic<JMeterHelper> jMETER_HELPER_MOCKED_STATIC;
 
   private MockedStatic<JMeterContextService> jMeterContextServiceMockedStatic;
 
@@ -65,36 +59,36 @@ public void init() {
     jmcx.setVariables(new JMeterVariables());
     JMeterUtils.setLocale(Locale.ENGLISH);
 
-    jMeterHelperMockedStatic = Mockito.mockStatic(JMeterHelper.class);
+    jMETER_HELPER_MOCKED_STATIC = Mockito.mockStatic(JMeterHelper.class);
     jMeterContextServiceMockedStatic = Mockito.mockStatic(JMeterContextService.class, Answers.RETURNS_DEEP_STUBS);
     argumentCaptor = ArgumentCaptor.forClass(Schema.class);
   }
 
   @AfterEach
   public void tearDown() {
     properties.clear();
-    jMeterHelperMockedStatic.close();
+    jMETER_HELPER_MOCKED_STATIC.close();
     jMeterContextServiceMockedStatic.close();
   }
 
   @Test
   void flatPropertiesList() throws IOException {
-    AvroExtractor avroExtractor = Mockito.mock(AvroExtractor.class);
-    ExtractorFactory.configExtractorFactory(avroExtractor, jsonExtractor, protobuffExtractor);
+    final AvroExtractor avroExtractor = Mockito.mock(AvroExtractor.class);
+    ExtractorFactory.configExtractorFactory(avroExtractor, JSON_EXTRACTOR, PROTOBUF_EXTRACTOR);
 
     final File testFile = fileHelper.getFile("/avro-files/embedded-avros-example-test.avsc");
     properties.setProperty(SchemaRegistryKeyHelper.SCHEMA_REGISTRY_NAME, SchemaRegistryEnum.CONFLUENT.toString());
 
     final ParsedSchema parsedSchema = new ParsedSchema(testFile, "AVRO");
     final var baseParsedSchema = new BaseParsedSchema<>(ConfluentAbstractParsedSchemaMetadata.parse(parsedSchema));
 
-    jMeterHelperMockedStatic.when(() -> JMeterHelper.getParsedSchema(Mockito.anyString(), Mockito.any(Properties.class))).thenReturn(baseParsedSchema);
+    jMETER_HELPER_MOCKED_STATIC.when(() -> JMeterHelper.getParsedSchema(Mockito.anyString(), Mockito.any(Properties.class))).thenReturn(baseParsedSchema);
     jMeterContextServiceMockedStatic.when(() -> JMeterContextService.getContext().getProperties()).thenReturn(properties);
 
     final Schema schema = new Schema.Parser().parse(testFile);
     final List<FieldValueMapping> fieldValueMappingList = avroConfluentExtractor.processSchema(schema);
 
-    when(avroExtractor.processSchema(new ParsedSchema(argumentCaptor.capture(), ""), isA(SchemaRegistryEnum.class))).thenReturn(fieldValueMappingList);
+    Mockito.when(avroExtractor.processSchema(new ParsedSchema(argumentCaptor.capture(), ""), ArgumentMatchers.isA(SchemaRegistryEnum.class))).thenReturn(fieldValueMappingList);
     final var result = SchemaExtractor.flatPropertiesList(schema.getName());
 
     Assertions.assertThat(result).isNotNull();

src/test/java/com/sngular/kloadgen/extractor/extractors/protobuff/ProtobufApicurioExtractorTest.java → src/test/java/com/sngular/kloadgen/extractor/extractors/protobuf/ProtobufApicurioExtractorTest.java

@@ -1,4 +1,4 @@
-package com.sngular.kloadgen.extractor.extractors.protobuff;
+package com.sngular.kloadgen.extractor.extractors.protobuf;
 
 import java.io.File;
 import java.util.List;

src/test/java/com/sngular/kloadgen/extractor/extractors/protobuff/ProtobufConfluentExtractorTest.java → src/test/java/com/sngular/kloadgen/extractor/extractors/protobuf/ProtobufConfluentExtractorTest.java

@@ -1,4 +1,4 @@
-package com.sngular.kloadgen.extractor.extractors.protobuff;
+package com.sngular.kloadgen.extractor.extractors.protobuf;
 
 import java.io.File;
 import java.util.List;
@@ -8,7 +8,6 @@
 import com.sngular.kloadgen.model.FieldValueMapping;
 import com.sngular.kloadgen.parsedschema.ParsedSchema;
 import com.sngular.kloadgen.testutil.FileHelper;
-import io.confluent.kafka.schemaregistry.protobuf.ProtobufSchema;
 import org.apache.jmeter.threads.JMeterContext;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.JMeterVariables;

src/test/java/com/sngular/kloadgen/processor/AvroSchemaProcessorTest.java

@@ -21,12 +21,12 @@
 import com.sngular.kloadgen.common.SchemaTypeEnum;
 import com.sngular.kloadgen.exception.KLoadGenException;
 import com.sngular.kloadgen.model.FieldValueMapping;
+import com.sngular.kloadgen.parsedschema.ParsedSchema;
 import com.sngular.kloadgen.processor.fixture.AvroSchemaFixturesConstants;
 import com.sngular.kloadgen.schemaregistry.adapter.impl.BaseSchemaMetadata;
 import com.sngular.kloadgen.schemaregistry.adapter.impl.ConfluentSchemaMetadata;
 import com.sngular.kloadgen.serializer.EnrichedRecord;
 import com.sngular.kloadgen.testutil.FileHelper;
-import com.sngular.kloadgen.parsedschema.ParsedSchema;
 import org.apache.avro.LogicalTypes;
 import org.apache.avro.Schema;
 import org.apache.avro.SchemaBuilder;

src/test/java/com/sngular/kloadgen/property/editor/FileSubjectPropertyEditorTest.java

@@ -11,8 +11,8 @@
 import java.util.List;
 
 import com.sngular.kloadgen.model.FieldValueMapping;
-import com.sngular.kloadgen.testutil.FileHelper;
 import com.sngular.kloadgen.parsedschema.ParsedSchema;
+import com.sngular.kloadgen.testutil.FileHelper;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;

src/test/java/com/sngular/kloadgen/sampler/SamplerUtilTest.java

@@ -14,12 +14,12 @@
 import java.util.stream.Stream;
 
 import com.sngular.kloadgen.model.FieldValueMapping;
+import com.sngular.kloadgen.parsedschema.ParsedSchema;
 import com.sngular.kloadgen.processor.fixture.JsonSchemaFixturesConstants;
 import com.sngular.kloadgen.serializer.SerializerTestFixture;
 import com.sngular.kloadgen.testutil.FileHelper;
 import com.sngular.kloadgen.util.PropsKeysHelper;
 import com.sngular.kloadgen.util.SchemaRegistryKeyHelper;
-import com.sngular.kloadgen.parsedschema.ParsedSchema;
 import org.apache.jmeter.threads.JMeterContext;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.JMeterVariables;

src/test/java/com/sngular/kloadgen/serializer/AvroDeserializerTest.java

@@ -10,11 +10,11 @@
 
 import com.sngular.kloadgen.common.SchemaTypeEnum;
 import com.sngular.kloadgen.model.FieldValueMapping;
+import com.sngular.kloadgen.parsedschema.ParsedSchema;
 import com.sngular.kloadgen.processor.SchemaProcessor;
 import com.sngular.kloadgen.schemaregistry.adapter.impl.BaseSchemaMetadata;
 import com.sngular.kloadgen.schemaregistry.adapter.impl.ConfluentSchemaMetadata;
 import com.sngular.kloadgen.util.PropsKeysHelper;
-import com.sngular.kloadgen.parsedschema.ParsedSchema;
 import lombok.extern.slf4j.Slf4j;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;

src/test/java/com/sngular/kloadgen/serializer/GenericRecordAvroSerializersTest.java

@@ -7,10 +7,10 @@
 
 import com.sngular.kloadgen.common.SchemaTypeEnum;
 import com.sngular.kloadgen.model.FieldValueMapping;
+import com.sngular.kloadgen.parsedschema.ParsedSchema;
 import com.sngular.kloadgen.processor.SchemaProcessor;
 import com.sngular.kloadgen.schemaregistry.adapter.impl.BaseSchemaMetadata;
 import com.sngular.kloadgen.schemaregistry.adapter.impl.ConfluentSchemaMetadata;
-import com.sngular.kloadgen.parsedschema.ParsedSchema;
 import org.apache.avro.generic.GenericRecord;
 import org.apache.kafka.common.serialization.Serializer;
 import org.assertj.core.api.Assertions;

src/test/java/com/sngular/kloadgen/serializer/JsonSerializerTest.java

@@ -8,10 +8,10 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.sngular.kloadgen.common.SchemaTypeEnum;
 import com.sngular.kloadgen.model.FieldValueMapping;
+import com.sngular.kloadgen.parsedschema.ParsedSchema;
 import com.sngular.kloadgen.processor.SchemaProcessor;
 import com.sngular.kloadgen.schemaregistry.adapter.impl.BaseSchemaMetadata;
 import com.sngular.kloadgen.schemaregistry.adapter.impl.ConfluentSchemaMetadata;
-import com.sngular.kloadgen.parsedschema.ParsedSchema;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Named;
 import org.junit.jupiter.params.ParameterizedTest;