Improve project structure

Author: Donnerbart

src/main/java/de/donnerbart/split/TestSplit.java

@@ -4,6 +4,9 @@
 import com.github.javaparser.JavaParser;
 import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;
 import com.github.javaparser.ast.expr.AnnotationExpr;
+import de.donnerbart.split.model.Split;
+import de.donnerbart.split.model.TestCase;
+import de.donnerbart.split.model.TestSuite;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
@@ -23,8 +26,7 @@
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
-import static de.donnerbart.split.Util.formatIndex;
-import static de.donnerbart.split.Util.formatTime;
+import static de.donnerbart.split.util.FormatUtil.formatTime;
 
 public class TestSplit {
 
@@ -130,12 +132,12 @@ public void run() throws Exception {
         if (debug) {
             final var fastestSplit = splits.stream().min(Comparator.naturalOrder()).orElseThrow();
             LOG.debug("Fastest test plan is #{} with {} tests ({})",
-                    formatIndex(fastestSplit.index()),
+                    fastestSplit.formatIndex(),
                     fastestSplit.tests().size(),
                     formatTime(fastestSplit.totalRecordedTime()));
             final var slowestSplit = splits.stream().max(Comparator.naturalOrder()).orElseThrow();
             LOG.debug("Slowest test plan is #{} with {} tests ({})",
-                    formatIndex(slowestSplit.index()),
+                    slowestSplit.formatIndex(),
                     slowestSplit.tests().size(),
                     formatTime(slowestSplit.totalRecordedTime()));
             LOG.debug("Difference between the fastest and slowest test plan: {}",

…main/java/de/donnerbart/split/Split.java …ava/de/donnerbart/split/model/Split.javasrc/main/java/de/donnerbart/split/Split.java renamed to src/main/java/de/donnerbart/split/model/Split.java src/main/java/de/donnerbart/split/Split.java renamed to src/main/java/de/donnerbart/split/model/Split.java

@@ -1,5 +1,6 @@
-package de.donnerbart.split;
+package de.donnerbart.split.model;
 
+import de.donnerbart.split.util.FormatUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -8,26 +9,30 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-class Split implements Comparable<Split> {
+public class Split implements Comparable<Split> {
 
     private final @NotNull Set<TestCase> tests = new HashSet<>();
     private final int index;
 
     private double totalRecordedTime;
 
-    Split(final int index) {
+    public Split(final int index) {
         this.index = index;
     }
 
-    int index() {
+    public int index() {
         return index;
     }
 
-    double totalRecordedTime() {
+    public @NotNull String formatIndex() {
+        return String.format("%02d", index);
+    }
+
+    public double totalRecordedTime() {
         return totalRecordedTime;
     }
 
-    @NotNull Set<TestCase> tests() {
+    public @NotNull Set<TestCase> tests() {
         return tests;
     }
 
@@ -61,17 +66,17 @@ public int hashCode() {
     public String toString() {
         return "Split{" +
                 "index=" +
-                Util.formatIndex(index) +
+                formatIndex() +
                 ", totalRecordedTime=" +
-                Util.formatTime(totalRecordedTime) +
+                FormatUtil.formatTime(totalRecordedTime) +
                 ", testCount=" +
                 tests.size() +
                 ", tests=" +
                 tests.stream().map(TestCase::name).collect(Collectors.joining(", ")) +
                 '}';
     }
 
-    void add(final @NotNull TestCase testCase) {
+    public void add(final @NotNull TestCase testCase) {
         tests.add(testCase);
         totalRecordedTime += testCase.time();
     }

…n/java/de/donnerbart/split/TestCase.java …/de/donnerbart/split/model/TestCase.javasrc/main/java/de/donnerbart/split/TestCase.java renamed to src/main/java/de/donnerbart/split/model/TestCase.java src/main/java/de/donnerbart/split/TestCase.java renamed to src/main/java/de/donnerbart/split/model/TestCase.java

@@ -1,11 +1,11 @@
-package de.donnerbart.split;
+package de.donnerbart.split.model;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Objects;
 
-record TestCase(@NotNull String name, double time) implements Comparable<TestCase> {
+public record TestCase(@NotNull String name, double time) implements Comparable<TestCase> {
 
     @Override
     public int compareTo(final @NotNull TestCase o) {

…/java/de/donnerbart/split/TestSuite.java …de/donnerbart/split/model/TestSuite.javasrc/main/java/de/donnerbart/split/TestSuite.java renamed to src/main/java/de/donnerbart/split/model/TestSuite.java src/main/java/de/donnerbart/split/TestSuite.java renamed to src/main/java/de/donnerbart/split/model/TestSuite.java

@@ -1,4 +1,4 @@
-package de.donnerbart.split;
+package de.donnerbart.split.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;

…/main/java/de/donnerbart/split/Util.java …de/donnerbart/split/util/FormatUtil.javasrc/main/java/de/donnerbart/split/Util.java renamed to src/main/java/de/donnerbart/split/util/FormatUtil.java src/main/java/de/donnerbart/split/Util.java renamed to src/main/java/de/donnerbart/split/util/FormatUtil.java

@@ -1,17 +1,13 @@
-package de.donnerbart.split;
+package de.donnerbart.split.util;
 
 import org.jetbrains.annotations.NotNull;
 
-public class Util {
+public class FormatUtil {
 
-    private Util() {
+    private FormatUtil() {
     }
 
-    static @NotNull String formatIndex(final int index) {
-        return String.format("%02d", index);
-    }
-
-    static @NotNull String formatTime(final double time) {
+    public static @NotNull String formatTime(final double time) {
         final var minutes = (int) Math.floor(time / 60d);
         final var seconds = Math.round(time - (minutes * 60));
         return String.format("%02dm%02ds", minutes, seconds);

…/java/de/donnerbart/split/SplitTest.java …de/donnerbart/split/model/SplitTest.javasrc/test/java/de/donnerbart/split/SplitTest.java renamed to src/test/java/de/donnerbart/split/model/SplitTest.java src/test/java/de/donnerbart/split/SplitTest.java renamed to src/test/java/de/donnerbart/split/model/SplitTest.java

@@ -1,4 +1,4 @@
-package de.donnerbart.split;
+package de.donnerbart.split.model;
 
 import nl.jqno.equalsverifier.EqualsVerifier;
 import org.junit.jupiter.api.Test;

…va/de/donnerbart/split/TestCaseTest.java …donnerbart/split/model/TestCaseTest.javasrc/test/java/de/donnerbart/split/TestCaseTest.java renamed to src/test/java/de/donnerbart/split/model/TestCaseTest.java src/test/java/de/donnerbart/split/TestCaseTest.java renamed to src/test/java/de/donnerbart/split/model/TestCaseTest.java

@@ -1,4 +1,4 @@
-package de.donnerbart.split;
+package de.donnerbart.split.model;
 
 import nl.jqno.equalsverifier.EqualsVerifier;
 import org.junit.jupiter.api.Test;