Refactor validateUpdatedPolicyService and validateUpdatedPolicyDevice

src/policy/src/main/java/eu/teraflow/policy/PolicyServiceImpl.java

@@ -507,10 +507,7 @@ public class PolicyServiceImpl implements PolicyService {
                 .subscribe()
                 .with(
                         policyRuleBoolean -> {
-                            if (Boolean.TRUE.equals(isUpdatedPolicyRuleValid)) {
-                                validateService(policyRuleService);
-                                return;
-                            } else {
+                            if (Boolean.FALSE.equals(isUpdatedPolicyRuleValid)) {
                                 var policyRuleState =
                                         createFailedPolicyRuleState(
                                                 "The requested PolicyRuleService to update: "
@@ -521,6 +518,8 @@ public class PolicyServiceImpl implements PolicyService {
                                 contextService.setPolicyRule(policyRuleBasic);
                                 return;
                             }
+
+                            validateService(policyRuleService);
                         });
     }
 
@@ -534,10 +533,7 @@ public class PolicyServiceImpl implements PolicyService {
                 .subscribe()
                 .with(
                         policyRuleBoolean -> {
-                            if (Boolean.TRUE.equals(isUpdatedPolicyRuleValid)) {
-                                validateDevice(policyRuleDevice);
-                                return;
-                            } else {
+                            if (Boolean.FALSE.equals(isUpdatedPolicyRuleValid)) {
                                 var policyRuleState =
                                         createFailedPolicyRuleState(
                                                 "The requested PolicyRuleDevice to update: "
@@ -548,6 +544,7 @@ public class PolicyServiceImpl implements PolicyService {
                                 contextService.setPolicyRule(policyRuleBasic);
                                 return;
                             }
+                            validateDevice(policyRuleDevice);
                         });
     }