Repository: marmotta Updated Branches: refs/heads/develop 89df9e039 -> b7ba8ff36
http://git-wip-us.apache.org/repos/asf/marmotta/blob/b7ba8ff3/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/hash/NSHA384.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/hash/NSHA384.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/hash/NSHA384.java index faaefdf..724a516 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/hash/NSHA384.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/hash/NSHA384.java @@ -20,7 +20,7 @@ package org.apache.marmotta.kiwi.sparql.function.hash; import org.apache.marmotta.kiwi.persistence.KiWiDialect; import org.apache.marmotta.kiwi.persistence.mysql.MySQLDialect; import org.apache.marmotta.kiwi.persistence.pgsql.PostgreSQLDialect; -import org.apache.marmotta.kiwi.sparql.builder.OPTypes; +import org.apache.marmotta.kiwi.sparql.builder.ValueType; import org.apache.marmotta.kiwi.sparql.function.NativeFunction; import org.openrdf.query.algebra.evaluation.function.hash.SHA384; @@ -65,8 +65,8 @@ public class NSHA384 extends SHA384 implements NativeFunction { * @return */ @Override - public OPTypes getReturnType() { - return OPTypes.STRING; + public ValueType getReturnType() { + return ValueType.STRING; } /** @@ -77,8 +77,8 @@ public class NSHA384 extends SHA384 implements NativeFunction { * @return */ @Override - public OPTypes getArgumentType(int arg) { - return OPTypes.STRING; + public ValueType getArgumentType(int arg) { + return ValueType.STRING; } /** http://git-wip-us.apache.org/repos/asf/marmotta/blob/b7ba8ff3/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/hash/NSHA512.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/hash/NSHA512.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/hash/NSHA512.java index 59a20f6..f94e2fe 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/hash/NSHA512.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/hash/NSHA512.java @@ -20,7 +20,7 @@ package org.apache.marmotta.kiwi.sparql.function.hash; import org.apache.marmotta.kiwi.persistence.KiWiDialect; import org.apache.marmotta.kiwi.persistence.mysql.MySQLDialect; import org.apache.marmotta.kiwi.persistence.pgsql.PostgreSQLDialect; -import org.apache.marmotta.kiwi.sparql.builder.OPTypes; +import org.apache.marmotta.kiwi.sparql.builder.ValueType; import org.apache.marmotta.kiwi.sparql.function.NativeFunction; import org.openrdf.query.algebra.evaluation.function.hash.SHA512; @@ -65,8 +65,8 @@ public class NSHA512 extends SHA512 implements NativeFunction { * @return */ @Override - public OPTypes getReturnType() { - return OPTypes.STRING; + public ValueType getReturnType() { + return ValueType.STRING; } /** @@ -77,8 +77,8 @@ public class NSHA512 extends SHA512 implements NativeFunction { * @return */ @Override - public OPTypes getArgumentType(int arg) { - return OPTypes.STRING; + public ValueType getArgumentType(int arg) { + return ValueType.STRING; } /** http://git-wip-us.apache.org/repos/asf/marmotta/blob/b7ba8ff3/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/numeric/NAbs.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/numeric/NAbs.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/numeric/NAbs.java index d1b913d..b606caa 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/numeric/NAbs.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/numeric/NAbs.java @@ -21,7 +21,7 @@ import org.apache.marmotta.kiwi.persistence.KiWiDialect; import org.apache.marmotta.kiwi.persistence.h2.H2Dialect; import org.apache.marmotta.kiwi.persistence.mysql.MySQLDialect; import org.apache.marmotta.kiwi.persistence.pgsql.PostgreSQLDialect; -import org.apache.marmotta.kiwi.sparql.builder.OPTypes; +import org.apache.marmotta.kiwi.sparql.builder.ValueType; import org.apache.marmotta.kiwi.sparql.function.NativeFunction; import org.openrdf.query.algebra.evaluation.function.numeric.Abs; @@ -61,8 +61,8 @@ public class NAbs extends Abs implements NativeFunction { * @return */ @Override - public OPTypes getReturnType() { - return OPTypes.DOUBLE; + public ValueType getReturnType() { + return ValueType.DOUBLE; } /** @@ -73,8 +73,8 @@ public class NAbs extends Abs implements NativeFunction { * @return */ @Override - public OPTypes getArgumentType(int arg) { - return OPTypes.DOUBLE; + public ValueType getArgumentType(int arg) { + return ValueType.DOUBLE; } /** http://git-wip-us.apache.org/repos/asf/marmotta/blob/b7ba8ff3/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/numeric/NCeil.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/numeric/NCeil.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/numeric/NCeil.java index 850ac94..b46c9ee 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/numeric/NCeil.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/numeric/NCeil.java @@ -21,7 +21,7 @@ import org.apache.marmotta.kiwi.persistence.KiWiDialect; import org.apache.marmotta.kiwi.persistence.h2.H2Dialect; import org.apache.marmotta.kiwi.persistence.mysql.MySQLDialect; import org.apache.marmotta.kiwi.persistence.pgsql.PostgreSQLDialect; -import org.apache.marmotta.kiwi.sparql.builder.OPTypes; +import org.apache.marmotta.kiwi.sparql.builder.ValueType; import org.apache.marmotta.kiwi.sparql.function.NativeFunction; import org.openrdf.query.algebra.evaluation.function.numeric.Ceil; @@ -61,8 +61,8 @@ public class NCeil extends Ceil implements NativeFunction { * @return */ @Override - public OPTypes getReturnType() { - return OPTypes.INT; + public ValueType getReturnType() { + return ValueType.INT; } /** @@ -73,8 +73,8 @@ public class NCeil extends Ceil implements NativeFunction { * @return */ @Override - public OPTypes getArgumentType(int arg) { - return OPTypes.DOUBLE; + public ValueType getArgumentType(int arg) { + return ValueType.DOUBLE; } /** http://git-wip-us.apache.org/repos/asf/marmotta/blob/b7ba8ff3/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/numeric/NFloor.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/numeric/NFloor.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/numeric/NFloor.java index b5e207c..171276b 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/numeric/NFloor.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/numeric/NFloor.java @@ -21,7 +21,7 @@ import org.apache.marmotta.kiwi.persistence.KiWiDialect; import org.apache.marmotta.kiwi.persistence.h2.H2Dialect; import org.apache.marmotta.kiwi.persistence.mysql.MySQLDialect; import org.apache.marmotta.kiwi.persistence.pgsql.PostgreSQLDialect; -import org.apache.marmotta.kiwi.sparql.builder.OPTypes; +import org.apache.marmotta.kiwi.sparql.builder.ValueType; import org.apache.marmotta.kiwi.sparql.function.NativeFunction; import org.openrdf.query.algebra.evaluation.function.numeric.Floor; @@ -61,8 +61,8 @@ public class NFloor extends Floor implements NativeFunction { * @return */ @Override - public OPTypes getReturnType() { - return OPTypes.INT; + public ValueType getReturnType() { + return ValueType.INT; } /** @@ -73,8 +73,8 @@ public class NFloor extends Floor implements NativeFunction { * @return */ @Override - public OPTypes getArgumentType(int arg) { - return OPTypes.DOUBLE; + public ValueType getArgumentType(int arg) { + return ValueType.DOUBLE; } /** http://git-wip-us.apache.org/repos/asf/marmotta/blob/b7ba8ff3/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/numeric/NRand.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/numeric/NRand.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/numeric/NRand.java index 1a5b46d..d5897c7 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/numeric/NRand.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/numeric/NRand.java @@ -21,7 +21,7 @@ import org.apache.marmotta.kiwi.persistence.KiWiDialect; import org.apache.marmotta.kiwi.persistence.h2.H2Dialect; import org.apache.marmotta.kiwi.persistence.mysql.MySQLDialect; import org.apache.marmotta.kiwi.persistence.pgsql.PostgreSQLDialect; -import org.apache.marmotta.kiwi.sparql.builder.OPTypes; +import org.apache.marmotta.kiwi.sparql.builder.ValueType; import org.apache.marmotta.kiwi.sparql.function.NativeFunction; import org.openrdf.query.algebra.evaluation.function.numeric.Rand; @@ -66,8 +66,8 @@ public class NRand extends Rand implements NativeFunction { * @return */ @Override - public OPTypes getReturnType() { - return OPTypes.DOUBLE; + public ValueType getReturnType() { + return ValueType.DOUBLE; } /** @@ -78,8 +78,8 @@ public class NRand extends Rand implements NativeFunction { * @return */ @Override - public OPTypes getArgumentType(int arg) { - return OPTypes.ANY; + public ValueType getArgumentType(int arg) { + return ValueType.NODE; } /** http://git-wip-us.apache.org/repos/asf/marmotta/blob/b7ba8ff3/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/numeric/NRound.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/numeric/NRound.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/numeric/NRound.java index eae1127..0048b71 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/numeric/NRound.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/numeric/NRound.java @@ -21,7 +21,7 @@ import org.apache.marmotta.kiwi.persistence.KiWiDialect; import org.apache.marmotta.kiwi.persistence.h2.H2Dialect; import org.apache.marmotta.kiwi.persistence.mysql.MySQLDialect; import org.apache.marmotta.kiwi.persistence.pgsql.PostgreSQLDialect; -import org.apache.marmotta.kiwi.sparql.builder.OPTypes; +import org.apache.marmotta.kiwi.sparql.builder.ValueType; import org.apache.marmotta.kiwi.sparql.function.NativeFunction; import org.openrdf.query.algebra.evaluation.function.numeric.Round; @@ -61,8 +61,8 @@ public class NRound extends Round implements NativeFunction { * @return */ @Override - public OPTypes getReturnType() { - return OPTypes.INT; + public ValueType getReturnType() { + return ValueType.INT; } /** @@ -73,8 +73,8 @@ public class NRound extends Round implements NativeFunction { * @return */ @Override - public OPTypes getArgumentType(int arg) { - return OPTypes.DOUBLE; + public ValueType getArgumentType(int arg) { + return ValueType.DOUBLE; } /** http://git-wip-us.apache.org/repos/asf/marmotta/blob/b7ba8ff3/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/rdfterm/NSTRUUID.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/rdfterm/NSTRUUID.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/rdfterm/NSTRUUID.java index 3c60294..e936de6 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/rdfterm/NSTRUUID.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/rdfterm/NSTRUUID.java @@ -20,7 +20,7 @@ package org.apache.marmotta.kiwi.sparql.function.rdfterm; import org.apache.marmotta.kiwi.persistence.KiWiDialect; import org.apache.marmotta.kiwi.persistence.mysql.MySQLDialect; import org.apache.marmotta.kiwi.persistence.pgsql.PostgreSQLDialect; -import org.apache.marmotta.kiwi.sparql.builder.OPTypes; +import org.apache.marmotta.kiwi.sparql.builder.ValueType; import org.apache.marmotta.kiwi.sparql.function.NativeFunction; import org.openrdf.query.algebra.evaluation.function.rdfterm.STRUUID; @@ -65,8 +65,8 @@ public class NSTRUUID extends STRUUID implements NativeFunction { * @return */ @Override - public OPTypes getReturnType() { - return OPTypes.STRING; + public ValueType getReturnType() { + return ValueType.STRING; } /** @@ -77,8 +77,8 @@ public class NSTRUUID extends STRUUID implements NativeFunction { * @return */ @Override - public OPTypes getArgumentType(int arg) { - return OPTypes.ANY; + public ValueType getArgumentType(int arg) { + return ValueType.NODE; } /** http://git-wip-us.apache.org/repos/asf/marmotta/blob/b7ba8ff3/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/rdfterm/NUUID.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/rdfterm/NUUID.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/rdfterm/NUUID.java index 04a6962..316d2df 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/rdfterm/NUUID.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/rdfterm/NUUID.java @@ -20,7 +20,7 @@ package org.apache.marmotta.kiwi.sparql.function.rdfterm; import org.apache.marmotta.kiwi.persistence.KiWiDialect; import org.apache.marmotta.kiwi.persistence.mysql.MySQLDialect; import org.apache.marmotta.kiwi.persistence.pgsql.PostgreSQLDialect; -import org.apache.marmotta.kiwi.sparql.builder.OPTypes; +import org.apache.marmotta.kiwi.sparql.builder.ValueType; import org.apache.marmotta.kiwi.sparql.function.NativeFunction; import org.openrdf.query.algebra.evaluation.function.rdfterm.UUID; @@ -65,8 +65,8 @@ public class NUUID extends UUID implements NativeFunction { * @return */ @Override - public OPTypes getReturnType() { - return OPTypes.URI; + public ValueType getReturnType() { + return ValueType.URI; } /** @@ -77,8 +77,8 @@ public class NUUID extends UUID implements NativeFunction { * @return */ @Override - public OPTypes getArgumentType(int arg) { - return OPTypes.ANY; + public ValueType getArgumentType(int arg) { + return ValueType.NODE; } /** http://git-wip-us.apache.org/repos/asf/marmotta/blob/b7ba8ff3/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NConcat.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NConcat.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NConcat.java index c7ad3b8..b1b5df6 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NConcat.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NConcat.java @@ -22,7 +22,7 @@ import org.apache.marmotta.kiwi.persistence.KiWiDialect; import org.apache.marmotta.kiwi.persistence.h2.H2Dialect; import org.apache.marmotta.kiwi.persistence.mysql.MySQLDialect; import org.apache.marmotta.kiwi.persistence.pgsql.PostgreSQLDialect; -import org.apache.marmotta.kiwi.sparql.builder.OPTypes; +import org.apache.marmotta.kiwi.sparql.builder.ValueType; import org.apache.marmotta.kiwi.sparql.function.NativeFunction; import org.openrdf.query.algebra.evaluation.function.string.Concat; @@ -67,8 +67,8 @@ public class NConcat extends Concat implements NativeFunction { * @return */ @Override - public OPTypes getReturnType() { - return OPTypes.STRING; + public ValueType getReturnType() { + return ValueType.STRING; } /** @@ -79,8 +79,8 @@ public class NConcat extends Concat implements NativeFunction { * @return */ @Override - public OPTypes getArgumentType(int arg) { - return OPTypes.STRING; + public ValueType getArgumentType(int arg) { + return ValueType.STRING; } /** http://git-wip-us.apache.org/repos/asf/marmotta/blob/b7ba8ff3/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NContains.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NContains.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NContains.java index e786b8c..e542566 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NContains.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NContains.java @@ -21,7 +21,7 @@ import org.apache.marmotta.kiwi.persistence.KiWiDialect; import org.apache.marmotta.kiwi.persistence.h2.H2Dialect; import org.apache.marmotta.kiwi.persistence.mysql.MySQLDialect; import org.apache.marmotta.kiwi.persistence.pgsql.PostgreSQLDialect; -import org.apache.marmotta.kiwi.sparql.builder.OPTypes; +import org.apache.marmotta.kiwi.sparql.builder.ValueType; import org.apache.marmotta.kiwi.sparql.function.NativeFunction; import org.openrdf.query.algebra.evaluation.function.string.Contains; @@ -68,8 +68,8 @@ public class NContains extends Contains implements NativeFunction { * @return */ @Override - public OPTypes getReturnType() { - return OPTypes.BOOL; + public ValueType getReturnType() { + return ValueType.BOOL; } /** @@ -80,8 +80,8 @@ public class NContains extends Contains implements NativeFunction { * @return */ @Override - public OPTypes getArgumentType(int arg) { - return OPTypes.STRING; + public ValueType getArgumentType(int arg) { + return ValueType.STRING; } /** http://git-wip-us.apache.org/repos/asf/marmotta/blob/b7ba8ff3/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NLowerCase.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NLowerCase.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NLowerCase.java index ac8226e..4418a08 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NLowerCase.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NLowerCase.java @@ -21,7 +21,7 @@ import org.apache.marmotta.kiwi.persistence.KiWiDialect; import org.apache.marmotta.kiwi.persistence.h2.H2Dialect; import org.apache.marmotta.kiwi.persistence.mysql.MySQLDialect; import org.apache.marmotta.kiwi.persistence.pgsql.PostgreSQLDialect; -import org.apache.marmotta.kiwi.sparql.builder.OPTypes; +import org.apache.marmotta.kiwi.sparql.builder.ValueType; import org.apache.marmotta.kiwi.sparql.function.NativeFunction; import org.openrdf.query.algebra.evaluation.function.string.LowerCase; @@ -61,8 +61,8 @@ public class NLowerCase extends LowerCase implements NativeFunction { * @return */ @Override - public OPTypes getReturnType() { - return OPTypes.STRING; + public ValueType getReturnType() { + return ValueType.STRING; } /** @@ -73,8 +73,8 @@ public class NLowerCase extends LowerCase implements NativeFunction { * @return */ @Override - public OPTypes getArgumentType(int arg) { - return OPTypes.STRING; + public ValueType getArgumentType(int arg) { + return ValueType.STRING; } /** http://git-wip-us.apache.org/repos/asf/marmotta/blob/b7ba8ff3/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NReplace.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NReplace.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NReplace.java index cd1b848..70b17d6 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NReplace.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NReplace.java @@ -21,7 +21,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.marmotta.kiwi.persistence.KiWiDialect; import org.apache.marmotta.kiwi.persistence.h2.H2Dialect; import org.apache.marmotta.kiwi.persistence.pgsql.PostgreSQLDialect; -import org.apache.marmotta.kiwi.sparql.builder.OPTypes; +import org.apache.marmotta.kiwi.sparql.builder.ValueType; import org.apache.marmotta.kiwi.sparql.function.NativeFunction; import org.openrdf.query.algebra.evaluation.function.string.Replace; @@ -78,8 +78,8 @@ public class NReplace extends Replace implements NativeFunction { * @return */ @Override - public OPTypes getReturnType() { - return OPTypes.STRING; + public ValueType getReturnType() { + return ValueType.STRING; } /** @@ -90,8 +90,8 @@ public class NReplace extends Replace implements NativeFunction { * @return */ @Override - public OPTypes getArgumentType(int arg) { - return OPTypes.STRING; + public ValueType getArgumentType(int arg) { + return ValueType.STRING; } /** http://git-wip-us.apache.org/repos/asf/marmotta/blob/b7ba8ff3/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NStrAfter.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NStrAfter.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NStrAfter.java index cfd7286..8485665 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NStrAfter.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NStrAfter.java @@ -21,7 +21,7 @@ import org.apache.marmotta.kiwi.persistence.KiWiDialect; import org.apache.marmotta.kiwi.persistence.h2.H2Dialect; import org.apache.marmotta.kiwi.persistence.mysql.MySQLDialect; import org.apache.marmotta.kiwi.persistence.pgsql.PostgreSQLDialect; -import org.apache.marmotta.kiwi.sparql.builder.OPTypes; +import org.apache.marmotta.kiwi.sparql.builder.ValueType; import org.apache.marmotta.kiwi.sparql.function.NativeFunction; import org.openrdf.query.algebra.evaluation.function.string.StrAfter; @@ -68,8 +68,8 @@ public class NStrAfter extends StrAfter implements NativeFunction { * @return */ @Override - public OPTypes getReturnType() { - return OPTypes.STRING; + public ValueType getReturnType() { + return ValueType.STRING; } /** @@ -80,8 +80,8 @@ public class NStrAfter extends StrAfter implements NativeFunction { * @return */ @Override - public OPTypes getArgumentType(int arg) { - return OPTypes.STRING; + public ValueType getArgumentType(int arg) { + return ValueType.STRING; } /** http://git-wip-us.apache.org/repos/asf/marmotta/blob/b7ba8ff3/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NStrBefore.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NStrBefore.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NStrBefore.java index 2136e18..219131b 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NStrBefore.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NStrBefore.java @@ -21,7 +21,7 @@ import org.apache.marmotta.kiwi.persistence.KiWiDialect; import org.apache.marmotta.kiwi.persistence.h2.H2Dialect; import org.apache.marmotta.kiwi.persistence.mysql.MySQLDialect; import org.apache.marmotta.kiwi.persistence.pgsql.PostgreSQLDialect; -import org.apache.marmotta.kiwi.sparql.builder.OPTypes; +import org.apache.marmotta.kiwi.sparql.builder.ValueType; import org.apache.marmotta.kiwi.sparql.function.NativeFunction; import org.openrdf.query.algebra.evaluation.function.string.StrBefore; @@ -68,8 +68,8 @@ public class NStrBefore extends StrBefore implements NativeFunction { * @return */ @Override - public OPTypes getReturnType() { - return OPTypes.STRING; + public ValueType getReturnType() { + return ValueType.STRING; } /** @@ -80,8 +80,8 @@ public class NStrBefore extends StrBefore implements NativeFunction { * @return */ @Override - public OPTypes getArgumentType(int arg) { - return OPTypes.STRING; + public ValueType getArgumentType(int arg) { + return ValueType.STRING; } /** http://git-wip-us.apache.org/repos/asf/marmotta/blob/b7ba8ff3/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NStrEnds.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NStrEnds.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NStrEnds.java index 4b98dbb..2c58986 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NStrEnds.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NStrEnds.java @@ -21,7 +21,7 @@ import org.apache.marmotta.kiwi.persistence.KiWiDialect; import org.apache.marmotta.kiwi.persistence.h2.H2Dialect; import org.apache.marmotta.kiwi.persistence.mysql.MySQLDialect; import org.apache.marmotta.kiwi.persistence.pgsql.PostgreSQLDialect; -import org.apache.marmotta.kiwi.sparql.builder.OPTypes; +import org.apache.marmotta.kiwi.sparql.builder.ValueType; import org.apache.marmotta.kiwi.sparql.function.NativeFunction; import org.openrdf.query.algebra.evaluation.function.string.StrEnds; @@ -68,8 +68,8 @@ public class NStrEnds extends StrEnds implements NativeFunction { * @return */ @Override - public OPTypes getReturnType() { - return OPTypes.BOOL; + public ValueType getReturnType() { + return ValueType.BOOL; } /** @@ -80,8 +80,8 @@ public class NStrEnds extends StrEnds implements NativeFunction { * @return */ @Override - public OPTypes getArgumentType(int arg) { - return OPTypes.STRING; + public ValueType getArgumentType(int arg) { + return ValueType.STRING; } /** http://git-wip-us.apache.org/repos/asf/marmotta/blob/b7ba8ff3/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NStrLen.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NStrLen.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NStrLen.java index 6f30c87..0088e7c 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NStrLen.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NStrLen.java @@ -21,7 +21,7 @@ import org.apache.marmotta.kiwi.persistence.KiWiDialect; import org.apache.marmotta.kiwi.persistence.h2.H2Dialect; import org.apache.marmotta.kiwi.persistence.mysql.MySQLDialect; import org.apache.marmotta.kiwi.persistence.pgsql.PostgreSQLDialect; -import org.apache.marmotta.kiwi.sparql.builder.OPTypes; +import org.apache.marmotta.kiwi.sparql.builder.ValueType; import org.apache.marmotta.kiwi.sparql.function.NativeFunction; import org.openrdf.query.algebra.evaluation.function.string.StrLen; @@ -61,8 +61,8 @@ public class NStrLen extends StrLen implements NativeFunction { * @return */ @Override - public OPTypes getReturnType() { - return OPTypes.INT; + public ValueType getReturnType() { + return ValueType.INT; } /** @@ -73,8 +73,8 @@ public class NStrLen extends StrLen implements NativeFunction { * @return */ @Override - public OPTypes getArgumentType(int arg) { - return OPTypes.STRING; + public ValueType getArgumentType(int arg) { + return ValueType.STRING; } /** http://git-wip-us.apache.org/repos/asf/marmotta/blob/b7ba8ff3/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NStrStarts.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NStrStarts.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NStrStarts.java index fdb2d27..2638698 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NStrStarts.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NStrStarts.java @@ -21,7 +21,7 @@ import org.apache.marmotta.kiwi.persistence.KiWiDialect; import org.apache.marmotta.kiwi.persistence.h2.H2Dialect; import org.apache.marmotta.kiwi.persistence.mysql.MySQLDialect; import org.apache.marmotta.kiwi.persistence.pgsql.PostgreSQLDialect; -import org.apache.marmotta.kiwi.sparql.builder.OPTypes; +import org.apache.marmotta.kiwi.sparql.builder.ValueType; import org.apache.marmotta.kiwi.sparql.function.NativeFunction; import org.openrdf.query.algebra.evaluation.function.string.StrStarts; @@ -68,8 +68,8 @@ public class NStrStarts extends StrStarts implements NativeFunction { * @return */ @Override - public OPTypes getReturnType() { - return OPTypes.BOOL; + public ValueType getReturnType() { + return ValueType.BOOL; } /** @@ -80,8 +80,8 @@ public class NStrStarts extends StrStarts implements NativeFunction { * @return */ @Override - public OPTypes getArgumentType(int arg) { - return OPTypes.STRING; + public ValueType getArgumentType(int arg) { + return ValueType.STRING; } /** http://git-wip-us.apache.org/repos/asf/marmotta/blob/b7ba8ff3/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NSubstring.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NSubstring.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NSubstring.java index afdddd9..969011a 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NSubstring.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NSubstring.java @@ -21,7 +21,7 @@ import org.apache.marmotta.kiwi.persistence.KiWiDialect; import org.apache.marmotta.kiwi.persistence.h2.H2Dialect; import org.apache.marmotta.kiwi.persistence.mysql.MySQLDialect; import org.apache.marmotta.kiwi.persistence.pgsql.PostgreSQLDialect; -import org.apache.marmotta.kiwi.sparql.builder.OPTypes; +import org.apache.marmotta.kiwi.sparql.builder.ValueType; import org.apache.marmotta.kiwi.sparql.function.NativeFunction; import org.openrdf.query.algebra.evaluation.function.string.Substring; @@ -81,8 +81,8 @@ public class NSubstring extends Substring implements NativeFunction { * @return */ @Override - public OPTypes getReturnType() { - return OPTypes.STRING; + public ValueType getReturnType() { + return ValueType.STRING; } /** @@ -93,11 +93,11 @@ public class NSubstring extends Substring implements NativeFunction { * @return */ @Override - public OPTypes getArgumentType(int arg) { + public ValueType getArgumentType(int arg) { if(arg == 0) { - return OPTypes.STRING; + return ValueType.STRING; } else { - return OPTypes.INT; + return ValueType.INT; } } http://git-wip-us.apache.org/repos/asf/marmotta/blob/b7ba8ff3/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NUpperCase.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NUpperCase.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NUpperCase.java index 2ecb231..eefc243 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NUpperCase.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/string/NUpperCase.java @@ -21,7 +21,7 @@ import org.apache.marmotta.kiwi.persistence.KiWiDialect; import org.apache.marmotta.kiwi.persistence.h2.H2Dialect; import org.apache.marmotta.kiwi.persistence.mysql.MySQLDialect; import org.apache.marmotta.kiwi.persistence.pgsql.PostgreSQLDialect; -import org.apache.marmotta.kiwi.sparql.builder.OPTypes; +import org.apache.marmotta.kiwi.sparql.builder.ValueType; import org.apache.marmotta.kiwi.sparql.function.NativeFunction; import org.openrdf.query.algebra.evaluation.function.string.UpperCase; @@ -61,8 +61,8 @@ public class NUpperCase extends UpperCase implements NativeFunction { * @return */ @Override - public OPTypes getReturnType() { - return OPTypes.STRING; + public ValueType getReturnType() { + return ValueType.STRING; } /** @@ -73,8 +73,8 @@ public class NUpperCase extends UpperCase implements NativeFunction { * @return */ @Override - public OPTypes getArgumentType(int arg) { - return OPTypes.STRING; + public ValueType getArgumentType(int arg) { + return ValueType.STRING; } /**
