fix: Remove unwrap variable for assign action (#44)

* Remove unwrap variable for assign action

* Fix version

* Fix version

* Fix version

* Fix version

* Fix version

Author: enricocolasante

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.hisp.dhis.rules</groupId>
     <artifactId>rule-engine</artifactId>
-    <version>2.0.3</version>
+    <version>2.0.4-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>rule-engine</name>
 

src/main/java/org/hisp/dhis/rules/RuleEngineExecution.java

@@ -187,7 +187,7 @@ private Boolean isAssignToCalculatedValue( RuleAction ruleAction )
 
     private void updateValueMap( String variable, RuleVariableValue value )
     {
-        valueMap.put( RuleExpression.unwrapVariableName( variable ), value );
+        valueMap.put( variable, value );
     }
 
     @Nonnull

src/main/java/org/hisp/dhis/rules/RuleExpression.java

@@ -5,30 +5,10 @@
 
 import javax.annotation.Nonnull;
 import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 @AutoValue
 public abstract class RuleExpression
 {
-    static final String VARIABLE_PATTERN = "[#]\\{([\\w -_.]+)\\}";
-
-    static final Pattern VARIABLE_PATTERN_COMPILED = Pattern.compile( VARIABLE_PATTERN );
-
-    @Nonnull
-    static String unwrapVariableName( @Nonnull String variable )
-    {
-        Matcher variableNameMatcher = VARIABLE_PATTERN_COMPILED.matcher( variable );
-
-        // extract variable name
-        if ( variableNameMatcher.find() )
-        {
-            return variableNameMatcher.group( 1 );
-        }
-
-        throw new IllegalArgumentException( "Malformed variable: " + variable );
-    }
-
     /* This method should probably be removed creating a new prefix for program rule variables that is
      *  not shared with indicators.*/
     @Nonnull

src/test/java/org/hisp/dhis/rules/ConstantsValueTests.java

@@ -96,7 +96,7 @@ public void assignConstantValueFromAssignActionInEnrollment()
     public void assignValue()
         throws Exception
     {
-        RuleAction assignAction = RuleActionAssign.create( null, "4", "#{test_attribute}" );
+        RuleAction assignAction = RuleActionAssign.create( null, "4", "test_attribute" );
         RuleAction action = RuleActionShowError.create( null, "#{test_attribute}", "" );
         org.hisp.dhis.rules.models.Rule rule = org.hisp.dhis.rules.models.Rule
             .create( null, 1, "true", Arrays.asList( assignAction ), "test_program_rule1" );
@@ -131,7 +131,7 @@ public void assignValue()
     public void assignValueThroughVariable()
         throws Exception
     {
-        RuleAction assignAction = RuleActionAssign.create( "#{test_attribute}", "4", null );
+        RuleAction assignAction = RuleActionAssign.create( "test_attribute", "4", null );
         RuleAction action = RuleActionShowError.create( null, "#{test_attribute}", "" );
         org.hisp.dhis.rules.models.Rule rule = org.hisp.dhis.rules.models.Rule
             .create( null, 1, "true", Arrays.asList( assignAction ), "test_program_rule1" );

src/test/java/org/hisp/dhis/rules/RuleExpressionTests.java

@@ -106,7 +106,7 @@ public void evaluateTenThousandRulesTest()
     public void sendMessageMustGetValueFromAssignAction()
         throws Exception
     {
-        RuleAction assignAction = RuleActionAssign.create( "#{test_calculated_value}", "2+2", null );
+        RuleAction assignAction = RuleActionAssign.create( "test_calculated_value", "2+2", null );
         org.hisp.dhis.rules.models.Rule rule = org.hisp.dhis.rules.models.Rule
             .create( null, 1, "true", Arrays.asList( assignAction ), "test_program_rule1" );
 
@@ -160,7 +160,7 @@ public void sendMessageMustGetValueFromAssignAction()
     private List<org.hisp.dhis.rules.models.Rule> createRules( int i )
     {
         ArrayList<org.hisp.dhis.rules.models.Rule> rules = Lists.newArrayList();
-        RuleAction assignAction = RuleActionAssign.create( "#{test_calculated_value}", "2+2", null );
+        RuleAction assignAction = RuleActionAssign.create( "test_calculated_value", "2+2", null );
         org.hisp.dhis.rules.models.Rule rule = org.hisp.dhis.rules.models.Rule
             .create( null, 1, "true", Arrays.asList( assignAction ), "test_program_rule1" );
 
@@ -179,7 +179,7 @@ private List<org.hisp.dhis.rules.models.Rule> createRules( int i )
     public void sendMessageMustGetValueFromAssignActionInSingleExecution()
         throws Exception
     {
-        RuleAction assignAction = RuleActionAssign.create( "#{test_calculated_value}", "2+2", null );
+        RuleAction assignAction = RuleActionAssign.create( "test_calculated_value", "2+2", null );
         org.hisp.dhis.rules.models.Rule rule = org.hisp.dhis.rules.models.Rule
             .create( null, 1, "true", Arrays.asList( assignAction ), "test_program_rule1" );