You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ss...@apache.org on 2013/03/08 12:11:32 UTC
git commit: extended LDPath transformers so the field configuration
is passed over to the transform call
Updated Branches:
refs/heads/master fc0c40195 -> c44c9a2f8
extended LDPath transformers so the field configuration is passed over to the transform call
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/c44c9a2f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/c44c9a2f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/c44c9a2f
Branch: refs/heads/master
Commit: c44c9a2f8fff38196b47e1b744d2ed0fd0a6c1f0
Parents: fc0c401
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Fri Mar 8 11:53:36 2013 +0100
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Fri Mar 8 11:53:36 2013 +0100
----------------------------------------------------------------------
.../ldpath/api/transformers/NodeTransformer.java | 6 +++++-
.../marmotta/ldpath/model/fields/FieldMapping.java | 4 ++--
.../model/functions/ConcatenateFunction.java | 3 +--
.../ldpath/model/functions/SortFunction.java | 13 ++++++-------
.../model/tests/functions/BinaryNumericTest.java | 2 +-
.../model/transformers/BigDecimalTransformer.java | 3 ++-
.../model/transformers/BigIntegerTransformer.java | 3 ++-
.../model/transformers/BooleanTransformer.java | 4 +++-
.../ldpath/model/transformers/ByteTransformer.java | 4 +++-
.../model/transformers/DateTimeTransformer.java | 3 ++-
.../ldpath/model/transformers/DateTransformer.java | 3 ++-
.../model/transformers/DoubleTransformer.java | 4 +++-
.../model/transformers/DurationTransformer.java | 4 +++-
.../model/transformers/FloatTransformer.java | 4 +++-
.../model/transformers/IdentityTransformer.java | 4 +++-
.../ldpath/model/transformers/IntTransformer.java | 4 +++-
.../ldpath/model/transformers/LongTransformer.java | 4 +++-
.../model/transformers/ShortTransformer.java | 4 +++-
.../model/transformers/StringTransformer.java | 4 +++-
.../ldpath/model/transformers/TimeTransformer.java | 3 ++-
.../apache/marmotta/ldpath/parser/ParserTest.java | 2 +-
.../model/functions/date/EarliestDateFunction.java | 2 +-
.../model/functions/date/LatestDateFunction.java | 2 +-
.../model/functions/html/CleanHtmlFunction.java | 3 +--
.../model/functions/html/CssSelectFunction.java | 5 ++---
.../ldpath/model/functions/math/MaxFunction.java | 2 +-
.../ldpath/model/functions/math/MinFunction.java | 2 +-
.../ldpath/model/functions/math/RoundFunction.java | 2 +-
.../ldpath/model/functions/math/SumFunction.java | 2 +-
.../model/functions/text/ReplaceFunction.java | 4 ++--
.../model/functions/xml/RemoveXmlTagsFunction.java | 4 ++--
.../ldpath/model/functions/xml/XPathFunction.java | 5 ++---
.../transformers/TemplateBooleanTransformer.java | 8 ++++++--
.../transformers/TemplateDateTransformer.java | 7 +++++--
.../transformers/TemplateDoubleTransformer.java | 8 ++++++--
.../transformers/TemplateFloatTransformer.java | 8 ++++++--
.../transformers/TemplateIntegerTransformer.java | 8 ++++++--
.../transformers/TemplateLongTransformer.java | 8 ++++++--
.../transformers/TemplateScalarTransformer.java | 8 ++++++--
.../ldpath/model/functions/JsoupFunction.java | 5 ++---
40 files changed, 114 insertions(+), 64 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c44c9a2f/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/transformers/NodeTransformer.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/transformers/NodeTransformer.java b/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/transformers/NodeTransformer.java
index a3f4b94..e1fa236 100644
--- a/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/transformers/NodeTransformer.java
+++ b/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/transformers/NodeTransformer.java
@@ -19,6 +19,8 @@ package org.apache.marmotta.ldpath.api.transformers;
import org.apache.marmotta.ldpath.api.backend.RDFBackend;
+import java.util.Map;
+
/**
* Implementations of this interface allow to transform KiWiNode objects into the type T. This is
* currently required by the indexer to map KiWiNodes to the Java types corresponding to the
@@ -34,9 +36,11 @@ public interface NodeTransformer<T,Node> {
* the respective datatype, throws an IllegalArgumentException that needs to be caught by the class
* carrying out the transformation.
*
+ *
* @param node
+ * @param configuration the field configuration used when defining the LDPath rule
* @return
*/
- public T transform(RDFBackend<Node> backend, Node node) throws IllegalArgumentException;
+ public T transform(RDFBackend<Node> backend, Node node, Map<String, String> configuration) throws IllegalArgumentException;
}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c44c9a2f/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/fields/FieldMapping.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/fields/FieldMapping.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/fields/FieldMapping.java
index 06b7cdd..b555d01 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/fields/FieldMapping.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/fields/FieldMapping.java
@@ -119,7 +119,7 @@ public class FieldMapping<T,Node> implements LDPathConstruct<Node> {
Function<Node,T> function = new Function<Node, T>() {
@Override
public T apply(Node input) {
- return transformer.transform(backend,input);
+ return transformer.transform(backend,input, getFieldConfig());
}
};
@@ -138,7 +138,7 @@ public class FieldMapping<T,Node> implements LDPathConstruct<Node> {
Function<Node,T> function = new Function<Node, T>() {
@Override
public T apply(Node input) {
- return transformer.transform(backend,input);
+ return transformer.transform(backend,input, getFieldConfig());
}
};
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c44c9a2f/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/ConcatenateFunction.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/ConcatenateFunction.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/ConcatenateFunction.java
index 79d0943..2ce6712 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/ConcatenateFunction.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/ConcatenateFunction.java
@@ -48,7 +48,7 @@ public class ConcatenateFunction<Node> extends SelectorFunction<Node> {
Iterator<Node> it = org.apache.marmotta.ldpath.util.Collections.iterator(args);
StringBuilder result = new StringBuilder();
while (it.hasNext()) {
- result.append(transformer.transform(rdfBackend,it.next()));
+ result.append(transformer.transform(rdfBackend,it.next(), null));
}
return Collections.singleton(rdfBackend.createLiteral(result.toString()));
@@ -58,7 +58,6 @@ public class ConcatenateFunction<Node> extends SelectorFunction<Node> {
* Return the name of the NodeFunction for registration in the function registry
*
* @return
- * @param backend
*/
@Override
public String getLocalName() {
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c44c9a2f/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/SortFunction.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/SortFunction.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/SortFunction.java
index 5c6cac5..30ec623 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/SortFunction.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/SortFunction.java
@@ -71,10 +71,10 @@ public class SortFunction<Node> extends SelectorFunction<Node> {
// parse arguments
if(args.length > 1) {
- order = transformer.transform(nodeRDFBackend,args[1].iterator().next());
+ order = transformer.transform(nodeRDFBackend,args[1].iterator().next(), null);
}
if(args.length > 2) {
- direction = transformer.transform(nodeRDFBackend,args[2].iterator().next());
+ direction = transformer.transform(nodeRDFBackend,args[2].iterator().next(), null);
}
Comparator<Node> comparator = null;
@@ -87,8 +87,8 @@ public class SortFunction<Node> extends SelectorFunction<Node> {
@Override
public int compare(Node o1, Node o2) {
- return stringCollator.compare(transformer.transform(nodeRDFBackend,o1),
- transformer.transform(nodeRDFBackend,o2));
+ return stringCollator.compare(transformer.transform(nodeRDFBackend,o1, null),
+ transformer.transform(nodeRDFBackend,o2, null));
}
};
} else if("number".equalsIgnoreCase(order)) {
@@ -102,8 +102,8 @@ public class SortFunction<Node> extends SelectorFunction<Node> {
comparator = new Comparator<Node>() {
@Override
public int compare(Node o1, Node o2) {
- return (int) (dateTransformer.transform(nodeRDFBackend,o2).getTime() -
- dateTransformer.transform(nodeRDFBackend,o1).getTime());
+ return (int) (dateTransformer.transform(nodeRDFBackend,o2, null).getTime() -
+ dateTransformer.transform(nodeRDFBackend,o1, null).getTime());
}
};
}
@@ -130,7 +130,6 @@ public class SortFunction<Node> extends SelectorFunction<Node> {
/**
* Return the representation of the NodeFunction or NodeSelector in the RDF Path Language
*
- * @param nodeRDFBackend
* @return
*/
@Override
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c44c9a2f/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/functions/BinaryNumericTest.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/functions/BinaryNumericTest.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/functions/BinaryNumericTest.java
index 5ebc539..b7422d6 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/functions/BinaryNumericTest.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/functions/BinaryNumericTest.java
@@ -50,7 +50,7 @@ public abstract class BinaryNumericTest<Node> extends TestFunction<Node> {
protected boolean test(RDFBackend<Node> backend, Node leftNode, Node rightNode) {
try {
- return test(transformer.transform(backend, leftNode), transformer.transform(backend, rightNode));
+ return test(transformer.transform(backend, leftNode, null), transformer.transform(backend, rightNode, null));
} catch (IllegalArgumentException e) {
return false;
}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c44c9a2f/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/BigDecimalTransformer.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/BigDecimalTransformer.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/BigDecimalTransformer.java
index 09e11aa..ed73f0e 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/BigDecimalTransformer.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/BigDecimalTransformer.java
@@ -19,6 +19,7 @@ package org.apache.marmotta.ldpath.model.transformers;
import java.math.BigDecimal;
+import java.util.Map;
import org.apache.marmotta.ldpath.api.backend.RDFBackend;
import org.apache.marmotta.ldpath.api.transformers.NodeTransformer;
@@ -26,7 +27,7 @@ import org.apache.marmotta.ldpath.api.transformers.NodeTransformer;
public class BigDecimalTransformer<Node> implements NodeTransformer<BigDecimal,Node> {
@Override
- public BigDecimal transform(RDFBackend<Node> backend, Node node) throws IllegalArgumentException {
+ public BigDecimal transform(RDFBackend<Node> backend, Node node, Map<String, String> configuration) throws IllegalArgumentException {
if(backend.isLiteral(node)) {
return backend.decimalValue(node);
} else {
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c44c9a2f/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/BigIntegerTransformer.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/BigIntegerTransformer.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/BigIntegerTransformer.java
index f1cdc6f..3bb3b5b 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/BigIntegerTransformer.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/BigIntegerTransformer.java
@@ -18,6 +18,7 @@
package org.apache.marmotta.ldpath.model.transformers;
import java.math.BigInteger;
+import java.util.Map;
import org.apache.marmotta.ldpath.api.backend.RDFBackend;
import org.apache.marmotta.ldpath.api.transformers.NodeTransformer;
@@ -26,7 +27,7 @@ import org.apache.marmotta.ldpath.api.transformers.NodeTransformer;
public class BigIntegerTransformer<Node> implements NodeTransformer<BigInteger,Node> {
@Override
- public BigInteger transform(RDFBackend<Node> backend, Node node) throws IllegalArgumentException {
+ public BigInteger transform(RDFBackend<Node> backend, Node node, Map<String, String> configuration) throws IllegalArgumentException {
if(backend.isLiteral(node)) {
return backend.integerValue(node);
} else {
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c44c9a2f/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/BooleanTransformer.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/BooleanTransformer.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/BooleanTransformer.java
index 2c1af47..d8d908f 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/BooleanTransformer.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/BooleanTransformer.java
@@ -20,6 +20,8 @@ package org.apache.marmotta.ldpath.model.transformers;
import org.apache.marmotta.ldpath.api.backend.RDFBackend;
import org.apache.marmotta.ldpath.api.transformers.NodeTransformer;
+import java.util.Map;
+
/**
* Add file description here!
* <p/>
@@ -37,7 +39,7 @@ public class BooleanTransformer<Node> implements NodeTransformer<Boolean,Node> {
* @return
*/
@Override
- public Boolean transform(RDFBackend<Node> rdfBackend, Node node) throws IllegalArgumentException {
+ public Boolean transform(RDFBackend<Node> rdfBackend, Node node, Map<String, String> configuration) throws IllegalArgumentException {
if(rdfBackend.isLiteral(node)) {
return rdfBackend.booleanValue(node);
} else {
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c44c9a2f/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/ByteTransformer.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/ByteTransformer.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/ByteTransformer.java
index 7cb3c9d..6088f39 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/ByteTransformer.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/ByteTransformer.java
@@ -20,10 +20,12 @@ package org.apache.marmotta.ldpath.model.transformers;
import org.apache.marmotta.ldpath.api.backend.RDFBackend;
import org.apache.marmotta.ldpath.api.transformers.NodeTransformer;
+import java.util.Map;
+
public class ByteTransformer<Node> implements NodeTransformer<Byte,Node> {
@Override
- public Byte transform(RDFBackend<Node> backend, Node node) throws IllegalArgumentException {
+ public Byte transform(RDFBackend<Node> backend, Node node, Map<String, String> configuration) throws IllegalArgumentException {
if(backend.isLiteral(node)) {
return backend.decimalValue(node).byteValueExact();
} else {
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c44c9a2f/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/DateTimeTransformer.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/DateTimeTransformer.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/DateTimeTransformer.java
index d2d27ed..77ed68f 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/DateTimeTransformer.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/DateTimeTransformer.java
@@ -19,6 +19,7 @@ package org.apache.marmotta.ldpath.model.transformers;
import java.util.Date;
+import java.util.Map;
import org.apache.marmotta.ldpath.api.backend.RDFBackend;
import org.apache.marmotta.ldpath.api.transformers.NodeTransformer;
@@ -39,7 +40,7 @@ public class DateTimeTransformer<Node> implements NodeTransformer<Date,Node> {
* @return
*/
@Override
- public Date transform(RDFBackend<Node> rdfBackend, Node node) throws IllegalArgumentException {
+ public Date transform(RDFBackend<Node> rdfBackend, Node node, Map<String, String> configuration) throws IllegalArgumentException {
if(rdfBackend.isLiteral(node)) {
return rdfBackend.dateTimeValue(node);
} else {
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c44c9a2f/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/DateTransformer.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/DateTransformer.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/DateTransformer.java
index 0be26d1..4a7dd1d 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/DateTransformer.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/DateTransformer.java
@@ -18,6 +18,7 @@
package org.apache.marmotta.ldpath.model.transformers;
import java.util.Date;
+import java.util.Map;
import org.apache.marmotta.ldpath.api.backend.RDFBackend;
import org.apache.marmotta.ldpath.api.transformers.NodeTransformer;
@@ -38,7 +39,7 @@ public class DateTransformer<Node> implements NodeTransformer<Date,Node> {
* @return
*/
@Override
- public Date transform(RDFBackend<Node> rdfBackend, Node node) throws IllegalArgumentException {
+ public Date transform(RDFBackend<Node> rdfBackend, Node node, Map<String, String> configuration) throws IllegalArgumentException {
if(rdfBackend.isLiteral(node)) {
return rdfBackend.dateValue(node);
} else {
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c44c9a2f/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/DoubleTransformer.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/DoubleTransformer.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/DoubleTransformer.java
index ef8bd48..37b37b5 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/DoubleTransformer.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/DoubleTransformer.java
@@ -20,6 +20,8 @@ package org.apache.marmotta.ldpath.model.transformers;
import org.apache.marmotta.ldpath.api.backend.RDFBackend;
import org.apache.marmotta.ldpath.api.transformers.NodeTransformer;
+import java.util.Map;
+
/**
* Add file description here!
* <p/>
@@ -36,7 +38,7 @@ public class DoubleTransformer<Node> implements NodeTransformer<Double,Node> {
* @return
*/
@Override
- public Double transform(RDFBackend<Node> rdfBackend, Node node) throws IllegalArgumentException {
+ public Double transform(RDFBackend<Node> rdfBackend, Node node, Map<String, String> configuration) throws IllegalArgumentException {
if(rdfBackend.isLiteral(node)) {
return rdfBackend.doubleValue(node);
} else {
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c44c9a2f/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/DurationTransformer.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/DurationTransformer.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/DurationTransformer.java
index 352c430..57a50c6 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/DurationTransformer.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/DurationTransformer.java
@@ -24,6 +24,8 @@ import javax.xml.datatype.Duration;
import org.apache.marmotta.ldpath.api.backend.RDFBackend;
import org.apache.marmotta.ldpath.api.transformers.NodeTransformer;
+import java.util.Map;
+
/**
* Transforms (and validates) the lexical value of a node to
@@ -56,7 +58,7 @@ public class DurationTransformer<Node> implements NodeTransformer<Duration,Node>
return xmlDatatypeFactory;
}
@Override
- public Duration transform(RDFBackend<Node> backend, Node node) throws IllegalArgumentException {
+ public Duration transform(RDFBackend<Node> backend, Node node, Map<String, String> configuration) throws IllegalArgumentException {
if(backend.isLiteral(node)) {
return toDuration(backend.stringValue(node), false);
} else {
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c44c9a2f/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/FloatTransformer.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/FloatTransformer.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/FloatTransformer.java
index cf49f46..50e23e6 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/FloatTransformer.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/FloatTransformer.java
@@ -20,6 +20,8 @@ package org.apache.marmotta.ldpath.model.transformers;
import org.apache.marmotta.ldpath.api.backend.RDFBackend;
import org.apache.marmotta.ldpath.api.transformers.NodeTransformer;
+import java.util.Map;
+
/**
* Add file description here!
* <p/>
@@ -36,7 +38,7 @@ public class FloatTransformer<Node> implements NodeTransformer<Float,Node> {
* @return
*/
@Override
- public Float transform(RDFBackend<Node> rdfBackend, Node node) throws IllegalArgumentException {
+ public Float transform(RDFBackend<Node> rdfBackend, Node node, Map<String, String> configuration) throws IllegalArgumentException {
if(rdfBackend.isLiteral(node)) {
return rdfBackend.floatValue(node);
} else {
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c44c9a2f/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/IdentityTransformer.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/IdentityTransformer.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/IdentityTransformer.java
index eb02716..0b3571d 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/IdentityTransformer.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/IdentityTransformer.java
@@ -20,6 +20,8 @@ package org.apache.marmotta.ldpath.model.transformers;
import org.apache.marmotta.ldpath.api.backend.RDFBackend;
import org.apache.marmotta.ldpath.api.transformers.NodeTransformer;
+import java.util.Map;
+
/**
* A very simple transformer that only returns the node itself. Used in case no transformer is given in a
* field mapping.
@@ -37,7 +39,7 @@ public class IdentityTransformer<Node> implements NodeTransformer<Node,Node> {
* @return
*/
@Override
- public Node transform(RDFBackend<Node> nodeRDFBackend, Node node) throws IllegalArgumentException {
+ public Node transform(RDFBackend<Node> nodeRDFBackend, Node node, Map<String, String> configuration) throws IllegalArgumentException {
return node;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c44c9a2f/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/IntTransformer.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/IntTransformer.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/IntTransformer.java
index a7671de..ed18452 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/IntTransformer.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/IntTransformer.java
@@ -20,6 +20,8 @@ package org.apache.marmotta.ldpath.model.transformers;
import org.apache.marmotta.ldpath.api.backend.RDFBackend;
import org.apache.marmotta.ldpath.api.transformers.NodeTransformer;
+import java.util.Map;
+
/**
* Add file description here!
* <p/>
@@ -37,7 +39,7 @@ public class IntTransformer<Node> implements NodeTransformer<Integer,Node> {
* @return
*/
@Override
- public Integer transform(RDFBackend<Node> rdfBackend, Node node) throws IllegalArgumentException {
+ public Integer transform(RDFBackend<Node> rdfBackend, Node node, Map<String, String> configuration) throws IllegalArgumentException {
if(rdfBackend.isLiteral(node)) {
return rdfBackend.intValue(node);
} else {
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c44c9a2f/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/LongTransformer.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/LongTransformer.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/LongTransformer.java
index 79de4ee..0d4227d 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/LongTransformer.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/LongTransformer.java
@@ -20,6 +20,8 @@ package org.apache.marmotta.ldpath.model.transformers;
import org.apache.marmotta.ldpath.api.backend.RDFBackend;
import org.apache.marmotta.ldpath.api.transformers.NodeTransformer;
+import java.util.Map;
+
/**
* Add file description here!
* <p/>
@@ -36,7 +38,7 @@ public class LongTransformer<Node> implements NodeTransformer<Long,Node> {
* @return
*/
@Override
- public Long transform(RDFBackend<Node> rdfBackend, Node node) throws IllegalArgumentException {
+ public Long transform(RDFBackend<Node> rdfBackend, Node node, Map<String, String> configuration) throws IllegalArgumentException {
if(rdfBackend.isLiteral(node)) {
return rdfBackend.longValue(node);
} else {
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c44c9a2f/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/ShortTransformer.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/ShortTransformer.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/ShortTransformer.java
index 62b0150..352f6a1 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/ShortTransformer.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/ShortTransformer.java
@@ -20,10 +20,12 @@ package org.apache.marmotta.ldpath.model.transformers;
import org.apache.marmotta.ldpath.api.backend.RDFBackend;
import org.apache.marmotta.ldpath.api.transformers.NodeTransformer;
+import java.util.Map;
+
public class ShortTransformer<Node> implements NodeTransformer<Short,Node> {
@Override
- public Short transform(RDFBackend<Node> backend, Node node) throws IllegalArgumentException {
+ public Short transform(RDFBackend<Node> backend, Node node, Map<String, String> configuration) throws IllegalArgumentException {
if(backend.isLiteral(node)) {
return backend.decimalValue(node).shortValueExact();
} else {
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c44c9a2f/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/StringTransformer.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/StringTransformer.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/StringTransformer.java
index 3edee9f..5dfc973 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/StringTransformer.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/StringTransformer.java
@@ -20,6 +20,8 @@ package org.apache.marmotta.ldpath.model.transformers;
import org.apache.marmotta.ldpath.api.backend.RDFBackend;
import org.apache.marmotta.ldpath.api.transformers.NodeTransformer;
+import java.util.Map;
+
/**
* Add file description here!
* <p/>
@@ -37,7 +39,7 @@ public class StringTransformer<Node> implements NodeTransformer<String,Node> {
* @return
*/
@Override
- public String transform(RDFBackend<Node> backend, Node node) throws IllegalArgumentException {
+ public String transform(RDFBackend<Node> backend, Node node, Map<String, String> configuration) throws IllegalArgumentException {
return backend.stringValue(node);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c44c9a2f/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/TimeTransformer.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/TimeTransformer.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/TimeTransformer.java
index c2aed32..0289ddb 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/TimeTransformer.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/TimeTransformer.java
@@ -19,6 +19,7 @@ package org.apache.marmotta.ldpath.model.transformers;
import java.util.Date;
+import java.util.Map;
import org.apache.marmotta.ldpath.api.backend.RDFBackend;
import org.apache.marmotta.ldpath.api.transformers.NodeTransformer;
@@ -39,7 +40,7 @@ public class TimeTransformer<Node> implements NodeTransformer<Date,Node> {
* @return
*/
@Override
- public Date transform(RDFBackend<Node> rdfBackend, Node node) throws IllegalArgumentException {
+ public Date transform(RDFBackend<Node> rdfBackend, Node node, Map<String, String> configuration) throws IllegalArgumentException {
if(rdfBackend.isLiteral(node)) {
return rdfBackend.timeValue(node);
} else {
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c44c9a2f/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/ParserTest.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/ParserTest.java b/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/ParserTest.java
index 05bcf91..a36968a 100644
--- a/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/ParserTest.java
+++ b/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/ParserTest.java
@@ -113,7 +113,7 @@ public class ParserTest {
RdfPathParser<String> rdfPathParser = new RdfPathParser<String>(backend,new StringReader(IOUtils.toString(resource)));
rdfPathParser.registerTransformer(NS_TEST + "type", new NodeTransformer<String, String>() {
@Override
- public String transform(RDFBackend<String> backend, String node)
+ public String transform(RDFBackend<String> backend, String node, Map<String,String> configuration)
throws IllegalArgumentException {
return node;
}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c44c9a2f/libraries/ldpath/ldpath-functions-date/src/main/java/org/apache/marmotta/ldpath/model/functions/date/EarliestDateFunction.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-date/src/main/java/org/apache/marmotta/ldpath/model/functions/date/EarliestDateFunction.java b/libraries/ldpath/ldpath-functions-date/src/main/java/org/apache/marmotta/ldpath/model/functions/date/EarliestDateFunction.java
index c30b61f..2ab28f7 100644
--- a/libraries/ldpath/ldpath-functions-date/src/main/java/org/apache/marmotta/ldpath/model/functions/date/EarliestDateFunction.java
+++ b/libraries/ldpath/ldpath-functions-date/src/main/java/org/apache/marmotta/ldpath/model/functions/date/EarliestDateFunction.java
@@ -41,7 +41,7 @@ public class EarliestDateFunction<Node> extends DateFunction<Node> {
for (Node node : args[0]) {
try {
- Date d = transformer.transform(backend, node);
+ Date d = transformer.transform(backend, node, null);
if (earliest == null || d.before(earliest)) {
earliest = d;
result = node;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c44c9a2f/libraries/ldpath/ldpath-functions-date/src/main/java/org/apache/marmotta/ldpath/model/functions/date/LatestDateFunction.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-date/src/main/java/org/apache/marmotta/ldpath/model/functions/date/LatestDateFunction.java b/libraries/ldpath/ldpath-functions-date/src/main/java/org/apache/marmotta/ldpath/model/functions/date/LatestDateFunction.java
index da98af1..94f3524 100644
--- a/libraries/ldpath/ldpath-functions-date/src/main/java/org/apache/marmotta/ldpath/model/functions/date/LatestDateFunction.java
+++ b/libraries/ldpath/ldpath-functions-date/src/main/java/org/apache/marmotta/ldpath/model/functions/date/LatestDateFunction.java
@@ -41,7 +41,7 @@ public class LatestDateFunction<Node> extends DateFunction<Node> {
for (Node node : args[0]) {
try {
- Date d = transformer.transform(backend, node);
+ Date d = transformer.transform(backend, node, null);
if (latest == null || d.after(latest)) {
latest = d;
result = node;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c44c9a2f/libraries/ldpath/ldpath-functions-html/src/main/java/org/apache/marmotta/ldpath/model/functions/html/CleanHtmlFunction.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-html/src/main/java/org/apache/marmotta/ldpath/model/functions/html/CleanHtmlFunction.java b/libraries/ldpath/ldpath-functions-html/src/main/java/org/apache/marmotta/ldpath/model/functions/html/CleanHtmlFunction.java
index 5ac7e1c..34af679 100644
--- a/libraries/ldpath/ldpath-functions-html/src/main/java/org/apache/marmotta/ldpath/model/functions/html/CleanHtmlFunction.java
+++ b/libraries/ldpath/ldpath-functions-html/src/main/java/org/apache/marmotta/ldpath/model/functions/html/CleanHtmlFunction.java
@@ -67,7 +67,7 @@ public class CleanHtmlFunction<Node> extends SelectorFunction<Node> {
List<Node> result = new ArrayList<Node>();
while(it.hasNext()) {
Node node = it.next();
- String cleaned = Jsoup.clean(transformer.transform(backend, node), Whitelist.basic());
+ String cleaned = Jsoup.clean(transformer.transform(backend, node, null), Whitelist.basic());
result.add(backend.createLiteral(cleaned));
}
return result;
@@ -77,7 +77,6 @@ public class CleanHtmlFunction<Node> extends SelectorFunction<Node> {
* Return the name of the NodeFunction for registration in the function registry
*
* @return
- * @param backend
*/
@Override
public String getLocalName() {
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c44c9a2f/libraries/ldpath/ldpath-functions-html/src/main/java/org/apache/marmotta/ldpath/model/functions/html/CssSelectFunction.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-html/src/main/java/org/apache/marmotta/ldpath/model/functions/html/CssSelectFunction.java b/libraries/ldpath/ldpath-functions-html/src/main/java/org/apache/marmotta/ldpath/model/functions/html/CssSelectFunction.java
index abae93b..1dbf28d 100644
--- a/libraries/ldpath/ldpath-functions-html/src/main/java/org/apache/marmotta/ldpath/model/functions/html/CssSelectFunction.java
+++ b/libraries/ldpath/ldpath-functions-html/src/main/java/org/apache/marmotta/ldpath/model/functions/html/CssSelectFunction.java
@@ -62,7 +62,7 @@ public class CssSelectFunction<KiWiNode> extends SelectorFunction<KiWiNode> {
Set<String> jsoupSelectors = new HashSet<String>();
for (KiWiNode xpath : args[0]) {
try {
- jsoupSelectors.add(transformer.transform(rdfBackend, xpath));
+ jsoupSelectors.add(transformer.transform(rdfBackend, xpath, null));
} catch (IllegalArgumentException iae) {
throw new IllegalArgumentException("First argument must not contain anything else than String-Literals!");
}
@@ -79,7 +79,7 @@ public class CssSelectFunction<KiWiNode> extends SelectorFunction<KiWiNode> {
while (it.hasNext()) {
KiWiNode n = it.next();
try {
- final String string = transformer.transform(rdfBackend, n);
+ final String string = transformer.transform(rdfBackend, n, null);
final Document jsoup = Jsoup.parse(string);
if (rdfBackend.isURI(context)) {
jsoup.setBaseUri(rdfBackend.stringValue(context));
@@ -113,7 +113,6 @@ public class CssSelectFunction<KiWiNode> extends SelectorFunction<KiWiNode> {
* Return the name of the NodeFunction for registration in the function registry
*
* @return
- * @param backend
*/
@Override
public String getLocalName() {
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c44c9a2f/libraries/ldpath/ldpath-functions-math/src/main/java/org/apache/marmotta/ldpath/model/functions/math/MaxFunction.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-math/src/main/java/org/apache/marmotta/ldpath/model/functions/math/MaxFunction.java b/libraries/ldpath/ldpath-functions-math/src/main/java/org/apache/marmotta/ldpath/model/functions/math/MaxFunction.java
index 11a5315..67bad62 100644
--- a/libraries/ldpath/ldpath-functions-math/src/main/java/org/apache/marmotta/ldpath/model/functions/math/MaxFunction.java
+++ b/libraries/ldpath/ldpath-functions-math/src/main/java/org/apache/marmotta/ldpath/model/functions/math/MaxFunction.java
@@ -51,7 +51,7 @@ public class MaxFunction<Node> extends MathFunction<Node> {
Node max = null;
for (Node n : arg) {
try {
- Double val = doubleTransformer.transform(backend, n);
+ Double val = doubleTransformer.transform(backend, n, null);
if (val > d) {
d = val;
max = n;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c44c9a2f/libraries/ldpath/ldpath-functions-math/src/main/java/org/apache/marmotta/ldpath/model/functions/math/MinFunction.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-math/src/main/java/org/apache/marmotta/ldpath/model/functions/math/MinFunction.java b/libraries/ldpath/ldpath-functions-math/src/main/java/org/apache/marmotta/ldpath/model/functions/math/MinFunction.java
index 8387a92..ababd26 100644
--- a/libraries/ldpath/ldpath-functions-math/src/main/java/org/apache/marmotta/ldpath/model/functions/math/MinFunction.java
+++ b/libraries/ldpath/ldpath-functions-math/src/main/java/org/apache/marmotta/ldpath/model/functions/math/MinFunction.java
@@ -52,7 +52,7 @@ public class MinFunction<Node> extends MathFunction<Node> {
Node min = null;
for (Node n : arg) {
try {
- Double val = doubleTransformer.transform(backend, n);
+ Double val = doubleTransformer.transform(backend, n, null);
if (val < d) {
d = val;
min = n;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c44c9a2f/libraries/ldpath/ldpath-functions-math/src/main/java/org/apache/marmotta/ldpath/model/functions/math/RoundFunction.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-math/src/main/java/org/apache/marmotta/ldpath/model/functions/math/RoundFunction.java b/libraries/ldpath/ldpath-functions-math/src/main/java/org/apache/marmotta/ldpath/model/functions/math/RoundFunction.java
index dec72b5..af68edd 100644
--- a/libraries/ldpath/ldpath-functions-math/src/main/java/org/apache/marmotta/ldpath/model/functions/math/RoundFunction.java
+++ b/libraries/ldpath/ldpath-functions-math/src/main/java/org/apache/marmotta/ldpath/model/functions/math/RoundFunction.java
@@ -51,7 +51,7 @@ public class RoundFunction<Node> extends MathFunction<Node> {
protected Node calc(RDFBackend<Node> backend, Node node) {
/* SUM */
try {
- Double val = doubleTransformer.transform(backend, node);
+ Double val = doubleTransformer.transform(backend, node, null);
return backend.createLiteral(String.valueOf(Math.round(val)), null,
intType);
} catch (IllegalArgumentException e) {
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c44c9a2f/libraries/ldpath/ldpath-functions-math/src/main/java/org/apache/marmotta/ldpath/model/functions/math/SumFunction.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-math/src/main/java/org/apache/marmotta/ldpath/model/functions/math/SumFunction.java b/libraries/ldpath/ldpath-functions-math/src/main/java/org/apache/marmotta/ldpath/model/functions/math/SumFunction.java
index 69bd660..264cb6a 100644
--- a/libraries/ldpath/ldpath-functions-math/src/main/java/org/apache/marmotta/ldpath/model/functions/math/SumFunction.java
+++ b/libraries/ldpath/ldpath-functions-math/src/main/java/org/apache/marmotta/ldpath/model/functions/math/SumFunction.java
@@ -50,7 +50,7 @@ public class SumFunction<Node> extends MathFunction<Node> {
Double d = 0d;
for (Node n : arg) {
try {
- Double val = doubleTransformer.transform(backend, n);
+ Double val = doubleTransformer.transform(backend, n, null);
d += val.doubleValue();
} catch (IllegalArgumentException e) {
// we just ignore non-numeric nodes
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c44c9a2f/libraries/ldpath/ldpath-functions-text/src/main/java/org/apache/marmotta/ldpath/model/functions/text/ReplaceFunction.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-text/src/main/java/org/apache/marmotta/ldpath/model/functions/text/ReplaceFunction.java b/libraries/ldpath/ldpath-functions-text/src/main/java/org/apache/marmotta/ldpath/model/functions/text/ReplaceFunction.java
index a1ac7ab..99bb4cd 100644
--- a/libraries/ldpath/ldpath-functions-text/src/main/java/org/apache/marmotta/ldpath/model/functions/text/ReplaceFunction.java
+++ b/libraries/ldpath/ldpath-functions-text/src/main/java/org/apache/marmotta/ldpath/model/functions/text/ReplaceFunction.java
@@ -48,8 +48,8 @@ public class ReplaceFunction<Node> extends SelectorFunction<Node> {
}
Collection<Node> nodes = args[0];
- String regex = transformer.transform(backend, args[1].iterator().next());
- String replace = transformer.transform(backend, args[2].iterator().next());
+ String regex = transformer.transform(backend, args[1].iterator().next(), null);
+ String replace = transformer.transform(backend, args[2].iterator().next(), null);
try {
final Pattern pattern = Pattern.compile(regex);
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c44c9a2f/libraries/ldpath/ldpath-functions-xml/src/main/java/org/apache/marmotta/ldpath/model/functions/xml/RemoveXmlTagsFunction.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-xml/src/main/java/org/apache/marmotta/ldpath/model/functions/xml/RemoveXmlTagsFunction.java b/libraries/ldpath/ldpath-functions-xml/src/main/java/org/apache/marmotta/ldpath/model/functions/xml/RemoveXmlTagsFunction.java
index 4c255c8..74861bf 100644
--- a/libraries/ldpath/ldpath-functions-xml/src/main/java/org/apache/marmotta/ldpath/model/functions/xml/RemoveXmlTagsFunction.java
+++ b/libraries/ldpath/ldpath-functions-xml/src/main/java/org/apache/marmotta/ldpath/model/functions/xml/RemoveXmlTagsFunction.java
@@ -52,13 +52,13 @@ public class RemoveXmlTagsFunction<Node> extends SelectorFunction<Node> {
if(args.length < 1){
log.debug("remove XML tags from context {}",context);
return java.util.Collections.singleton(
- rdfBackend.createLiteral(doFilter(transformer.transform(rdfBackend, context))));
+ rdfBackend.createLiteral(doFilter(transformer.transform(rdfBackend, context, null))));
} else {
log.debug("remove XML tags from parameters");
Iterator<Node> it = Collections.iterator(args);
List<Node> result = new ArrayList<Node>();
while (it.hasNext()) {
- result.add(rdfBackend.createLiteral(doFilter(transformer.transform(rdfBackend, it.next()))));
+ result.add(rdfBackend.createLiteral(doFilter(transformer.transform(rdfBackend, it.next(), null))));
}
return result;
}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c44c9a2f/libraries/ldpath/ldpath-functions-xml/src/main/java/org/apache/marmotta/ldpath/model/functions/xml/XPathFunction.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-xml/src/main/java/org/apache/marmotta/ldpath/model/functions/xml/XPathFunction.java b/libraries/ldpath/ldpath-functions-xml/src/main/java/org/apache/marmotta/ldpath/model/functions/xml/XPathFunction.java
index 9af9350..e06ec40 100644
--- a/libraries/ldpath/ldpath-functions-xml/src/main/java/org/apache/marmotta/ldpath/model/functions/xml/XPathFunction.java
+++ b/libraries/ldpath/ldpath-functions-xml/src/main/java/org/apache/marmotta/ldpath/model/functions/xml/XPathFunction.java
@@ -72,7 +72,7 @@ public class XPathFunction<Node> extends SelectorFunction<Node> {
Set<String> xpaths = new HashSet<String>();
for (Node xpath : args[0]) {
try {
- xpaths.add(transformer.transform(rdfBackend,xpath));
+ xpaths.add(transformer.transform(rdfBackend,xpath, null));
} catch (IllegalArgumentException iae) {
throw new IllegalArgumentException("First argument must not contain anything else than String-Literals!");
}
@@ -89,7 +89,7 @@ public class XPathFunction<Node> extends SelectorFunction<Node> {
while (it.hasNext()) {
Node n = it.next();
try {
- for (String r : doFilter(transformer.transform(rdfBackend,n), xpaths)) {
+ for (String r : doFilter(transformer.transform(rdfBackend,n, null), xpaths)) {
result.add(rdfBackend.createLiteral(r));
}
} catch (IOException e) {
@@ -127,7 +127,6 @@ public class XPathFunction<Node> extends SelectorFunction<Node> {
* Return the name of the NodeFunction for registration in the function registry
*
* @return
- * @param backend
*/
@Override
public String getLocalName() {
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c44c9a2f/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateBooleanTransformer.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateBooleanTransformer.java b/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateBooleanTransformer.java
index 455520f..5ea2d96 100644
--- a/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateBooleanTransformer.java
+++ b/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateBooleanTransformer.java
@@ -24,6 +24,8 @@ import org.apache.marmotta.ldpath.model.transformers.BooleanTransformer;
import freemarker.template.TemplateBooleanModel;
import freemarker.template.TemplateModelException;
+import java.util.Map;
+
/**
* Transform a node into the freemarker boolean type (TemplateBooleanModel).
* <p/>
@@ -42,15 +44,17 @@ public class TemplateBooleanTransformer<Node> implements NodeTransformer<Templat
* the respective datatype, throws an IllegalArgumentException that needs to be caught by the class
* carrying out the transformation.
*
+ *
* @param node
+ * @param configuration
* @return
*/
@Override
- public TemplateBooleanModel transform(final RDFBackend<Node> nodeRDFBackend, final Node node) throws IllegalArgumentException {
+ public TemplateBooleanModel transform(final RDFBackend<Node> nodeRDFBackend, final Node node, final Map<String, String> configuration) throws IllegalArgumentException {
return new TemplateBooleanModel() {
@Override
public boolean getAsBoolean() throws TemplateModelException {
- return delegate.transform(nodeRDFBackend,node);
+ return delegate.transform(nodeRDFBackend,node, configuration);
}
};
}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c44c9a2f/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateDateTransformer.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateDateTransformer.java b/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateDateTransformer.java
index ae7ad0d..4bee1de 100644
--- a/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateDateTransformer.java
+++ b/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateDateTransformer.java
@@ -21,6 +21,7 @@ import freemarker.template.TemplateDateModel;
import freemarker.template.TemplateModelException;
import java.util.Date;
+import java.util.Map;
import org.apache.marmotta.ldpath.api.backend.RDFBackend;
import org.apache.marmotta.ldpath.api.transformers.NodeTransformer;
@@ -50,15 +51,17 @@ public class TemplateDateTransformer<Node> implements NodeTransformer<TemplateDa
* the respective datatype, throws an IllegalArgumentException that needs to be caught by the class
* carrying out the transformation.
*
+ *
* @param node
+ * @param configuration
* @return
*/
@Override
- public TemplateDateModel transform(final RDFBackend<Node> nodeRDFBackend, final Node node) throws IllegalArgumentException {
+ public TemplateDateModel transform(final RDFBackend<Node> nodeRDFBackend, final Node node, final Map<String, String> configuration) throws IllegalArgumentException {
return new TemplateDateModel() {
@Override
public Date getAsDate() throws TemplateModelException {
- return delegate.transform(nodeRDFBackend, node);
+ return delegate.transform(nodeRDFBackend, node, configuration);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c44c9a2f/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateDoubleTransformer.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateDoubleTransformer.java b/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateDoubleTransformer.java
index d39a887..b73396e 100644
--- a/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateDoubleTransformer.java
+++ b/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateDoubleTransformer.java
@@ -24,6 +24,8 @@ import org.apache.marmotta.ldpath.model.transformers.DoubleTransformer;
import freemarker.template.TemplateModelException;
import freemarker.template.TemplateNumberModel;
+import java.util.Map;
+
/**
* Transform a node into the freemarker double type (TemplateDoubleModel).
* <p/>
@@ -42,15 +44,17 @@ public class TemplateDoubleTransformer<Node> implements NodeTransformer<Template
* the respective datatype, throws an IllegalArgumentException that needs to be caught by the class
* carrying out the transformation.
*
+ *
* @param node
+ * @param configuration
* @return
*/
@Override
- public TemplateNumberModel transform(final RDFBackend<Node> nodeRDFBackend, final Node node) throws IllegalArgumentException {
+ public TemplateNumberModel transform(final RDFBackend<Node> nodeRDFBackend, final Node node, final Map<String, String> configuration) throws IllegalArgumentException {
return new TemplateNumberModel() {
@Override
public Number getAsNumber() throws TemplateModelException {
- return delegate.transform(nodeRDFBackend,node);
+ return delegate.transform(nodeRDFBackend,node, configuration);
}
};
}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c44c9a2f/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateFloatTransformer.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateFloatTransformer.java b/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateFloatTransformer.java
index 657197e..71610ef 100644
--- a/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateFloatTransformer.java
+++ b/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateFloatTransformer.java
@@ -24,6 +24,8 @@ import org.apache.marmotta.ldpath.model.transformers.FloatTransformer;
import freemarker.template.TemplateModelException;
import freemarker.template.TemplateNumberModel;
+import java.util.Map;
+
/**
* Transform a node into the freemarker float type (TemplateFloatModel).
* <p/>
@@ -42,15 +44,17 @@ public class TemplateFloatTransformer<Node> implements NodeTransformer<TemplateN
* the respective datatype, throws an IllegalArgumentException that needs to be caught by the class
* carrying out the transformation.
*
+ *
* @param node
+ * @param configuration
* @return
*/
@Override
- public TemplateNumberModel transform(final RDFBackend<Node> nodeRDFBackend, final Node node) throws IllegalArgumentException {
+ public TemplateNumberModel transform(final RDFBackend<Node> nodeRDFBackend, final Node node, final Map<String, String> configuration) throws IllegalArgumentException {
return new TemplateNumberModel() {
@Override
public Number getAsNumber() throws TemplateModelException {
- return delegate.transform(nodeRDFBackend,node);
+ return delegate.transform(nodeRDFBackend,node, configuration);
}
};
}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c44c9a2f/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateIntegerTransformer.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateIntegerTransformer.java b/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateIntegerTransformer.java
index 6488757..e7d03a9 100644
--- a/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateIntegerTransformer.java
+++ b/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateIntegerTransformer.java
@@ -24,6 +24,8 @@ import org.apache.marmotta.ldpath.model.transformers.IntTransformer;
import freemarker.template.TemplateModelException;
import freemarker.template.TemplateNumberModel;
+import java.util.Map;
+
/**
* Transform a node into the freemarker integer type (TemplateNumberModel).
* <p/>
@@ -42,15 +44,17 @@ public class TemplateIntegerTransformer<Node> implements NodeTransformer<Templat
* the respective datatype, throws an IllegalArgumentException that needs to be caught by the class
* carrying out the transformation.
*
+ *
* @param node
+ * @param configuration
* @return
*/
@Override
- public TemplateNumberModel transform(final RDFBackend<Node> nodeRDFBackend, final Node node) throws IllegalArgumentException {
+ public TemplateNumberModel transform(final RDFBackend<Node> nodeRDFBackend, final Node node, final Map<String, String> configuration) throws IllegalArgumentException {
return new TemplateNumberModel() {
@Override
public Number getAsNumber() throws TemplateModelException {
- return delegate.transform(nodeRDFBackend, node);
+ return delegate.transform(nodeRDFBackend, node, configuration);
}
};
}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c44c9a2f/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateLongTransformer.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateLongTransformer.java b/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateLongTransformer.java
index 9f60c9b..509e32a 100644
--- a/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateLongTransformer.java
+++ b/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateLongTransformer.java
@@ -24,6 +24,8 @@ import org.apache.marmotta.ldpath.model.transformers.LongTransformer;
import freemarker.template.TemplateModelException;
import freemarker.template.TemplateNumberModel;
+import java.util.Map;
+
/**
* Transform a node into the freemarker long type (TemplateNumberModel).
* <p/>
@@ -42,15 +44,17 @@ public class TemplateLongTransformer<Node> implements NodeTransformer<TemplateNu
* the respective datatype, throws an IllegalArgumentException that needs to be caught by the class
* carrying out the transformation.
*
+ *
* @param node
+ * @param configuration
* @return
*/
@Override
- public TemplateNumberModel transform(final RDFBackend<Node> nodeRDFBackend, final Node node) throws IllegalArgumentException {
+ public TemplateNumberModel transform(final RDFBackend<Node> nodeRDFBackend, final Node node, final Map<String, String> configuration) throws IllegalArgumentException {
return new TemplateNumberModel() {
@Override
public Number getAsNumber() throws TemplateModelException {
- return delegate.transform(nodeRDFBackend, node);
+ return delegate.transform(nodeRDFBackend, node, configuration);
}
};
}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c44c9a2f/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateScalarTransformer.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateScalarTransformer.java b/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateScalarTransformer.java
index c25a608..148c5ff 100644
--- a/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateScalarTransformer.java
+++ b/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateScalarTransformer.java
@@ -24,6 +24,8 @@ import org.apache.marmotta.ldpath.model.transformers.StringTransformer;
import freemarker.template.TemplateModelException;
import freemarker.template.TemplateScalarModel;
+import java.util.Map;
+
/**
* Transform a node into the freemarker string (scalar) type (TemplateScalarModel).
* <p/>
@@ -43,15 +45,17 @@ public class TemplateScalarTransformer<Node> implements NodeTransformer<Template
* the respective datatype, throws an IllegalArgumentException that needs to be caught by the class
* carrying out the transformation.
*
+ *
* @param node
+ * @param configuration
* @return
*/
@Override
- public TemplateScalarModel transform(final RDFBackend<Node> nodeRDFBackend, final Node node) throws IllegalArgumentException {
+ public TemplateScalarModel transform(final RDFBackend<Node> nodeRDFBackend, final Node node, final Map<String, String> configuration) throws IllegalArgumentException {
return new TemplateScalarModel() {
@Override
public String getAsString() throws TemplateModelException {
- return delegate.transform(nodeRDFBackend,node);
+ return delegate.transform(nodeRDFBackend,node, configuration);
}
};
}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c44c9a2f/platform/marmotta-ldpath/src/main/java/org/apache/marmotta/platform/ldpath/model/functions/JsoupFunction.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-ldpath/src/main/java/org/apache/marmotta/platform/ldpath/model/functions/JsoupFunction.java b/platform/marmotta-ldpath/src/main/java/org/apache/marmotta/platform/ldpath/model/functions/JsoupFunction.java
index 0b3ddc4..68166e2 100644
--- a/platform/marmotta-ldpath/src/main/java/org/apache/marmotta/platform/ldpath/model/functions/JsoupFunction.java
+++ b/platform/marmotta-ldpath/src/main/java/org/apache/marmotta/platform/ldpath/model/functions/JsoupFunction.java
@@ -61,7 +61,7 @@ public class JsoupFunction extends LMFLDPathFunction {
Set<String> jsoupSelectors = new HashSet<String>();
for (Value xpath : args[0]) {
try {
- jsoupSelectors.add(transformer.transform(rdfBackend, xpath));
+ jsoupSelectors.add(transformer.transform(rdfBackend, xpath, null));
} catch (IllegalArgumentException iae) {
throw new IllegalArgumentException("First argument must not contain anything else than String-Literals!");
}
@@ -78,7 +78,7 @@ public class JsoupFunction extends LMFLDPathFunction {
while (it.hasNext()) {
Value n = it.next();
try {
- final String string = transformer.transform(rdfBackend, n);
+ final String string = transformer.transform(rdfBackend, n, null);
final Document jsoup = Jsoup.parse(string);
if (rdfBackend.isURI(context)) {
jsoup.setBaseUri(rdfBackend.stringValue(context));
@@ -112,7 +112,6 @@ public class JsoupFunction extends LMFLDPathFunction {
* Return the name of the NodeFunction for registration in the function registry
*
* @return
- * @param backend
*/
@Override
public String getLocalName() {