diff --git a/src/main/java/com/metaweb/gridworks/expr/ControlFunctionRegistry.java b/src/main/java/com/metaweb/gridworks/expr/ControlFunctionRegistry.java index 1fd5c5489..b32e736da 100644 --- a/src/main/java/com/metaweb/gridworks/expr/ControlFunctionRegistry.java +++ b/src/main/java/com/metaweb/gridworks/expr/ControlFunctionRegistry.java @@ -9,38 +9,38 @@ import com.metaweb.gridworks.expr.controls.ForEach; import com.metaweb.gridworks.expr.controls.ForNonBlank; import com.metaweb.gridworks.expr.controls.If; import com.metaweb.gridworks.expr.controls.With; -import com.metaweb.gridworks.expr.functions.And; -import com.metaweb.gridworks.expr.functions.Ceil; -import com.metaweb.gridworks.expr.functions.EndsWith; -import com.metaweb.gridworks.expr.functions.Floor; import com.metaweb.gridworks.expr.functions.Get; -import com.metaweb.gridworks.expr.functions.IndexOf; -import com.metaweb.gridworks.expr.functions.IsBlank; -import com.metaweb.gridworks.expr.functions.IsNotBlank; -import com.metaweb.gridworks.expr.functions.IsNotNull; -import com.metaweb.gridworks.expr.functions.IsNull; -import com.metaweb.gridworks.expr.functions.Join; -import com.metaweb.gridworks.expr.functions.LastIndexOf; import com.metaweb.gridworks.expr.functions.Length; -import com.metaweb.gridworks.expr.functions.Ln; -import com.metaweb.gridworks.expr.functions.Log; -import com.metaweb.gridworks.expr.functions.Max; -import com.metaweb.gridworks.expr.functions.Min; -import com.metaweb.gridworks.expr.functions.Mod; -import com.metaweb.gridworks.expr.functions.Not; -import com.metaweb.gridworks.expr.functions.Or; -import com.metaweb.gridworks.expr.functions.Replace; -import com.metaweb.gridworks.expr.functions.Reverse; -import com.metaweb.gridworks.expr.functions.Round; import com.metaweb.gridworks.expr.functions.Slice; -import com.metaweb.gridworks.expr.functions.Sort; -import com.metaweb.gridworks.expr.functions.Split; -import com.metaweb.gridworks.expr.functions.StartsWith; -import com.metaweb.gridworks.expr.functions.ToLowercase; import com.metaweb.gridworks.expr.functions.ToNumber; import com.metaweb.gridworks.expr.functions.ToString; -import com.metaweb.gridworks.expr.functions.ToTitlecase; -import com.metaweb.gridworks.expr.functions.ToUppercase; +import com.metaweb.gridworks.expr.functions.arrays.Join; +import com.metaweb.gridworks.expr.functions.arrays.Reverse; +import com.metaweb.gridworks.expr.functions.arrays.Sort; +import com.metaweb.gridworks.expr.functions.booleans.And; +import com.metaweb.gridworks.expr.functions.booleans.Not; +import com.metaweb.gridworks.expr.functions.booleans.Or; +import com.metaweb.gridworks.expr.functions.math.Ceil; +import com.metaweb.gridworks.expr.functions.math.Floor; +import com.metaweb.gridworks.expr.functions.math.Ln; +import com.metaweb.gridworks.expr.functions.math.Log; +import com.metaweb.gridworks.expr.functions.math.Max; +import com.metaweb.gridworks.expr.functions.math.Min; +import com.metaweb.gridworks.expr.functions.math.Mod; +import com.metaweb.gridworks.expr.functions.math.Round; +import com.metaweb.gridworks.expr.functions.strings.EndsWith; +import com.metaweb.gridworks.expr.functions.strings.IndexOf; +import com.metaweb.gridworks.expr.functions.strings.LastIndexOf; +import com.metaweb.gridworks.expr.functions.strings.Replace; +import com.metaweb.gridworks.expr.functions.strings.Split; +import com.metaweb.gridworks.expr.functions.strings.StartsWith; +import com.metaweb.gridworks.expr.functions.strings.ToLowercase; +import com.metaweb.gridworks.expr.functions.strings.ToTitlecase; +import com.metaweb.gridworks.expr.functions.strings.ToUppercase; +import com.metaweb.gridworks.expr.functions.tests.IsBlank; +import com.metaweb.gridworks.expr.functions.tests.IsNotBlank; +import com.metaweb.gridworks.expr.functions.tests.IsNotNull; +import com.metaweb.gridworks.expr.functions.tests.IsNull; public class ControlFunctionRegistry { diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/Join.java b/src/main/java/com/metaweb/gridworks/expr/functions/arrays/Join.java similarity index 92% rename from src/main/java/com/metaweb/gridworks/expr/functions/Join.java rename to src/main/java/com/metaweb/gridworks/expr/functions/arrays/Join.java index db58cb5aa..b04382f87 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/Join.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/arrays/Join.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.expr.functions; +package com.metaweb.gridworks.expr.functions.arrays; import java.util.Properties; diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/Reverse.java b/src/main/java/com/metaweb/gridworks/expr/functions/arrays/Reverse.java similarity index 91% rename from src/main/java/com/metaweb/gridworks/expr/functions/Reverse.java rename to src/main/java/com/metaweb/gridworks/expr/functions/arrays/Reverse.java index a5fccd941..c6f2181e7 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/Reverse.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/arrays/Reverse.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.expr.functions; +package com.metaweb.gridworks.expr.functions.arrays; import java.util.Properties; diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/Sort.java b/src/main/java/com/metaweb/gridworks/expr/functions/arrays/Sort.java similarity index 91% rename from src/main/java/com/metaweb/gridworks/expr/functions/Sort.java rename to src/main/java/com/metaweb/gridworks/expr/functions/arrays/Sort.java index 8934625e5..1835e9aa6 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/Sort.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/arrays/Sort.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.expr.functions; +package com.metaweb.gridworks.expr.functions.arrays; import java.util.Arrays; import java.util.Properties; diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/And.java b/src/main/java/com/metaweb/gridworks/expr/functions/booleans/And.java similarity index 88% rename from src/main/java/com/metaweb/gridworks/expr/functions/And.java rename to src/main/java/com/metaweb/gridworks/expr/functions/booleans/And.java index 3cc7bc9d7..4411c5464 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/And.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/booleans/And.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.expr.functions; +package com.metaweb.gridworks.expr.functions.booleans; import java.util.Properties; diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/Not.java b/src/main/java/com/metaweb/gridworks/expr/functions/booleans/Not.java similarity index 91% rename from src/main/java/com/metaweb/gridworks/expr/functions/Not.java rename to src/main/java/com/metaweb/gridworks/expr/functions/booleans/Not.java index 0cfe0be5b..5cac8bf1b 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/Not.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/booleans/Not.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.expr.functions; +package com.metaweb.gridworks.expr.functions.booleans; import java.util.Properties; diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/Or.java b/src/main/java/com/metaweb/gridworks/expr/functions/booleans/Or.java similarity index 88% rename from src/main/java/com/metaweb/gridworks/expr/functions/Or.java rename to src/main/java/com/metaweb/gridworks/expr/functions/booleans/Or.java index fda22a682..e9309edb5 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/Or.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/booleans/Or.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.expr.functions; +package com.metaweb.gridworks.expr.functions.booleans; import java.util.Properties; diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/Ceil.java b/src/main/java/com/metaweb/gridworks/expr/functions/math/Ceil.java similarity index 91% rename from src/main/java/com/metaweb/gridworks/expr/functions/Ceil.java rename to src/main/java/com/metaweb/gridworks/expr/functions/math/Ceil.java index 23fcd151d..ebaa4b6e1 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/Ceil.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/math/Ceil.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.expr.functions; +package com.metaweb.gridworks.expr.functions.math; import java.util.Properties; diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/Floor.java b/src/main/java/com/metaweb/gridworks/expr/functions/math/Floor.java similarity index 91% rename from src/main/java/com/metaweb/gridworks/expr/functions/Floor.java rename to src/main/java/com/metaweb/gridworks/expr/functions/math/Floor.java index 4c8aa0041..acd1c8a9d 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/Floor.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/math/Floor.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.expr.functions; +package com.metaweb.gridworks.expr.functions.math; import java.util.Properties; diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/Ln.java b/src/main/java/com/metaweb/gridworks/expr/functions/math/Ln.java similarity index 91% rename from src/main/java/com/metaweb/gridworks/expr/functions/Ln.java rename to src/main/java/com/metaweb/gridworks/expr/functions/math/Ln.java index 3f51abb9a..c1ac28e79 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/Ln.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/math/Ln.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.expr.functions; +package com.metaweb.gridworks.expr.functions.math; import java.util.Properties; diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/Log.java b/src/main/java/com/metaweb/gridworks/expr/functions/math/Log.java similarity index 91% rename from src/main/java/com/metaweb/gridworks/expr/functions/Log.java rename to src/main/java/com/metaweb/gridworks/expr/functions/math/Log.java index f4d3a1578..2a4904f64 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/Log.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/math/Log.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.expr.functions; +package com.metaweb.gridworks.expr.functions.math; import java.util.Properties; diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/Max.java b/src/main/java/com/metaweb/gridworks/expr/functions/math/Max.java similarity index 92% rename from src/main/java/com/metaweb/gridworks/expr/functions/Max.java rename to src/main/java/com/metaweb/gridworks/expr/functions/math/Max.java index 285c49a82..991a0653d 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/Max.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/math/Max.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.expr.functions; +package com.metaweb.gridworks.expr.functions.math; import java.util.Properties; diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/Min.java b/src/main/java/com/metaweb/gridworks/expr/functions/math/Min.java similarity index 92% rename from src/main/java/com/metaweb/gridworks/expr/functions/Min.java rename to src/main/java/com/metaweb/gridworks/expr/functions/math/Min.java index 1d1272729..f709838e2 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/Min.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/math/Min.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.expr.functions; +package com.metaweb.gridworks.expr.functions.math; import java.util.Properties; diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/Mod.java b/src/main/java/com/metaweb/gridworks/expr/functions/math/Mod.java similarity index 92% rename from src/main/java/com/metaweb/gridworks/expr/functions/Mod.java rename to src/main/java/com/metaweb/gridworks/expr/functions/math/Mod.java index 873c296d7..7048bda3a 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/Mod.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/math/Mod.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.expr.functions; +package com.metaweb.gridworks.expr.functions.math; import java.util.Properties; diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/Round.java b/src/main/java/com/metaweb/gridworks/expr/functions/math/Round.java similarity index 91% rename from src/main/java/com/metaweb/gridworks/expr/functions/Round.java rename to src/main/java/com/metaweb/gridworks/expr/functions/math/Round.java index 9851f1544..fa793fb4e 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/Round.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/math/Round.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.expr.functions; +package com.metaweb.gridworks.expr.functions.math; import java.util.Properties; diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/EndsWith.java b/src/main/java/com/metaweb/gridworks/expr/functions/strings/EndsWith.java similarity index 91% rename from src/main/java/com/metaweb/gridworks/expr/functions/EndsWith.java rename to src/main/java/com/metaweb/gridworks/expr/functions/strings/EndsWith.java index 18881d7e6..cc4bb3163 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/EndsWith.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/strings/EndsWith.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.expr.functions; +package com.metaweb.gridworks.expr.functions.strings; import java.util.Properties; diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/IndexOf.java b/src/main/java/com/metaweb/gridworks/expr/functions/strings/IndexOf.java similarity index 91% rename from src/main/java/com/metaweb/gridworks/expr/functions/IndexOf.java rename to src/main/java/com/metaweb/gridworks/expr/functions/strings/IndexOf.java index 486e0fad8..361f25426 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/IndexOf.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/strings/IndexOf.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.expr.functions; +package com.metaweb.gridworks.expr.functions.strings; import java.util.Properties; diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/LastIndexOf.java b/src/main/java/com/metaweb/gridworks/expr/functions/strings/LastIndexOf.java similarity index 91% rename from src/main/java/com/metaweb/gridworks/expr/functions/LastIndexOf.java rename to src/main/java/com/metaweb/gridworks/expr/functions/strings/LastIndexOf.java index d7bd8930a..6c6a201d9 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/LastIndexOf.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/strings/LastIndexOf.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.expr.functions; +package com.metaweb.gridworks.expr.functions.strings; import java.util.Properties; diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/Replace.java b/src/main/java/com/metaweb/gridworks/expr/functions/strings/Replace.java similarity index 92% rename from src/main/java/com/metaweb/gridworks/expr/functions/Replace.java rename to src/main/java/com/metaweb/gridworks/expr/functions/strings/Replace.java index 14a7cdf2b..928232b5a 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/Replace.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/strings/Replace.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.expr.functions; +package com.metaweb.gridworks.expr.functions.strings; import java.util.Properties; diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/Split.java b/src/main/java/com/metaweb/gridworks/expr/functions/strings/Split.java similarity index 92% rename from src/main/java/com/metaweb/gridworks/expr/functions/Split.java rename to src/main/java/com/metaweb/gridworks/expr/functions/strings/Split.java index d310573fa..640c85a5e 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/Split.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/strings/Split.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.expr.functions; +package com.metaweb.gridworks.expr.functions.strings; import java.util.Properties; diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/StartsWith.java b/src/main/java/com/metaweb/gridworks/expr/functions/strings/StartsWith.java similarity index 91% rename from src/main/java/com/metaweb/gridworks/expr/functions/StartsWith.java rename to src/main/java/com/metaweb/gridworks/expr/functions/strings/StartsWith.java index 143c54866..12aa39043 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/StartsWith.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/strings/StartsWith.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.expr.functions; +package com.metaweb.gridworks.expr.functions.strings; import java.util.Properties; diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/ToLowercase.java b/src/main/java/com/metaweb/gridworks/expr/functions/strings/ToLowercase.java similarity index 91% rename from src/main/java/com/metaweb/gridworks/expr/functions/ToLowercase.java rename to src/main/java/com/metaweb/gridworks/expr/functions/strings/ToLowercase.java index 49c8a0cce..28d9152ab 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/ToLowercase.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/strings/ToLowercase.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.expr.functions; +package com.metaweb.gridworks.expr.functions.strings; import java.util.Properties; diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/ToTitlecase.java b/src/main/java/com/metaweb/gridworks/expr/functions/strings/ToTitlecase.java similarity index 92% rename from src/main/java/com/metaweb/gridworks/expr/functions/ToTitlecase.java rename to src/main/java/com/metaweb/gridworks/expr/functions/strings/ToTitlecase.java index c357484c6..e8829e110 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/ToTitlecase.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/strings/ToTitlecase.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.expr.functions; +package com.metaweb.gridworks.expr.functions.strings; import java.util.Properties; diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/ToUppercase.java b/src/main/java/com/metaweb/gridworks/expr/functions/strings/ToUppercase.java similarity index 91% rename from src/main/java/com/metaweb/gridworks/expr/functions/ToUppercase.java rename to src/main/java/com/metaweb/gridworks/expr/functions/strings/ToUppercase.java index dbfd58e62..1d5cc5ed5 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/ToUppercase.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/strings/ToUppercase.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.expr.functions; +package com.metaweb.gridworks.expr.functions.strings; import java.util.Properties; diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/IsBlank.java b/src/main/java/com/metaweb/gridworks/expr/functions/tests/IsBlank.java similarity index 89% rename from src/main/java/com/metaweb/gridworks/expr/functions/IsBlank.java rename to src/main/java/com/metaweb/gridworks/expr/functions/tests/IsBlank.java index 44bcf1c82..47595b83d 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/IsBlank.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/tests/IsBlank.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.expr.functions; +package com.metaweb.gridworks.expr.functions.tests; import java.util.Properties; diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/IsNotBlank.java b/src/main/java/com/metaweb/gridworks/expr/functions/tests/IsNotBlank.java similarity index 90% rename from src/main/java/com/metaweb/gridworks/expr/functions/IsNotBlank.java rename to src/main/java/com/metaweb/gridworks/expr/functions/tests/IsNotBlank.java index 9312d7852..da7c37480 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/IsNotBlank.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/tests/IsNotBlank.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.expr.functions; +package com.metaweb.gridworks.expr.functions.tests; import java.util.Properties; diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/IsNotNull.java b/src/main/java/com/metaweb/gridworks/expr/functions/tests/IsNotNull.java similarity index 88% rename from src/main/java/com/metaweb/gridworks/expr/functions/IsNotNull.java rename to src/main/java/com/metaweb/gridworks/expr/functions/tests/IsNotNull.java index e4ed7b742..505427ee9 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/IsNotNull.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/tests/IsNotNull.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.expr.functions; +package com.metaweb.gridworks.expr.functions.tests; import java.util.Properties; diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/IsNull.java b/src/main/java/com/metaweb/gridworks/expr/functions/tests/IsNull.java similarity index 88% rename from src/main/java/com/metaweb/gridworks/expr/functions/IsNull.java rename to src/main/java/com/metaweb/gridworks/expr/functions/tests/IsNull.java index 3c6ea497d..bc211a481 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/IsNull.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/tests/IsNull.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.expr.functions; +package com.metaweb.gridworks.expr.functions.tests; import java.util.Properties;