TCA:Support for string & decimal policy FieldPath

[dcaegen2/analytics/tca.git] / dcae-analytics-model / src / main / java / org / openecomp / dcae / apod / analytics / model / domain / policy / tca / Direction.java

diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/policy/tca/Direction.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/policy/tca/Direction.java
index 76c8086..0d7203b 100644 (file)
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/policy/tca/Direction.java
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/policy/tca/Direction.java
@@ -20,6 +20,8 @@
 \r
 package org.openecomp.dcae.apod.analytics.model.domain.policy.tca;\r
 \r
+import java.math.BigDecimal;\r
+\r
 import javax.annotation.Nonnull;\r
 \r
 /**\r
@@ -32,32 +34,32 @@ public enum Direction implements TCAPolicyModel {
 \r
     EQUAL {\r
         @Override\r
-        public Boolean operate(@Nonnull Long value1, @Nonnull Long value2) {\r
-            return value1.equals(value2);\r
+        public Boolean operate(@Nonnull BigDecimal value1, @Nonnull BigDecimal value2) {\r
+            return value1.compareTo(value2) == 0;\r
         }\r
     },\r
     LESS {\r
         @Override\r
-        public Boolean operate(@Nonnull Long value1, @Nonnull Long value2) {\r
-            return value1 < value2;\r
+        public Boolean operate(@Nonnull BigDecimal value1, @Nonnull BigDecimal value2) {\r
+            return value1.compareTo(value2) < 0;\r
         }\r
     },\r
     LESS_OR_EQUAL {\r
         @Override\r
-        public Boolean operate(@Nonnull Long value1, @Nonnull Long value2) {\r
-            return value1 <= value2;\r
+        public Boolean operate(@Nonnull BigDecimal value1, @Nonnull BigDecimal value2) {\r
+            return value1.compareTo(value2) <= 0;\r
         }\r
     },\r
     GREATER {\r
         @Override\r
-        public Boolean operate(@Nonnull Long value1, @Nonnull Long value2) {\r
-            return value1 > value2;\r
+        public Boolean operate(@Nonnull BigDecimal value1, @Nonnull BigDecimal value2) {\r
+            return value1.compareTo(value2) > 0;\r
         }\r
     },\r
     GREATER_OR_EQUAL {\r
         @Override\r
-        public Boolean operate(@Nonnull Long value1, @Nonnull Long value2) {\r
-            return value1 >= value2;\r
+        public Boolean operate(@Nonnull BigDecimal value1, @Nonnull BigDecimal value2) {\r
+            return value1.compareTo(value2) >= 0;\r
         }\r
     };\r
 \r
@@ -69,6 +71,6 @@ public enum Direction implements TCAPolicyModel {
      *\r
      * @return result of operation for the direction logic\r
      */\r
-    public abstract Boolean operate(@Nonnull Long value1, @Nonnull Long value2);\r
+    public abstract Boolean operate(@Nonnull BigDecimal value1, @Nonnull BigDecimal value2);\r
 \r
 }\r