From f86eb9082e7b2670aec75c3cfa32e27e5832c94a Mon Sep 17 00:00:00 2001
From: Peter Gafert <peter.gafert@tngtech.com>
Date: Sat, 25 Jun 2022 12:54:12 +0700
Subject: [PATCH] fixup! extend Onion Architecture to allow defining components
 by predicate

Avoid assigning variables within while check

Signed-off-by: Peter Gafert <peter.gafert@tngtech.com>
---
 .../java/com/tngtech/archunit/core/domain/JavaClass.java   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaClass.java b/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaClass.java
index 4c9f389b68..cf1dffc137 100644
--- a/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaClass.java
+++ b/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaClass.java
@@ -2510,11 +2510,12 @@ private static class BelongToPredicate extends DescribedPredicate<JavaClass> {
             @Override
             public boolean test(JavaClass input) {
                 JavaClass toTest = input;
-                boolean result;
-                while (!(result = predicate.test(toTest)) && toTest.getEnclosingClass().isPresent()) {
+                boolean matches = predicate.test(toTest);
+                while (!matches && toTest.getEnclosingClass().isPresent()) {
                     toTest = toTest.getEnclosingClass().get();
+                    matches = predicate.test(toTest);
                 }
-                return result;
+                return matches;
             }
         }