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 2018/01/02 19:04:05 UTC
[1/4] any23 git commit: Solved ANY23-316
Repository: any23
Updated Branches:
refs/heads/master 06132801a -> 3c8bb730b
Solved ANY23-316
- create value for null values: yaml:Null
- update null-aware unit test
- modify example for unit test: 'null' value is an item of a list
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/b786e899
Tree: http://git-wip-us.apache.org/repos/asf/any23/tree/b786e899
Diff: http://git-wip-us.apache.org/repos/asf/any23/diff/b786e899
Branch: refs/heads/master
Commit: b786e899b738886e240e12a84c2c291c75ecd694
Parents: 7c68688
Author: Jacek Grzebyta <gr...@gmail.com>
Authored: Tue Dec 26 00:37:13 2017 +0000
Committer: Jacek Grzebyta <gr...@gmail.com>
Committed: Tue Dec 26 00:38:00 2017 +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 | 8 ++------
.../resources/org/apache/any23/extractor/yaml/test-null.yml | 4 +++-
5 files changed, 12 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/any23/blob/b786e899/api/src/main/java/org/apache/any23/vocab/YAML.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/any23/vocab/YAML.java b/api/src/main/java/org/apache/any23/vocab/YAML.java
index c4e488f..52afda5 100644
--- a/api/src/main/java/org/apache/any23/vocab/YAML.java
+++ b/api/src/main/java/org/apache/any23/vocab/YAML.java
@@ -42,6 +42,8 @@ public class YAML extends Vocabulary {
public static final String MAPPING = "Mapping";
public static final String CONTAINS = "contains";
+
+ public static final String NULL = "Null";
private static final YAML _instance = new YAML();
@@ -80,5 +82,6 @@ public class YAML extends Vocabulary {
public final IRI mapping = createClass(NS, MAPPING);
// property
public final IRI contains = createProperty(NS, CONTAINS);
-
-}
+
+ public final IRI nullValue = createProperty(NS, NULL);
+ }
http://git-wip-us.apache.org/repos/asf/any23/blob/b786e899/core/src/main/java/org/apache/any23/extractor/yaml/ElementsProcessor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/any23/extractor/yaml/ElementsProcessor.java b/core/src/main/java/org/apache/any23/extractor/yaml/ElementsProcessor.java
index bacb90c..a4604e4 100644
--- a/core/src/main/java/org/apache/any23/extractor/yaml/ElementsProcessor.java
+++ b/core/src/main/java/org/apache/any23/extractor/yaml/ElementsProcessor.java
@@ -101,9 +101,6 @@ public class ElementsProcessor {
* @return instance of {@link ModelHolder},
*/
public ModelHolder asModel(IRI namespace, final Object t, Value rootNode) {
- if (t == null) {
- return null;
- }
if (t instanceof List) {
return processList(namespace, (List) t);
@@ -111,6 +108,8 @@ public class ElementsProcessor {
return processMap(namespace, (Map) 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());
}
@@ -213,7 +212,6 @@ public class ElementsProcessor {
prevNode = currentNode;
}
- finalModel.add((Resource) listRoot, RDF.TYPE, RDF.LIST, (Resource[]) null);
return asModelHolder(listRoot, finalModel);
}
http://git-wip-us.apache.org/repos/asf/any23/blob/b786e899/core/src/test/java/org/apache/any23/extractor/yaml/ElementsProcessorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/any23/extractor/yaml/ElementsProcessorTest.java b/core/src/test/java/org/apache/any23/extractor/yaml/ElementsProcessorTest.java
index d670916..b6aa7cc 100644
--- a/core/src/test/java/org/apache/any23/extractor/yaml/ElementsProcessorTest.java
+++ b/core/src/test/java/org/apache/any23/extractor/yaml/ElementsProcessorTest.java
@@ -24,7 +24,6 @@ import java.util.Map;
import org.eclipse.rdf4j.model.Literal;
import org.eclipse.rdf4j.model.Model;
import org.eclipse.rdf4j.model.Resource;
-import org.eclipse.rdf4j.model.Value;
import org.eclipse.rdf4j.model.vocabulary.RDF;
import org.eclipse.rdf4j.rio.RDFFormat;
import org.eclipse.rdf4j.rio.Rio;
http://git-wip-us.apache.org/repos/asf/any23/blob/b786e899/core/src/test/java/org/apache/any23/extractor/yaml/YAMLExtractorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/any23/extractor/yaml/YAMLExtractorTest.java b/core/src/test/java/org/apache/any23/extractor/yaml/YAMLExtractorTest.java
index 06e341e..9aa8dee 100644
--- a/core/src/test/java/org/apache/any23/extractor/yaml/YAMLExtractorTest.java
+++ b/core/src/test/java/org/apache/any23/extractor/yaml/YAMLExtractorTest.java
@@ -107,12 +107,8 @@ public class YAMLExtractorTest extends AbstractExtractorTestCase {
assertExtract("/org/apache/any23/extractor/yaml/test-null.yml");
log.debug(dumpModelToTurtle());
assertModelNotEmpty();
- /**
- * Since the map is empty it should not contain any document marked type mapping.
- */
- assertNotContains(RDF.TYPE, vocab.mapping);
int statements = dumpAsListOfStatements().size();
- Assert.assertTrue("Found " + statements + " statements", statements == 9);
+ Assert.assertTrue("Found " + statements + " statements", statements == 26);
}
@Test
@@ -125,7 +121,7 @@ public class YAMLExtractorTest extends AbstractExtractorTestCase {
RDFUtils.triple(RDFUtils.bnode(), RDFUtils.iri(ns, "value3"), RDFUtils.bnode("10")),
RDFUtils.triple(RDFUtils.bnode("10"), RDF.FIRST, RDFUtils.bnode("11")),
RDFUtils.triple(RDFUtils.bnode("11"), RDFUtils.iri(ns, "key3.1"), RDFUtils.bnode("12")),
- RDFUtils.triple(RDFUtils.bnode("12"), RDF.TYPE, RDF.LIST),
+ // RDFUtils.triple(RDFUtils.bnode("12"), RDF.TYPE, RDF.LIST),
RDFUtils.triple(RDFUtils.bnode("12"), RDF.FIRST, RDFUtils.literal("value3.1.1"))
});
http://git-wip-us.apache.org/repos/asf/any23/blob/b786e899/test-resources/src/test/resources/org/apache/any23/extractor/yaml/test-null.yml
----------------------------------------------------------------------
diff --git a/test-resources/src/test/resources/org/apache/any23/extractor/yaml/test-null.yml b/test-resources/src/test/resources/org/apache/any23/extractor/yaml/test-null.yml
index 2b16113..b67d1d9 100644
--- a/test-resources/src/test/resources/org/apache/any23/extractor/yaml/test-null.yml
+++ b/test-resources/src/test/resources/org/apache/any23/extractor/yaml/test-null.yml
@@ -2,4 +2,6 @@
---
canonical: null
tag: !!null
-practice:
\ No newline at end of file
+practice:
+some testing:
+ values: [Very, sour, null]
\ No newline at end of file
[3/4] any23 git commit: Solved ANY23-316
Posted by jg...@apache.org.
Solved ANY23-316
- remove commented line in test
- RDFUtils: fixed isRelative method
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/21e2bf79
Tree: http://git-wip-us.apache.org/repos/asf/any23/tree/21e2bf79
Diff: http://git-wip-us.apache.org/repos/asf/any23/diff/21e2bf79
Branch: refs/heads/master
Commit: 21e2bf798d8d74360303eec5a3d31950925bfc4c
Parents: 43b1cf9
Author: Jacek Grzebyta <gr...@gmail.com>
Authored: Mon Jan 1 14:16:53 2018 +0000
Committer: Jacek Grzebyta <gr...@gmail.com>
Committed: Mon Jan 1 14:16:53 2018 +0000
----------------------------------------------------------------------
core/src/main/java/org/apache/any23/rdf/RDFUtils.java | 10 ++++------
.../apache/any23/extractor/yaml/YAMLExtractorTest.java | 1 -
2 files changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/any23/blob/21e2bf79/core/src/main/java/org/apache/any23/rdf/RDFUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/any23/rdf/RDFUtils.java b/core/src/main/java/org/apache/any23/rdf/RDFUtils.java
index b8f143b..55f9920 100644
--- a/core/src/main/java/org/apache/any23/rdf/RDFUtils.java
+++ b/core/src/main/java/org/apache/any23/rdf/RDFUtils.java
@@ -564,12 +564,10 @@ public class RDFUtils {
*/
public static boolean isAbsoluteIRI(String href) {
try {
- SimpleValueFactory.getInstance().createIRI(href.trim());
- new java.net.URI(href.trim());
- return true;
- } catch (IllegalArgumentException e) {
- return false;
- } catch (URISyntaxException e) {
+ valueFactory.createIRI(href.trim());
+ java.net.URI asURI = new java.net.URI(href.trim());
+ return asURI.isAbsolute();
+ } catch (IllegalArgumentException | URISyntaxException e) {
return false;
}
}
http://git-wip-us.apache.org/repos/asf/any23/blob/21e2bf79/core/src/test/java/org/apache/any23/extractor/yaml/YAMLExtractorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/any23/extractor/yaml/YAMLExtractorTest.java b/core/src/test/java/org/apache/any23/extractor/yaml/YAMLExtractorTest.java
index 9aa8dee..e510c70 100644
--- a/core/src/test/java/org/apache/any23/extractor/yaml/YAMLExtractorTest.java
+++ b/core/src/test/java/org/apache/any23/extractor/yaml/YAMLExtractorTest.java
@@ -121,7 +121,6 @@ public class YAMLExtractorTest extends AbstractExtractorTestCase {
RDFUtils.triple(RDFUtils.bnode(), RDFUtils.iri(ns, "value3"), RDFUtils.bnode("10")),
RDFUtils.triple(RDFUtils.bnode("10"), RDF.FIRST, RDFUtils.bnode("11")),
RDFUtils.triple(RDFUtils.bnode("11"), RDFUtils.iri(ns, "key3.1"), RDFUtils.bnode("12")),
- // RDFUtils.triple(RDFUtils.bnode("12"), RDF.TYPE, RDF.LIST),
RDFUtils.triple(RDFUtils.bnode("12"), RDF.FIRST, RDFUtils.literal("value3.1.1"))
});
[4/4] any23 git commit: Merge branch 'ANY23-316'
Posted by jg...@apache.org.
Merge branch 'ANY23-316'
Project: http://git-wip-us.apache.org/repos/asf/any23/repo
Commit: http://git-wip-us.apache.org/repos/asf/any23/commit/3c8bb730
Tree: http://git-wip-us.apache.org/repos/asf/any23/tree/3c8bb730
Diff: http://git-wip-us.apache.org/repos/asf/any23/diff/3c8bb730
Branch: refs/heads/master
Commit: 3c8bb730bdb70be2e5bd8ebea2bbd2c67bb9f426
Parents: 0613280 21e2bf7
Author: Jacek Grzebyta <gr...@gmail.com>
Authored: Tue Jan 2 18:30:17 2018 +0000
Committer: Jacek Grzebyta <gr...@gmail.com>
Committed: Tue Jan 2 18:30:17 2018 +0000
----------------------------------------------------------------------
api/src/main/java/org/apache/any23/vocab/YAML.java | 7 +++++--
.../apache/any23/extractor/yaml/ElementsProcessor.java | 6 ++----
core/src/main/java/org/apache/any23/rdf/RDFUtils.java | 10 ++++------
.../any23/extractor/yaml/ElementsProcessorTest.java | 1 -
.../apache/any23/extractor/yaml/YAMLExtractorTest.java | 7 +------
.../org/apache/any23/extractor/yaml/test-null.yml | 4 +++-
6 files changed, 15 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
[2/4] any23 git commit: Merge branch 'master' into ANY23-316
Posted by jg...@apache.org.
Merge branch 'master' into ANY23-316
Project: http://git-wip-us.apache.org/repos/asf/any23/repo
Commit: http://git-wip-us.apache.org/repos/asf/any23/commit/43b1cf9f
Tree: http://git-wip-us.apache.org/repos/asf/any23/tree/43b1cf9f
Diff: http://git-wip-us.apache.org/repos/asf/any23/diff/43b1cf9f
Branch: refs/heads/master
Commit: 43b1cf9f668ec910cdcf921b30de6ec516ed94b3
Parents: b786e89 0613280
Author: Jacek Grzebyta <gr...@gmail.com>
Authored: Mon Jan 1 12:56:37 2018 +0000
Committer: Jacek Grzebyta <gr...@gmail.com>
Committed: Mon Jan 1 12:56:37 2018 +0000
----------------------------------------------------------------------
LICENSE.md | 271 +++++++++++++++++++
LICENSE.txt | 271 -------------------
README.md | 34 +--
.../any23/extractor/ExtractionParameters.java | 22 +-
.../main/java/org/apache/any23/cli/Rover.java | 4 +-
.../apache/any23/cli/MicrodataParserTest.java | 5 +-
.../any23/extractor/SimpleExtractorFactory.java | 50 ++--
.../extractor/SingleDocumentExtraction.java | 20 +-
.../any23/extractor/rdf/BaseRDFExtractor.java | 19 +-
.../extractor/rdfa/RDFa11ExtractorFactory.java | 4 +-
.../DefaultValidationReportBuilder.java | 12 +-
.../any23/validator/DefaultValidator.java | 13 +-
.../any23/validator/ValidationReport.java | 28 +-
.../any23/validator/rule/AboutNotURIRule.java | 8 +-
.../any23/validator/rule/MetaNameMisuseFix.java | 2 +
.../validator/rule/MetaNameMisuseRule.java | 6 +-
.../rule/MissingItemscopeAttributeValueFix.java | 23 +-
.../MissingItemscopeAttributeValueRule.java | 6 +-
.../rule/MissingOpenGraphNamespaceRule.java | 4 +-
.../validator/rule/OpenGraphNamespaceFix.java | 5 +-
.../test/java/org/apache/any23/Any23Test.java | 41 ++-
.../any23/validator/DefaultValidatorTest.java | 15 +-
.../XMLValidationReportSerializerTest.java | 2 +-
.../any23/mime/TikaMIMETypeDetectorTest.java | 1 -
.../java/org/apache/any23/cli/CrawlerTest.java | 4 +-
pom.xml | 12 +-
.../apache/any23/servlet/RedirectServlet.java | 51 +++-
.../java/org/apache/any23/servlet/Servlet.java | 16 +-
.../org/apache/any23/servlet/WebResponder.java | 2 +-
.../resources/microdata/microdata-basic.html | 129 +++++----
30 files changed, 580 insertions(+), 500 deletions(-)
----------------------------------------------------------------------