Updated Branches: refs/heads/develop b44e655b5 -> 8a7af22f8
reverted a change that would only pass NodeBackend to NodeTransformers, as some transformers need access to the querying functionality Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/8a7af22f Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/8a7af22f Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/8a7af22f Branch: refs/heads/develop Commit: 8a7af22f8c88626a9ef0c736cbbd1dc5de8f5b16 Parents: b44e655 Author: Sebastian Schaffert <[email protected]> Authored: Tue Apr 30 11:24:27 2013 +0200 Committer: Sebastian Schaffert <[email protected]> Committed: Tue Apr 30 11:24:27 2013 +0200 ---------------------------------------------------------------------- .../ldpath/api/transformers/NodeTransformer.java | 5 ++++- .../model/transformers/BigDecimalTransformer.java | 4 ++-- .../model/transformers/BigIntegerTransformer.java | 4 ++-- .../model/transformers/BooleanTransformer.java | 6 ++++-- .../ldpath/model/transformers/ByteTransformer.java | 4 ++-- .../model/transformers/DateTimeTransformer.java | 6 ++++-- .../ldpath/model/transformers/DateTransformer.java | 6 ++++-- .../model/transformers/DoubleTransformer.java | 6 ++++-- .../model/transformers/DurationTransformer.java | 4 ++-- .../model/transformers/FloatTransformer.java | 6 ++++-- .../model/transformers/IdentityTransformer.java | 6 ++++-- .../ldpath/model/transformers/IntTransformer.java | 6 ++++-- .../ldpath/model/transformers/LongTransformer.java | 6 ++++-- .../model/transformers/ShortTransformer.java | 4 ++-- .../model/transformers/StringTransformer.java | 6 ++++-- .../ldpath/model/transformers/TimeTransformer.java | 6 ++++-- .../apache/marmotta/ldpath/parser/ParserTest.java | 3 ++- .../transformers/TemplateBooleanTransformer.java | 6 ++++-- .../transformers/TemplateDateTransformer.java | 6 ++++-- .../transformers/TemplateDoubleTransformer.java | 6 ++++-- .../transformers/TemplateFloatTransformer.java | 6 ++++-- .../transformers/TemplateIntegerTransformer.java | 6 ++++-- .../transformers/TemplateLongTransformer.java | 6 ++++-- .../transformers/TemplateScalarTransformer.java | 6 ++++-- 24 files changed, 84 insertions(+), 46 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/8a7af22f/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 44b07cc..54e50ff 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 @@ -18,6 +18,7 @@ package org.apache.marmotta.ldpath.api.transformers; import org.apache.marmotta.ldpath.api.backend.NodeBackend; +import org.apache.marmotta.ldpath.api.backend.RDFBackend; import java.util.Map; @@ -37,10 +38,12 @@ public interface NodeTransformer<T,Node> { * carrying out the transformation. * * + * + * @param backend * @param node * @param configuration the field configuration used when defining the LDPath rule * @return */ - public T transform(NodeBackend<Node> backend, Node node, Map<String, String> configuration) 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/8a7af22f/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 d15b185..543ae9b 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 @@ -21,7 +21,7 @@ package org.apache.marmotta.ldpath.model.transformers; import java.math.BigDecimal; import java.util.Map; -import org.apache.marmotta.ldpath.api.backend.NodeBackend; +import org.apache.marmotta.ldpath.api.backend.RDFBackend; import org.apache.marmotta.ldpath.api.transformers.NodeTransformer; /** @@ -32,7 +32,7 @@ import org.apache.marmotta.ldpath.api.transformers.NodeTransformer; public class BigDecimalTransformer<Node> implements NodeTransformer<BigDecimal,Node> { @Override - public BigDecimal transform(NodeBackend<Node> backend, Node node, Map<String, String> configuration) 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/8a7af22f/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 02398a9..f4c95cb 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 @@ -20,7 +20,7 @@ package org.apache.marmotta.ldpath.model.transformers; import java.math.BigInteger; import java.util.Map; -import org.apache.marmotta.ldpath.api.backend.NodeBackend; +import org.apache.marmotta.ldpath.api.backend.RDFBackend; import org.apache.marmotta.ldpath.api.transformers.NodeTransformer; @@ -32,7 +32,7 @@ import org.apache.marmotta.ldpath.api.transformers.NodeTransformer; public class BigIntegerTransformer<Node> implements NodeTransformer<BigInteger,Node> { @Override - public BigInteger transform(NodeBackend<Node> backend, Node node, Map<String, String> configuration) 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/8a7af22f/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 bd57ecd..9ac484a 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 @@ -17,7 +17,7 @@ */ package org.apache.marmotta.ldpath.model.transformers; -import org.apache.marmotta.ldpath.api.backend.NodeBackend; +import org.apache.marmotta.ldpath.api.backend.RDFBackend; import org.apache.marmotta.ldpath.api.transformers.NodeTransformer; import java.util.Map; @@ -35,11 +35,13 @@ public class BooleanTransformer<Node> implements NodeTransformer<Boolean,Node> { * the respective datatype, throws an IllegalArgumentException that needs to be caught by the class * carrying out the transformation. * + * + * @param rdfBackend * @param node * @return */ @Override - public Boolean transform(NodeBackend<Node> rdfBackend, Node node, Map<String, String> configuration) 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/8a7af22f/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 03f001c..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 @@ -17,7 +17,7 @@ */ package org.apache.marmotta.ldpath.model.transformers; -import org.apache.marmotta.ldpath.api.backend.NodeBackend; +import org.apache.marmotta.ldpath.api.backend.RDFBackend; import org.apache.marmotta.ldpath.api.transformers.NodeTransformer; import java.util.Map; @@ -25,7 +25,7 @@ import java.util.Map; public class ByteTransformer<Node> implements NodeTransformer<Byte,Node> { @Override - public Byte transform(NodeBackend<Node> backend, Node node, Map<String, String> configuration) 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/8a7af22f/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 3e6e173..aec6d53 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 @@ -21,7 +21,7 @@ package org.apache.marmotta.ldpath.model.transformers; import java.util.Date; import java.util.Map; -import org.apache.marmotta.ldpath.api.backend.NodeBackend; +import org.apache.marmotta.ldpath.api.backend.RDFBackend; import org.apache.marmotta.ldpath.api.transformers.NodeTransformer; /** @@ -38,11 +38,13 @@ public class DateTimeTransformer<Node> implements NodeTransformer<Date,Node> { * the respective datatype, throws an IllegalArgumentException that needs to be caught by the class * carrying out the transformation. * + * + * @param rdfBackend * @param node * @return */ @Override - public Date transform(NodeBackend<Node> rdfBackend, Node node, Map<String, String> configuration) 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/8a7af22f/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 c47387a..58937ad 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 @@ -20,7 +20,7 @@ package org.apache.marmotta.ldpath.model.transformers; import java.util.Date; import java.util.Map; -import org.apache.marmotta.ldpath.api.backend.NodeBackend; +import org.apache.marmotta.ldpath.api.backend.RDFBackend; import org.apache.marmotta.ldpath.api.transformers.NodeTransformer; /** @@ -37,11 +37,13 @@ public class DateTransformer<Node> implements NodeTransformer<Date,Node> { * the respective datatype, throws an IllegalArgumentException that needs to be caught by the class * carrying out the transformation. * + * + * @param rdfBackend * @param node * @return */ @Override - public Date transform(NodeBackend<Node> rdfBackend, Node node, Map<String, String> configuration) 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/8a7af22f/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 83bec9c..d577a2c 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 @@ -17,7 +17,7 @@ */ package org.apache.marmotta.ldpath.model.transformers; -import org.apache.marmotta.ldpath.api.backend.NodeBackend; +import org.apache.marmotta.ldpath.api.backend.RDFBackend; import org.apache.marmotta.ldpath.api.transformers.NodeTransformer; import java.util.Map; @@ -34,11 +34,13 @@ public class DoubleTransformer<Node> implements NodeTransformer<Double,Node> { * the respective datatype, throws an IllegalArgumentException that needs to be caught by the class * carrying out the transformation. * + * + * @param rdfBackend * @param node * @return */ @Override - public Double transform(NodeBackend<Node> rdfBackend, Node node, Map<String, String> configuration) 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/8a7af22f/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 37d7f54..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 @@ -21,7 +21,7 @@ import javax.xml.datatype.DatatypeConfigurationException; import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.Duration; -import org.apache.marmotta.ldpath.api.backend.NodeBackend; +import org.apache.marmotta.ldpath.api.backend.RDFBackend; import org.apache.marmotta.ldpath.api.transformers.NodeTransformer; import java.util.Map; @@ -58,7 +58,7 @@ public class DurationTransformer<Node> implements NodeTransformer<Duration,Node> return xmlDatatypeFactory; } @Override - public Duration transform(NodeBackend<Node> backend, Node node, Map<String, String> configuration) 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/8a7af22f/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 f019df3..a853963 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 @@ -17,7 +17,7 @@ */ package org.apache.marmotta.ldpath.model.transformers; -import org.apache.marmotta.ldpath.api.backend.NodeBackend; +import org.apache.marmotta.ldpath.api.backend.RDFBackend; import org.apache.marmotta.ldpath.api.transformers.NodeTransformer; import java.util.Map; @@ -36,11 +36,13 @@ public class FloatTransformer<Node> implements NodeTransformer<Float,Node> { * the respective datatype, throws an IllegalArgumentException that needs to be caught by the class * carrying out the transformation. * + * + * @param rdfBackend * @param node * @return */ @Override - public Float transform(NodeBackend<Node> rdfBackend, Node node, Map<String, String> configuration) 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/8a7af22f/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 f0fc6eb..7fc0713 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 @@ -17,7 +17,7 @@ */ package org.apache.marmotta.ldpath.model.transformers; -import org.apache.marmotta.ldpath.api.backend.NodeBackend; +import org.apache.marmotta.ldpath.api.backend.RDFBackend; import org.apache.marmotta.ldpath.api.transformers.NodeTransformer; import java.util.Map; @@ -35,11 +35,13 @@ public class IdentityTransformer<Node> implements NodeTransformer<Node,Node> { * the respective datatype, throws an IllegalArgumentException that needs to be caught by the class * carrying out the transformation. * + * + * @param nodeRDFBackend * @param node * @return */ @Override - public Node transform(NodeBackend<Node> nodeRDFBackend, Node node, Map<String, String> configuration) 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/8a7af22f/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 d0a33c9..8cddda4 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 @@ -17,7 +17,7 @@ */ package org.apache.marmotta.ldpath.model.transformers; -import org.apache.marmotta.ldpath.api.backend.NodeBackend; +import org.apache.marmotta.ldpath.api.backend.RDFBackend; import org.apache.marmotta.ldpath.api.transformers.NodeTransformer; import java.util.Map; @@ -35,11 +35,13 @@ public class IntTransformer<Node> implements NodeTransformer<Integer,Node> { * the respective datatype, throws an IllegalArgumentException that needs to be caught by the class * carrying out the transformation. * + * + * @param rdfBackend * @param node * @return */ @Override - public Integer transform(NodeBackend<Node> rdfBackend, Node node, Map<String, String> configuration) 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/8a7af22f/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 4188e02..49754e5 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 @@ -17,7 +17,7 @@ */ package org.apache.marmotta.ldpath.model.transformers; -import org.apache.marmotta.ldpath.api.backend.NodeBackend; +import org.apache.marmotta.ldpath.api.backend.RDFBackend; import org.apache.marmotta.ldpath.api.transformers.NodeTransformer; import java.util.Map; @@ -34,11 +34,13 @@ public class LongTransformer<Node> implements NodeTransformer<Long,Node> { * the respective datatype, throws an IllegalArgumentException that needs to be caught by the class * carrying out the transformation. * + * + * @param rdfBackend * @param node * @return */ @Override - public Long transform(NodeBackend<Node> rdfBackend, Node node, Map<String, String> configuration) 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/8a7af22f/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 66fcfa1..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 @@ -17,7 +17,7 @@ */ package org.apache.marmotta.ldpath.model.transformers; -import org.apache.marmotta.ldpath.api.backend.NodeBackend; +import org.apache.marmotta.ldpath.api.backend.RDFBackend; import org.apache.marmotta.ldpath.api.transformers.NodeTransformer; import java.util.Map; @@ -25,7 +25,7 @@ import java.util.Map; public class ShortTransformer<Node> implements NodeTransformer<Short,Node> { @Override - public Short transform(NodeBackend<Node> backend, Node node, Map<String, String> configuration) 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/8a7af22f/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 addb444..7f6e365 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 @@ -17,7 +17,7 @@ */ package org.apache.marmotta.ldpath.model.transformers; -import org.apache.marmotta.ldpath.api.backend.NodeBackend; +import org.apache.marmotta.ldpath.api.backend.RDFBackend; import org.apache.marmotta.ldpath.api.transformers.NodeTransformer; import java.util.Map; @@ -35,11 +35,13 @@ public class StringTransformer<Node> implements NodeTransformer<String,Node> { * the respective datatype, throws an IllegalArgumentException that needs to be caught by the class * carrying out the transformation. * + * + * @param backend * @param node * @return */ @Override - public String transform(NodeBackend<Node> backend, Node node, Map<String, String> configuration) 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/8a7af22f/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 887c0eb..c6aeb48 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 @@ -21,7 +21,7 @@ package org.apache.marmotta.ldpath.model.transformers; import java.util.Date; import java.util.Map; -import org.apache.marmotta.ldpath.api.backend.NodeBackend; +import org.apache.marmotta.ldpath.api.backend.RDFBackend; import org.apache.marmotta.ldpath.api.transformers.NodeTransformer; /** @@ -36,11 +36,13 @@ public class TimeTransformer<Node> implements NodeTransformer<Date,Node> { * the respective datatype, throws an IllegalArgumentException that needs to be caught by the class * carrying out the transformation. * + * + * @param rdfBackend * @param node * @return */ @Override - public Date transform(NodeBackend<Node> rdfBackend, Node node, Map<String, String> configuration) 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/8a7af22f/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 f7bcbe8..510f370 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 @@ -32,6 +32,7 @@ import java.util.Map; import org.apache.commons.io.IOUtils; import org.apache.marmotta.ldpath.api.backend.NodeBackend; +import org.apache.marmotta.ldpath.api.backend.RDFBackend; import org.apache.marmotta.ldpath.api.tests.NodeTest; import org.apache.marmotta.ldpath.api.transformers.NodeTransformer; import org.apache.marmotta.ldpath.model.programs.Program; @@ -115,7 +116,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(NodeBackend<String> backend, String node, Map<String,String> configuration) + 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/8a7af22f/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 b6df026..551da4e 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 @@ -17,7 +17,7 @@ */ package org.apache.marmotta.ldpath.template.model.transformers; -import org.apache.marmotta.ldpath.api.backend.NodeBackend; +import org.apache.marmotta.ldpath.api.backend.RDFBackend; import org.apache.marmotta.ldpath.api.transformers.NodeTransformer; import org.apache.marmotta.ldpath.model.transformers.BooleanTransformer; @@ -45,12 +45,14 @@ public class TemplateBooleanTransformer<Node> implements NodeTransformer<Templat * carrying out the transformation. * * + * + * @param nodeRDFBackend * @param node * @param configuration * @return */ @Override - public TemplateBooleanModel transform(final NodeBackend<Node> nodeRDFBackend, final Node node, final Map<String, String> configuration) 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 { http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/8a7af22f/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 57f0a70..d934994 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 @@ -23,7 +23,7 @@ import freemarker.template.TemplateModelException; import java.util.Date; import java.util.Map; -import org.apache.marmotta.ldpath.api.backend.NodeBackend; +import org.apache.marmotta.ldpath.api.backend.RDFBackend; import org.apache.marmotta.ldpath.api.transformers.NodeTransformer; import org.apache.marmotta.ldpath.model.transformers.DateTimeTransformer; @@ -52,12 +52,14 @@ public class TemplateDateTransformer<Node> implements NodeTransformer<TemplateDa * carrying out the transformation. * * + * + * @param nodeRDFBackend * @param node * @param configuration * @return */ @Override - public TemplateDateModel transform(final NodeBackend<Node> nodeRDFBackend, final Node node, final Map<String, String> configuration) 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 { http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/8a7af22f/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 594ea93..f5ffddb 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 @@ -17,7 +17,7 @@ */ package org.apache.marmotta.ldpath.template.model.transformers; -import org.apache.marmotta.ldpath.api.backend.NodeBackend; +import org.apache.marmotta.ldpath.api.backend.RDFBackend; import org.apache.marmotta.ldpath.api.transformers.NodeTransformer; import org.apache.marmotta.ldpath.model.transformers.DoubleTransformer; @@ -47,12 +47,14 @@ public class TemplateDoubleTransformer<Node> implements NodeTransformer<Template * carrying out the transformation. * * + * + * @param nodeRDFBackend * @param node * @param configuration * @return */ @Override - public TemplateNumberModel transform(final NodeBackend<Node> nodeRDFBackend, final Node node, final Map<String, String> configuration) 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 { http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/8a7af22f/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 d8d2c2a..bc3e206 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 @@ -17,7 +17,7 @@ */ package org.apache.marmotta.ldpath.template.model.transformers; -import org.apache.marmotta.ldpath.api.backend.NodeBackend; +import org.apache.marmotta.ldpath.api.backend.RDFBackend; import org.apache.marmotta.ldpath.api.transformers.NodeTransformer; import org.apache.marmotta.ldpath.model.transformers.FloatTransformer; @@ -45,12 +45,14 @@ public class TemplateFloatTransformer<Node> implements NodeTransformer<TemplateN * carrying out the transformation. * * + * + * @param nodeRDFBackend * @param node * @param configuration * @return */ @Override - public TemplateNumberModel transform(final NodeBackend<Node> nodeRDFBackend, final Node node, final Map<String, String> configuration) 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 { http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/8a7af22f/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 5df8bd6..760ce99 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 @@ -17,7 +17,7 @@ */ package org.apache.marmotta.ldpath.template.model.transformers; -import org.apache.marmotta.ldpath.api.backend.NodeBackend; +import org.apache.marmotta.ldpath.api.backend.RDFBackend; import org.apache.marmotta.ldpath.api.transformers.NodeTransformer; import org.apache.marmotta.ldpath.model.transformers.IntTransformer; @@ -45,12 +45,14 @@ public class TemplateIntegerTransformer<Node> implements NodeTransformer<Templat * carrying out the transformation. * * + * + * @param nodeRDFBackend * @param node * @param configuration * @return */ @Override - public TemplateNumberModel transform(final NodeBackend<Node> nodeRDFBackend, final Node node, final Map<String, String> configuration) 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 { http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/8a7af22f/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 9fc20b0..3e55e01 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 @@ -17,7 +17,7 @@ */ package org.apache.marmotta.ldpath.template.model.transformers; -import org.apache.marmotta.ldpath.api.backend.NodeBackend; +import org.apache.marmotta.ldpath.api.backend.RDFBackend; import org.apache.marmotta.ldpath.api.transformers.NodeTransformer; import org.apache.marmotta.ldpath.model.transformers.LongTransformer; @@ -45,12 +45,14 @@ public class TemplateLongTransformer<Node> implements NodeTransformer<TemplateNu * carrying out the transformation. * * + * + * @param nodeRDFBackend * @param node * @param configuration * @return */ @Override - public TemplateNumberModel transform(final NodeBackend<Node> nodeRDFBackend, final Node node, final Map<String, String> configuration) 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 { http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/8a7af22f/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 980a030..bc6d711 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 @@ -17,7 +17,7 @@ */ package org.apache.marmotta.ldpath.template.model.transformers; -import org.apache.marmotta.ldpath.api.backend.NodeBackend; +import org.apache.marmotta.ldpath.api.backend.RDFBackend; import org.apache.marmotta.ldpath.api.transformers.NodeTransformer; import org.apache.marmotta.ldpath.model.transformers.StringTransformer; @@ -46,12 +46,14 @@ public class TemplateScalarTransformer<Node> implements NodeTransformer<Template * carrying out the transformation. * * + * + * @param nodeRDFBackend * @param node * @param configuration * @return */ @Override - public TemplateScalarModel transform(final NodeBackend<Node> nodeRDFBackend, final Node node, final Map<String, String> configuration) 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 {
