Ports IllegalArgumentException : Can't decide wich method to use fix

This refers to #159
orphan-oss · Sep 1, 2022 · 32dd054 · 32dd054
1 parent 2f8c786
commit 32dd054
Show file tree

Hide file tree

Showing 295 changed files with 881 additions and 781 deletions.
diff --git a/docs/DeveloperGuide.md b/docs/DeveloperGuide.md
@@ -43,8 +43,8 @@ efficient. The class then takes an `OgnlContext` and a root object to
 evaluate against.
 
 ```java
-import org.ognl.Ognl;
-import org.ognl.OgnlContext;
+import ognl.Ognl;
+import ognl.OgnlContext;
 
 public class OgnlExpression {
 

diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,7 @@
         <version>9</version>
     </parent>
 
-    <groupId>org.ognl</groupId>
+    <groupId>ognl</groupId>
     <artifactId>ognl</artifactId>
     <packaging>jar</packaging>
     <version>3.4.0-SNAPSHOT</version>
@@ -177,7 +177,7 @@
                         <phase>generate-sources</phase>
                         <configuration>
                             <outputDirectory>${project.build.directory}/generated-sources/java</outputDirectory>
-                            <packageName>org.ognl</packageName>
+                            <packageName>ognl</packageName>
                             <!-- Uncomment if AST files needs to be generated
                             <nodePackage>*.jtree</nodePackage>
                              -->

diff --git a/src/main/java/org/ognl/ASTAdd.java → src/main/java/ognl/ASTAdd.java b/src/main/java/org/ognl/ASTAdd.java → src/main/java/ognl/ASTAdd.java
@@ -16,9 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ognl;
+package ognl;
 
-import org.ognl.enhance.ExpressionCompiler;
+import ognl.OgnlParser;
+import ognl.enhance.ExpressionCompiler;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;

diff --git a/src/main/java/org/ognl/ASTAnd.java → src/main/java/ognl/ASTAnd.java b/src/main/java/org/ognl/ASTAnd.java → src/main/java/ognl/ASTAnd.java
@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ognl;
+package ognl;
 
-import org.ognl.enhance.ExpressionCompiler;
-import org.ognl.enhance.UnsupportedCompilationException;
+import ognl.OgnlParser;
+import ognl.enhance.ExpressionCompiler;
+import ognl.enhance.UnsupportedCompilationException;
 
 public class ASTAnd extends BooleanExpression {
 
@@ -93,7 +94,7 @@ public String toGetSourceString(OgnlContext context, Object target) {
             if (!OgnlRuntime.isBoolean(second) && !context.getCurrentType().isPrimitive())
                 second = OgnlRuntime.getCompiler().createLocalReference(context, second, context.getCurrentType());
 
-            result += "(org.ognl.OgnlOps.booleanValue(" + first + ")";
+            result += "(ognl.OgnlOps.booleanValue(" + first + ")";
 
             result += " ? ";
 
@@ -141,7 +142,7 @@ public String toSetSourceString(OgnlContext context, Object target) {
                     + pre + children[1].toSetSourceString(context, target);
 
             if (!OgnlRuntime.isBoolean(first))
-                result += "if(org.ognl.OgnlOps.booleanValue(" + first + ")){";
+                result += "if(ognl.OgnlOps.booleanValue(" + first + ")){";
             else
                 result += "if(" + first + "){";
 

diff --git a/src/main/java/org/ognl/ASTAssign.java → src/main/java/ognl/ASTAssign.java b/src/main/java/org/ognl/ASTAssign.java → src/main/java/ognl/ASTAssign.java
@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ognl;
+package ognl;
 
-import org.ognl.enhance.OrderedReturn;
-import org.ognl.enhance.UnsupportedCompilationException;
+import ognl.OgnlParser;
+import ognl.enhance.OrderedReturn;
+import ognl.enhance.UnsupportedCompilationException;
 
 public class ASTAssign extends SimpleNode {
 
@@ -65,7 +66,7 @@ public String toGetSourceString(OgnlContext context, Object target) {
                 core = core.substring(0, core.lastIndexOf(";"));
 
             second = OgnlRuntime.getCompiler().createLocalReference(context,
-                    "org.ognl.OgnlOps.returnValue(($w)" + core + ", ($w) " + seq.getLastExpression() + ")",
+                    "ognl.OgnlOps.returnValue(($w)" + core + ", ($w) " + seq.getLastExpression() + ")",
                     Object.class);
         }
 
@@ -85,7 +86,7 @@ public String toGetSourceString(OgnlContext context, Object target) {
             // System.out.println("building ordered ret from child[0] with result of:" + result);
 
             result = OgnlRuntime.getCompiler().createLocalReference(context,
-                    "org.ognl.OgnlOps.returnValue(($w)" + result + ", ($w)" + ((OrderedReturn) children[0]).getLastExpression() + ")",
+                    "ognl.OgnlOps.returnValue(($w)" + result + ", ($w)" + ((OrderedReturn) children[0]).getLastExpression() + ")",
                     Object.class);
         }
 

diff --git a/src/main/java/org/ognl/ASTBitAnd.java → src/main/java/ognl/ASTBitAnd.java b/src/main/java/org/ognl/ASTBitAnd.java → src/main/java/ognl/ASTBitAnd.java
@@ -16,7 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ognl;
+package ognl;
+
+import ognl.OgnlParser;
 
 public class ASTBitAnd extends NumericExpression {
 

diff --git a/src/main/java/org/ognl/ASTBitNegate.java → src/main/java/ognl/ASTBitNegate.java b/src/main/java/org/ognl/ASTBitNegate.java → src/main/java/ognl/ASTBitNegate.java
@@ -16,7 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ognl;
+package ognl;
+
+import ognl.OgnlParser;
 
 public class ASTBitNegate extends NumericExpression {
 

diff --git a/src/main/java/org/ognl/ASTBitOr.java → src/main/java/ognl/ASTBitOr.java b/src/main/java/org/ognl/ASTBitOr.java → src/main/java/ognl/ASTBitOr.java
@@ -16,7 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ognl;
+package ognl;
+
+import ognl.OgnlParser;
 
 public class ASTBitOr extends NumericExpression {
 

diff --git a/src/main/java/org/ognl/ASTChain.java → src/main/java/ognl/ASTChain.java b/src/main/java/org/ognl/ASTChain.java → src/main/java/ognl/ASTChain.java
@@ -16,11 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ognl;
+package ognl;
 
-import org.ognl.enhance.ExpressionCompiler;
-import org.ognl.enhance.OrderedReturn;
-import org.ognl.enhance.UnsupportedCompilationException;
+import ognl.OgnlParser;
+import ognl.enhance.ExpressionCompiler;
+import ognl.enhance.OrderedReturn;
+import ognl.enhance.UnsupportedCompilationException;
 
 import java.lang.reflect.Array;
 

diff --git a/src/main/java/org/ognl/ASTConst.java → src/main/java/ognl/ASTConst.java b/src/main/java/org/ognl/ASTConst.java → src/main/java/ognl/ASTConst.java
@@ -16,9 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ognl;
+package ognl;
 
-import org.ognl.enhance.UnsupportedCompilationException;
+import ognl.OgnlParser;
+import ognl.enhance.UnsupportedCompilationException;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;

diff --git a/src/main/java/org/ognl/ASTCtor.java → src/main/java/ognl/ASTCtor.java b/src/main/java/org/ognl/ASTCtor.java → src/main/java/ognl/ASTCtor.java
@@ -16,9 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ognl;
+package ognl;
 
-import org.ognl.enhance.ExpressionCompiler;
+import ognl.OgnlParser;
+import ognl.enhance.ExpressionCompiler;
 
 import java.lang.reflect.Array;
 import java.lang.reflect.Constructor;

diff --git a/src/main/java/org/ognl/ASTDivide.java → src/main/java/ognl/ASTDivide.java b/src/main/java/org/ognl/ASTDivide.java → src/main/java/ognl/ASTDivide.java
@@ -16,7 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ognl;
+package ognl;
+
+import ognl.OgnlParser;
 
 public class ASTDivide extends NumericExpression {
 

diff --git a/src/main/java/org/ognl/ASTEq.java → src/main/java/ognl/ASTEq.java b/src/main/java/org/ognl/ASTEq.java → src/main/java/ognl/ASTEq.java
@@ -16,7 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ognl;
+package ognl;
+
+import ognl.OgnlParser;
 
 public class ASTEq extends ComparisonExpression {
 
@@ -41,6 +43,6 @@ public String getExpressionOperator(int index) {
     }
 
     public String getComparisonFunction() {
-        return "org.ognl.OgnlOps.equal";
+        return "ognl.OgnlOps.equal";
     }
 }
diff --git a/src/main/java/org/ognl/ASTEval.java → src/main/java/ognl/ASTEval.java b/src/main/java/org/ognl/ASTEval.java → src/main/java/ognl/ASTEval.java
@@ -16,9 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ognl;
+package ognl;
 
-import org.ognl.enhance.UnsupportedCompilationException;
+import ognl.OgnlParser;
+import ognl.enhance.UnsupportedCompilationException;
 
 public class ASTEval extends SimpleNode {
 

diff --git a/src/main/java/org/ognl/ASTGreater.java → src/main/java/ognl/ASTGreater.java b/src/main/java/org/ognl/ASTGreater.java → src/main/java/ognl/ASTGreater.java
@@ -16,7 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ognl;
+package ognl;
+
+import ognl.OgnlParser;
 
 public class ASTGreater extends ComparisonExpression {
 
@@ -42,6 +44,6 @@ public String getExpressionOperator(int index) {
     }
 
     public String getComparisonFunction() {
-        return "org.ognl.OgnlOps.greater";
+        return "ognl.OgnlOps.greater";
     }
 }
diff --git a/src/main/java/org/ognl/ASTGreaterEq.java → src/main/java/ognl/ASTGreaterEq.java b/src/main/java/org/ognl/ASTGreaterEq.java → src/main/java/ognl/ASTGreaterEq.java
@@ -16,7 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ognl;
+package ognl;
+
+import ognl.OgnlParser;
 
 public class ASTGreaterEq extends ComparisonExpression {
 
@@ -41,6 +43,6 @@ public String getExpressionOperator(int index) {
     }
 
     public String getComparisonFunction() {
-        return "!org.ognl.OgnlOps.less";
+        return "!ognl.OgnlOps.less";
     }
 }
diff --git a/src/main/java/org/ognl/ASTIn.java → src/main/java/ognl/ASTIn.java b/src/main/java/org/ognl/ASTIn.java → src/main/java/ognl/ASTIn.java
@@ -16,9 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ognl;
+package ognl;
 
-import org.ognl.enhance.UnsupportedCompilationException;
+import ognl.OgnlParser;
+import ognl.enhance.UnsupportedCompilationException;
 
 public class ASTIn extends SimpleNode implements NodeType {
 
@@ -54,7 +55,7 @@ public Class<?> getSetterClass() {
 
     public String toGetSourceString(OgnlContext context, Object target) {
         try {
-            String result = "org.ognl.OgnlOps.in( ($w) ";
+            String result = "ognl.OgnlOps.in( ($w) ";
 
             result += OgnlRuntime.getChildSource(context, target, children[0]) + ", ($w) " + OgnlRuntime.getChildSource(context, target, children[1]);
 

diff --git a/src/main/java/org/ognl/ASTInstanceof.java → src/main/java/ognl/ASTInstanceof.java b/src/main/java/org/ognl/ASTInstanceof.java → src/main/java/ognl/ASTInstanceof.java
@@ -16,7 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ognl;
+package ognl;
+
+import ognl.OgnlParser;
 
 public class ASTInstanceof extends SimpleNode implements NodeType {
 

diff --git a/src/main/java/org/ognl/ASTKeyValue.java → src/main/java/ognl/ASTKeyValue.java b/src/main/java/org/ognl/ASTKeyValue.java → src/main/java/ognl/ASTKeyValue.java
@@ -16,7 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ognl;
+package ognl;
+
+import ognl.OgnlParser;
 
 public class ASTKeyValue extends SimpleNode {
 

diff --git a/src/main/java/org/ognl/ASTLess.java → src/main/java/ognl/ASTLess.java b/src/main/java/org/ognl/ASTLess.java → src/main/java/ognl/ASTLess.java
@@ -16,7 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ognl;
+package ognl;
+
+import ognl.OgnlParser;
 
 class ASTLess extends ComparisonExpression {
 
@@ -42,6 +44,6 @@ public String getExpressionOperator(int index) {
     }
 
     public String getComparisonFunction() {
-        return "org.ognl.OgnlOps.less";
+        return "ognl.OgnlOps.less";
     }
 }
diff --git a/src/main/java/org/ognl/ASTLessEq.java → src/main/java/ognl/ASTLessEq.java b/src/main/java/org/ognl/ASTLessEq.java → src/main/java/ognl/ASTLessEq.java
@@ -16,7 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ognl;
+package ognl;
+
+import ognl.OgnlParser;
 
 public class ASTLessEq extends ComparisonExpression {
 
@@ -41,7 +43,7 @@ public String getExpressionOperator(int index) {
     }
 
     public String getComparisonFunction() {
-        return "!org.ognl.OgnlOps.greater";
+        return "!ognl.OgnlOps.greater";
     }
 
 }
diff --git a/src/main/java/org/ognl/ASTList.java → src/main/java/ognl/ASTList.java b/src/main/java/org/ognl/ASTList.java → src/main/java/ognl/ASTList.java
@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ognl;
+package ognl;
 
-import org.ognl.enhance.ExpressionCompiler;
-import org.ognl.enhance.UnsupportedCompilationException;
+import ognl.OgnlParser;
+import ognl.enhance.ExpressionCompiler;
+import ognl.enhance.UnsupportedCompilationException;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -124,14 +125,14 @@ public String toGetSourceString(OgnlContext context, Object target) {
 
                         value = OgnlRuntime.getCompiler().createLocalReference(context,
                                 "(" + ExpressionCompiler.getCastString(ctorClass)
-                                        + ")org.ognl.OgnlOps.toArray(" + value + ", " + ctorClass.getComponentType().getName()
+                                        + ")ognl.OgnlOps.toArray(" + value + ", " + ctorClass.getComponentType().getName()
                                         + ".class, true)",
                                 ctorClass
                         );
 
                     } else if (ctorClass != Object.class) {
                         value = OgnlRuntime.getCompiler().createLocalReference(context,
-                                "(" + ctorClass.getName() + ")org.ognl.OgnlOps.convertValue(" + value + "," + ctorClass.getName() + ".class)",
+                                "(" + ctorClass.getName() + ")ognl.OgnlOps.convertValue(" + value + "," + ctorClass.getName() + ".class)",
                                 ctorClass
                         );
                     } else if ((children[i] instanceof NodeType

diff --git a/src/main/java/org/ognl/ASTMap.java → src/main/java/ognl/ASTMap.java b/src/main/java/org/ognl/ASTMap.java → src/main/java/ognl/ASTMap.java
@@ -16,9 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ognl;
+package ognl;
 
-import org.ognl.enhance.UnsupportedCompilationException;
+import ognl.OgnlParser;
+import ognl.enhance.UnsupportedCompilationException;
 
 import java.util.LinkedHashMap;
 import java.util.Map;