From d61fc1f56dfd2e4a1601c2c540e0e67cfb872118 Mon Sep 17 00:00:00 2001 From: Mustapha Zorgati <15628173+mustaphazorgati@users.noreply.github.com> Date: Sun, 19 Sep 2021 23:55:03 +0200 Subject: [PATCH] TSK-1730: Moved all Builder classes to package builder --- .../internal/{ => builder}/ClassificationBuilder.java | 2 +- .../internal/{ => builder}/ClassificationTestImpl.java | 2 +- .../internal/{ => builder}/ObjectReferenceBuilder.java | 2 +- .../internal/{ => builder}/TaskAttachmentBuilder.java | 2 +- .../task/internal/{ => builder}/TaskCommentBuilder.java | 2 +- .../task/internal/{ => builder}/TaskCommentTestImpl.java | 2 +- .../{ => builder}/WorkbasketAccessItemBuilder.java | 2 +- .../internal/{ => builder}/WorkbasketBuilder.java | 2 +- .../internal/{ => builder}/WorkbasketTestImpl.java | 2 +- .../src/test/java/acceptance/DefaultTestEntities.java | 4 ++-- .../acceptance/builder/ClassificationBuilderTest.java | 4 ++-- .../acceptance/builder/ObjectReferenceBuilderTest.java | 2 +- .../acceptance/builder/TaskAttachmentBuilderTest.java | 4 ++-- .../src/test/java/acceptance/builder/TaskBuilderTest.java | 6 +++--- .../java/acceptance/builder/TaskCommentBuilderTest.java | 8 ++++---- .../builder/WorkbasketAccessItemBuilderTest.java | 4 ++-- .../java/acceptance/builder/WorkbasketBuilderTest.java | 4 ++-- 17 files changed, 27 insertions(+), 27 deletions(-) rename lib/taskana-core/src/main/java/pro/taskana/classification/internal/{ => builder}/ClassificationBuilder.java (98%) rename lib/taskana-core/src/main/java/pro/taskana/classification/internal/{ => builder}/ClassificationTestImpl.java (94%) rename lib/taskana-core/src/main/java/pro/taskana/task/internal/{ => builder}/ObjectReferenceBuilder.java (95%) rename lib/taskana-core/src/main/java/pro/taskana/task/internal/{ => builder}/TaskAttachmentBuilder.java (97%) rename lib/taskana-core/src/main/java/pro/taskana/task/internal/{ => builder}/TaskCommentBuilder.java (98%) rename lib/taskana-core/src/main/java/pro/taskana/task/internal/{ => builder}/TaskCommentTestImpl.java (95%) rename lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/{ => builder}/WorkbasketAccessItemBuilder.java (98%) rename lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/{ => builder}/WorkbasketBuilder.java (98%) rename lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/{ => builder}/WorkbasketTestImpl.java (95%) diff --git a/lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationBuilder.java b/lib/taskana-core/src/main/java/pro/taskana/classification/internal/builder/ClassificationBuilder.java similarity index 98% rename from lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationBuilder.java rename to lib/taskana-core/src/main/java/pro/taskana/classification/internal/builder/ClassificationBuilder.java index 84e3ce930..afc195b29 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationBuilder.java +++ b/lib/taskana-core/src/main/java/pro/taskana/classification/internal/builder/ClassificationBuilder.java @@ -1,4 +1,4 @@ -package pro.taskana.classification.internal; +package pro.taskana.classification.internal.builder; import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; diff --git a/lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationTestImpl.java b/lib/taskana-core/src/main/java/pro/taskana/classification/internal/builder/ClassificationTestImpl.java similarity index 94% rename from lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationTestImpl.java rename to lib/taskana-core/src/main/java/pro/taskana/classification/internal/builder/ClassificationTestImpl.java index a4cfbb01f..2cbcbd824 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationTestImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/classification/internal/builder/ClassificationTestImpl.java @@ -1,4 +1,4 @@ -package pro.taskana.classification.internal; +package pro.taskana.classification.internal.builder; import java.time.Instant; diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/internal/ObjectReferenceBuilder.java b/lib/taskana-core/src/main/java/pro/taskana/task/internal/builder/ObjectReferenceBuilder.java similarity index 95% rename from lib/taskana-core/src/main/java/pro/taskana/task/internal/ObjectReferenceBuilder.java rename to lib/taskana-core/src/main/java/pro/taskana/task/internal/builder/ObjectReferenceBuilder.java index 94c0ff392..28b055563 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/task/internal/ObjectReferenceBuilder.java +++ b/lib/taskana-core/src/main/java/pro/taskana/task/internal/builder/ObjectReferenceBuilder.java @@ -1,4 +1,4 @@ -package pro.taskana.task.internal; +package pro.taskana.task.internal.builder; import pro.taskana.task.api.models.ObjectReference; diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskAttachmentBuilder.java b/lib/taskana-core/src/main/java/pro/taskana/task/internal/builder/TaskAttachmentBuilder.java similarity index 97% rename from lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskAttachmentBuilder.java rename to lib/taskana-core/src/main/java/pro/taskana/task/internal/builder/TaskAttachmentBuilder.java index 271981f75..cc4da4b35 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskAttachmentBuilder.java +++ b/lib/taskana-core/src/main/java/pro/taskana/task/internal/builder/TaskAttachmentBuilder.java @@ -1,4 +1,4 @@ -package pro.taskana.task.internal; +package pro.taskana.task.internal.builder; import java.time.Instant; import java.util.Map; diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskCommentBuilder.java b/lib/taskana-core/src/main/java/pro/taskana/task/internal/builder/TaskCommentBuilder.java similarity index 98% rename from lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskCommentBuilder.java rename to lib/taskana-core/src/main/java/pro/taskana/task/internal/builder/TaskCommentBuilder.java index 48f95cdf7..da0209bab 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskCommentBuilder.java +++ b/lib/taskana-core/src/main/java/pro/taskana/task/internal/builder/TaskCommentBuilder.java @@ -1,4 +1,4 @@ -package pro.taskana.task.internal; +package pro.taskana.task.internal.builder; import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskCommentTestImpl.java b/lib/taskana-core/src/main/java/pro/taskana/task/internal/builder/TaskCommentTestImpl.java similarity index 95% rename from lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskCommentTestImpl.java rename to lib/taskana-core/src/main/java/pro/taskana/task/internal/builder/TaskCommentTestImpl.java index 156e0c9a5..0bc8fbdec 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskCommentTestImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/task/internal/builder/TaskCommentTestImpl.java @@ -1,4 +1,4 @@ -package pro.taskana.task.internal; +package pro.taskana.task.internal.builder; import java.time.Instant; diff --git a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketAccessItemBuilder.java b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/builder/WorkbasketAccessItemBuilder.java similarity index 98% rename from lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketAccessItemBuilder.java rename to lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/builder/WorkbasketAccessItemBuilder.java index 78490b22f..617e19571 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketAccessItemBuilder.java +++ b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/builder/WorkbasketAccessItemBuilder.java @@ -1,4 +1,4 @@ -package pro.taskana.workbasket.internal; +package pro.taskana.workbasket.internal.builder; import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; diff --git a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketBuilder.java b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/builder/WorkbasketBuilder.java similarity index 98% rename from lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketBuilder.java rename to lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/builder/WorkbasketBuilder.java index 550f3d4eb..a6b19584e 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketBuilder.java +++ b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/builder/WorkbasketBuilder.java @@ -1,4 +1,4 @@ -package pro.taskana.workbasket.internal; +package pro.taskana.workbasket.internal.builder; import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; diff --git a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketTestImpl.java b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/builder/WorkbasketTestImpl.java similarity index 95% rename from lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketTestImpl.java rename to lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/builder/WorkbasketTestImpl.java index d54a4fd91..8c2b695dc 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketTestImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/builder/WorkbasketTestImpl.java @@ -1,4 +1,4 @@ -package pro.taskana.workbasket.internal; +package pro.taskana.workbasket.internal.builder; import java.time.Instant; diff --git a/lib/taskana-core/src/test/java/acceptance/DefaultTestEntities.java b/lib/taskana-core/src/test/java/acceptance/DefaultTestEntities.java index 6b752167a..35587f334 100644 --- a/lib/taskana-core/src/test/java/acceptance/DefaultTestEntities.java +++ b/lib/taskana-core/src/test/java/acceptance/DefaultTestEntities.java @@ -1,8 +1,8 @@ package acceptance; -import pro.taskana.task.internal.ObjectReferenceBuilder; +import pro.taskana.task.internal.builder.ObjectReferenceBuilder; import pro.taskana.workbasket.api.WorkbasketType; -import pro.taskana.workbasket.internal.WorkbasketBuilder; +import pro.taskana.workbasket.internal.builder.WorkbasketBuilder; public class DefaultTestEntities { diff --git a/lib/taskana-core/src/test/java/acceptance/builder/ClassificationBuilderTest.java b/lib/taskana-core/src/test/java/acceptance/builder/ClassificationBuilderTest.java index 1d9431757..97fba87be 100644 --- a/lib/taskana-core/src/test/java/acceptance/builder/ClassificationBuilderTest.java +++ b/lib/taskana-core/src/test/java/acceptance/builder/ClassificationBuilderTest.java @@ -2,7 +2,7 @@ package acceptance.builder; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; -import static pro.taskana.classification.internal.ClassificationBuilder.newClassification; +import static pro.taskana.classification.internal.builder.ClassificationBuilder.newClassification; import java.time.Instant; import java.util.List; @@ -19,7 +19,7 @@ import testapi.TaskanaIntegrationTest; import pro.taskana.classification.api.ClassificationCustomField; import pro.taskana.classification.api.ClassificationService; import pro.taskana.classification.api.models.Classification; -import pro.taskana.classification.internal.ClassificationBuilder; +import pro.taskana.classification.internal.builder.ClassificationBuilder; import pro.taskana.classification.internal.models.ClassificationImpl; import pro.taskana.common.internal.util.Quadruple; import pro.taskana.common.test.security.WithAccessId; diff --git a/lib/taskana-core/src/test/java/acceptance/builder/ObjectReferenceBuilderTest.java b/lib/taskana-core/src/test/java/acceptance/builder/ObjectReferenceBuilderTest.java index 8ef8f836d..cf2a35cc3 100644 --- a/lib/taskana-core/src/test/java/acceptance/builder/ObjectReferenceBuilderTest.java +++ b/lib/taskana-core/src/test/java/acceptance/builder/ObjectReferenceBuilderTest.java @@ -1,7 +1,7 @@ package acceptance.builder; import static org.assertj.core.api.Assertions.assertThat; -import static pro.taskana.task.internal.ObjectReferenceBuilder.newObjectReference; +import static pro.taskana.task.internal.builder.ObjectReferenceBuilder.newObjectReference; import org.junit.jupiter.api.Test; diff --git a/lib/taskana-core/src/test/java/acceptance/builder/TaskAttachmentBuilderTest.java b/lib/taskana-core/src/test/java/acceptance/builder/TaskAttachmentBuilderTest.java index 4db8d871e..24fa4e85d 100644 --- a/lib/taskana-core/src/test/java/acceptance/builder/TaskAttachmentBuilderTest.java +++ b/lib/taskana-core/src/test/java/acceptance/builder/TaskAttachmentBuilderTest.java @@ -11,11 +11,11 @@ import testapi.TaskanaIntegrationTest; import pro.taskana.classification.api.ClassificationService; import pro.taskana.classification.api.models.ClassificationSummary; -import pro.taskana.classification.internal.ClassificationBuilder; +import pro.taskana.classification.internal.builder.ClassificationBuilder; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.models.Attachment; import pro.taskana.task.api.models.ObjectReference; -import pro.taskana.task.internal.TaskAttachmentBuilder; +import pro.taskana.task.internal.builder.TaskAttachmentBuilder; import pro.taskana.task.internal.models.AttachmentImpl; @TaskanaIntegrationTest diff --git a/lib/taskana-core/src/test/java/acceptance/builder/TaskBuilderTest.java b/lib/taskana-core/src/test/java/acceptance/builder/TaskBuilderTest.java index 373e57bf9..0739dfdab 100644 --- a/lib/taskana-core/src/test/java/acceptance/builder/TaskBuilderTest.java +++ b/lib/taskana-core/src/test/java/acceptance/builder/TaskBuilderTest.java @@ -4,10 +4,10 @@ import static acceptance.DefaultTestEntities.defaultTestObjectReference; import static acceptance.DefaultTestEntities.defaultTestWorkbasket; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; -import static pro.taskana.classification.internal.ClassificationBuilder.newClassification; +import static pro.taskana.classification.internal.builder.ClassificationBuilder.newClassification; import static pro.taskana.common.internal.util.CheckedSupplier.wrap; import static pro.taskana.task.internal.builder.TaskBuilder.newTask; -import static pro.taskana.workbasket.internal.WorkbasketAccessItemBuilder.newWorkbasketAccessItem; +import static pro.taskana.workbasket.internal.builder.WorkbasketAccessItemBuilder.newWorkbasketAccessItem; import java.time.Instant; import java.util.List; @@ -34,7 +34,7 @@ import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskState; import pro.taskana.task.api.models.Attachment; import pro.taskana.task.api.models.Task; -import pro.taskana.task.internal.TaskAttachmentBuilder; +import pro.taskana.task.internal.builder.TaskAttachmentBuilder; import pro.taskana.task.internal.builder.TaskBuilder; import pro.taskana.task.internal.models.TaskImpl; import pro.taskana.workbasket.api.WorkbasketPermission; diff --git a/lib/taskana-core/src/test/java/acceptance/builder/TaskCommentBuilderTest.java b/lib/taskana-core/src/test/java/acceptance/builder/TaskCommentBuilderTest.java index 6ebe5328a..64682dc07 100644 --- a/lib/taskana-core/src/test/java/acceptance/builder/TaskCommentBuilderTest.java +++ b/lib/taskana-core/src/test/java/acceptance/builder/TaskCommentBuilderTest.java @@ -4,10 +4,10 @@ import static acceptance.DefaultTestEntities.defaultTestObjectReference; import static acceptance.DefaultTestEntities.defaultTestWorkbasket; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; -import static pro.taskana.classification.internal.ClassificationBuilder.newClassification; +import static pro.taskana.classification.internal.builder.ClassificationBuilder.newClassification; import static pro.taskana.common.internal.util.CheckedSupplier.wrap; -import static pro.taskana.task.internal.TaskCommentBuilder.newTaskComment; -import static pro.taskana.workbasket.internal.WorkbasketAccessItemBuilder.newWorkbasketAccessItem; +import static pro.taskana.task.internal.builder.TaskCommentBuilder.newTaskComment; +import static pro.taskana.workbasket.internal.builder.WorkbasketAccessItemBuilder.newWorkbasketAccessItem; import java.time.Instant; import java.util.List; @@ -31,8 +31,8 @@ import pro.taskana.task.api.TaskService; import pro.taskana.task.api.models.ObjectReference; import pro.taskana.task.api.models.Task; import pro.taskana.task.api.models.TaskComment; -import pro.taskana.task.internal.TaskCommentBuilder; import pro.taskana.task.internal.builder.TaskBuilder; +import pro.taskana.task.internal.builder.TaskCommentBuilder; import pro.taskana.task.internal.models.TaskCommentImpl; import pro.taskana.workbasket.api.WorkbasketPermission; import pro.taskana.workbasket.api.WorkbasketService; diff --git a/lib/taskana-core/src/test/java/acceptance/builder/WorkbasketAccessItemBuilderTest.java b/lib/taskana-core/src/test/java/acceptance/builder/WorkbasketAccessItemBuilderTest.java index 01f09eee8..a430fdb63 100644 --- a/lib/taskana-core/src/test/java/acceptance/builder/WorkbasketAccessItemBuilderTest.java +++ b/lib/taskana-core/src/test/java/acceptance/builder/WorkbasketAccessItemBuilderTest.java @@ -4,7 +4,7 @@ import static acceptance.DefaultTestEntities.defaultTestWorkbasket; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.AssertionsForClassTypes.assertThatCode; import static pro.taskana.common.internal.util.CheckedSupplier.wrap; -import static pro.taskana.workbasket.internal.WorkbasketAccessItemBuilder.newWorkbasketAccessItem; +import static pro.taskana.workbasket.internal.builder.WorkbasketAccessItemBuilder.newWorkbasketAccessItem; import java.util.List; import org.junit.jupiter.api.Test; @@ -17,7 +17,7 @@ import pro.taskana.workbasket.api.WorkbasketPermission; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.models.Workbasket; import pro.taskana.workbasket.api.models.WorkbasketAccessItem; -import pro.taskana.workbasket.internal.WorkbasketAccessItemBuilder; +import pro.taskana.workbasket.internal.builder.WorkbasketAccessItemBuilder; import pro.taskana.workbasket.internal.models.WorkbasketAccessItemImpl; @TaskanaIntegrationTest diff --git a/lib/taskana-core/src/test/java/acceptance/builder/WorkbasketBuilderTest.java b/lib/taskana-core/src/test/java/acceptance/builder/WorkbasketBuilderTest.java index 6e3d67b64..138b5272a 100644 --- a/lib/taskana-core/src/test/java/acceptance/builder/WorkbasketBuilderTest.java +++ b/lib/taskana-core/src/test/java/acceptance/builder/WorkbasketBuilderTest.java @@ -3,7 +3,7 @@ package acceptance.builder; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; import static pro.taskana.common.internal.util.CheckedSupplier.wrap; -import static pro.taskana.workbasket.internal.WorkbasketBuilder.newWorkbasket; +import static pro.taskana.workbasket.internal.builder.WorkbasketBuilder.newWorkbasket; import java.time.Instant; import java.util.List; @@ -24,7 +24,7 @@ import pro.taskana.workbasket.api.WorkbasketCustomField; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.WorkbasketType; import pro.taskana.workbasket.api.models.Workbasket; -import pro.taskana.workbasket.internal.WorkbasketBuilder; +import pro.taskana.workbasket.internal.builder.WorkbasketBuilder; import pro.taskana.workbasket.internal.models.WorkbasketImpl; @TaskanaIntegrationTest