refactoring

Author: raydac

src/main/java/com/igormaznitsa/jcp/expression/ValueType.java

@@ -52,10 +52,7 @@ public boolean isCompatible(@Nonnull final ValueType type) {
       return true;
     }
 
-    if (this == UNKNOWN || type == UNKNOWN) {
-      return false;
-    }
+    return this != UNKNOWN && type != UNKNOWN && (this == ANY || type == ANY);
 
-    return this == ANY || type == ANY;
   }
 }

src/main/java/com/igormaznitsa/jcp/expression/functions/AbstractFunction.java

@@ -15,29 +15,19 @@
  */
 package com.igormaznitsa.jcp.expression.functions;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import com.igormaznitsa.jcp.expression.functions.xml.FunctionXML_TEXT;
-import com.igormaznitsa.jcp.expression.functions.xml.FunctionXML_ATTR;
-import com.igormaznitsa.jcp.expression.functions.xml.FunctionXML_LIST;
-import com.igormaznitsa.jcp.expression.functions.xml.FunctionXML_GET;
-import com.igormaznitsa.jcp.expression.functions.xml.FunctionXML_SIZE;
-import com.igormaznitsa.jcp.expression.functions.xml.FunctionXML_OPEN;
-import com.igormaznitsa.jcp.expression.functions.xml.FunctionXML_ROOT;
-import com.igormaznitsa.jcp.expression.functions.xml.FunctionXML_NAME;
 import com.igormaznitsa.jcp.expression.ExpressionItem;
 import com.igormaznitsa.jcp.expression.ExpressionItemPriority;
 import com.igormaznitsa.jcp.expression.ExpressionItemType;
 import com.igormaznitsa.jcp.expression.ValueType;
 import com.igormaznitsa.jcp.expression.functions.xml.*;
-
-import java.util.concurrent.atomic.AtomicLong;
+import com.igormaznitsa.meta.annotation.MustNotContainNull;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-
-import com.igormaznitsa.meta.annotation.MustNotContainNull;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicLong;
 
 /**
  * The abstract class is the base for each function handler in the preprocessor

src/main/java/com/igormaznitsa/jcp/expression/operators/OperatorNOT.java

@@ -46,7 +46,7 @@ public String getKeyword() {
 
   @Nonnull
   public Value executeInt(@Nonnull final Value arg1) {
-    return Value.valueOf(0xFFFFFFFFFFFFFFFFL ^ arg1.asLong());
+    return Value.valueOf(~arg1.asLong());
   }
 
   @Nonnull

src/main/java/com/igormaznitsa/jcp/utils/antpathmatcher/AntPathMatcher.java

@@ -390,7 +390,7 @@ private boolean isWildcardChar(char c) {
   protected String[] tokenizePattern(String pattern) {
     String[] tokenized = null;
     Boolean cachePatterns = this.cachePatterns;
-    if (cachePatterns == null || cachePatterns.booleanValue()) {
+    if (cachePatterns == null || cachePatterns) {
       tokenized = this.tokenizedPatternCache.get(pattern);
     }
     if (tokenized == null) {
@@ -402,7 +402,7 @@ protected String[] tokenizePattern(String pattern) {
         deactivatePatternCache();
         return tokenized;
       }
-      if (cachePatterns == null || cachePatterns.booleanValue()) {
+      if (cachePatterns == null || cachePatterns) {
         this.tokenizedPatternCache.put(pattern, tokenized);
       }
     }
@@ -454,7 +454,7 @@ private boolean matchStrings(String pattern, String str, Map<String, String> uri
   protected AntPathStringMatcher getStringMatcher(String pattern) {
     AntPathStringMatcher matcher = null;
     Boolean cachePatterns = this.cachePatterns;
-    if (cachePatterns == null || cachePatterns.booleanValue()) {
+    if (cachePatterns == null || cachePatterns) {
       matcher = this.stringMatcherCache.get(pattern);
     }
     if (matcher == null) {
@@ -466,7 +466,7 @@ protected AntPathStringMatcher getStringMatcher(String pattern) {
         deactivatePatternCache();
         return matcher;
       }
-      if (cachePatterns == null || cachePatterns.booleanValue()) {
+      if (cachePatterns == null || cachePatterns) {
         this.stringMatcherCache.put(pattern, matcher);
       }
     }