Resolve merge conflict between master and ANY23-320
Project: http://git-wip-us.apache.org/repos/asf/any23/repo Commit: http://git-wip-us.apache.org/repos/asf/any23/commit/46408604 Tree: http://git-wip-us.apache.org/repos/asf/any23/tree/46408604 Diff: http://git-wip-us.apache.org/repos/asf/any23/diff/46408604 Branch: refs/heads/master Commit: 46408604a18ec289e252093a67f5ea010eed4488 Parents: 60e93a7 d2ace9c Author: Lewis John McGibbney <[email protected]> Authored: Wed Jan 3 00:19:05 2018 +0000 Committer: Lewis John McGibbney <[email protected]> Committed: Wed Jan 3 00:19:05 2018 +0000 ---------------------------------------------------------------------- api/src/main/java/org/apache/any23/vocab/YAML.java | 7 +++++-- .../org/apache/any23/extractor/yaml/ElementsProcessor.java | 6 ++---- .../apache/any23/extractor/yaml/ElementsProcessorTest.java | 1 - .../org/apache/any23/extractor/yaml/YAMLExtractorTest.java | 7 +------ .../test/java/org/apache/any23/vocab/RDFSchemaUtilsTest.java | 4 ++-- .../resources/org/apache/any23/extractor/yaml/test-null.yml | 4 +++- 6 files changed, 13 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/any23/blob/46408604/core/src/main/java/org/apache/any23/extractor/yaml/ElementsProcessor.java ---------------------------------------------------------------------- diff --cc core/src/main/java/org/apache/any23/extractor/yaml/ElementsProcessor.java index 90863ac,a4604e4..75c6611 --- a/core/src/main/java/org/apache/any23/extractor/yaml/ElementsProcessor.java +++ b/core/src/main/java/org/apache/any23/extractor/yaml/ElementsProcessor.java @@@ -104,18 -100,16 +104,17 @@@ public class ElementsProcessor * created. * @return instance of {@link ModelHolder}, */ + @SuppressWarnings("unchecked") public ModelHolder asModel(IRI namespace, final Object t, Value rootNode) { - if (t == null) { - return null; - } if (t instanceof List) { - return processList(namespace, (List) t); + return processList(namespace, (List<Object>) t); } else if (t instanceof Map) { - return processMap(namespace, (Map) t, rootNode); + return processMap(namespace, (Map<String, Object>) t, rootNode); } else if (t instanceof String) { return asModelHolder(RDFUtils.makeIRI(t.toString()), modelFactory.createEmptyModel()); + } else if (t == null) { + return asModelHolder(vocab.nullValue, modelFactory.createEmptyModel()); } else { return asModelHolder(Literals.createLiteral(vf, t), modelFactory.createEmptyModel()); }
