From 4b101bb18335cc6b6b6a241a81a7771cd800c699 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sat, 22 Jun 2024 17:23:46 -0700
Subject: [PATCH] Moved Report and ReportID to their own sub-package

---
 .../java/rife/bld/extension/DetektOperation.java     |  2 +-
 .../{DetektReport.java => detekt/Report.java}        |  4 ++--
 .../{DetektReportId.java => detekt/ReportId.java}    |  4 ++--
 .../java/rife/bld/extension/DetektOperationTest.java | 12 +++++++-----
 4 files changed, 12 insertions(+), 10 deletions(-)
 rename src/main/java/rife/bld/extension/{DetektReport.java => detekt/Report.java} (90%)
 rename src/main/java/rife/bld/extension/{DetektReportId.java => detekt/ReportId.java} (93%)

diff --git a/src/main/java/rife/bld/extension/DetektOperation.java b/src/main/java/rife/bld/extension/DetektOperation.java
index 6db96db..a1377ba 100644
--- a/src/main/java/rife/bld/extension/DetektOperation.java
+++ b/src/main/java/rife/bld/extension/DetektOperation.java
@@ -617,7 +617,7 @@ public class DetektOperation extends AbstractProcessOperation<DetektOperation> {
      * @param reports one or more reports
      * @return this operation instance
      */
-    public DetektOperation report(DetektReport... reports) {
+    public DetektOperation report(Report... reports) {
         report_.addAll(List.of(reports));
         return this;
     }
diff --git a/src/main/java/rife/bld/extension/DetektReport.java b/src/main/java/rife/bld/extension/detekt/Report.java
similarity index 90%
rename from src/main/java/rife/bld/extension/DetektReport.java
rename to src/main/java/rife/bld/extension/detekt/Report.java
index 0560f3d..32dcc60 100644
--- a/src/main/java/rife/bld/extension/DetektReport.java
+++ b/src/main/java/rife/bld/extension/detekt/Report.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package rife.bld.extension;
+package rife.bld.extension.detekt;
 
 /**
  * Defines a report for the given report-id to be stored on the given path.
@@ -24,5 +24,5 @@ package rife.bld.extension;
  * @author <a href="https://erik.thauvin.net/">Erik C. Thauvin</a>
  * @since 1.0
  */
-public record DetektReport(DetektReportId id, String path) {
+public record Report(ReportId id, String path) {
 }
diff --git a/src/main/java/rife/bld/extension/DetektReportId.java b/src/main/java/rife/bld/extension/detekt/ReportId.java
similarity index 93%
rename from src/main/java/rife/bld/extension/DetektReportId.java
rename to src/main/java/rife/bld/extension/detekt/ReportId.java
index ab398eb..ef53bc9 100644
--- a/src/main/java/rife/bld/extension/DetektReportId.java
+++ b/src/main/java/rife/bld/extension/detekt/ReportId.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package rife.bld.extension;
+package rife.bld.extension.detekt;
 
 /**
  * The report-id values.
@@ -22,6 +22,6 @@ package rife.bld.extension;
  * @author <a href="https://erik.thauvin.net/">Erik C. Thauvin</a>
  * @since 1.0
  */
-public enum DetektReportId {
+public enum ReportId {
     TXT, XML, HTML, MD, SARIF
 }
diff --git a/src/test/java/rife/bld/extension/DetektOperationTest.java b/src/test/java/rife/bld/extension/DetektOperationTest.java
index 9112adc..c480af9 100644
--- a/src/test/java/rife/bld/extension/DetektOperationTest.java
+++ b/src/test/java/rife/bld/extension/DetektOperationTest.java
@@ -20,6 +20,8 @@ import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import rife.bld.BaseProject;
 import rife.bld.blueprints.BaseProjectBlueprint;
+import rife.bld.extension.detekt.Report;
+import rife.bld.extension.detekt.ReportId;
 import rife.bld.operations.exceptions.ExitStatusException;
 
 import java.io.File;
@@ -147,11 +149,11 @@ class DetektOperationTest {
         var op = new DetektOperation()
                 .fromProject(new BaseProjectBlueprint(new File("examples"), "com.example",
                         "Example"))
-                .report(new DetektReport(DetektReportId.HTML, html.getAbsolutePath()))
-                .report(new DetektReport(DetektReportId.XML, xml.getAbsolutePath()))
-                .report(new DetektReport(DetektReportId.TXT, txt.getAbsolutePath()))
-                .report(new DetektReport(DetektReportId.MD, md.getAbsolutePath()))
-                .report(new DetektReport(DetektReportId.SARIF, sarif.getAbsolutePath()));
+                .report(new Report(ReportId.HTML, html.getAbsolutePath()))
+                .report(new Report(ReportId.XML, xml.getAbsolutePath()))
+                .report(new Report(ReportId.TXT, txt.getAbsolutePath()))
+                .report(new Report(ReportId.MD, md.getAbsolutePath()))
+                .report(new Report(ReportId.SARIF, sarif.getAbsolutePath()));
 
         assertThatThrownBy(op::execute).isInstanceOf(ExitStatusException.class);