From 7e6c045deddbd4b062770627c4b3176994fa8b22 Mon Sep 17 00:00:00 2001
From: Tristan <19949441+Tristan2357@users.noreply.github.com>
Date: Mon, 2 Aug 2021 13:46:40 +0200
Subject: [PATCH] TSK-1240: PR amends

---
 lib/taskana-core/pom.xml                       |  8 +-------
 rest/taskana-rest-spring/pom.xml               |  2 +-
 .../pro/taskana/SpringArchitectureTest.java    | 18 +++++-------------
 3 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/lib/taskana-core/pom.xml b/lib/taskana-core/pom.xml
index 1d1a7a201..bc842baef 100644
--- a/lib/taskana-core/pom.xml
+++ b/lib/taskana-core/pom.xml
@@ -107,13 +107,7 @@
     </dependency>
     <dependency>
       <groupId>com.tngtech.archunit</groupId>
-      <artifactId>archunit-junit5-api</artifactId>
-      <version>${version.archunit}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.tngtech.archunit</groupId>
-      <artifactId>archunit-junit5-engine</artifactId>
+      <artifactId>archunit</artifactId>
       <version>${version.archunit}</version>
       <scope>test</scope>
     </dependency>
diff --git a/rest/taskana-rest-spring/pom.xml b/rest/taskana-rest-spring/pom.xml
index 04313c733..dc115a215 100644
--- a/rest/taskana-rest-spring/pom.xml
+++ b/rest/taskana-rest-spring/pom.xml
@@ -167,7 +167,7 @@
     <dependency>
       <groupId>com.tngtech.archunit</groupId>
       <artifactId>archunit</artifactId>
-      <version>0.20.1</version>
+      <version>${version.archunit}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/SpringArchitectureTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/SpringArchitectureTest.java
index f02f7010e..4cfbfa69f 100644
--- a/rest/taskana-rest-spring/src/test/java/pro/taskana/SpringArchitectureTest.java
+++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/SpringArchitectureTest.java
@@ -13,19 +13,13 @@ import com.tngtech.archunit.lang.ArchCondition;
 import com.tngtech.archunit.lang.ArchRule;
 import com.tngtech.archunit.lang.ConditionEvents;
 import com.tngtech.archunit.lang.SimpleConditionEvent;
-import java.util.List;
 import java.util.stream.Stream;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
+import pro.taskana.common.rest.QueryParameter;
+
 public class SpringArchitectureTest {
-  private static final List<String> TASKANA_SUB_PACKAGES =
-      List.of(
-          "pro.taskana.common.rest",
-          "pro.taskana.classification.rest",
-          "pro.taskana.task.rest",
-          "pro.taskana.workbasket.rest",
-          "pro.taskana.monitor.rest");
   private static JavaClasses importedClasses;
 
   @BeforeAll
@@ -37,16 +31,14 @@ public class SpringArchitectureTest {
   @Test
   void should_AnnotateAllFieldsWithJsonProperty_When_ImplementingQueryParameter() {
     ArchRule myRule =
-        classes()
-            .that()
-            .implement(pro.taskana.common.rest.QueryParameter.class)
-            .should(shouldOnlyHaveAnnotatedFields());
+        classes().that().implement(QueryParameter.class).should(shouldOnlyHaveAnnotatedFields());
 
     myRule.check(importedClasses);
   }
 
   private ArchCondition<JavaClass> shouldOnlyHaveAnnotatedFields() {
-    return new ArchCondition<JavaClass>("have all fields without a @JsonProperty annotation") {
+    return new ArchCondition<JavaClass>(
+        "all fields should have a @JsonProperty or @JsonIgnore annotation") {
       @Override
       public void check(JavaClass javaClass, ConditionEvents events) {
         for (JavaField field : javaClass.getAllFields()) {