Use DataFaker instead of our implementation

Signed-off-by: Jakub Stejskal <[email protected]>

pom.xml

@@ -84,6 +84,7 @@
         <junit.jupiter.version>5.10.2</junit.jupiter.version>
         <junit.platform.version>1.10.2</junit.platform.version>
         <maven.surefire.version>3.3.0</maven.surefire.version>
+        <datafaker.version>2.3.0</datafaker.version>
 
         <jackson-dataformat-yaml.version>2.17.1</jackson-dataformat-yaml.version>
 
@@ -164,6 +165,13 @@
             <version>${spotbugs.version}</version>
             <scope>provided</scope>
         </dependency>
+
+        <!-- https://mvnrepository.com/artifact/net.datafaker/datafaker -->
+        <dependency>
+            <groupId>net.datafaker</groupId>
+            <artifactId>datafaker</artifactId>
+            <version>${datafaker.version}</version>
+        </dependency>
     </dependencies>
 
     <build>

src/main/java/io/skodjob/loadgenerator/DataGenerator.java

@@ -6,16 +6,12 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import io.skodjob.loadgenerator.enums.ETemplateType;
 import io.skodjob.loadgenerator.handlers.IotDevice;
-import io.skodjob.loadgenerator.handlers.People;
+import io.skodjob.loadgenerator.handlers.Payroll;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
 import java.util.Objects;
 
 /**
@@ -24,43 +20,16 @@
 public class DataGenerator {
     private static final Logger LOGGER = LogManager.getLogger(DataGenerator.class);
 
-    private final String templateJson;
     private final ETemplateType templateType;
 
     /**
      * Constructor for DataGenerator.
      *
      * @param templateType the type of template to be used for data generation
      */
-    // The suppression is needed due to false positive result
-    @SuppressFBWarnings("CT_CONSTRUCTOR_THROW")
     public DataGenerator(ETemplateType templateType) {
         this.templateType = Objects.requireNonNull(templateType, "TemplateType cannot be null!");
-        try {
-            this.templateJson = loadTemplate(templateType.getTemplatePath());
-        } catch (IOException e) {
-            LOGGER.error("Error loading template", e);
-            throw new RuntimeException("Failed to load template: " + templateType.getTemplatePath(), e);
-        }
-
-        LOGGER.info("Loaded {} template with location {}", templateType.getTemplateName(),
-            templateType.getTemplatePath());
-    }
-
-    /**
-     * Loads the template from the specified path.
-     *
-     * @param templateName the name of the template file
-     * @return the content of the template file as a string
-     * @throws IOException if an I/O error occurs while loading the template
-     */
-    private String loadTemplate(String templateName) throws IOException {
-        try (InputStream inputStream = getClass().getClassLoader().getResourceAsStream(templateName)) {
-            if (inputStream == null) {
-                throw new IOException("Template not found: " + templateName);
-            }
-            return new String(inputStream.readAllBytes(), StandardCharsets.UTF_8);
-        }
+        LOGGER.info("Initialized DataGenerator with template type {}", templateType.getTemplateName());
     }
 
     /**
@@ -71,9 +40,9 @@ private String loadTemplate(String templateName) throws IOException {
     public String generateStringData() {
         switch (this.templateType) {
             case PAYROLL_EMPLOYEE:
-                return Utils.stripWhitespace(People.fillTemplate(this.templateJson));
+                return Payroll.generateData();
             case IOT_DEVICE:
-                return Utils.stripWhitespace(IotDevice.fillTemplate(this.templateJson));
+                return IotDevice.generateData();
             default:
                 throw new IllegalArgumentException("Unknown template type: " + this.templateType);
         }
@@ -83,10 +52,12 @@ public String generateStringData() {
      * Generates JSON data based on the template type.
      *
      * @return the generated JSON data
-     * @throws IOException if an I/O error occurs while generating JSON data
      */
-    public JsonNode generateJsonData() throws IOException {
-        ObjectMapper objectMapper = new ObjectMapper();
-        return objectMapper.readTree(generateStringData());
+    public JsonNode generateJsonData() {
+        try {
+            return new ObjectMapper().readTree(generateStringData());
+        } catch (Exception e) {
+            throw new RuntimeException("Error generating JSON data", e);
+        }
     }
 }

src/main/java/io/skodjob/loadgenerator/enums/ETemplateType.java

@@ -11,25 +11,22 @@ public enum ETemplateType {
     /**
      * Template for People Payrol data
      */
-    PAYROLL_EMPLOYEE("payroll_employee", "templates/payroll_employee.json"),
+    PAYROLL_EMPLOYEE("payroll_employee"),
 
     /**
      * Template for IoT device data
      */
-    IOT_DEVICE("iot_device", "templates/iot_device.json");
+    IOT_DEVICE("iot_device");
 
     private final String templateName;
-    private final String templatePath;
 
     /**
      * Constructor for ETemplateType.
      *
      * @param templateName the name of the template
-     * @param templatePath the path to the template file
      */
-    ETemplateType(String templateName, String templatePath) {
+    ETemplateType(String templateName) {
         this.templateName = templateName;
-        this.templatePath = templatePath;
     }
 
     /**
@@ -40,13 +37,4 @@ public enum ETemplateType {
     public String getTemplateName() {
         return templateName;
     }
-
-    /**
-     * Gets the path to the template file.
-     *
-     * @return the path to the template file
-     */
-    public String getTemplatePath() {
-        return templatePath;
-    }
 }