Fixing codacy recommended changes

sngular · Oct 13, 2023 · e7d178c · e7d178c
1 parent f82173a
commit e7d178c
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 31 deletions.
diff --git a/src/main/java/com/sngular/kloadgen/extractor/SchemaExtractor.java b/src/main/java/com/sngular/kloadgen/extractor/SchemaExtractor.java
@@ -55,8 +55,4 @@ private static String readLineByLine(final String filePath) throws IOException {
     return contentBuilder.toString();
   }
 
-  private static List<FieldValueMapping> processSchema(final ParsedSchema parsedSchema) {
-    return ExtractorFactory.getExtractor(parsedSchema.schemaType()).processSchema(parsedSchema.rawSchema().toString(), SchemaRegistryEnum.CONFLUENT);
-  }
-
 }
diff --git a/src/main/java/com/sngular/kloadgen/extractor/extractors/avro/AbstractAvroFileExtractor.java b/src/main/java/com/sngular/kloadgen/extractor/extractors/avro/AbstractAvroFileExtractor.java
@@ -38,7 +38,7 @@ public List<FieldValueMapping> processSchemaDefault(final Schema schemaReceived)
   }
 
   public List<String> getSchemaNameList(Schema schema) {
-      return new ArrayList<>(extractSchemaNames(schema));
+    return new ArrayList<>(extractSchemaNames(schema));
   }
 
   public void processField(

diff --git a/src/main/java/com/sngular/kloadgen/extractor/extractors/avro/AvroExtractor.java b/src/main/java/com/sngular/kloadgen/extractor/extractors/avro/AvroExtractor.java
@@ -22,8 +22,7 @@ public final List<FieldValueMapping> processSchema(final Object schema, SchemaRe
     return schemaRegistryMap.get(registryEnum).processSchema(schema);
   }
 
-  @Override
-  public ParsedSchema processSchema(String fileContent) {
+  public final ParsedSchema processSchema(String fileContent) {
     return new AvroSchema(fileContent);
   }
 

diff --git a/src/main/java/com/sngular/kloadgen/extractor/extractors/json/JsonExtractor.java b/src/main/java/com/sngular/kloadgen/extractor/extractors/json/JsonExtractor.java
@@ -23,8 +23,7 @@ public final List<FieldValueMapping> processSchema(final Object schemaReceived,
     return schemaRegistryMap.get(registryEnum).processSchema(schemaReceived);
   }
 
-  @Override
-  public ParsedSchema processSchema(String fileContent) {
+  public final ParsedSchema processSchema(String fileContent) {
     return new JsonSchema(fileContent);
   }
 

diff --git a/src/main/java/com/sngular/kloadgen/extractor/extractors/protobuff/ProtobuffExtractor.java b/src/main/java/com/sngular/kloadgen/extractor/extractors/protobuff/ProtobuffExtractor.java
@@ -26,8 +26,7 @@ public final List<FieldValueMapping> processSchema(final Object schemaReceived,
     return schemaRegistryMap.get(registryEnum).processSchema(schemaReceived);
   }
 
-  @Override
-  public ParsedSchema processSchema(String fileContent) {
+  public final ParsedSchema processSchema(String fileContent) {
     return new ProtobufSchema(fileContent);
   }
 

diff --git a/src/main/java/com/sngular/kloadgen/property/editor/FileSubjectPropertyEditor.java b/src/main/java/com/sngular/kloadgen/property/editor/FileSubjectPropertyEditor.java
@@ -10,8 +10,6 @@
 import java.awt.Component;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.event.FocusEvent;
-import java.awt.event.FocusListener;
 import java.beans.PropertyDescriptor;
 import java.beans.PropertyEditor;
 import java.beans.PropertyEditorSupport;
@@ -28,11 +26,8 @@
 import com.sngular.kloadgen.extractor.extractors.ExtractorFactory;
 import com.sngular.kloadgen.extractor.extractors.ExtractorRegistry;
 import com.sngular.kloadgen.model.FieldValueMapping;
-import com.sngular.kloadgen.util.AutoCompletion;
 import com.sngular.kloadgen.util.PropsKeysHelper;
-import com.sngular.kloadgen.util.SchemaRegistryKeyHelper;
 import io.confluent.kafka.schemaregistry.ParsedSchema;
-import javax.swing.DefaultComboBoxModel;
 import javax.swing.JButton;
 import javax.swing.JComboBox;
 import javax.swing.JFileChooser;
@@ -48,7 +43,6 @@
 import org.apache.jmeter.testbeans.gui.TestBeanGUI;
 import org.apache.jmeter.testbeans.gui.TestBeanPropertyEditor;
 import org.apache.jmeter.threads.JMeterContextService;
-import org.apache.jmeter.threads.JMeterVariables;
 import org.apache.jmeter.util.JMeterUtils;
 
 @Slf4j
@@ -100,18 +94,18 @@ public final void actionFileChooser(final ActionEvent event) {
 
     if (JFileChooser.APPROVE_OPTION == returnValue) {
       final File schemaFile = Objects.requireNonNull(fileChooser.getSelectedFile());
-        try {
-            final String schemaType = schemaTypeComboBox.getSelectedItem().toString();
-            ExtractorRegistry extractor = ExtractorFactory.getExtractor(schemaType);
-            String fileContent = SchemaExtractor.readSchemaFile(schemaFile.getPath());
-            this.parserSchema =  extractor.processSchema(fileContent);
-            List<FieldValueMapping> schemaFieldList = extractor.processSchema(parserSchema, SchemaRegistryEnum.CONFLUENT);
-            buildTable(schemaFieldList);
-            JMeterContextService.getContext().getProperties().setProperty(PropsKeysHelper.VALUE_SCHEMA, fileContent);
-            JMeterContextService.getContext().getProperties().setProperty(PropsKeysHelper.VALUE_SCHEMA_TYPE, schemaType);
-        } catch (final IOException e) {
+      try {
+        final String schemaType = schemaTypeComboBox.getSelectedItem().toString();
+        final ExtractorRegistry extractor = ExtractorFactory.getExtractor(schemaType);
+        final String fileContent = SchemaExtractor.readSchemaFile(schemaFile.getPath());
+        this.parserSchema = extractor.processSchema(fileContent);
+        final List<FieldValueMapping> schemaFieldList = extractor.processSchema(parserSchema, SchemaRegistryEnum.CONFLUENT);
+        buildTable(schemaFieldList);
+        JMeterContextService.getContext().getProperties().setProperty(PropsKeysHelper.VALUE_SCHEMA, fileContent);
+        JMeterContextService.getContext().getProperties().setProperty(PropsKeysHelper.VALUE_SCHEMA_TYPE, schemaType);
+      } catch (final IOException e) {
         JOptionPane.showMessageDialog(panel, "Can't read a file : " + e.getMessage(), ERROR_FAILED_TO_RETRIEVE_PROPERTIES,
-                                      JOptionPane.ERROR_MESSAGE);
+                                    JOptionPane.ERROR_MESSAGE);
         log.error(e.getMessage(), e);
       }
     }

diff --git a/src/main/java/com/sngular/kloadgen/sampler/SamplerUtil.java b/src/main/java/com/sngular/kloadgen/sampler/SamplerUtil.java
@@ -389,9 +389,9 @@ public static BaseLoadGenerator configureValueGenerator(final Properties props)
         }
       }
     } else {
-      try{
+      try {
         generator.setUpGenerator(jMeterVariables.get(PropsKeysHelper.VALUE_SCHEMA), (List<FieldValueMapping>) jMeterVariables.getObject(PropsKeysHelper.VALUE_SCHEMA_PROPERTIES));
-      }catch (final SchemaParseException exc) {
+      } catch (final SchemaParseException exc) {
         generator.setUpGenerator(props.getProperty(PropsKeysHelper.VALUE_SCHEMA), (List<FieldValueMapping>) jMeterVariables.getObject(PropsKeysHelper.VALUE_SCHEMA_PROPERTIES));
       }
     }
@@ -473,7 +473,7 @@ public static List<String> populateHeaders(final List<HeaderMapping> kafkaHeader
 
   private static BaseLoadGenerator getLoadGenerator() {
     final BaseLoadGenerator generator;
-    String schemaType = JMeterContextService.getContext().getProperties().getProperty(PropsKeysHelper.VALUE_SCHEMA_TYPE);
+    final String schemaType = JMeterContextService.getContext().getProperties().getProperty(PropsKeysHelper.VALUE_SCHEMA_TYPE);
     if (Objects.nonNull(schemaType)) {
       if (JSON_TYPE_SET.contains(schemaType.toLowerCase())) {
         generator = new JsonSRLoadGenerator();