From f8015e34f76bf68590f3de1f90a64766f772d1d4 Mon Sep 17 00:00:00 2001
From: Fotis Soldatos <fsoldatos@ubitech.eu>
Date: Tue, 12 Jul 2022 00:12:36 +0300
Subject: [PATCH] refactor(policy): refactor policy related domain models
---
.../eu/teraflow/policy/model/PolicyRuleState.java | 12 ++----------
.../java/eu/teraflow/policy/model/RuleState.java | 14 +++++++++++---
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleState.java b/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleState.java
index 38ee0a73b..566c3b785 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleState.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleState.java
@@ -18,26 +18,18 @@ package eu.teraflow.policy.model;
public class PolicyRuleState {
- private final String policeRuleId;
private final RuleState ruleState;
- public PolicyRuleState(String policeRuleId, RuleState ruleState) {
- this.policeRuleId = policeRuleId;
+ public PolicyRuleState(RuleState ruleState) {
this.ruleState = ruleState;
}
- public String getPolicyRuleId() {
- return policeRuleId;
- }
-
public RuleState getRuleState() {
return ruleState;
}
@Override
public String toString() {
- return String.format(
- "%s:{policeRuleId:\"%s\", ruleState:\"%s\"}",
- getClass().getSimpleName(), policeRuleId, ruleState);
+ return String.format("%s:{ruleState:\"%s\"}", getClass().getSimpleName(), ruleState.toString());
}
}
diff --git a/src/policy/src/main/java/eu/teraflow/policy/model/RuleState.java b/src/policy/src/main/java/eu/teraflow/policy/model/RuleState.java
index 6c8aabdb0..2d01a6b94 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/model/RuleState.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/model/RuleState.java
@@ -17,7 +17,15 @@
package eu.teraflow.policy.model;
public enum RuleState {
- POLICY_INACTIVE,
- POLICY_PLANNED,
- POLICY_ACTIVE
+ POLICY_UNDEFINED,
+ POLICY_FAILED,
+ POLICY_INSERTED,
+ POLICY_VALIDATED,
+ POLICY_PROVISIONED,
+ POLICY_ACTIVE,
+ POLICY_ENFORCED,
+ POLICY_INEFFECTIVE,
+ POLICY_EFFECTIVE,
+ POLICY_UPDATED,
+ POLICY_REMOVED
}
--
GitLab