Merge pull request #3 from Andre601/feature/further-condition-improvements

Further improvements of condition parsing

Author: Andre601

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/ServerListProfile.java

@@ -96,14 +96,12 @@ private List<Expression> createExpressions(List<String> list, PluginLogger logge
         for(String str : list){
             Expression expression = new Expression(str);
 
-            switch(expression.getResult()){
-                case VALID -> expressions.add(expression);
-                case INVALID_EMPTY_PARTS -> logInvalid(logger, str, "Either left or right part of condition was empty.");
-                case INVALID_NO_EXPRESSION -> logInvalid(logger, str, "Empty conditions are not allowed.");
-                case INVALID_DOUBLE_OPERATOR -> logInvalid(logger, str, "Condition had two operands!");
-                case INVALID_BROKEN_NOT_EQUAL -> logInvalid(logger, str, "Found '!' without '=' following it.");
-                default -> logInvalid(logger, str, "Encountered unknown issue.");
+            if(expression.getResult() != Expression.ExpressionResult.VALID){
+                logger.warn("Detected Invalid condition '%s'! Cause: %s", str, expression.getResult().getMessage());
+                continue;
             }
+            
+            expressions.add(expression);
         }
 
         return expressions;
@@ -125,8 +123,4 @@ private List<String> getList(ConfigurationNode node, String key, boolean trim){
 
         return list;
     }
-    
-    private void logInvalid(PluginLogger logger, String expression, String reason){
-        logger.warn("Invalid Condition '%s'! %s", expression, reason);
-    }
 }

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/conditions/Expression.java

@@ -42,8 +42,8 @@ public Expression(String expression){
     }
 
     public boolean evaluate(Map<String, Object> replacements){
-        String newLeft = StringReplacer.replace(left, replacements);
-        String newRight = StringReplacer.replace(right, replacements);
+        String newLeft = StringReplacer.replace(left, replacements).trim();
+        String newRight = StringReplacer.replace(right, replacements).trim();
 
         return operator.evaluate(newLeft, newRight);
     }
@@ -67,8 +67,10 @@ private void resolveExpression(String expression){
 
         for(int i = 0; i < chars.length; i++){
             char c = chars[i];
+            char next = (i == (chars.length - 1)) ? '\0' : chars[i + 1];
 
-            if((c != '<' && c != '>' && c != '=' && c != '!') || i + 1 >= chars.length){
+            Operator tmp = Operator.getOperand(c, next);
+            if(tmp == Operator.UNKNOWN){
                 if(foundOperator){
                     right.append(c);
                 }else{
@@ -82,17 +84,8 @@ private void resolveExpression(String expression){
                 return;
             }
 
+            operator = tmp;
             foundOperator = true;
-            
-            char next = chars[i + 1];
-            if(c == '!' && next != '='){
-                result = ExpressionResult.INVALID_BROKEN_NOT_EQUAL;
-                return;
-            }
-            
-            operator = Operator.getOperand(c, next);
-            if(operator.hasSecond() && operator != Operator.UNKNOWN)
-                i++;
         }
 
         if(left.isEmpty() || right.isEmpty()){
@@ -198,11 +191,32 @@ private static int getInt(String text){
     }
 
     public enum ExpressionResult{
-        VALID,
+        VALID{
+            @Override
+            public String getMessage(){
+                return null;
+            }
+        },
+        
+        INVALID_NO_EXPRESSION{
+            @Override
+            public String getMessage(){
+                return "Received empty condition which isn't allowed!";
+            }
+        },
+        INVALID_DOUBLE_OPERATOR{
+            @Override
+            public String getMessage(){
+                return "Condition contained two operands.";
+            }
+        },
+        INVALID_EMPTY_PARTS{
+            @Override
+            public String getMessage(){
+                return "Received condition with either left or right part being empty.";
+            }
+        };
 
-        INVALID_NO_EXPRESSION,
-        INVALID_DOUBLE_OPERATOR,
-        INVALID_BROKEN_NOT_EQUAL,
-        INVALID_EMPTY_PARTS
+        public abstract String getMessage();
     }
 }