feat: enhance correlation rule

Author: mjabascal10

backend/src/main/java/com/park/utmstack/domain/correlation/rules/UtmCorrelationRules.java

@@ -87,16 +87,8 @@ public class UtmCorrelationRules implements Serializable {
     @Setter(AccessLevel.NONE)
     private List<String> ruleReferences;
 
-    @JsonIgnore
     @Column(name = "rule_definition_def", nullable = false)
-    private String ruleDefinitionDef;
-
-    @Transient
-    @JsonSerialize
-    @JsonDeserialize
-    @Getter(AccessLevel.NONE)
-    @Setter(AccessLevel.NONE)
-    private RuleDefinition ruleDefinition;
+    private String ruleDefinition;
 
     @Column(name = "rule_last_update")
     private Instant ruleLastUpdate;
@@ -165,22 +157,6 @@ public void setRuleReferences(List<String> ruleReferences) throws UtmSerializati
         this.ruleReferences = ruleReferences;
     }
 
-
-    public RuleDefinition getRuleDefinition() throws UtmSerializationException {
-        if (StringUtils.hasText(ruleDefinitionDef))
-            ruleDefinition = UtilSerializer.jsonDeserialize(RuleDefinition.class, ruleDefinitionDef);
-        return ruleDefinition;
-    }
-
-    public void setRuleDefinition(RuleDefinition ruleDefinition) throws UtmSerializationException {
-        if (ruleDefinition == null)
-            this.ruleDefinitionDef = null;
-        else
-            this.ruleDefinitionDef = UtilSerializer.jsonSerialize(ruleDefinition);
-
-        this.ruleDefinition = ruleDefinition;
-    }
-
     public List<SearchRequest> getAfterEvents() throws UtmSerializationException {
         if (StringUtils.hasText(afterEventsDef))
             afterEvents = UtilSerializer.jsonDeserializeList(SearchRequest.class, afterEventsDef);

backend/src/main/java/com/park/utmstack/service/dto/correlation/UtmCorrelationRulesDTO.java

@@ -52,7 +52,7 @@ public class UtmCorrelationRulesDTO implements Serializable {
     @NotEmpty
     private Set<UtmDataTypes> dataTypes;
 
-    private RuleDefinition definition;
+    private String definition;
 
     private Boolean systemOwner;
 

backend/src/main/java/com/park/utmstack/service/dto/correlation/validators/CorrelationRuleValidator.java

@@ -21,14 +21,6 @@ public void validate(Object target, Errors errors) {
         if (dto.getDataTypes() == null || dto.getDataTypes().isEmpty()) {
             errors.rejectValue("dataTypes", "DataTypesEmpty", "The rule must have at least one data type.");
         }
-
-        if (dto.getDefinition() == null || dto.getDefinition().getRuleVariables().isEmpty()) {
-            errors.rejectValue("definition.ruleVariables", "RuleVariablesEmpty", "The rule must have at least one rule variable.");
-        }
-
-        if (dto.getDefinition() != null && !StringUtils.hasText(dto.getDefinition().getRuleExpression())) {
-            errors.rejectValue("definition.ruleExpression", "RuleExpressionEmpty", "The rule's expression must not be empty.");
-        }
     }
 }
 

backend/src/main/java/com/park/utmstack/web/rest/correlation/rules/UtmCorrelationRulesResource.java

@@ -140,11 +140,6 @@ public ResponseEntity<Void> updateCorrelationRule(@Valid @RequestBody UtmCorrela
         try {
             if (correlationRulesDTO.getDefinition() == null) {
                 throw new BadRequestException(ctx + ": The rule's definition field can't be null.");
-            } else {
-                if (correlationRulesDTO.getDefinition().getRuleVariables().isEmpty()
-                        || !StringUtils.hasText(correlationRulesDTO.getDefinition().getRuleExpression())) {
-                    throw new BadRequestException(ctx + ": The rule's definition variables or expression field is null or empty, please check.");
-                }
             }
             rulesService.updateRule(this.utmCorrelationRulesMapper.toEntity(correlationRulesDTO));
             return ResponseEntity.noContent().build();