From 74fd3aa7b5d0c5fd10a1f66ef77f1442d941ef8f Mon Sep 17 00:00:00 2001
From: Vasileios Katopodis <vkatopodis@ubitech.eu>
Date: Mon, 3 Oct 2022 16:59:24 +0300
Subject: [PATCH] Refactor validateUpdatedPolicyService and
validateUpdatedPolicyDevice
---
.../java/eu/teraflow/policy/PolicyServiceImpl.java | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/policy/src/main/java/eu/teraflow/policy/PolicyServiceImpl.java b/src/policy/src/main/java/eu/teraflow/policy/PolicyServiceImpl.java
index 44959e3da..45e11d880 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/PolicyServiceImpl.java
+++ b/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);
});
}
--
GitLab