#332 Fix styles and test

sngular · Oct 3, 2023 · 8b8e936 · 8b8e936
1 parent a442f7a
commit 8b8e936
Show file tree

Hide file tree

Showing 6 changed files with 131 additions and 138 deletions.
diff --git a/src/main/java/com/sngular/kloadgen/extractor/extractors/ExtractorFactory.java b/src/main/java/com/sngular/kloadgen/extractor/extractors/ExtractorFactory.java
@@ -77,7 +77,6 @@ public static Pair<String, List<FieldValueMapping>> flatPropertiesList(final Str
       schema = switch (schemaRegistryEnum) {
         case APICURIO -> ((ApicurioAbstractParsedSchemaMetadata) abstractParsedSchemaAdapter).getSchema();
         case CONFLUENT -> abstractParsedSchemaAdapter.getRawSchema();
-        default -> throw new KLoadGenException("Schema Registry Type nos supported " + registryName.toUpperCase());
       };
       attributeList.addAll(getExtractor(schemaType).processSchema(schema, schemaRegistryEnum));
     }

diff --git a/src/main/java/com/sngular/kloadgen/extractor/extractors/json/AbstractJsonExtractor.java b/src/main/java/com/sngular/kloadgen/extractor/extractors/json/AbstractJsonExtractor.java
@@ -189,12 +189,9 @@ private List<FieldValueMapping> extractMapInternalFields(
       completeFieldList.add(
           FieldValueMapping.builder()
                            .fieldName(name)
-                           .fieldType(value.getType() + "-map" + ((StringUtils.isNotEmpty(breadCrumb) && breadCrumb.endsWith("[:]")) ? "-map" :
-                                                                                                                                                  (StringUtils.isNotEmpty(
-                                                                                                                                                      breadCrumb) &&
-                                                                                                                                                   breadCrumb.endsWith("[]"))
-                                                                                                                                                      ?
-                                                                                                                                                      SchemaExtractorUtil.ARRAY_TYPE_POSTFIX
+                           .fieldType(value.getType() + "-map" + ((StringUtils.isNotEmpty(breadCrumb)
+                                                                   && breadCrumb.endsWith("[:]")) ? "-map"
+                                                                      : (StringUtils.isNotEmpty(breadCrumb) && breadCrumb.endsWith("[]")) ? SchemaExtractorUtil.ARRAY_TYPE_POSTFIX
                                                                                                                                                       : breadCrumb))
                            .required(!name.endsWith("][]") && !name.endsWith("][:]") && innerField.isFieldRequired())
                            .isAncestorRequired(!isRootElement && isAncestorRequired != null && isAncestorRequired)

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
@@ -12,20 +12,21 @@
 
 public class ProtobuffExtractor implements ExtractorRegistry<Object> {
 
-  static Map<SchemaRegistryEnum, Extractor> schemaRegistryMap = Map.of(SchemaRegistryEnum.CONFLUENT, new ProtoBufConfluentExtractor(),
-                                                                       SchemaRegistryEnum.APICURIO, new ProtoBufApicurioExtractor());
+  private static final Map<SchemaRegistryEnum, Extractor> SCHEMA_REGISTRY_MAP = Map.of(SchemaRegistryEnum.CONFLUENT, new ProtoBufConfluentExtractor(),
+                                                                                       SchemaRegistryEnum.APICURIO, new ProtoBufApicurioExtractor());
 
   public final List<FieldValueMapping> processSchema(final Object schemaReceived, final SchemaRegistryEnum registryEnum) {
     final var resultSchema = new ArrayList<FieldValueMapping>();
     if (schemaReceived instanceof ProtoFileElement) {
-      resultSchema.addAll(schemaRegistryMap.get(SchemaRegistryEnum.APICURIO).processSchema(schemaReceived));
+      resultSchema.addAll(SCHEMA_REGISTRY_MAP.get(SchemaRegistryEnum.APICURIO).processSchema(schemaReceived));
+    } else {
+      resultSchema.addAll(SCHEMA_REGISTRY_MAP.get(registryEnum).processSchema(schemaReceived));
     }
-    resultSchema.addAll(schemaRegistryMap.get(registryEnum).processSchema(schemaReceived));
     return resultSchema;
   }
 
   public final List<String> getSchemaNameList(final String schema, final SchemaRegistryEnum registryEnum) {
-    return schemaRegistryMap.get(registryEnum).getSchemaNameList(schema);
+    return SCHEMA_REGISTRY_MAP.get(registryEnum).getSchemaNameList(schema);
   }
 
 }
diff --git a/src/main/java/com/sngular/kloadgen/schemaregistry/adapter/impl/BaseSchemaMetadata.java b/src/main/java/com/sngular/kloadgen/schemaregistry/adapter/impl/BaseSchemaMetadata.java
@@ -1,7 +1,9 @@
 package com.sngular.kloadgen.schemaregistry.adapter.impl;
 
 import lombok.Builder;
+import lombok.Getter;
 
+@Getter
 @Builder
 public final class BaseSchemaMetadata<T extends SchemaMetadataAdapter> {
 
@@ -11,7 +13,4 @@ public BaseSchemaMetadata(final T schemaMetadataAdapter) {
     this.schemaMetadataAdapter = schemaMetadataAdapter;
   }
 
-  public T getSchemaMetadataAdapter() {
-    return schemaMetadataAdapter;
-  }
 }
diff --git a/src/main/java/com/sngular/kloadgen/schemaregistry/schema/KLoadSchemaMetadata.java b/src/main/java/com/sngular/kloadgen/schemaregistry/schema/KLoadSchemaMetadata.java