You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@any23.apache.org by jg...@apache.org on 2017/12/07 12:28:05 UTC
[02/17] any23 git commit: Ref ANY23-312
Ref ANY23-312
- buildNode method returns Optional wrapper
Signed-off-by:Jacek Grzebyta <gr...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/any23/repo
Commit: http://git-wip-us.apache.org/repos/asf/any23/commit/783434d5
Tree: http://git-wip-us.apache.org/repos/asf/any23/tree/783434d5
Diff: http://git-wip-us.apache.org/repos/asf/any23/diff/783434d5
Branch: refs/heads/master
Commit: 783434d55648990469f7bf958d687c98796adfad
Parents: af0a7e1
Author: Jacek Grzebyta <gr...@gmail.com>
Authored: Tue Oct 17 17:22:53 2017 +0100
Committer: Jacek Grzebyta <gr...@gmail.com>
Committed: Tue Oct 17 17:22:53 2017 +0100
----------------------------------------------------------------------
.../any23/extractor/yaml/YAMLExtractor.java | 33 +++++++++++---------
1 file changed, 18 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/any23/blob/783434d5/core/src/main/java/org/apache/any23/extractor/yaml/YAMLExtractor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/any23/extractor/yaml/YAMLExtractor.java b/core/src/main/java/org/apache/any23/extractor/yaml/YAMLExtractor.java
index dc80e0f..ceacaba 100644
--- a/core/src/main/java/org/apache/any23/extractor/yaml/YAMLExtractor.java
+++ b/core/src/main/java/org/apache/any23/extractor/yaml/YAMLExtractor.java
@@ -21,6 +21,7 @@ import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Optional;
import org.apache.any23.extractor.ExtractionContext;
import org.apache.any23.extractor.ExtractionException;
import org.apache.any23.extractor.ExtractionParameters;
@@ -89,32 +90,32 @@ public class YAMLExtractor implements Extractor.ContentExtractor {
return YAMLExtractorFactory.getDescriptionInstance();
}
- private Value buildNode(IRI fileURI, Object treeData, ExtractionResult out, Resource... parent) {
+ private Optional<Value> buildNode(IRI fileURI, Object treeData, ExtractionResult out, Resource... parent) {
if (treeData != null) {
log.debug("object type: {}", treeData.getClass());
}
if (treeData == null) {
- return RDF.NIL;
+ return Optional.empty();
} else if (treeData instanceof Map) {
- return processMap(fileURI, (Map) treeData, out, parent);
+ return Optional.ofNullable(processMap(fileURI, (Map) treeData, out, parent));
} else if (treeData instanceof List) {
- return processList(fileURI, (List) treeData, out, parent);
+ return Optional.ofNullable(processList(fileURI, (List) treeData, out, parent));
} else if (treeData instanceof Long) {
- return RDFUtils.literal(((Long) treeData));
+ return Optional.of(RDFUtils.literal(((Long) treeData)));
} else if (treeData instanceof Integer) {
- return RDFUtils.literal(((Integer) treeData));
+ return Optional.of(RDFUtils.literal(((Integer) treeData)));
} else if (treeData instanceof Float) {
- return RDFUtils.literal((Float) treeData);
+ return Optional.of(RDFUtils.literal((Float) treeData));
} else if (treeData instanceof Double) {
- return RDFUtils.literal((Double) treeData);
+ return Optional.of(RDFUtils.literal((Double) treeData));
} else if (treeData instanceof Byte) {
- return RDFUtils.literal((Byte) treeData);
+ return Optional.of(RDFUtils.literal((Byte) treeData));
} else if (treeData instanceof Boolean) {
- return RDFUtils.literal((Boolean) treeData);
+ return Optional.of(RDFUtils.literal((Boolean) treeData));
} else {
- return processString((String) treeData);
+ return Optional.of(processString((String) treeData));
}
}
@@ -128,9 +129,11 @@ public class YAMLExtractor implements Extractor.ContentExtractor {
"some string" ---> ns:someString
*/
Resource predicate = RDFUtils.makeIRI(k, file, false);
- Value value = buildNode(file, node.get(k), out);
+ Optional<Value> isValue = buildNode(file, node.get(k), out);
out.writeTriple(nodeURI, RDF.TYPE, vocab.mapping);
- out.writeTriple(nodeURI, (IRI) predicate, value);
+ if (isValue.isPresent()) {
+ out.writeTriple(nodeURI, (IRI) predicate, isValue.get());
+ }
out.writeTriple(predicate, RDF.TYPE, RDF.PREDICATE);
out.writeTriple(predicate, RDFS.LABEL, RDFUtils.literal(k));
});
@@ -154,8 +157,8 @@ public class YAMLExtractor implements Extractor.ContentExtractor {
out.writeTriple(pList, RDF.REST, cList);
}
// adds value to the current iter
- Value val = buildNode(fileURI, listIter.next(), out);
- out.writeTriple(cList, RDF.FIRST, val);
+ Optional<Value> isValue = buildNode(fileURI, listIter.next(), out);
+ out.writeTriple(cList, RDF.FIRST, isValue.orElse(RDF.NIL));
// makes current node the previuos one and generate new current node
pList = cList;
cList = YAMLExtractor.this.makeUri();