From c6786343443b14765d797558c3b1e2921f6464bd Mon Sep 17 00:00:00 2001
From: dshvaika <dshvaika@thingsboard.io>
Date: Tue, 16 Sep 2025 10:37:19 +0300
Subject: [PATCH] fix validation logic of zoneGroupConfiguration after testing

---
 .../cf/configuration/geofencing/ZoneGroupConfiguration.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/geofencing/ZoneGroupConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/geofencing/ZoneGroupConfiguration.java
index 43997c23fa..5328dbdbc3 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/geofencing/ZoneGroupConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/geofencing/ZoneGroupConfiguration.java
@@ -53,6 +53,9 @@ public class ZoneGroupConfiguration {
         if (reportStrategy == null) {
             throw new IllegalArgumentException("Report strategy must be specified for '" + name + "' zone group!");
         }
+        if (hasDynamicSource()) {
+            refDynamicSourceConfiguration.validate();
+        }
         if (!createRelationsWithMatchedZones) {
             return;
         }
@@ -62,9 +65,6 @@ public class ZoneGroupConfiguration {
         if (direction == null) {
             throw new IllegalArgumentException("Relation direction must be specified for '" + name + "' zone group!");
         }
-        if (hasDynamicSource()) {
-            refDynamicSourceConfiguration.validate();
-        }
     }
 
     public boolean hasDynamicSource() {