merge: #9028

9028: [Backport release-8.0.0] Do not generate ImmutableProcessInstanceRelated r=npepinpe a=github-actions[bot] # Description Backport of #9014 to `release-8.0.0`. relates to Co-authored-by: Nicolas Pepin-Perreault <[email protected]>
camunda · Mar 30, 2022 · bddd216 · bddd216
2 parents d60f1f7 + a5db015
commit bddd216
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 9 deletions.
diff --git a/protocol/src/main/java/io/camunda/zeebe/protocol/record/value/ProcessInstanceRelated.java b/protocol/src/main/java/io/camunda/zeebe/protocol/record/value/ProcessInstanceRelated.java
@@ -15,11 +15,6 @@
  */
 package io.camunda.zeebe.protocol.record.value;
 
-import io.camunda.zeebe.protocol.record.ImmutableProtocol;
-import org.immutables.value.Value;
-
-@Value.Immutable
-@ImmutableProtocol
 public interface ProcessInstanceRelated {
 
   /** @return the key of the corresponding process instance */

diff --git a/protocol/src/test/java/io/camunda/zeebe/protocol/ImmutableProtocolTest.java b/protocol/src/test/java/io/camunda/zeebe/protocol/ImmutableProtocolTest.java
@@ -45,9 +45,6 @@ final class ImmutableProtocolTest {
   @ArchTest
   void shouldAnnotateImmutableProtocolValues(final JavaClasses importedClasses) {
     // given
-    // exclude certain interfaces for which we won't be generating any immutable variants
-    final DescribedPredicate<JavaClass> excludedClasses =
-        Predicates.equivalentTo(ProcessInstanceRelated.class);
     final ArchRule rule =
         ArchRuleDefinition.classes()
             .that()
@@ -59,7 +56,7 @@ void shouldAnnotateImmutableProtocolValues(final JavaClasses importedClasses) {
             // also check the Record interface itself
             .or(Predicates.equivalentTo(Record.class))
             // exclude certain interfaces
-            .and(DescribedPredicate.not(excludedClasses))
+            .and(DescribedPredicate.not(getExcludedClasses()))
             .should()
             .beAnnotatedWith(ImmutableProtocol.class)
             .andShould()
@@ -68,4 +65,24 @@ void shouldAnnotateImmutableProtocolValues(final JavaClasses importedClasses) {
     // then
     rule.check(importedClasses);
   }
+
+  @ArchTest
+  void shouldNotAnnotateExcludedClasses(final JavaClasses importedClasses) {
+    // given
+    final ArchRule rule =
+        ArchRuleDefinition.classes()
+            .that(getExcludedClasses())
+            .should()
+            .notBeAnnotatedWith(ImmutableProtocol.class)
+            .orShould()
+            .notBeAnnotatedWith(Value.Immutable.class);
+
+    // then
+    rule.check(importedClasses);
+  }
+
+  // exclude certain interfaces for which we won't be generating any immutable variants
+  private DescribedPredicate<JavaClass> getExcludedClasses() {
+    return Predicates.equivalentTo(ProcessInstanceRelated.class);
+  }
 }