svn commit: r1006425 - in /websites/production/commons/content: ./ dormant/ proper/ sandbox/
Author: britter Date: Wed Feb 8 19:26:31 2017 New Revision: 1006425 Log: Publishing svnmucc operation to commons site by britter Added: websites/production/commons/content/ - copied from r1006424, websites/staging/commons/trunk/content/ websites/production/commons/content/dormant/ - copied from r1006424, websites/production/commons/content/dormant/ websites/production/commons/content/proper/ - copied from r1006424, websites/production/commons/content/proper/ websites/production/commons/content/sandbox/ - copied from r1006424, websites/production/commons/content/sandbox/
svn commit: r1006423 - in /websites/staging/commons/trunk/content: ./ downloads/ gsoc/ gsoc/2010/ releases/
Author: buildbot Date: Wed Feb 8 19:22:29 2017 New Revision: 1006423 Log: Staging update by buildbot for commons Modified: websites/staging/commons/trunk/content/ (props changed) websites/staging/commons/trunk/content/bugs.html websites/staging/commons/trunk/content/building.html websites/staging/commons/trunk/content/charter.html websites/staging/commons/trunk/content/commons-parent-pom.html websites/staging/commons/trunk/content/components.html websites/staging/commons/trunk/content/dormant.html websites/staging/commons/trunk/content/downloads/index.html websites/staging/commons/trunk/content/gsoc/2010/index.html websites/staging/commons/trunk/content/gsoc/index.html websites/staging/commons/trunk/content/index.html websites/staging/commons/trunk/content/mail-lists.html websites/staging/commons/trunk/content/new-sandbox-component.html websites/staging/commons/trunk/content/oldcharter.html websites/staging/commons/trunk/content/patches.html websites/staging/commons/trunk/content/project-info.html websites/staging/commons/trunk/content/releases/index.html websites/staging/commons/trunk/content/releases/moving-to-dormant.html websites/staging/commons/trunk/content/releases/prepare.html websites/staging/commons/trunk/content/releases/publish-site.html websites/staging/commons/trunk/content/releases/release.html websites/staging/commons/trunk/content/releases/versioning.html websites/staging/commons/trunk/content/sandbox.html websites/staging/commons/trunk/content/security.html websites/staging/commons/trunk/content/site-publish.html websites/staging/commons/trunk/content/svninfo.html websites/staging/commons/trunk/content/team-list.html websites/staging/commons/trunk/content/volunteering.html Propchange: websites/staging/commons/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Wed Feb 8 19:22:29 2017 @@ -1 +1 @@ -1779550 +1782233 Modified: websites/staging/commons/trunk/content/bugs.html == --- websites/staging/commons/trunk/content/bugs.html (original) +++ websites/staging/commons/trunk/content/bugs.html Wed Feb 8 19:22:29 2017 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> @@ -8,7 +8,7 @@ - + Apache Commons On Reporting Bugs @@ -36,7 +36,7 @@ http://commons.apache.org/;>Apache Commons -Last Published: 20 January 2017 +Last Published: 08 February 2017 | Version: 18 Modified: websites/staging/commons/trunk/content/building.html == --- websites/staging/commons/trunk/content/building.html (original) +++ websites/staging/commons/trunk/content/building.html Wed Feb 8 19:22:29 2017 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> @@ -8,7 +8,7 @@ - + Apache Commons Building Apache Commons Components @@ -36,7 +36,7 @@ http://commons.apache.org/;>Apache Commons -Last Published: 20 January 2017 +Last Published: 08 February 2017 | Version: 18 Modified: websites/staging/commons/trunk/content/charter.html == --- websites/staging/commons/trunk/content/charter.html (original) +++ websites/staging/commons/trunk/content/charter.html Wed Feb 8 19:22:29 2017 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> @@ -8,7 +8,7 @@ - + Apache Commons Charter @@ -36,7 +36,7 @@ http://commons.apache.org/;>Apache Commons -Last Published: 20 January 2017 +Last Published: 08 February 2017 | Version: 18 Modified: websites/staging/commons/trunk/content/commons-parent-pom.html == --- websites/staging/commons/trunk/content/commons-parent-pom.html (original) +++ websites/staging/commons/trunk/content/commons-parent-pom.html Wed Feb 8 19:22:29 2017 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Apache Commons Apache Commons Parent pom.xml @@ -35,7 +35,7 @@ http://commons.apache.org/;>Apache Commons
svn commit: r1006424 - in /websites/staging/commons/trunk/content: ./ index.html
Author: buildbot Date: Wed Feb 8 19:24:46 2017 New Revision: 1006424 Log: Staging update by buildbot for commons Modified: websites/staging/commons/trunk/content/ (props changed) websites/staging/commons/trunk/content/index.html Propchange: websites/staging/commons/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Wed Feb 8 19:24:46 2017 @@ -1 +1 @@ -1782233 +1782235 Modified: websites/staging/commons/trunk/content/index.html == --- websites/staging/commons/trunk/content/index.html (original) +++ websites/staging/commons/trunk/content/index.html Wed Feb 8 19:24:46 2017 @@ -318,7 +318,7 @@ Byte Code Engineering Library - analyze, create, and manipulate Java class files 6.0 -2016-14-07 +2016-07-14 BeanUtils @@ -334,7 +334,7 @@ Bean Scripting Framework - interface to scripting languages, including JSR-223 3.1 -2010-24-06 +2010-06-24 Chain
svn commit: r1006426 - in /websites/production/commons/content/proper/commons-configuration: ./ apidocs/ apidocs/org/apache/commons/configuration2/ apidocs/org/apache/commons/configuration2/beanutils/
Author: britter Date: Wed Feb 8 19:59:04 2017 New Revision: 1006426 Log: Site checkin for project Apache Commons Configuration [This commit notification would consist of 1004 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.]
svn commit: r1006435 [11/18] - in /websites/production/commons/content/proper/commons-rdf-parent: ./ apidocs/ apidocs/org/apache/commons/rdf/api/ apidocs/org/apache/commons/rdf/api/class-use/ apidocs/
Modified: websites/production/commons/content/proper/commons-rdf-parent/xref-test/org/apache/commons/rdf/api/AbstractRDFTest.html == --- websites/production/commons/content/proper/commons-rdf-parent/xref-test/org/apache/commons/rdf/api/AbstractRDFTest.html (original) +++ websites/production/commons/content/proper/commons-rdf-parent/xref-test/org/apache/commons/rdf/api/AbstractRDFTest.html Thu Feb 9 00:35:28 2017 @@ -25,13 +25,13 @@ 17 */ 18 package org.apache.commons.rdf.api; 19 -20 import static org.junit.Assert.assertEquals; -21 import static org.junit.Assert.assertFalse; -22 import static org.junit.Assert.assertNotEquals; -23 import static org.junit.Assert.assertNotSame; -24 -25 import java.util.Objects; -26 +20 import static org.junit.Assert.*; +21 +22 import java.util.Locale; +23 import java.util.Objects; +24 import java.util.Optional; +25 +26 import org.junit.Assume; 27 import org.junit.Before; 28 import org.junit.Test; 29 @@ -49,10 +49,10 @@ 41 private RDF factory; 42 43 /** -44 * +44 * 45 * This method must be overridden by the implementing test to provide a 46 * factory for the test to create {@link Literal}, {@link IRI} etc. -47 * +47 * 48 * @return {@link RDF} instance to be tested. 49 */ 50 protected abstract RDF createFactory(); @@ -147,7 +147,7 @@ 139 assertEquals("http://example.com/vocab#term;, term.ntriplesString()); 140 141 // and now for the international fun! -142 +142 // make sure this file is edited/compiled as UTF-8 143 final IRI latin1 = factory.createIRI("http://accént.example.com/première;); 144 assertEquals("http://accént.example.com/première;, latin1.getIRIString()); 145 assertEquals("http://accént.example.com/première;, latin1.ntriplesString()); @@ -202,120 +202,264 @@ 194 assertEquals("\Herbert Van de Sompel\@vls", vls.ntriplesString()); 195 } 196 -197 @Test -198 public void testCreateLiteralString() throws Exception { -199 final Literal example = factory.createLiteral("Example", -200 factory.createIRI("http://www.w3.org/2001/XMLSchema#string;)); -201 assertEquals("Example", example.getLexicalForm()); -202 assertFalse(example.getLanguageTag().isPresent()); -203 assertEquals("http://www.w3.org/2001/XMLSchema#string;, example.getDatatype().getIRIString()); -204 // http://lists.w3.org/Archives/Public/public-rdf-comments/2014Dec/0004.html -205 assertEquals("\Example\", example.ntriplesString()); -206 } -207 -208 @Test -209 public void testCreateTripleBnodeBnode() { -210 final BlankNode subject = factory.createBlankNode("b1"); -211 final IRI predicate = factory.createIRI("http://example.com/pred;); -212 final BlankNode object = factory.createBlankNode("b2"); -213 final Triple triple = factory.createTriple(subject, predicate, object); -214 -215 // bnode equivalence should be OK as we used the same -216 // factory and have not yet inserted Triple into a Graph -217 assertEquals(subject, triple.getSubject()); -218 assertEquals(predicate, triple.getPredicate()); -219 assertEquals(object, triple.getObject()); -220 } -221 -222 @Test -223 public void testCreateTripleBnodeIRI() { -224 final BlankNode subject = factory.createBlankNode("b1"); -225 final IRI predicate = factory.createIRI("http://example.com/pred;); -226 final IRI object = factory.createIRI("http://example.com/obj;); -227 final Triple triple = factory.createTriple(subject, predicate, object); -228 -229 // bnode equivalence should be OK as we used the same -230 // factory and have not yet inserted Triple into a Graph -231 assertEquals(subject, triple.getSubject()); -232 assertEquals(predicate, triple.getPredicate()); -233 assertEquals(object, triple.getObject()); -234 } -235 -236 @Test -237 public void testCreateTripleBnodeTriple() { -238 final BlankNode subject = factory.createBlankNode(); -239 final IRI predicate = factory.createIRI("http://example.com/pred;); -240 final Literal object = factory.createLiteral("Example", "en"); -241 final Triple triple = factory.createTriple(subject, predicate, object); -242 -243 // bnode equivalence should be OK as we used the same -244 // factory and have not yet inserted Triple into a Graph -245 assertEquals(subject, triple.getSubject()); -246 assertEquals(predicate, triple.getPredicate()); -247 assertEquals(object, triple.getObject()); -248 } -249 -250 @Test -251 public void testPossiblyInvalidBlankNode() throws Exception { -252
svn commit: r1006435 [17/18] - in /websites/production/commons/content/proper/commons-rdf-parent: ./ apidocs/ apidocs/org/apache/commons/rdf/api/ apidocs/org/apache/commons/rdf/api/class-use/ apidocs/
Modified: websites/production/commons/content/proper/commons-rdf-parent/xref/org/apache/commons/rdf/rdf4j/RDF4J.html == --- websites/production/commons/content/proper/commons-rdf-parent/xref/org/apache/commons/rdf/rdf4j/RDF4J.html (original) +++ websites/production/commons/content/proper/commons-rdf-parent/xref/org/apache/commons/rdf/rdf4j/RDF4J.html Thu Feb 9 00:35:28 2017 @@ -45,553 +45,626 @@ 37 import org.apache.commons.rdf.api.TripleLike; 38 import org.apache.commons.rdf.rdf4j.impl.InternalRDF4JFactory; 39 import org.eclipse.rdf4j.model.BNode; -40 import org.eclipse.rdf4j.model.Model; -41 import org.eclipse.rdf4j.model.Resource; -42 import org.eclipse.rdf4j.model.Statement; -43 import org.eclipse.rdf4j.model.Value; -44 import org.eclipse.rdf4j.model.ValueFactory; -45 import org.eclipse.rdf4j.model.impl.LinkedHashModel; -46 import org.eclipse.rdf4j.model.impl.SimpleValueFactory; -47 import org.eclipse.rdf4j.repository.Repository; -48 import org.eclipse.rdf4j.repository.RepositoryConnection; -49 import org.eclipse.rdf4j.repository.sail.SailRepository; -50 import org.eclipse.rdf4j.sail.Sail; -51 import org.eclipse.rdf4j.sail.memory.MemoryStore; -52 -53 /** -54 * RDF4J implementation of RDF. -55 * p -56 * The {@link #RDF4J()} constructor uses a {@link SimpleValueFactory} to create -57 * corresponding RDF4J {@link Value} instances. Alternatively, this factory can -58 * be constructed with a different {@link ValueFactory} using -59 * {@link #RDF4J(ValueFactory)}. -60 * p -61 * {@link #asRDFTerm(Value)} can be used to convert any RDF4J {@link Value} to -62 * an RDFTerm. Note that adapted {@link BNode}s are considered equal if they are -63 * converted with the same {@link RDF4J} instance and have the same -64 * {@link BNode#getID()}. -65 * p -66 * {@link #createGraph()} creates a new Graph backed by {@link LinkedHashModel}. -67 * To use other models, see {@link #asGraph(Model)}. -68 * p -69 * To adapt a RDF4J {@link Repository} as a {@link Dataset} or {@link Graph}, -70 * use {@link #asDataset(Repository, Option...)} or -71 * {@link #asGraph(Repository, Option...)}. -72 * p -73 * {@link #asTriple(Statement)} can be used to convert a RDF4J {@link Statement} -74 * to a Commons RDF {@link Triple}, and equivalent {@link #asQuad(Statement)} to -75 * convert a {@link Quad}. -76 * p -77 * To convert any {@link Triple} or {@link Quad} to to RDF4J {@link Statement}, -78 * use {@link #asStatement(TripleLike)}. This recognises previously converted -79 * {@link RDF4JTriple}s and {@link RDF4JQuad}s without re-converting their -80 * {@link RDF4JTripleLike#asStatement()}. -81 * p -82 * Likewise, {@link #asValue(RDFTerm)} can be used to convert any Commons RDF -83 * {@link RDFTerm} to a corresponding RDF4J {@link Value}. This recognises -84 * previously converted {@link RDF4JTerm}s without re-converting their -85 * {@link RDF4JTerm#asValue()}. -86 * p -87 * For the purpose of {@link BlankNode} equivalence, this factory contains an -88 * internal {@link UUID} salt that is used by adapter methods like -89 * {@link #asQuad(Statement)}, {@link #asTriple(Statement)}, -90 * {@link #asRDFTerm(Value)} as well as {@link #createBlankNode(String)}. As -91 * RDF4J {@link BNode} instances from multiple repositories or models may have -92 * the same {@link BNode#getID()}, converting them with the above methods might -93 * cause accidental {@link BlankNode} equivalence. Note that the {@link Graph} -94 * and {@link Dataset} adapter methods like -95 * {@link #asDataset(Repository, Option...)} and -96 * {@link #asGraph(Repository, Option...)} therefore uses a unique {@link RDF4J} -97 * internally. -98 * -99 * @see RDF -100 * -101 */ -102 public final class RDF4J implements RDF { -103 -104 /** -105 * InternalRDF4JFactory is deliberately abstract -106 */ -107 private static InternalRDF4JFactory rdf4j = new InternalRDF4JFactory() { -108 }; -109 -110 public enum Option { -111 /** -112 * The Graph/Dataset should include any inferred statements -113 */ -114 includeInferred, -115 /** -116 * The graph/dataset should handle {@link Repository#initialize()} (if -117 * needed) and {@link Repository#shutDown()} on {@link Graph#close()} / -118 * {@link Dataset#close()}. -119 */ -120 handleInitAndShutdown -121 } -122 -123 private final UUID salt; +40 import org.eclipse.rdf4j.model.IRI; +41 import org.eclipse.rdf4j.model.Literal; +42 import org.eclipse.rdf4j.model.Model; +43 import org.eclipse.rdf4j.model.Resource; +44 import org.eclipse.rdf4j.model.Statement; +45 import org.eclipse.rdf4j.model.Value; +46 import org.eclipse.rdf4j.model.ValueFactory; +47 import
svn commit: r1006435 [7/18] - in /websites/production/commons/content/proper/commons-rdf-parent: ./ apidocs/ apidocs/org/apache/commons/rdf/api/ apidocs/org/apache/commons/rdf/api/class-use/ apidocs/o
Modified: websites/production/commons/content/proper/commons-rdf-parent/checkstyle-aggregate.html == --- websites/production/commons/content/proper/commons-rdf-parent/checkstyle-aggregate.html (original) +++ websites/production/commons/content/proper/commons-rdf-parent/checkstyle-aggregate.html Thu Feb 9 00:35:28 2017 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Apache Commons RDF Checkstyle Results @@ -40,7 +40,7 @@ https://commons.apache.org/proper/commons-rdf/;>Commons RDF -Last Published: 11 January 2017 +Last Published: 09 February 2017 | Version: 0.4.0-SNAPSHOT @@ -305,7 +305,7 @@ api/src/main/java/org/apache/commons/rdf/api/Literal.java 0 0 -2 +3 api/src/main/java/org/apache/commons/rdf/api/RDF.java 0 @@ -385,7 +385,7 @@ jena/src/main/java/org/apache/commons/rdf/jena/impl/AbstractQuadLike.java 0 0 -5 +4 jena/src/main/java/org/apache/commons/rdf/jena/impl/InternalJenaFactory.java 0 @@ -587,24 +587,30 @@ Error imports UnusedImports +Unused import - java.util.Locale. +21 + +Error +imports +UnusedImports Unused import - java.util.Objects. -21 +22 api/src/main/java/org/apache/commons/rdf/api/RDF.java - + Severity Category Rule Message Line - + Error imports UnusedImports Unused import - java.io.Serializable. 20 - + Error imports UnusedImports @@ -613,25 +619,25 @@ api/src/main/java/org/apache/commons/rdf/api/RDFSyntax.java - + Severity Category Rule Message Line - + Error design VisibilityModifier Variable 'mediaType' must be private and have accessor methods. 114 - + Error design VisibilityModifier Variable 'fileExtension' must be private and have accessor methods. 122 - + Error design VisibilityModifier @@ -640,13 +646,13 @@ api/src/main/java/org/apache/commons/rdf/api/RDFTerm.java - + Severity Category Rule Message Line - + Error whitespace FileTabCharacter @@ -655,13 +661,13 @@ api/src/main/java/org/apache/commons/rdf/api/Triple.java - + Severity Category Rule Message Line - + Error imports UnusedImports @@ -670,37 +676,37 @@ api/src/main/java/org/apache/commons/rdf/experimental/RDFParser.java - + Severity Category Rule Message Line - + Error imports UnusedImports Unused import - java.nio.charset.StandardCharsets. 22 - + Error imports UnusedImports Unused import - java.util.Optional. 24 - + Error imports UnusedImports Unused import - org.apache.commons.rdf.api.BlankNode. 28 - + Error imports UnusedImports Unused import - org.apache.commons.rdf.api.RDFTerm. 34 - + Error imports UnusedImports @@ -709,13 +715,13 @@ api/src/main/java/org/apache/commons/rdf/experimental/package-info.java - + Severity Category Rule Message Line - + Error misc NewlineAtEndOfFile @@ -724,13 +730,13 @@ jena/src/main/java/org/apache/commons/rdf/jena/JenaBlankNode.java - + Severity Category Rule Message Line - + Error imports UnusedImports @@ -739,19 +745,19 @@ jena/src/main/java/org/apache/commons/rdf/jena/JenaDataset.java - + Severity Category Rule Message Line - + Error imports UnusedImports Unused import - org.apache.commons.rdf.api.Dataset. 21 - + Error imports UnusedImports @@ -760,13 +766,13 @@ jena/src/main/java/org/apache/commons/rdf/jena/JenaGeneralizedQuadLike.java - + Severity Category Rule Message Line - + Error imports UnusedImports @@ -775,19 +781,19 @@ jena/src/main/java/org/apache/commons/rdf/jena/JenaGeneralizedTripleLike.java - + Severity Category Rule Message Line - + Error imports UnusedImports Unused import - org.apache.commons.rdf.api.RDFTerm. 20 - + Error imports UnusedImports @@ -796,13 +802,13 @@ jena/src/main/java/org/apache/commons/rdf/jena/JenaIRI.java - + Severity Category Rule Message Line - + Error imports UnusedImports @@ -811,13 +817,13 @@ jena/src/main/java/org/apache/commons/rdf/jena/JenaLiteral.java - + Severity Category Rule Message Line - + Error imports UnusedImports @@ -826,19 +832,19 @@ jena/src/main/java/org/apache/commons/rdf/jena/JenaRDF.java - + Severity Category Rule Message Line - + Error imports UnusedImports Unused import - org.apache.commons.rdf.api.Dataset. 26 - + Error imports UnusedImports @@ -847,13 +853,13 @@ jena/src/main/java/org/apache/commons/rdf/jena/JenaTripleLike.java - + Severity Category Rule Message Line - + Error imports UnusedImports @@ -862,13 +868,13 @@ jena/src/main/java/org/apache/commons/rdf/jena/experimental/package-info.java - + Severity Category Rule Message Line - + Error misc NewlineAtEndOfFile @@ -877,41 +883,35 @@ jena/src/main/java/org/apache/commons/rdf/jena/impl/AbstractQuadLike.java - + Severity Category Rule
svn commit: r1006435 [16/18] - in /websites/production/commons/content/proper/commons-rdf-parent: ./ apidocs/ apidocs/org/apache/commons/rdf/api/ apidocs/org/apache/commons/rdf/api/class-use/ apidocs/
Modified: websites/production/commons/content/proper/commons-rdf-parent/xref/org/apache/commons/rdf/jena/impl/JenaGraphImpl.html == --- websites/production/commons/content/proper/commons-rdf-parent/xref/org/apache/commons/rdf/jena/impl/JenaGraphImpl.html (original) +++ websites/production/commons/content/proper/commons-rdf-parent/xref/org/apache/commons/rdf/jena/impl/JenaGraphImpl.html Thu Feb 9 00:35:28 2017 @@ -32,138 +32,150 @@ 24 25 import org.apache.commons.rdf.api.BlankNodeOrIRI; 26 import org.apache.commons.rdf.api.IRI; -27 import org.apache.commons.rdf.api.RDFTerm; -28 import org.apache.commons.rdf.api.Triple; -29 import org.apache.commons.rdf.jena.JenaGraph; -30 import org.apache.commons.rdf.jena.JenaRDF; -31 import org.apache.jena.atlas.iterator.Iter; -32 import org.apache.jena.graph.Node; -33 import org.apache.jena.rdf.model.Model; -34 import org.apache.jena.rdf.model.ModelFactory; -35 import org.apache.jena.riot.Lang; -36 import org.apache.jena.riot.RDFDataMgr; -37 -38 class JenaGraphImpl implements JenaGraph { -39 -40 private final org.apache.jena.graph.Graph graph; -41 private final UUID salt; -42 private final transient JenaRDF factory; -43 private Model model; -44 -45 JenaGraphImpl(final org.apache.jena.graph.Graph graph, final UUID salt) { -46 this.graph = graph; -47 this.salt = salt; -48 this.factory = new JenaRDF(salt); -49 } -50 -51 JenaGraphImpl(final Model model, final UUID salt) { -52 this.model = model; -53 this.graph = model.getGraph(); -54 this.salt = salt; -55 this.factory = new JenaRDF(salt); -56 } -57 -58 @Override -59 public void add(final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) { -60 graph.add(org.apache.jena.graph.Triple.create(factory.asJenaNode(subject), factory.asJenaNode(predicate), -61 factory.asJenaNode(object))); -62 } -63 -64 @Override -65 public void add(final Triple triple) { -66 graph.add(factory.asJenaTriple(triple)); -67 } -68 -69 @Override -70 public org.apache.jena.graph.Graph asJenaGraph() { -71 return graph; -72 } -73 -74 @Override -75 public void clear() { -76 graph.clear(); -77 } -78 -79 @Override -80 public void close() { -81 graph.close(); -82 } -83 -84 @Override -85 public boolean contains(final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) { -86 return graph.contains(toJenaPattern(subject), toJenaPattern(predicate), toJenaPattern(object)); -87 } -88 -89 @Override -90 public boolean contains(final Triple triple) { -91 return graph.contains(factory.asJenaTriple(triple)); -92 } -93 -94 @Override -95 public void remove(final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) { -96 graph.delete(org.apache.jena.graph.Triple.create(toJenaPattern(subject), toJenaPattern(predicate), -97 toJenaPattern(object))); -98 } -99 -100 private Node toJenaPattern(final RDFTerm pattern) { -101 if (pattern == null) { -102 return Node.ANY; -103 } -104 return factory.asJenaNode(pattern); -105 } -106 -107 @Override -108 public void remove(final Triple triple) { -109 graph.delete(factory.asJenaTriple(triple)); -110 } -111 -112 @Override -113 public long size() { -114 return graph.size(); -115 } -116 -117 @Override -118 public Stream? extends Triple stream() { -119 final JenaRDF factory = new JenaRDF(salt); -120 return Iter.asStream(graph.find(null, null, null), true).map(factory::asTriple); -121 } -122 -123 @Override -124 public Stream? extends Triple stream(final BlankNodeOrIRI s, final IRI p, final RDFTerm o) { -125 final JenaRDF factory = new JenaRDF(salt); -126 return Iter.asStream(graph.find(toJenaAny(s), toJenaAny(p), toJenaAny(o)), true).map(factory::asTriple); +27 import org.apache.commons.rdf.api.Literal; +28 import org.apache.commons.rdf.api.RDFTerm; +29 import org.apache.commons.rdf.api.Triple; +30 import org.apache.commons.rdf.jena.JenaGraph; +31 import org.apache.commons.rdf.jena.JenaRDF; +32 import org.apache.jena.atlas.iterator.Iter; +33 import org.apache.jena.graph.Node; +34 import org.apache.jena.rdf.model.Model; +35 import org.apache.jena.rdf.model.ModelFactory; +36 import org.apache.jena.riot.Lang; +37 import org.apache.jena.riot.RDFDataMgr; +38 +39 class JenaGraphImpl implements JenaGraph { +40 +41 private final org.apache.jena.graph.Graph graph; +42 private final UUID salt; +43 private final transient JenaRDF factory; +44
svn commit: r1006435 [2/18] - in /websites/production/commons/content/proper/commons-rdf-parent: ./ apidocs/ apidocs/org/apache/commons/rdf/api/ apidocs/org/apache/commons/rdf/api/class-use/ apidocs/o
Modified: websites/production/commons/content/proper/commons-rdf-parent/apidocs/org/apache/commons/rdf/rdf4j/RDF4J.html == --- websites/production/commons/content/proper/commons-rdf-parent/apidocs/org/apache/commons/rdf/rdf4j/RDF4J.html (original) +++ websites/production/commons/content/proper/commons-rdf-parent/apidocs/org/apache/commons/rdf/rdf4j/RDF4J.html Thu Feb 9 00:35:28 2017 @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":9,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10}; +var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":9,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10}; var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -113,7 +113,7 @@ var activeTableTab = "activeTableTab"; -public final class RDF4J +public final class RDF4J extends https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true; title="class or interface in java.lang">Object implements RDF RDF4J implementation of RDF. @@ -278,88 +278,120 @@ implements +RDF4JBlankNode +asRDFTerm(org.eclipse.rdf4j.model.BNodevalue) +Adapt a RDF4J + BNode as a Commons RDF + BlankNode + + + +RDF4JIRI +asRDFTerm(org.eclipse.rdf4j.model.IRIvalue) +Adapt a RDF4J + IRI as a Commons RDF + IRI + + + +RDF4JLiteral +asRDFTerm(org.eclipse.rdf4j.model.Literalvalue) +Adapt a RDF4J + Literal as a Commons RDF + Literal + + + +RDF4JBlankNodeOrIRI +asRDFTerm(org.eclipse.rdf4j.model.Resourcevalue) +Adapt a RDF4J + Resource as a Commons RDF + BlankNodeOrIRI + + + RDF4JTerm asRDFTerm(org.eclipse.rdf4j.model.Valuevalue) Adapt a RDF4J Value as a Commons RDF RDFTerm. - + static RDF4JTerm asRDFTerm(org.eclipse.rdf4j.model.Valuevalue, https://docs.oracle.com/javase/8/docs/api/java/util/UUID.html?is-external=true; title="class or interface in java.util">UUIDsalt) Adapt a RDF4J Value as a Commons RDF RDFTerm. - + org.eclipse.rdf4j.model.Statement asStatement(TripleLiketripleLike) Adapt a Commons RDF Triple or Quad as a RDF4J Statement. - + RDF4JTriple asTriple(org.eclipse.rdf4j.model.Statementstatement) Adapt a RDF4J Statement as a Commons RDF Triple. - + org.eclipse.rdf4j.model.Value asValue(RDFTermterm) Adapt a Commons RDF RDFTerm as a RDF4J Value. - + RDF4JBlankNode createBlankNode() Create a new blank node. - + RDF4JBlankNode createBlankNode(https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">Stringname) Create a blank node based on the given name. - + RDF4JDataset createDataset() Create a new dataset. - + RDF4JGraph createGraph() Create a new graph. - + RDF4JIRI createIRI(https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">Stringiri) Create an IRI from a (possibly escaped) String. - + RDF4JLiteral createLiteral(https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">StringlexicalForm) Create a simple literal. - + Literal createLiteral(https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">StringlexicalForm, IRIdataType) Create a literal with the specified data type. - + Literal createLiteral(https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">StringlexicalForm, https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">StringlanguageTag) Create a language-tagged literal. - + Quad createQuad(BlankNodeOrIRIgraphName, BlankNodeOrIRIsubject, @@ -368,7 +400,7 @@ implements Create a quad. - + RDF4JTriple createTriple(BlankNodeOrIRIsubject, IRIpredicate, @@ -376,7 +408,7 @@ implements Create a triple. - + org.eclipse.rdf4j.model.ValueFactory getValueFactory() @@ -408,7 +440,7 @@ implements RDF4J -publicRDF4J() +publicRDF4J() Construct an RDF4J. @@ -418,7 +450,7 @@ implements RDF4J -publicRDF4J(org.eclipse.rdf4j.model.ValueFactoryvalueFactory) +publicRDF4J(org.eclipse.rdf4j.model.ValueFactoryvalueFactory) Construct an RDF4J. This constructor is intended for use with the value factory from @@ -436,7 +468,7 @@ implements RDF4J -publicRDF4J(https://docs.oracle.com/javase/8/docs/api/java/util/UUID.html?is-external=true; title="class or interface in
svn commit: r1006435 [4/18] - in /websites/production/commons/content/proper/commons-rdf-parent: ./ apidocs/ apidocs/org/apache/commons/rdf/api/ apidocs/org/apache/commons/rdf/api/class-use/ apidocs/o
Modified: websites/production/commons/content/proper/commons-rdf-parent/apidocs/src-html/org/apache/commons/rdf/jena/impl/InternalJenaFactory.html == --- websites/production/commons/content/proper/commons-rdf-parent/apidocs/src-html/org/apache/commons/rdf/jena/impl/InternalJenaFactory.html (original) +++ websites/production/commons/content/proper/commons-rdf-parent/apidocs/src-html/org/apache/commons/rdf/jena/impl/InternalJenaFactory.html Thu Feb 9 00:35:28 2017 @@ -167,7 +167,7 @@ 159} 160throw new ConversionException("Unrecognized node type: " + node); 161} -162 +162 163public JenaTriple createTriple(final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) { 164return new JenaTripleImpl(subject, predicate, object); 165} Modified: websites/production/commons/content/proper/commons-rdf-parent/apidocs/src-html/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.html == --- websites/production/commons/content/proper/commons-rdf-parent/apidocs/src-html/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.html (original) +++ websites/production/commons/content/proper/commons-rdf-parent/apidocs/src-html/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.html Thu Feb 9 00:35:28 2017 @@ -212,22 +212,36 @@ 204if (predicateNode.isPresent() predicateNode.get().compareTo(q.getPredicate()) != 0) { 205return false; 206} -207if (objectNode.isPresent() objectNode.get().compareTo(q.getObject()) != 0) { -208return false; -209} -210return true; -211}; -212} -213 -214// NOTE: This is made public in JsonLdDataset and is used by the other -215// remove methods. -216void remove(final OptionalBlankNodeOrIRI graphName, final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) { -217// remove the quads which match our filter (which could have nulls as -218// wildcards) -219 filteredGraphs(graphName).forEach(t - t.removeIf(quadFilter(subject, predicate, object))); -220} -221 -222} +207if (objectNode.isPresent()) { +208if (object instanceof Literal q.getObject().isLiteral()) { +209// Special handling for COMMONSRDF-56, COMMONSRDF-51: +210// Less efficient wrapper to a Commons RDF Literal so +211// we can use our RDF 1.1-compliant .equals() +212RDFTerm otherObj = factory.asRDFTerm(q.getObject()); +213if (! (object.equals(otherObj))) { +214return false; +215} +216} else { +217// JSONLD-Java's .compareTo can handle IRI, BlankNode and type-mismatch +218if (objectNode.get().compareTo(q.getObject()) != 0) { +219return false; +220} +221} +222} +223// All patterns checked, must be good! +224return true; +225}; +226} +227 +228// NOTE: This is made public in JsonLdDataset and is used by the other +229// remove methods. +230void remove(final OptionalBlankNodeOrIRI graphName, final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) { +231// remove the quads which match our filter (which could have nulls as +232// wildcards) +233 filteredGraphs(graphName).forEach(t - t.removeIf(quadFilter(subject, predicate, object))); +234} +235 +236} Modified: websites/production/commons/content/proper/commons-rdf-parent/apidocs/src-html/org/apache/commons/rdf/jsonldjava/JsonLdLiteral.html == --- websites/production/commons/content/proper/commons-rdf-parent/apidocs/src-html/org/apache/commons/rdf/jsonldjava/JsonLdLiteral.html (original) +++ websites/production/commons/content/proper/commons-rdf-parent/apidocs/src-html/org/apache/commons/rdf/jsonldjava/JsonLdLiteral.html Thu Feb 9 00:35:28 2017 @@ -25,85 +25,88 @@ 017 */ 018package org.apache.commons.rdf.jsonldjava; 019 -020import java.util.Objects; -021import java.util.Optional; -022 -023import org.apache.commons.rdf.api.IRI; -024import org.apache.commons.rdf.api.Literal; -025import org.apache.commons.rdf.simple.Types; -026 -027import com.github.jsonldjava.core.RDFDataset.Node; -028 -029public interface JsonLdLiteral extends JsonLdTerm, Literal { -030} -031 -032class JsonLdLiteralImpl extends JsonLdTermImpl implements JsonLdLiteral { -033 -034JsonLdLiteralImpl(final Node node) { -035super(node); -036if (!node.isLiteral()) { -037throw new IllegalArgumentException("Node is not a Literal:" +
svn commit: r1006435 [12/18] - in /websites/production/commons/content/proper/commons-rdf-parent: ./ apidocs/ apidocs/org/apache/commons/rdf/api/ apidocs/org/apache/commons/rdf/api/class-use/ apidocs/
Added: websites/production/commons/content/proper/commons-rdf-parent/xref-test/org/apache/commons/rdf/jena/DefaultGraphInQuadTest.html == --- websites/production/commons/content/proper/commons-rdf-parent/xref-test/org/apache/commons/rdf/jena/DefaultGraphInQuadTest.html (added) +++ websites/production/commons/content/proper/commons-rdf-parent/xref-test/org/apache/commons/rdf/jena/DefaultGraphInQuadTest.html Thu Feb 9 00:35:28 2017 @@ -0,0 +1,149 @@ +http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd;> +http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> + +DefaultGraphInQuadTest xref + + + +View Javadoc +1 /** +2* Licensed to the Apache Software Foundation (ASF) under one +3* or more contributor license agreements. See the NOTICE file +4* distributed with this work for additional information +5* regarding copyright ownership. The ASF licenses this file +6* to you under the Apache License, Version 2.0 (the +7* "License"); you may not use this file except in compliance +8* with the License. You may obtain a copy of the License at +9* +10 * http://www.apache.org/licenses/LICENSE-2.; target="alexandria_uri">http://www.apache.org/licenses/LICENSE-2.0 +11 * +12 * Unless required by applicable law or agreed to in writing, software +13 * distributed under the License is distributed on an "AS IS" BASIS, +14 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +15 * See the License for the specific language governing permissions and +16 * limitations under the License. +17 */ +18 package org.apache.commons.rdf.jena; +19 +20 import static org.junit.Assert.assertEquals; +21 import static org.junit.Assert.assertFalse; +22 import static org.junit.Assert.assertTrue; +23 +24 import org.apache.commons.rdf.api.IRI; +25 import org.apache.commons.rdf.simple.SimpleRDF; +26 import org.apache.jena.graph.Node; +27 import org.apache.jena.graph.NodeFactory; +28 import org.apache.jena.sparql.core.Quad; +29 import org.junit.Test; +30 +31 /** +32 * COMMONSRDF-55: Handling of +33 * Jena's default graph IRI urn:x-arq:DefaultGraph +34 */ +35 public class DefaultGraphInQuadTest { +36 +37 JenaRDF rdf = new JenaRDF(); +38 SimpleRDF simpleRDF = new SimpleRDF(); +39 IRI example = rdf.createIRI("http://example.com/;); +40 Node exampleJena = NodeFactory.createURI("http://example.com/;); +41 +42 @Test +43 public void createFromNull() throws Exception { +44 JenaQuad q = rdf.createQuad(null, example, example, example); +45 assertFalse(q.getGraphName().isPresent()); +46 assertTrue(q.asJenaQuad().isDefaultGraph()); +47 assertEquals(Quad.defaultGraphIRI, q.asJenaQuad().getGraph()); +48 } +49 +50 @Test +51 public void createFromDefaultGraphIRI() throws Exception { +52 JenaIRI defaultGraph = (JenaIRI) rdf.asRDFTerm(Quad.defaultGraphIRI); +53 JenaQuad q = rdf.createQuad(defaultGraph, example, example, example); +54 // NOTE: JenaRDF specially recognize this JenaIRI constant, +55 // even if this breaks the SHOULD of RDF.createQuad() +56 assertTrue(q.asJenaQuad().isDefaultGraph()); +57 assertEquals(Quad.defaultGraphIRI, q.asJenaQuad().getGraph()); +58 assertFalse(q.getGraphName().isPresent()); +59 // thus we can't require +60 //assertEquals(defaultGraph, q.getGraphName().get()); +61 } +62 +63 @Test +64 public void createFromForeignDefaultGraph() throws Exception { +65 // What if urn:x-arq:DefaultGraph appear in a non-Jena IRI? +66 IRI foreignDefaultGraph = simpleRDF.createIRI(Quad.defaultGraphIRI.getURI()); +67 JenaQuad q = rdf.createQuad(foreignDefaultGraph, example, example, example); +68 // As the IRI was NOT a JenaIRI we preserve it as-is, +69 // rather than replacing it with Optional.empty() +70 assertTrue(q.asJenaQuad().isDefaultGraph()); +71 assertTrue(q.getGraphName().isPresent()); // INCONSISTENT with above +72 assertEquals(Quad.defaultGraphIRI, q.asJenaQuad().getGraph()); +73 assertEquals(foreignDefaultGraph, q.getGraphName().get()); +74 // Note that adding such a quad to a Dataset would still "convert" it to +75 // Optional.empty() +76 } +77 +78 +79 @Test +80 public void createFromDefaultGraphNodeGeneratedIRINode() throws Exception { +81 // What if urn:x-arq:DefaultGraphNode appear as an IRI instance? +82 IRI foreignDefaultGraph = rdf.createIRI(Quad.defaultGraphNodeGenerated.getURI()); +83 JenaQuad q = rdf.createQuad(foreignDefaultGraph, example, example, example); +84 // NOTE: JenaRDF specially recognize this JenaIRI constant,
svn commit: r1006435 [3/18] - in /websites/production/commons/content/proper/commons-rdf-parent: ./ apidocs/ apidocs/org/apache/commons/rdf/api/ apidocs/org/apache/commons/rdf/api/class-use/ apidocs/o
Modified: websites/production/commons/content/proper/commons-rdf-parent/apidocs/src-html/org/apache/commons/rdf/jena/JenaRDF.html == --- websites/production/commons/content/proper/commons-rdf-parent/apidocs/src-html/org/apache/commons/rdf/jena/JenaRDF.html (original) +++ websites/production/commons/content/proper/commons-rdf-parent/apidocs/src-html/org/apache/commons/rdf/jena/JenaRDF.html Thu Feb 9 00:35:28 2017 @@ -159,620 +159,652 @@ 151return internalJenaFactory.createTriple(subject, predicate, object); 152} 153 -154@Override -155public JenaQuad createQuad(final BlankNodeOrIRI graphName, final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) -156throws IllegalArgumentException, UnsupportedOperationException { -157return internalJenaFactory.createQuad(subject, predicate, object, graphName); -158} -159 -160/** -161 * Create a generalized Jena triple. -162 * p -163 * The emgeneralized triple/em supports any {@link RDFTerm} as its -164 * {@link TripleLike#getSubject()} {@link TripleLike#getPredicate()} or -165 * {@link TripleLike#getObject()}. -166 * -167 * @see #createTriple(BlankNodeOrIRI, IRI, RDFTerm) -168 * @see #createGeneralizedQuad(RDFTerm, RDFTerm, RDFTerm, RDFTerm) -169 * -170 * @param subject -171 *The subject of the statement -172 * @param predicate -173 *The predicate of the statement -174 * @param object -175 *The object of the statement -176 * @return Generalized {@link TripleLike}. Note that the generalized triple -177 * does strongnot/strong implement {@link Triple#equals(Object)} -178 * or {@link Triple#hashCode()}. -179 */ -180public JenaGeneralizedTripleLike createGeneralizedTriple(final RDFTerm subject, final RDFTerm predicate, final RDFTerm object) { -181return internalJenaFactory.createGeneralizedTriple(subject, predicate, object); -182} -183 -184/** -185 * Create a generalized Jena quad. -186 * p -187 * The emgeneralized quad/em supports any {@link RDFTerm} as its -188 * {@link QuadLike#getSubject()} {@link QuadLike#getPredicate()}, -189 * {@link QuadLike#getObject()} or {@link QuadLike#getObject()}. -190 * -191 * @see #createQuad(BlankNodeOrIRI, BlankNodeOrIRI, IRI, RDFTerm) -192 * @see #createGeneralizedTriple(RDFTerm, RDFTerm, RDFTerm) -193 * -194 * @param subject -195 *The subject of the statement -196 * @param predicate -197 *The predicate of the statement -198 * @param object -199 *The object of the statement -200 * @param graphName -201 *The graph name of the statement -202 * @return Generalized {@link QuadLike}. Note that the generalized quad does -203 * strongnot/strong implement {@link Quad#equals(Object)} or -204 * {@link Quad#hashCode()}. -205 */ -206public JenaGeneralizedQuadLike createGeneralizedQuad(final RDFTerm subject, final RDFTerm predicate, final RDFTerm object, -207final RDFTerm graphName) { -208return internalJenaFactory.createGeneralizedQuad(subject, predicate, object, graphName); -209} -210 -211/** -212 * Adapt an existing Jena Node to CommonsRDF {@link RDFTerm}. -213 * p -214 * If {@link Node#isLiteral()}, then the returned value is a -215 * {@link Literal}. If {@link Node#isURI()}, the returned value is a IRI. If -216 * {$@link Node#isBlank()}, the returned value is a {@link BlankNode}, which -217 * will use a {@link UUID} salt from this {@link JenaRDF} instance in -218 * combination with {@link Node#getBlankNodeId()} for the purpose of its -219 * {@link BlankNode#uniqueReference()}. -220 * -221 * @see #asRDFTerm(RDF, Node) -222 * -223 * @param node -224 *The Jena Node to adapt. It's {@link Node#isConcrete()} must be -225 * codetrue/code. -226 * @return Adapted {@link JenaRDFTerm} -227 * @throws ConversionException -228 * If the {@link Node} can't be represented as an -229 * {@link RDFTerm}, e.g. if the node is not concrete or -230 * represents a variable in Jena. -231 */ -232public JenaRDFTerm asRDFTerm(final Node node) throws ConversionException { -233return internalJenaFactory.createRDFTerm(node, salt()); -234} -235 -236/** -237 * Convert from Jena {@link Node} to any Commons RDF implementation. -238 * p -239 * Note that if the {@link Node#isBlank()}, then the factory's -240 * {@link RDF#createBlankNode(String)} will be used, meaning that care -241 * should be taken if reusing an {@link RDF} instance for multiple -242 * conversion sessions. -243
svn commit: r1006435 [8/18] - in /websites/production/commons/content/proper/commons-rdf-parent: ./ apidocs/ apidocs/org/apache/commons/rdf/api/ apidocs/org/apache/commons/rdf/api/class-use/ apidocs/o
Modified: websites/production/commons/content/proper/commons-rdf-parent/pmd.html == --- websites/production/commons/content/proper/commons-rdf-parent/pmd.html (original) +++ websites/production/commons/content/proper/commons-rdf-parent/pmd.html Thu Feb 9 00:35:28 2017 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Apache Commons RDF PMD Results @@ -40,7 +40,7 @@ https://commons.apache.org/proper/commons-rdf/;>Commons RDF -Last Published: 11 January 2017 +Last Published: 09 February 2017 | Version: 0.4.0-SNAPSHOT @@ -299,10 +299,10 @@ Line Avoid modifiers which are implied by the context -109 +122 Avoid modifiers which are implied by the context -128 +141 Commons RDF API - org/apache/commons/rdf/api/Quad.java @@ -449,28 +449,28 @@ Line Unnecessary use of fully qualified name 'org.apache.jena.sparql.core.Quad' due to existing import 'org.apache.jena.sparql.core.Quad' -59 +108 Unnecessary use of fully qualified name 'org.apache.jena.graph.Triple' due to existing import 'org.apache.jena.graph.Triple' -60 +109 Unnecessary use of fully qualified name 'org.apache.jena.sparql.core.Quad' due to existing import 'org.apache.jena.sparql.core.Quad' -74 +125 Unnecessary use of fully qualified name 'org.apache.jena.graph.Triple' due to existing import 'org.apache.jena.graph.Triple' -83 +138 Unnecessary use of fully qualified name 'org.apache.jena.sparql.core.Quad' due to existing import 'org.apache.jena.sparql.core.Quad' -92 +147 Unnecessary use of fully qualified name 'org.apache.jena.sparql.core.Quad.create' due to existing import 'org.apache.jena.sparql.core.Quad' -95 +150 Unnecessary use of fully qualified name 'org.apache.jena.graph.Triple' due to existing import 'org.apache.jena.graph.Triple' -102 +160 Unnecessary use of fully qualified name 'org.apache.jena.graph.Triple.create' due to existing import 'org.apache.jena.graph.Triple' -105 +163 Commons RDF impl: Jena - org/apache/commons/rdf/jena/impl/InternalJenaFactory.java @@ -490,240 +490,291 @@ Violation Line +Useless parentheses. +110 + Double checked locking is not thread safe in Java. -144156 +156168 Commons RDF impl: Jena - org/apache/commons/rdf/jena/impl/JenaQuadImpl.java - + Violation Line - + Useless parentheses. 41 Commons RDF impl: JSON-LD Java - org/apache/commons/rdf/jsonldjava/JsonLdDataset.java - + Violation Line - + Unnecessary use of fully qualified name 'org.apache.commons.rdf.api.Quad' due to existing import 'org.apache.commons.rdf.api.Quad' 35 - + Unnecessary use of fully qualified name 'org.apache.commons.rdf.api.Quad' due to existing import 'org.apache.commons.rdf.api.Quad' 38 - + Unnecessary use of fully qualified name 'com.github.jsonldjava.core.RDFDataset.Quad' due to existing import 'com.github.jsonldjava.core.RDFDataset' 107 Commons RDF impl: JSON-LD Java - org/apache/commons/rdf/jsonldjava/JsonLdGraph.java - + Violation Line - + Unnecessary use of fully qualified name 'com.github.jsonldjava.core.RDFDataset.Quad' due to existing import 'com.github.jsonldjava.core.RDFDataset' 109 Commons RDF impl: JSON-LD Java - org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.java - + Violation Line - + Avoid modifiers which are implied by the context 58 Commons RDF impl: JSON-LD Java - org/apache/commons/rdf/jsonldjava/JsonLdTripleLike.java - + Violation Line - + Avoid modifiers which are implied by the context 30 Commons RDF impl: JSON-LD Java - org/apache/commons/rdf/jsonldjava/JsonLdUnionGraph.java - + Violation Line - + Unnecessary use of fully qualified name 'org.apache.commons.rdf.api.Triple' due to existing import 'org.apache.commons.rdf.api.Triple' 47 - + Unnecessary use of fully qualified name 'org.apache.commons.rdf.api.Triple' due to existing import 'org.apache.commons.rdf.api.Triple' 50 - + Unnecessary use of fully qualified name 'com.github.jsonldjava.core.RDFDataset.Quad' due to existing import 'com.github.jsonldjava.core.RDFDataset' 103 Commons RDF impl: RDF4j - org/apache/commons/rdf/rdf4j/RDF4J.java - + Violation Line + +Unnecessary use of fully qualified name 'org.eclipse.rdf4j.model.IRI' due to existing import 'org.eclipse.rdf4j.model.IRI' +285 Unnecessary use of fully qualified name 'org.eclipse.rdf4j.model.Resource' due to existing import 'org.eclipse.rdf4j.model.Resource' -408 +299 + +Unnecessary use of fully qualified name 'org.eclipse.rdf4j.model.Literal' due to existing import 'org.eclipse.rdf4j.model.Literal' +335 + +Unnecessary use of fully qualified name 'org.eclipse.rdf4j.model.Literal' due to existing import 'org.eclipse.rdf4j.model.Literal' +336 + +Unnecessary use of fully qualified name
svn commit: r1006435 [15/18] - in /websites/production/commons/content/proper/commons-rdf-parent: ./ apidocs/ apidocs/org/apache/commons/rdf/api/ apidocs/org/apache/commons/rdf/api/class-use/ apidocs/
Modified: websites/production/commons/content/proper/commons-rdf-parent/xref/org/apache/commons/rdf/jena/impl/AbstractQuadLike.html == --- websites/production/commons/content/proper/commons-rdf-parent/xref/org/apache/commons/rdf/jena/impl/AbstractQuadLike.html (original) +++ websites/production/commons/content/proper/commons-rdf-parent/xref/org/apache/commons/rdf/jena/impl/AbstractQuadLike.html Thu Feb 9 00:35:28 2017 @@ -35,115 +35,175 @@ 27 import org.apache.commons.rdf.jena.JenaQuad; 28 import org.apache.commons.rdf.jena.JenaQuadLike; 29 import org.apache.commons.rdf.jena.JenaRDF; -30 import org.apache.commons.rdf.jena.JenaTriple; -31 import org.apache.jena.graph.Triple; -32 import org.apache.jena.sparql.core.Quad; -33 -34 /** -35 * A generalized {@link QuadLike}, backed by a Jena {@link Quad} or -36 * {@link Triple}. -37 * p -38 * This class does not implement any particular {@link #equals(Object)} or -39 * {@link #hashCode()} but can otherwise be used as a base class for both a -40 * {@link JenaTriple} and a {@link JenaQuad}. -41 * -42 * @see JenaTripleImpl -43 * @see JenaQuadImpl -44 * @see internalJenaFactory#createGeneralizedTriple(RDFTerm, RDFTerm, RDFTerm) -45 * @see internalJenaFactory#createGeneralizedQuad(RDFTerm, RDFTerm, RDFTerm, -46 * RDFTerm) -47 * -48 */ -49 abstract class AbstractQuadLikeS extends RDFTerm, P extends RDFTerm, O extends RDFTerm, G extends RDFTerm -50 implements JenaQuadLikeG { -51 -52 private static InternalJenaFactory internalJenaFactory = new InternalJenaFactory() { -53 }; -54 -55 final OptionalG graphName; -56 final S subject; -57 final P predicate; -58 final O object; -59 org.apache.jena.sparql.core.Quad quad = null; -60 org.apache.jena.graph.Triple triple = null; -61 -62 AbstractQuadLike(final S subject, final P predicate, final O object, final OptionalG graphName) { -63 this.subject = Objects.requireNonNull(subject); -64 this.predicate = Objects.requireNonNull(predicate); -65 this.object = Objects.requireNonNull(object); -66 this.graphName = Objects.requireNonNull(graphName); -67 } -68 -69 AbstractQuadLike(final S subject, final P predicate, final O object) { -70 this(subject, predicate, object, Optional.empty()); -71 } -72 -73 @SuppressWarnings("unchecked") -74 AbstractQuadLike(final org.apache.jena.sparql.core.Quad quad, final UUID salt) { -75 this.quad = Objects.requireNonNull(quad); -76 this.subject = (S) internalJenaFactory.createRDFTerm(quad.getSubject(), salt); -77 this.predicate = (P) internalJenaFactory.createRDFTerm(quad.getPredicate(), salt); -78 this.object = (O) internalJenaFactory.createRDFTerm(quad.getObject(), salt); -79 this.graphName = Optional.of((G) internalJenaFactory.createRDFTerm(quad.getGraph(), salt)); -80 } -81 -82 @SuppressWarnings("unchecked") -83 AbstractQuadLike(final org.apache.jena.graph.Triple triple, final UUID salt) { -84 this.triple = Objects.requireNonNull(triple); -85 this.subject = (S) internalJenaFactory.createRDFTerm(triple.getSubject(), salt); -86 this.predicate = (P) internalJenaFactory.createRDFTerm(triple.getPredicate(), salt); -87 this.object = (O) internalJenaFactory.createRDFTerm(triple.getObject(), salt); -88 this.graphName = Optional.empty(); -89 } -90 -91 @Override -92 public org.apache.jena.sparql.core.Quad asJenaQuad() { -93 final JenaRDF factory = new JenaRDF(); -94 if (quad == null) { -95 quad = org.apache.jena.sparql.core.Quad.create(factory.asJenaNode(graphName.orElse(null)), -96 factory.asJenaNode(subject), factory.asJenaNode(predicate), factory.asJenaNode(object)); -97 } -98 return quad; -99 } -100 -101 @Override -102 public org.apache.jena.graph.Triple asJenaTriple() { -103 final JenaRDF factory = new JenaRDF(); -104 if (triple == null) { -105 triple = org.apache.jena.graph.Triple.create(factory.asJenaNode(subject), factory.asJenaNode(predicate), -106 factory.asJenaNode(object)); -107 } -108 return triple; -109 } +30 import org.apache.commons.rdf.jena.JenaRDFTerm; +31 import org.apache.commons.rdf.jena.JenaTriple; +32 import org.apache.jena.graph.Triple; +33 import org.apache.jena.sparql.core.Quad; +34 +35 /** +36 * A generalized {@link QuadLike}, backed by a Jena {@link Quad} or +37 * {@link Triple}. +38 * p +39 * This class does not implement any particular {@link #equals(Object)} or +40 * {@link #hashCode()} but can otherwise be used as a base class for both a +41 * {@link JenaTriple} and a {@link JenaQuad}. +42 * +43 *
svn commit: r1006435 [14/18] - in /websites/production/commons/content/proper/commons-rdf-parent: ./ apidocs/ apidocs/org/apache/commons/rdf/api/ apidocs/org/apache/commons/rdf/api/class-use/ apidocs/
Modified: websites/production/commons/content/proper/commons-rdf-parent/xref/org/apache/commons/rdf/jena/JenaRDF.html == --- websites/production/commons/content/proper/commons-rdf-parent/xref/org/apache/commons/rdf/jena/JenaRDF.html (original) +++ websites/production/commons/content/proper/commons-rdf-parent/xref/org/apache/commons/rdf/jena/JenaRDF.html Thu Feb 9 00:35:28 2017 @@ -159,620 +159,652 @@ 151 return internalJenaFactory.createTriple(subject, predicate, object); 152 } 153 -154 @Override -155 public JenaQuad createQuad(final BlankNodeOrIRI graphName, final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) -156 throws IllegalArgumentException, UnsupportedOperationException { -157 return internalJenaFactory.createQuad(subject, predicate, object, graphName); -158 } -159 -160 /** -161 * Create a generalized Jena triple. -162 * p -163 * The emgeneralized triple/em supports any {@link RDFTerm} as its -164 * {@link TripleLike#getSubject()} {@link TripleLike#getPredicate()} or -165 * {@link TripleLike#getObject()}. -166 * -167 * @see #createTriple(BlankNodeOrIRI, IRI, RDFTerm) -168 * @see #createGeneralizedQuad(RDFTerm, RDFTerm, RDFTerm, RDFTerm) -169 * -170 * @param subject -171 *The subject of the statement -172 * @param predicate -173 *The predicate of the statement -174 * @param object -175 *The object of the statement -176 * @return Generalized {@link TripleLike}. Note that the generalized triple -177 * does strongnot/strong implement {@link Triple#equals(Object)} -178 * or {@link Triple#hashCode()}. -179 */ -180 public JenaGeneralizedTripleLike createGeneralizedTriple(final RDFTerm subject, final RDFTerm predicate, final RDFTerm object) { -181 return internalJenaFactory.createGeneralizedTriple(subject, predicate, object); -182 } -183 -184 /** -185 * Create a generalized Jena quad. -186 * p -187 * The emgeneralized quad/em supports any {@link RDFTerm} as its -188 * {@link QuadLike#getSubject()} {@link QuadLike#getPredicate()}, -189 * {@link QuadLike#getObject()} or {@link QuadLike#getObject()}. -190 * -191 * @see #createQuad(BlankNodeOrIRI, BlankNodeOrIRI, IRI, RDFTerm) -192 * @see #createGeneralizedTriple(RDFTerm, RDFTerm, RDFTerm) -193 * -194 * @param subject -195 *The subject of the statement -196 * @param predicate -197 *The predicate of the statement -198 * @param object -199 *The object of the statement -200 * @param graphName -201 *The graph name of the statement -202 * @return Generalized {@link QuadLike}. Note that the generalized quad does -203 * strongnot/strong implement {@link Quad#equals(Object)} or -204 * {@link Quad#hashCode()}. -205 */ -206 public JenaGeneralizedQuadLike createGeneralizedQuad(final RDFTerm subject, final RDFTerm predicate, final RDFTerm object, -207 final RDFTerm graphName) { -208 return internalJenaFactory.createGeneralizedQuad(subject, predicate, object, graphName); -209 } -210 -211 /** -212 * Adapt an existing Jena Node to CommonsRDF {@link RDFTerm}. -213 * p -214 * If {@link Node#isLiteral()}, then the returned value is a -215 * {@link Literal}. If {@link Node#isURI()}, the returned value is a IRI. If -216 * {$@link Node#isBlank()}, the returned value is a {@link BlankNode}, which -217 * will use a {@link UUID} salt from this {@link JenaRDF} instance in -218 * combination with {@link Node#getBlankNodeId()} for the purpose of its -219 * {@link BlankNode#uniqueReference()}. -220 * -221 * @see #asRDFTerm(RDF, Node) -222 * -223 * @param node -224 *The Jena Node to adapt. It's {@link Node#isConcrete()} must be -225 *codetrue/code. -226 * @return Adapted {@link JenaRDFTerm} -227 * @throws ConversionException -228 * If the {@link Node} can't be represented as an -229 * {@link RDFTerm}, e.g. if the node is not concrete or -230 * represents a variable in Jena. -231 */ -232 public JenaRDFTerm asRDFTerm(final Node node) throws ConversionException { -233 return internalJenaFactory.createRDFTerm(node, salt()); -234 } -235 -236 /** -237 * Convert from Jena {@link Node} to any Commons RDF implementation. -238 * p -239 * Note that if the {@link Node#isBlank()}, then the factory's -240 * {@link RDF#createBlankNode(String)} will be used, meaning that care -241 * should be taken if reusing an {@link RDF} instance
svn commit: r1006435 [9/18] - in /websites/production/commons/content/proper/commons-rdf-parent: ./ apidocs/ apidocs/org/apache/commons/rdf/api/ apidocs/org/apache/commons/rdf/api/class-use/ apidocs/o
Modified: websites/production/commons/content/proper/commons-rdf-parent/xref-test/org/apache/commons/rdf/api/AbstractDatasetTest.html == --- websites/production/commons/content/proper/commons-rdf-parent/xref-test/org/apache/commons/rdf/api/AbstractDatasetTest.html (original) +++ websites/production/commons/content/proper/commons-rdf-parent/xref-test/org/apache/commons/rdf/api/AbstractDatasetTest.html Thu Feb 9 00:35:28 2017 @@ -31,575 +31,759 @@ 23 import java.util.HashSet; 24 import java.util.Iterator; 25 import java.util.List; -26 import java.util.Map; -27 import java.util.Optional; -28 import java.util.Set; -29 import java.util.concurrent.ConcurrentHashMap; -30 import java.util.stream.Collectors; -31 import java.util.stream.Stream; -32 -33 import org.junit.Assume; -34 import org.junit.Before; -35 import org.junit.Test; -36 -37 /** -38 * Test Dataset implementation -39 * p -40 * To add to your implementation's tests, create a subclass with a name ending -41 * in codeTest/code and provide {@link #createFactory()} which minimally -42 * must support {@link RDF#createDataset()} and {@link RDF#createIRI(String)}, but -43 * ideally support all operations. -44 * p -45 * This test uses try-with-resources blocks for calls to {@link Dataset#stream()} -46 * and {@link Dataset#iterate()}. -47 * -48 * @see Dataset -49 * @see RDF -50 */ -51 public abstract class AbstractDatasetTest { -52 -53 protected RDF factory; -54 protected Dataset dataset; -55 protected IRI alice; -56 protected IRI bob; -57 protected IRI name; -58 protected IRI knows; -59 protected IRI member; -60 protected BlankNode bnode1; -61 protected BlankNode bnode2; -62 protected Literal aliceName; -63 protected Literal bobName; -64 protected Literal secretClubName; -65 protected Literal companyName; -66 protected Quad bobNameQuad; -67 private IRI isPrimaryTopicOf; -68 private IRI graph1; -69 private BlankNode graph2; -70 -71 /** -72 * -73 * This method must be overridden by the implementing test to provide a -74 * factory for the test to create {@link Dataset}, {@link IRI} etc. -75 * -76 * @return {@link RDF} instance to be tested. -77 */ -78 protected abstract RDF createFactory(); -79 -80 @Before -81 public void createDatasetAndAdd() { -82 factory = createFactory(); -83 dataset = factory.createDataset(); -84 assertEquals(0, dataset.size()); -85 -86 graph1 = factory.createIRI("http://example.com/graph1;); -87 graph2 = factory.createBlankNode(); -88 -89 alice = factory.createIRI("http://example.com/alice;); -90 bob = factory.createIRI("http://example.com/bob;); -91 name = factory.createIRI("http://xmlns.com/foaf/0.1/name;); -92 knows = factory.createIRI("http://xmlns.com/foaf/0.1/knows;); -93 member = factory.createIRI("http://xmlns.com/foaf/0.1/member;); -94 bnode1 = factory.createBlankNode("org1"); -95 bnode2 = factory.createBlankNode("org2"); -96 -97 secretClubName = factory.createLiteral("The Secret Club"); -98 companyName = factory.createLiteral("A company"); -99 aliceName = factory.createLiteral("Alice"); -100 bobName = factory.createLiteral("Bob", "en-US"); -101 -102 dataset.add(graph1, alice, name, aliceName); -103 dataset.add(graph1, alice, knows, bob); -104 -105 dataset.add(graph1, alice, member, bnode1); -106 -107 bobNameQuad = factory.createQuad(graph2, bob, name, bobName); -108 dataset.add(bobNameQuad); -109 -110 dataset.add(factory.createQuad(graph2, bob, member, bnode1)); -111 dataset.add(factory.createQuad(graph2, bob, member, bnode2)); -112 // NOTE: bnode1 used in both graph1 and graph2 -113 dataset.add(graph1, bnode1, name, secretClubName); -114 dataset.add(graph2, bnode2, name, companyName); -115 -116 // default graph describes graph1 and graph2 -117 isPrimaryTopicOf = factory.createIRI("http://xmlns.com/foaf/0.1/isPrimaryTopicOf;); -118 dataset.add(null, alice, isPrimaryTopicOf, graph1); -119 dataset.add(null, bob, isPrimaryTopicOf, graph2); -120 +26 import java.util.Locale; +27 import java.util.Map; +28 import java.util.Optional; +29 import java.util.Set; +30 import java.util.concurrent.ConcurrentHashMap; +31 import java.util.stream.Collectors; +32 import java.util.stream.Stream; +33 +34 import org.junit.Assume; +35 import org.junit.Before; +36 import org.junit.Test; +37 +38 /** +39 * Test Dataset implementation +40 * p +41 * To add to your implementation's tests, create a subclass with a name ending +42
svn commit: r1006435 [10/18] - in /websites/production/commons/content/proper/commons-rdf-parent: ./ apidocs/ apidocs/org/apache/commons/rdf/api/ apidocs/org/apache/commons/rdf/api/class-use/ apidocs/
Modified: websites/production/commons/content/proper/commons-rdf-parent/xref-test/org/apache/commons/rdf/api/AbstractGraphTest.html == --- websites/production/commons/content/proper/commons-rdf-parent/xref-test/org/apache/commons/rdf/api/AbstractGraphTest.html (original) +++ websites/production/commons/content/proper/commons-rdf-parent/xref-test/org/apache/commons/rdf/api/AbstractGraphTest.html Thu Feb 9 00:35:28 2017 @@ -35,517 +35,660 @@ 27 import java.util.HashSet; 28 import java.util.Iterator; 29 import java.util.List; -30 import java.util.Map; -31 import java.util.Optional; -32 import java.util.concurrent.ConcurrentHashMap; -33 import java.util.stream.Stream; -34 -35 import org.junit.Assume; -36 import org.junit.Before; -37 import org.junit.Test; -38 -39 /** -40 * Test Graph implementation -41 * p -42 * To add to your implementation's tests, create a subclass with a name ending -43 * in codeTest/code and provide {@link #createFactory()} which minimally -44 * must support {@link RDF#createGraph()} and {@link RDF#createIRI(String)}, but -45 * ideally support all operations. -46 * p -47 * This test uses try-with-resources blocks for calls to {@link Graph#stream()} -48 * and {@link Graph#iterate()}. -49 * -50 * @see Graph -51 * @see RDF -52 */ -53 public abstract class AbstractGraphTest { -54 -55 protected RDF factory; -56 protected Graph graph; -57 protected IRI alice; -58 protected IRI bob; -59 protected IRI name; -60 protected IRI knows; -61 protected IRI member; -62 protected BlankNode bnode1; -63 protected BlankNode bnode2; -64 protected Literal aliceName; -65 protected Literal bobName; -66 protected Literal secretClubName; -67 protected Literal companyName; -68 protected Triple bobNameTriple; -69 -70 /** -71 * -72 * This method must be overridden by the implementing test to provide a -73 * factory for the test to create {@link Graph}, {@link IRI} etc. -74 * -75 * @return {@link RDF} instance to be tested. -76 */ -77 protected abstract RDF createFactory(); -78 -79 @Before -80 public void createGraphAndAdd() { -81 factory = createFactory(); -82 graph = factory.createGraph(); -83 assertEquals(0, graph.size()); -84 -85 alice = factory.createIRI("http://example.com/alice;); -86 bob = factory.createIRI("http://example.com/bob;); -87 name = factory.createIRI("http://xmlns.com/foaf/0.1/name;); -88 knows = factory.createIRI("http://xmlns.com/foaf/0.1/knows;); -89 member = factory.createIRI("http://xmlns.com/foaf/0.1/member;); -90 try { -91 bnode1 = factory.createBlankNode("org1"); -92 bnode2 = factory.createBlankNode("org2"); -93 } catch (final UnsupportedOperationException ex) { -94 // leave as null -95 } -96 -97 try { -98 secretClubName = factory.createLiteral("The Secret Club"); -99 companyName = factory.createLiteral("A company"); -100 aliceName = factory.createLiteral("Alice"); -101 bobName = factory.createLiteral("Bob", "en-US"); -102 } catch (final UnsupportedOperationException ex) { -103 // leave as null -104 } -105 -106 if (aliceName != null) { -107 graph.add(alice, name, aliceName); -108 } -109 graph.add(alice, knows, bob); -110 -111 if (bnode1 != null) { -112 graph.add(alice, member, bnode1); -113 } -114 -115 if (bobName != null) { -116 try { -117 bobNameTriple = factory.createTriple(bob, name, bobName); -118 } catch (final UnsupportedOperationException ex) { -119 // leave as null -120 } -121 if (bobNameTriple != null) { -122 graph.add(bobNameTriple); -123 } -124 } -125 if (bnode1 != null) { -126 graph.add(factory.createTriple(bob, member, bnode1)); -127 graph.add(factory.createTriple(bob, member, bnode2)); -128 if (secretClubName != null) { -129 graph.add(bnode1, name, secretClubName); -130 graph.add(bnode2, name, companyName); -131 } -132 } -133 } -134 -135 @Test -136 public void size() throws Exception { -137 assertTrue(graph.size() 0); -138 Assume.assumeNotNull(bnode1, bnode2, aliceName, bobName, secretClubName, companyName, bobNameTriple); -139 // Can only reliably predict size if we could create all triples -140 assertEquals(8, graph.size()); -141 } -142 -143 @Test -144 public void iterate() throws Exception { -145 -146
svn commit: r1006437 - /websites/production/commons/content/proper/commons-rdf-parent/
Author: stain Date: Thu Feb 9 01:52:55 2017 New Revision: 1006437 Log: Drop wrongly deployed commons-rdf-parent I fixed scmPubUrl now Removed: websites/production/commons/content/proper/commons-rdf-parent/
svn commit: r1006438 [22/23] - in /websites/production/commons/content/proper/commons-rdf: ./ apidocs/ apidocs/org/apache/commons/rdf/api/ apidocs/org/apache/commons/rdf/api/class-use/ apidocs/org/apa
Modified: websites/production/commons/content/proper/commons-rdf/xref/org/apache/commons/rdf/rdf4j/RDF4J.html == --- websites/production/commons/content/proper/commons-rdf/xref/org/apache/commons/rdf/rdf4j/RDF4J.html (original) +++ websites/production/commons/content/proper/commons-rdf/xref/org/apache/commons/rdf/rdf4j/RDF4J.html Thu Feb 9 01:59:06 2017 @@ -45,555 +45,628 @@ 37 import org.apache.commons.rdf.api.TripleLike; 38 import org.apache.commons.rdf.rdf4j.impl.InternalRDF4JFactory; 39 import org.eclipse.rdf4j.model.BNode; -40 import org.eclipse.rdf4j.model.Model; -41 import org.eclipse.rdf4j.model.Resource; -42 import org.eclipse.rdf4j.model.Statement; -43 import org.eclipse.rdf4j.model.Value; -44 import org.eclipse.rdf4j.model.ValueFactory; -45 import org.eclipse.rdf4j.model.impl.LinkedHashModel; -46 import org.eclipse.rdf4j.model.impl.SimpleValueFactory; -47 import org.eclipse.rdf4j.repository.Repository; -48 import org.eclipse.rdf4j.repository.RepositoryConnection; -49 import org.eclipse.rdf4j.repository.sail.SailRepository; -50 import org.eclipse.rdf4j.sail.Sail; -51 import org.eclipse.rdf4j.sail.memory.MemoryStore; -52 -53 /** -54 * RDF4J implementation of RDF. -55 * p -56 * The {@link #RDF4J()} constructor uses a {@link SimpleValueFactory} to create -57 * corresponding RDF4J {@link Value} instances. Alternatively, this factory can -58 * be constructed with a different {@link ValueFactory} using -59 * {@link #RDF4J(ValueFactory)}. -60 * p -61 * {@link #asRDFTerm(Value)} can be used to convert any RDF4J {@link Value} to -62 * an RDFTerm. Note that adapted {@link BNode}s are considered equal if they are -63 * converted with the same {@link RDF4J} instance and have the same -64 * {@link BNode#getID()}. -65 * p -66 * {@link #createGraph()} creates a new Graph backed by {@link LinkedHashModel}. -67 * To use other models, see {@link #asGraph(Model)}. -68 * p -69 * To adapt a RDF4J {@link Repository} as a {@link Dataset} or {@link Graph}, -70 * use {@link #asDataset(Repository, Option...)} or -71 * {@link #asGraph(Repository, Option...)}. -72 * p -73 * {@link #asTriple(Statement)} can be used to convert a RDF4J {@link Statement} -74 * to a Commons RDF {@link Triple}, and equivalent {@link #asQuad(Statement)} to -75 * convert a {@link Quad}. -76 * p -77 * To convert any {@link Triple} or {@link Quad} to to RDF4J {@link Statement}, -78 * use {@link #asStatement(TripleLike)}. This recognises previously converted -79 * {@link RDF4JTriple}s and {@link RDF4JQuad}s without re-converting their -80 * {@link RDF4JTripleLike#asStatement()}. -81 * p -82 * Likewise, {@link #asValue(RDFTerm)} can be used to convert any Commons RDF -83 * {@link RDFTerm} to a corresponding RDF4J {@link Value}. This recognises -84 * previously converted {@link RDF4JTerm}s without re-converting their -85 * {@link RDF4JTerm#asValue()}. -86 * p -87 * For the purpose of {@link BlankNode} equivalence, this factory contains an -88 * internal {@link UUID} salt that is used by adapter methods like -89 * {@link #asQuad(Statement)}, {@link #asTriple(Statement)}, -90 * {@link #asRDFTerm(Value)} as well as {@link #createBlankNode(String)}. As -91 * RDF4J {@link BNode} instances from multiple repositories or models may have -92 * the same {@link BNode#getID()}, converting them with the above methods might -93 * cause accidental {@link BlankNode} equivalence. Note that the {@link Graph} -94 * and {@link Dataset} adapter methods like -95 * {@link #asDataset(Repository, Option...)} and -96 * {@link #asGraph(Repository, Option...)} therefore uses a unique {@link RDF4J} -97 * internally. -98 * -99 * @see RDF -100 * -101 */ -102 public final class RDF4J implements RDF { -103 -104 /** -105 * InternalRDF4JFactory is deliberately abstract -106 */ -107 private static InternalRDF4JFactory rdf4j = new InternalRDF4JFactory() { -108 }; -109 -110 public enum Option { -111 /** -112 * The Graph/Dataset should include any inferred statements -113 */ -114 includeInferred, -115 /** -116 * The graph/dataset should handle {@link Repository#initialize()} (if -117 * needed) and {@link Repository#shutDown()} on {@link Graph#close()} / -118 * {@link Dataset#close()}. -119 */ -120 handleInitAndShutdown -121 } -122 -123 private final UUID salt; +40 import org.eclipse.rdf4j.model.IRI; +41 import org.eclipse.rdf4j.model.Literal; +42 import org.eclipse.rdf4j.model.Model; +43 import org.eclipse.rdf4j.model.Resource; +44 import org.eclipse.rdf4j.model.Statement; +45 import org.eclipse.rdf4j.model.Value; +46 import org.eclipse.rdf4j.model.ValueFactory; +47 import org.eclipse.rdf4j.model.impl.LinkedHashModel; +48
svn commit: r1006438 [18/23] - in /websites/production/commons/content/proper/commons-rdf: ./ apidocs/ apidocs/org/apache/commons/rdf/api/ apidocs/org/apache/commons/rdf/api/class-use/ apidocs/org/apa
Modified: websites/production/commons/content/proper/commons-rdf/xref/org/apache/commons/rdf/jena/JenaRDF.html == --- websites/production/commons/content/proper/commons-rdf/xref/org/apache/commons/rdf/jena/JenaRDF.html (original) +++ websites/production/commons/content/proper/commons-rdf/xref/org/apache/commons/rdf/jena/JenaRDF.html Thu Feb 9 01:59:06 2017 @@ -159,622 +159,654 @@ 151 return internalJenaFactory.createTriple(subject, predicate, object); 152 } 153 -154 @Override -155 public JenaQuad createQuad(final BlankNodeOrIRI graphName, final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) -156 throws IllegalArgumentException, UnsupportedOperationException { -157 return internalJenaFactory.createQuad(subject, predicate, object, graphName); -158 } -159 -160 /** -161 * Create a generalized Jena triple. -162 * p -163 * The emgeneralized triple/em supports any {@link RDFTerm} as its -164 * {@link TripleLike#getSubject()} {@link TripleLike#getPredicate()} or -165 * {@link TripleLike#getObject()}. -166 * -167 * @see #createTriple(BlankNodeOrIRI, IRI, RDFTerm) -168 * @see #createGeneralizedQuad(RDFTerm, RDFTerm, RDFTerm, RDFTerm) -169 * -170 * @param subject -171 *The subject of the statement -172 * @param predicate -173 *The predicate of the statement -174 * @param object -175 *The object of the statement -176 * @return Generalized {@link TripleLike}. Note that the generalized triple -177 * does strongnot/strong implement {@link Triple#equals(Object)} -178 * or {@link Triple#hashCode()}. -179 */ -180 public JenaGeneralizedTripleLike createGeneralizedTriple(final RDFTerm subject, final RDFTerm predicate, final RDFTerm object) { -181 return internalJenaFactory.createGeneralizedTriple(subject, predicate, object); -182 } -183 -184 /** -185 * Create a generalized Jena quad. -186 * p -187 * The emgeneralized quad/em supports any {@link RDFTerm} as its -188 * {@link QuadLike#getSubject()} {@link QuadLike#getPredicate()}, -189 * {@link QuadLike#getObject()} or {@link QuadLike#getObject()}. -190 * -191 * @see #createQuad(BlankNodeOrIRI, BlankNodeOrIRI, IRI, RDFTerm) -192 * @see #createGeneralizedTriple(RDFTerm, RDFTerm, RDFTerm) -193 * -194 * @param subject -195 *The subject of the statement -196 * @param predicate -197 *The predicate of the statement -198 * @param object -199 *The object of the statement -200 * @param graphName -201 *The graph name of the statement -202 * @return Generalized {@link QuadLike}. Note that the generalized quad does -203 * strongnot/strong implement {@link Quad#equals(Object)} or -204 * {@link Quad#hashCode()}. -205 */ -206 public JenaGeneralizedQuadLike createGeneralizedQuad(final RDFTerm subject, final RDFTerm predicate, final RDFTerm object, -207 final RDFTerm graphName) { -208 return internalJenaFactory.createGeneralizedQuad(subject, predicate, object, graphName); -209 } -210 -211 /** -212 * Adapt an existing Jena Node to CommonsRDF {@link RDFTerm}. -213 * p -214 * If {@link Node#isLiteral()}, then the returned value is a -215 * {@link Literal}. If {@link Node#isURI()}, the returned value is a IRI. If -216 * {$@link Node#isBlank()}, the returned value is a {@link BlankNode}, which -217 * will use a {@link UUID} salt from this {@link JenaRDF} instance in -218 * combination with {@link Node#getBlankNodeId()} for the purpose of its -219 * {@link BlankNode#uniqueReference()}. -220 * -221 * @see #asRDFTerm(RDF, Node) -222 * -223 * @param node -224 *The Jena Node to adapt. It's {@link Node#isConcrete()} must be -225 *codetrue/code. -226 * @return Adapted {@link JenaRDFTerm} -227 * @throws ConversionException -228 * If the {@link Node} can't be represented as an -229 * {@link RDFTerm}, e.g. if the node is not concrete or -230 * represents a variable in Jena. -231 */ -232 public JenaRDFTerm asRDFTerm(final Node node) throws ConversionException { -233 return internalJenaFactory.createRDFTerm(node, salt()); -234 } -235 -236 /** -237 * Convert from Jena {@link Node} to any Commons RDF implementation. -238 * p -239 * Note that if the {@link Node#isBlank()}, then the factory's -240 * {@link RDF#createBlankNode(String)} will be used, meaning that care -241 * should be taken if reusing an {@link RDF} instance for multiple -242
svn commit: r1006438 [9/23] - in /websites/production/commons/content/proper/commons-rdf: ./ apidocs/ apidocs/org/apache/commons/rdf/api/ apidocs/org/apache/commons/rdf/api/class-use/ apidocs/org/apac
Modified: websites/production/commons/content/proper/commons-rdf/apidocs/src-html/org/apache/commons/rdf/rdf4j/RDF4J.html == --- websites/production/commons/content/proper/commons-rdf/apidocs/src-html/org/apache/commons/rdf/rdf4j/RDF4J.html (original) +++ websites/production/commons/content/proper/commons-rdf/apidocs/src-html/org/apache/commons/rdf/rdf4j/RDF4J.html Thu Feb 9 01:59:06 2017 @@ -45,553 +45,626 @@ 037import org.apache.commons.rdf.api.TripleLike; 038import org.apache.commons.rdf.rdf4j.impl.InternalRDF4JFactory; 039import org.eclipse.rdf4j.model.BNode; -040import org.eclipse.rdf4j.model.Model; -041import org.eclipse.rdf4j.model.Resource; -042import org.eclipse.rdf4j.model.Statement; -043import org.eclipse.rdf4j.model.Value; -044import org.eclipse.rdf4j.model.ValueFactory; -045import org.eclipse.rdf4j.model.impl.LinkedHashModel; -046import org.eclipse.rdf4j.model.impl.SimpleValueFactory; -047import org.eclipse.rdf4j.repository.Repository; -048import org.eclipse.rdf4j.repository.RepositoryConnection; -049import org.eclipse.rdf4j.repository.sail.SailRepository; -050import org.eclipse.rdf4j.sail.Sail; -051import org.eclipse.rdf4j.sail.memory.MemoryStore; -052 -053/** -054 * RDF4J implementation of RDF. -055 * p -056 * The {@link #RDF4J()} constructor uses a {@link SimpleValueFactory} to create -057 * corresponding RDF4J {@link Value} instances. Alternatively, this factory can -058 * be constructed with a different {@link ValueFactory} using -059 * {@link #RDF4J(ValueFactory)}. -060 * p -061 * {@link #asRDFTerm(Value)} can be used to convert any RDF4J {@link Value} to -062 * an RDFTerm. Note that adapted {@link BNode}s are considered equal if they are -063 * converted with the same {@link RDF4J} instance and have the same -064 * {@link BNode#getID()}. -065 * p -066 * {@link #createGraph()} creates a new Graph backed by {@link LinkedHashModel}. -067 * To use other models, see {@link #asGraph(Model)}. -068 * p -069 * To adapt a RDF4J {@link Repository} as a {@link Dataset} or {@link Graph}, -070 * use {@link #asDataset(Repository, Option...)} or -071 * {@link #asGraph(Repository, Option...)}. -072 * p -073 * {@link #asTriple(Statement)} can be used to convert a RDF4J {@link Statement} -074 * to a Commons RDF {@link Triple}, and equivalent {@link #asQuad(Statement)} to -075 * convert a {@link Quad}. -076 * p -077 * To convert any {@link Triple} or {@link Quad} to to RDF4J {@link Statement}, -078 * use {@link #asStatement(TripleLike)}. This recognises previously converted -079 * {@link RDF4JTriple}s and {@link RDF4JQuad}s without re-converting their -080 * {@link RDF4JTripleLike#asStatement()}. -081 * p -082 * Likewise, {@link #asValue(RDFTerm)} can be used to convert any Commons RDF -083 * {@link RDFTerm} to a corresponding RDF4J {@link Value}. This recognises -084 * previously converted {@link RDF4JTerm}s without re-converting their -085 * {@link RDF4JTerm#asValue()}. -086 * p -087 * For the purpose of {@link BlankNode} equivalence, this factory contains an -088 * internal {@link UUID} salt that is used by adapter methods like -089 * {@link #asQuad(Statement)}, {@link #asTriple(Statement)}, -090 * {@link #asRDFTerm(Value)} as well as {@link #createBlankNode(String)}. As -091 * RDF4J {@link BNode} instances from multiple repositories or models may have -092 * the same {@link BNode#getID()}, converting them with the above methods might -093 * cause accidental {@link BlankNode} equivalence. Note that the {@link Graph} -094 * and {@link Dataset} adapter methods like -095 * {@link #asDataset(Repository, Option...)} and -096 * {@link #asGraph(Repository, Option...)} therefore uses a unique {@link RDF4J} -097 * internally. -098 * -099 * @see RDF -100 * -101 */ -102public final class RDF4J implements RDF { -103 -104/** -105 * InternalRDF4JFactory is deliberately abstract -106 */ -107private static InternalRDF4JFactory rdf4j = new InternalRDF4JFactory() { -108}; -109 -110public enum Option { -111/** -112 * The Graph/Dataset should include any inferred statements -113 */ -114includeInferred, -115/** -116 * The graph/dataset should handle {@link Repository#initialize()} (if -117 * needed) and {@link Repository#shutDown()} on {@link Graph#close()} / -118 * {@link Dataset#close()}. -119 */ -120handleInitAndShutdown -121} -122 -123private final UUID salt; +040import org.eclipse.rdf4j.model.IRI; +041import org.eclipse.rdf4j.model.Literal; +042import org.eclipse.rdf4j.model.Model; +043import org.eclipse.rdf4j.model.Resource; +044import org.eclipse.rdf4j.model.Statement; +045import org.eclipse.rdf4j.model.Value; +046import org.eclipse.rdf4j.model.ValueFactory; +047import org.eclipse.rdf4j.model.impl.LinkedHashModel; +048import
svn commit: r1006438 [2/23] - in /websites/production/commons/content/proper/commons-rdf: ./ apidocs/ apidocs/org/apache/commons/rdf/api/ apidocs/org/apache/commons/rdf/api/class-use/ apidocs/org/apac
Modified: websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/api/class-use/RDF.html == --- websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/api/class-use/RDF.html (original) +++ websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/api/class-use/RDF.html Thu Feb 9 01:59:06 2017 @@ -384,6 +384,6 @@ -Copyright 20152016 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. +Copyright 20152017 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. \ No newline at end of file Modified: websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/api/class-use/RDFSyntax.html == --- websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/api/class-use/RDFSyntax.html (original) +++ websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/api/class-use/RDFSyntax.html Thu Feb 9 01:59:06 2017 @@ -326,6 +326,6 @@ the order they are declared. -Copyright 20152016 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. +Copyright 20152017 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. \ No newline at end of file Modified: websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/api/class-use/RDFTerm.html == --- websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/api/class-use/RDFTerm.html (original) +++ websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/api/class-use/RDFTerm.html Thu Feb 9 01:59:06 2017 @@ -489,7 +489,9 @@ JenaRDF.createQuad(BlankNodeOrIRIgraphName, BlankNodeOrIRIsubject, IRIpredicate, - RDFTermobject) + RDFTermobject) +Create a quad. + JenaTriple @@ -880,6 +882,6 @@ -Copyright 20152016 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. +Copyright 20152017 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. \ No newline at end of file Modified: websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/api/class-use/RDFTermFactory.html == --- websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/api/class-use/RDFTermFactory.html (original) +++ websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/api/class-use/RDFTermFactory.html Thu Feb 9 01:59:06 2017 @@ -164,6 +164,6 @@ -Copyright 20152016 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. +Copyright 20152017 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. \ No newline at end of file Modified: websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/api/class-use/Triple.html == --- websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/api/class-use/Triple.html (original) +++ websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/api/class-use/Triple.html Thu Feb 9 01:59:06 2017 @@ -481,6 +481,6 @@ -Copyright 20152016 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. +Copyright 20152017 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. \ No newline at end of file Modified: websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/api/class-use/TripleLike.html == --- websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/api/class-use/TripleLike.html (original) +++ websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/api/class-use/TripleLike.html Thu Feb 9 01:59:06 2017 @@ -413,6 +413,6 @@ -Copyright 20152016 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. +Copyright 20152017 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. \ No newline at end of file Modified: websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/api/package-summary.html == --- websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/api/package-summary.html
svn commit: r1006438 [15/23] - in /websites/production/commons/content/proper/commons-rdf: ./ apidocs/ apidocs/org/apache/commons/rdf/api/ apidocs/org/apache/commons/rdf/api/class-use/ apidocs/org/apa
Added: websites/production/commons/content/proper/commons-rdf/xref-test/org/apache/commons/rdf/integrationtests/JSONLDParsingTest.html == --- websites/production/commons/content/proper/commons-rdf/xref-test/org/apache/commons/rdf/integrationtests/JSONLDParsingTest.html (added) +++ websites/production/commons/content/proper/commons-rdf/xref-test/org/apache/commons/rdf/integrationtests/JSONLDParsingTest.html Thu Feb 9 01:59:06 2017 @@ -0,0 +1,177 @@ +http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd;> +http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> + +JSONLDParsingTest xref + + + +View Javadoc +1 /** +2* Licensed to the Apache Software Foundation (ASF) under one +3* or more contributor license agreements. See the NOTICE file +4* distributed with this work for additional information +5* regarding copyright ownership. The ASF licenses this file +6* to you under the Apache License, Version 2.0 (the +7* "License"); you may not use this file except in compliance +8* with the License. You may obtain a copy of the License at +9* +10 * http://www.apache.org/licenses/LICENSE-2.; target="alexandria_uri">http://www.apache.org/licenses/LICENSE-2.0 +11 * +12 * Unless required by applicable law or agreed to in writing, software +13 * distributed under the License is distributed on an "AS IS" BASIS, +14 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +15 * See the License for the specific language governing permissions and +16 * limitations under the License. +17 */ +18 package org.apache.commons.rdf.integrationtests; +19 +20 import static org.junit.Assert.assertTrue; +21 +22 import java.io.IOException; +23 import java.io.InputStream; +24 import java.net.URL; +25 +26 import org.apache.commons.rdf.api.Graph; +27 import org.apache.commons.rdf.api.IRI; +28 import org.apache.commons.rdf.api.Literal; +29 import org.apache.commons.rdf.api.RDF; +30 import org.apache.commons.rdf.jena.JenaDataset; +31 import org.apache.commons.rdf.jena.JenaRDF; +32 import org.apache.commons.rdf.jsonldjava.JsonLdGraph; +33 import org.apache.commons.rdf.jsonldjava.JsonLdRDF; +34 import org.apache.commons.rdf.rdf4j.RDF4J; +35 import org.apache.commons.rdf.rdf4j.RDF4JGraph; +36 import org.apache.commons.rdf.simple.SimpleRDF; +37 import org.apache.jena.riot.RDFDataMgr; +38 import org.eclipse.rdf4j.model.Model; +39 import org.eclipse.rdf4j.rio.RDFFormat; +40 import org.eclipse.rdf4j.rio.Rio; +41 import org.junit.Before; +42 import org.junit.Test; +43 +44 import com.fasterxml.jackson.core.JsonParseException; +45 import com.github.jsonldjava.core.JsonLdError; +46 import com.github.jsonldjava.core.JsonLdOptions; +47 import com.github.jsonldjava.core.JsonLdProcessor; +48 import com.github.jsonldjava.core.RDFDataset; +49 import com.github.jsonldjava.utils.JsonUtils; +50 +51 /** +52 * COMMONSRDF-57 etc: For upgrades, ensure JSONLD-Java parses well in all +53 * implementations even if they might have slightly incompatible versions of +54 * their dependencies. +55 * p +56 * The code*Embedded/code tests parse codealice-embedded.jsonld/code +57 * from the test classpath through Jena, RDF4J and JSONLD-Java and verifies it +58 * contains the expected triples using {@link #checkGraph(Graph)}. This ensures +59 * that the versions of JSONLD-Java and Jackson are compatible with Jena and +60 * RDF4J. +61 * p +62 * The code*Cached/code tests parse codealice-cached.jsonld/code, which +63 * references an external code@context/code of http://example.com/context; target="alexandria_uri">http://example.com/context - +64 * but using the a href= +65 * "https://github.com/jsonld-java/jsonld-java#loading-contexts-from-classpathjar"jarcache.json/a; +66 * mechanism of JSONLD-Java, this context will be loaded from +67 * codecontexts/example.jsonld/code on the test classpath instead. This +68 * ensures that the versions of HTTPClient is compatible with JSONLD-Java +69 * (however it does not check that it is compatible with Jena and +70 * RDF4J's external fetching of RDF documents). +71 * +72 */ +73 public class JSONLDParsingTest { +74 +75 static RDF rdf = new SimpleRDF(); +76 static IRI alice = rdf.createIRI("http://example.com/Alice;); +77 static IRI name = rdf.createIRI("http://schema.org/name;); +78 static IRI type = rdf.createIRI("http://www.w3.org/1999/02/22-rdf-syntax-ns#type;); +79 static IRI person = rdf.createIRI("http://schema.org/Person;); +80 static Literal aliceWLand = rdf.createLiteral("Alice W. Land"); +81 +82 URL aliceCached = getClass().getResource("/alice-cached.jsonld"); +83 URL aliceEmbedded = getClass().getResource("/alice-embedded.jsonld"); +84 +85 /** +86 * Pre-test that src/test/resources files are on the
svn commit: r1006438 [23/23] - in /websites/production/commons/content/proper/commons-rdf: ./ apidocs/ apidocs/org/apache/commons/rdf/api/ apidocs/org/apache/commons/rdf/api/class-use/ apidocs/org/apa
Modified: websites/production/commons/content/proper/commons-rdf/xref/org/apache/commons/rdf/rdf4j/RDF4JBlankNode.html == --- websites/production/commons/content/proper/commons-rdf/xref/org/apache/commons/rdf/rdf4j/RDF4JBlankNode.html (original) +++ websites/production/commons/content/proper/commons-rdf/xref/org/apache/commons/rdf/rdf4j/RDF4JBlankNode.html Thu Feb 9 01:59:06 2017 @@ -45,6 +45,6 @@ 37 } -Copyright 20152016 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. +Copyright 20152017 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. \ No newline at end of file Modified: websites/production/commons/content/proper/commons-rdf/xref/org/apache/commons/rdf/rdf4j/RDF4JBlankNodeOrIRI.html == --- websites/production/commons/content/proper/commons-rdf/xref/org/apache/commons/rdf/rdf4j/RDF4JBlankNodeOrIRI.html (original) +++ websites/production/commons/content/proper/commons-rdf/xref/org/apache/commons/rdf/rdf4j/RDF4JBlankNodeOrIRI.html Thu Feb 9 01:59:06 2017 @@ -45,6 +45,6 @@ 37 } -Copyright 20152016 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. +Copyright 20152017 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. \ No newline at end of file Modified: websites/production/commons/content/proper/commons-rdf/xref/org/apache/commons/rdf/rdf4j/RDF4JDataset.html == --- websites/production/commons/content/proper/commons-rdf/xref/org/apache/commons/rdf/rdf4j/RDF4JDataset.html (original) +++ websites/production/commons/content/proper/commons-rdf/xref/org/apache/commons/rdf/rdf4j/RDF4JDataset.html Thu Feb 9 01:59:06 2017 @@ -150,6 +150,6 @@ 142 } -Copyright 20152016 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. +Copyright 20152017 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. \ No newline at end of file Modified: websites/production/commons/content/proper/commons-rdf/xref/org/apache/commons/rdf/rdf4j/RDF4JGraph.html == --- websites/production/commons/content/proper/commons-rdf/xref/org/apache/commons/rdf/rdf4j/RDF4JGraph.html (original) +++ websites/production/commons/content/proper/commons-rdf/xref/org/apache/commons/rdf/rdf4j/RDF4JGraph.html Thu Feb 9 01:59:06 2017 @@ -165,6 +165,6 @@ 157 } -Copyright 20152016 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. +Copyright 20152017 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. \ No newline at end of file Modified: websites/production/commons/content/proper/commons-rdf/xref/org/apache/commons/rdf/rdf4j/RDF4JGraphLike.html == --- websites/production/commons/content/proper/commons-rdf/xref/org/apache/commons/rdf/rdf4j/RDF4JGraphLike.html (original) +++ websites/production/commons/content/proper/commons-rdf/xref/org/apache/commons/rdf/rdf4j/RDF4JGraphLike.html Thu Feb 9 01:59:06 2017 @@ -74,6 +74,6 @@ 66 } -Copyright 20152016 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. +Copyright 20152017 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. \ No newline at end of file Modified: websites/production/commons/content/proper/commons-rdf/xref/org/apache/commons/rdf/rdf4j/RDF4JIRI.html == --- websites/production/commons/content/proper/commons-rdf/xref/org/apache/commons/rdf/rdf4j/RDF4JIRI.html (original) +++ websites/production/commons/content/proper/commons-rdf/xref/org/apache/commons/rdf/rdf4j/RDF4JIRI.html Thu Feb 9 01:59:06 2017 @@ -42,6 +42,6 @@ 34 } -Copyright 20152016 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. +Copyright 20152017 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. \ No newline at end of file Modified: websites/production/commons/content/proper/commons-rdf/xref/org/apache/commons/rdf/rdf4j/RDF4JLiteral.html == --- websites/production/commons/content/proper/commons-rdf/xref/org/apache/commons/rdf/rdf4j/RDF4JLiteral.html (original) +++ websites/production/commons/content/proper/commons-rdf/xref/org/apache/commons/rdf/rdf4j/RDF4JLiteral.html Thu Feb 9 01:59:06 2017 @@ -38,6 +38,6 @@ 30 } -Copyright 20152016 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. +Copyright 20152017 https://www.apache.org/;>The Apache Software
svn commit: r1006438 [11/23] - in /websites/production/commons/content/proper/commons-rdf: ./ apidocs/ apidocs/org/apache/commons/rdf/api/ apidocs/org/apache/commons/rdf/api/class-use/ apidocs/org/apa
Modified: websites/production/commons/content/proper/commons-rdf/pmd.html == --- websites/production/commons/content/proper/commons-rdf/pmd.html (original) +++ websites/production/commons/content/proper/commons-rdf/pmd.html Thu Feb 9 01:59:06 2017 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Apache Commons RDF PMD Results @@ -40,7 +40,7 @@ https://commons.apache.org/proper/commons-rdf/;>Commons RDF -Last Published: 15 December 2016 +Last Published: 09 February 2017 | Version: 0.4.0-SNAPSHOT @@ -299,10 +299,10 @@ Line Avoid modifiers which are implied by the context -109 +122 Avoid modifiers which are implied by the context -128 +141 Commons RDF API - org/apache/commons/rdf/api/Quad.java @@ -449,28 +449,28 @@ Line Unnecessary use of fully qualified name 'org.apache.jena.sparql.core.Quad' due to existing import 'org.apache.jena.sparql.core.Quad' -59 +108 Unnecessary use of fully qualified name 'org.apache.jena.graph.Triple' due to existing import 'org.apache.jena.graph.Triple' -60 +109 Unnecessary use of fully qualified name 'org.apache.jena.sparql.core.Quad' due to existing import 'org.apache.jena.sparql.core.Quad' -74 +125 Unnecessary use of fully qualified name 'org.apache.jena.graph.Triple' due to existing import 'org.apache.jena.graph.Triple' -83 +138 Unnecessary use of fully qualified name 'org.apache.jena.sparql.core.Quad' due to existing import 'org.apache.jena.sparql.core.Quad' -92 +147 Unnecessary use of fully qualified name 'org.apache.jena.sparql.core.Quad.create' due to existing import 'org.apache.jena.sparql.core.Quad' -95 +150 Unnecessary use of fully qualified name 'org.apache.jena.graph.Triple' due to existing import 'org.apache.jena.graph.Triple' -102 +160 Unnecessary use of fully qualified name 'org.apache.jena.graph.Triple.create' due to existing import 'org.apache.jena.graph.Triple' -105 +163 Commons RDF impl: Jena - org/apache/commons/rdf/jena/impl/InternalJenaFactory.java @@ -490,240 +490,291 @@ Violation Line +Useless parentheses. +110 + Double checked locking is not thread safe in Java. -144156 +156168 Commons RDF impl: Jena - org/apache/commons/rdf/jena/impl/JenaQuadImpl.java - + Violation Line - + Useless parentheses. 41 Commons RDF impl: JSON-LD Java - org/apache/commons/rdf/jsonldjava/JsonLdDataset.java - + Violation Line - + Unnecessary use of fully qualified name 'org.apache.commons.rdf.api.Quad' due to existing import 'org.apache.commons.rdf.api.Quad' 35 - + Unnecessary use of fully qualified name 'org.apache.commons.rdf.api.Quad' due to existing import 'org.apache.commons.rdf.api.Quad' 38 - + Unnecessary use of fully qualified name 'com.github.jsonldjava.core.RDFDataset.Quad' due to existing import 'com.github.jsonldjava.core.RDFDataset' 107 Commons RDF impl: JSON-LD Java - org/apache/commons/rdf/jsonldjava/JsonLdGraph.java - + Violation Line - + Unnecessary use of fully qualified name 'com.github.jsonldjava.core.RDFDataset.Quad' due to existing import 'com.github.jsonldjava.core.RDFDataset' 109 Commons RDF impl: JSON-LD Java - org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.java - + Violation Line - + Avoid modifiers which are implied by the context 58 Commons RDF impl: JSON-LD Java - org/apache/commons/rdf/jsonldjava/JsonLdTripleLike.java - + Violation Line - + Avoid modifiers which are implied by the context 30 Commons RDF impl: JSON-LD Java - org/apache/commons/rdf/jsonldjava/JsonLdUnionGraph.java - + Violation Line - + Unnecessary use of fully qualified name 'org.apache.commons.rdf.api.Triple' due to existing import 'org.apache.commons.rdf.api.Triple' 47 - + Unnecessary use of fully qualified name 'org.apache.commons.rdf.api.Triple' due to existing import 'org.apache.commons.rdf.api.Triple' 50 - + Unnecessary use of fully qualified name 'com.github.jsonldjava.core.RDFDataset.Quad' due to existing import 'com.github.jsonldjava.core.RDFDataset' 103 Commons RDF impl: RDF4j - org/apache/commons/rdf/rdf4j/RDF4J.java - + Violation Line + +Unnecessary use of fully qualified name 'org.eclipse.rdf4j.model.IRI' due to existing import 'org.eclipse.rdf4j.model.IRI' +285 Unnecessary use of fully qualified name 'org.eclipse.rdf4j.model.Resource' due to existing import 'org.eclipse.rdf4j.model.Resource' -408 +299 + +Unnecessary use of fully qualified name 'org.eclipse.rdf4j.model.Literal' due to existing import 'org.eclipse.rdf4j.model.Literal' +335 + +Unnecessary use of fully qualified name 'org.eclipse.rdf4j.model.Literal' due to existing import 'org.eclipse.rdf4j.model.Literal' +336 + +Unnecessary use of fully qualified name 'org.eclipse.rdf4j.model.IRI' due to
svn commit: r1006438 [7/23] - in /websites/production/commons/content/proper/commons-rdf: ./ apidocs/ apidocs/org/apache/commons/rdf/api/ apidocs/org/apache/commons/rdf/api/class-use/ apidocs/org/apac
Modified: websites/production/commons/content/proper/commons-rdf/apidocs/src-html/org/apache/commons/rdf/jena/impl/InternalJenaFactory.html == --- websites/production/commons/content/proper/commons-rdf/apidocs/src-html/org/apache/commons/rdf/jena/impl/InternalJenaFactory.html (original) +++ websites/production/commons/content/proper/commons-rdf/apidocs/src-html/org/apache/commons/rdf/jena/impl/InternalJenaFactory.html Thu Feb 9 01:59:06 2017 @@ -167,7 +167,7 @@ 159} 160throw new ConversionException("Unrecognized node type: " + node); 161} -162 +162 163public JenaTriple createTriple(final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) { 164return new JenaTripleImpl(subject, predicate, object); 165} Modified: websites/production/commons/content/proper/commons-rdf/apidocs/src-html/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.html == --- websites/production/commons/content/proper/commons-rdf/apidocs/src-html/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.html (original) +++ websites/production/commons/content/proper/commons-rdf/apidocs/src-html/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.html Thu Feb 9 01:59:06 2017 @@ -212,22 +212,36 @@ 204if (predicateNode.isPresent() predicateNode.get().compareTo(q.getPredicate()) != 0) { 205return false; 206} -207if (objectNode.isPresent() objectNode.get().compareTo(q.getObject()) != 0) { -208return false; -209} -210return true; -211}; -212} -213 -214// NOTE: This is made public in JsonLdDataset and is used by the other -215// remove methods. -216void remove(final OptionalBlankNodeOrIRI graphName, final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) { -217// remove the quads which match our filter (which could have nulls as -218// wildcards) -219 filteredGraphs(graphName).forEach(t - t.removeIf(quadFilter(subject, predicate, object))); -220} -221 -222} +207if (objectNode.isPresent()) { +208if (object instanceof Literal q.getObject().isLiteral()) { +209// Special handling for COMMONSRDF-56, COMMONSRDF-51: +210// Less efficient wrapper to a Commons RDF Literal so +211// we can use our RDF 1.1-compliant .equals() +212RDFTerm otherObj = factory.asRDFTerm(q.getObject()); +213if (! (object.equals(otherObj))) { +214return false; +215} +216} else { +217// JSONLD-Java's .compareTo can handle IRI, BlankNode and type-mismatch +218if (objectNode.get().compareTo(q.getObject()) != 0) { +219return false; +220} +221} +222} +223// All patterns checked, must be good! +224return true; +225}; +226} +227 +228// NOTE: This is made public in JsonLdDataset and is used by the other +229// remove methods. +230void remove(final OptionalBlankNodeOrIRI graphName, final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) { +231// remove the quads which match our filter (which could have nulls as +232// wildcards) +233 filteredGraphs(graphName).forEach(t - t.removeIf(quadFilter(subject, predicate, object))); +234} +235 +236} Modified: websites/production/commons/content/proper/commons-rdf/apidocs/src-html/org/apache/commons/rdf/jsonldjava/JsonLdLiteral.html == --- websites/production/commons/content/proper/commons-rdf/apidocs/src-html/org/apache/commons/rdf/jsonldjava/JsonLdLiteral.html (original) +++ websites/production/commons/content/proper/commons-rdf/apidocs/src-html/org/apache/commons/rdf/jsonldjava/JsonLdLiteral.html Thu Feb 9 01:59:06 2017 @@ -25,85 +25,88 @@ 017 */ 018package org.apache.commons.rdf.jsonldjava; 019 -020import java.util.Objects; -021import java.util.Optional; -022 -023import org.apache.commons.rdf.api.IRI; -024import org.apache.commons.rdf.api.Literal; -025import org.apache.commons.rdf.simple.Types; -026 -027import com.github.jsonldjava.core.RDFDataset.Node; -028 -029public interface JsonLdLiteral extends JsonLdTerm, Literal { -030} -031 -032class JsonLdLiteralImpl extends JsonLdTermImpl implements JsonLdLiteral { -033 -034JsonLdLiteralImpl(final Node node) { -035super(node); -036if (!node.isLiteral()) { -037throw new IllegalArgumentException("Node is not a Literal:" + node); -038} -039} -040 -041@Override -042
svn commit: r1006438 [14/23] - in /websites/production/commons/content/proper/commons-rdf: ./ apidocs/ apidocs/org/apache/commons/rdf/api/ apidocs/org/apache/commons/rdf/api/class-use/ apidocs/org/apa
Modified: websites/production/commons/content/proper/commons-rdf/xref-test/org/apache/commons/rdf/api/AbstractRDFTest.html == --- websites/production/commons/content/proper/commons-rdf/xref-test/org/apache/commons/rdf/api/AbstractRDFTest.html (original) +++ websites/production/commons/content/proper/commons-rdf/xref-test/org/apache/commons/rdf/api/AbstractRDFTest.html Thu Feb 9 01:59:06 2017 @@ -25,13 +25,13 @@ 17 */ 18 package org.apache.commons.rdf.api; 19 -20 import static org.junit.Assert.assertEquals; -21 import static org.junit.Assert.assertFalse; -22 import static org.junit.Assert.assertNotEquals; -23 import static org.junit.Assert.assertNotSame; -24 -25 import java.util.Objects; -26 +20 import static org.junit.Assert.*; +21 +22 import java.util.Locale; +23 import java.util.Objects; +24 import java.util.Optional; +25 +26 import org.junit.Assume; 27 import org.junit.Before; 28 import org.junit.Test; 29 @@ -49,10 +49,10 @@ 41 private RDF factory; 42 43 /** -44 * +44 * 45 * This method must be overridden by the implementing test to provide a 46 * factory for the test to create {@link Literal}, {@link IRI} etc. -47 * +47 * 48 * @return {@link RDF} instance to be tested. 49 */ 50 protected abstract RDF createFactory(); @@ -147,7 +147,7 @@ 139 assertEquals("http://example.com/vocab#term;, term.ntriplesString()); 140 141 // and now for the international fun! -142 +142 // make sure this file is edited/compiled as UTF-8 143 final IRI latin1 = factory.createIRI("http://accént.example.com/première;); 144 assertEquals("http://accént.example.com/première;, latin1.getIRIString()); 145 assertEquals("http://accént.example.com/première;, latin1.ntriplesString()); @@ -202,122 +202,266 @@ 194 assertEquals("\Herbert Van de Sompel\@vls", vls.ntriplesString()); 195 } 196 -197 @Test -198 public void testCreateLiteralString() throws Exception { -199 final Literal example = factory.createLiteral("Example", -200 factory.createIRI("http://www.w3.org/2001/XMLSchema#string;)); -201 assertEquals("Example", example.getLexicalForm()); -202 assertFalse(example.getLanguageTag().isPresent()); -203 assertEquals("http://www.w3.org/2001/XMLSchema#string;, example.getDatatype().getIRIString()); -204 // http://lists.w3.org/Archives/Public/public-rdf-comments/2014Dec/0004.html -205 assertEquals("\Example\", example.ntriplesString()); -206 } -207 -208 @Test -209 public void testCreateTripleBnodeBnode() { -210 final BlankNode subject = factory.createBlankNode("b1"); -211 final IRI predicate = factory.createIRI("http://example.com/pred;); -212 final BlankNode object = factory.createBlankNode("b2"); -213 final Triple triple = factory.createTriple(subject, predicate, object); -214 -215 // bnode equivalence should be OK as we used the same -216 // factory and have not yet inserted Triple into a Graph -217 assertEquals(subject, triple.getSubject()); -218 assertEquals(predicate, triple.getPredicate()); -219 assertEquals(object, triple.getObject()); -220 } -221 -222 @Test -223 public void testCreateTripleBnodeIRI() { -224 final BlankNode subject = factory.createBlankNode("b1"); -225 final IRI predicate = factory.createIRI("http://example.com/pred;); -226 final IRI object = factory.createIRI("http://example.com/obj;); -227 final Triple triple = factory.createTriple(subject, predicate, object); -228 -229 // bnode equivalence should be OK as we used the same -230 // factory and have not yet inserted Triple into a Graph -231 assertEquals(subject, triple.getSubject()); -232 assertEquals(predicate, triple.getPredicate()); -233 assertEquals(object, triple.getObject()); -234 } -235 -236 @Test -237 public void testCreateTripleBnodeTriple() { -238 final BlankNode subject = factory.createBlankNode(); -239 final IRI predicate = factory.createIRI("http://example.com/pred;); -240 final Literal object = factory.createLiteral("Example", "en"); -241 final Triple triple = factory.createTriple(subject, predicate, object); -242 -243 // bnode equivalence should be OK as we used the same -244 // factory and have not yet inserted Triple into a Graph -245 assertEquals(subject, triple.getSubject()); -246 assertEquals(predicate, triple.getPredicate()); -247 assertEquals(object, triple.getObject()); -248 } -249 -250 @Test -251 public void testPossiblyInvalidBlankNode() throws Exception { -252 BlankNode withColon;
svn commit: r1006438 [6/23] - in /websites/production/commons/content/proper/commons-rdf: ./ apidocs/ apidocs/org/apache/commons/rdf/api/ apidocs/org/apache/commons/rdf/api/class-use/ apidocs/org/apac
Modified: websites/production/commons/content/proper/commons-rdf/apidocs/src-html/org/apache/commons/rdf/jena/JenaRDF.html == --- websites/production/commons/content/proper/commons-rdf/apidocs/src-html/org/apache/commons/rdf/jena/JenaRDF.html (original) +++ websites/production/commons/content/proper/commons-rdf/apidocs/src-html/org/apache/commons/rdf/jena/JenaRDF.html Thu Feb 9 01:59:06 2017 @@ -159,620 +159,652 @@ 151return internalJenaFactory.createTriple(subject, predicate, object); 152} 153 -154@Override -155public JenaQuad createQuad(final BlankNodeOrIRI graphName, final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) -156throws IllegalArgumentException, UnsupportedOperationException { -157return internalJenaFactory.createQuad(subject, predicate, object, graphName); -158} -159 -160/** -161 * Create a generalized Jena triple. -162 * p -163 * The emgeneralized triple/em supports any {@link RDFTerm} as its -164 * {@link TripleLike#getSubject()} {@link TripleLike#getPredicate()} or -165 * {@link TripleLike#getObject()}. -166 * -167 * @see #createTriple(BlankNodeOrIRI, IRI, RDFTerm) -168 * @see #createGeneralizedQuad(RDFTerm, RDFTerm, RDFTerm, RDFTerm) -169 * -170 * @param subject -171 *The subject of the statement -172 * @param predicate -173 *The predicate of the statement -174 * @param object -175 *The object of the statement -176 * @return Generalized {@link TripleLike}. Note that the generalized triple -177 * does strongnot/strong implement {@link Triple#equals(Object)} -178 * or {@link Triple#hashCode()}. -179 */ -180public JenaGeneralizedTripleLike createGeneralizedTriple(final RDFTerm subject, final RDFTerm predicate, final RDFTerm object) { -181return internalJenaFactory.createGeneralizedTriple(subject, predicate, object); -182} -183 -184/** -185 * Create a generalized Jena quad. -186 * p -187 * The emgeneralized quad/em supports any {@link RDFTerm} as its -188 * {@link QuadLike#getSubject()} {@link QuadLike#getPredicate()}, -189 * {@link QuadLike#getObject()} or {@link QuadLike#getObject()}. -190 * -191 * @see #createQuad(BlankNodeOrIRI, BlankNodeOrIRI, IRI, RDFTerm) -192 * @see #createGeneralizedTriple(RDFTerm, RDFTerm, RDFTerm) -193 * -194 * @param subject -195 *The subject of the statement -196 * @param predicate -197 *The predicate of the statement -198 * @param object -199 *The object of the statement -200 * @param graphName -201 *The graph name of the statement -202 * @return Generalized {@link QuadLike}. Note that the generalized quad does -203 * strongnot/strong implement {@link Quad#equals(Object)} or -204 * {@link Quad#hashCode()}. -205 */ -206public JenaGeneralizedQuadLike createGeneralizedQuad(final RDFTerm subject, final RDFTerm predicate, final RDFTerm object, -207final RDFTerm graphName) { -208return internalJenaFactory.createGeneralizedQuad(subject, predicate, object, graphName); -209} -210 -211/** -212 * Adapt an existing Jena Node to CommonsRDF {@link RDFTerm}. -213 * p -214 * If {@link Node#isLiteral()}, then the returned value is a -215 * {@link Literal}. If {@link Node#isURI()}, the returned value is a IRI. If -216 * {$@link Node#isBlank()}, the returned value is a {@link BlankNode}, which -217 * will use a {@link UUID} salt from this {@link JenaRDF} instance in -218 * combination with {@link Node#getBlankNodeId()} for the purpose of its -219 * {@link BlankNode#uniqueReference()}. -220 * -221 * @see #asRDFTerm(RDF, Node) -222 * -223 * @param node -224 *The Jena Node to adapt. It's {@link Node#isConcrete()} must be -225 * codetrue/code. -226 * @return Adapted {@link JenaRDFTerm} -227 * @throws ConversionException -228 * If the {@link Node} can't be represented as an -229 * {@link RDFTerm}, e.g. if the node is not concrete or -230 * represents a variable in Jena. -231 */ -232public JenaRDFTerm asRDFTerm(final Node node) throws ConversionException { -233return internalJenaFactory.createRDFTerm(node, salt()); -234} -235 -236/** -237 * Convert from Jena {@link Node} to any Commons RDF implementation. -238 * p -239 * Note that if the {@link Node#isBlank()}, then the factory's -240 * {@link RDF#createBlankNode(String)} will be used, meaning that care -241 * should be taken if reusing an {@link RDF} instance for multiple -242 * conversion sessions. -243 * -244 * @see
svn commit: r1006438 [17/23] - in /websites/production/commons/content/proper/commons-rdf: ./ apidocs/ apidocs/org/apache/commons/rdf/api/ apidocs/org/apache/commons/rdf/api/class-use/ apidocs/org/apa
Modified: websites/production/commons/content/proper/commons-rdf/xref/org/apache/commons/rdf/api/Literal.html == --- websites/production/commons/content/proper/commons-rdf/xref/org/apache/commons/rdf/api/Literal.html (original) +++ websites/production/commons/content/proper/commons-rdf/xref/org/apache/commons/rdf/api/Literal.html Thu Feb 9 01:59:06 2017 @@ -26,118 +26,131 @@ 18 package org.apache.commons.rdf.api; 19 20 import java.io.Serializable; -21 import java.util.Objects; -22 import java.util.Optional; -23 -24 /** -25 * A RDF-1.1 Literal, as defined by -26 * a href= "http://www.w3.org/TR/rdf11-concepts/; target="alexandria_uri">http://www.w3.org/TR/rdf11-concepts/#section-Graph-Literal" -27 * RDF-1.1 Concepts and Abstract Syntax/a, a W3C Recommendation published on -28 * 25 February 2014 -29 * -30 * @see RDF#createLiteral(String) -31 * @see RDF#createLiteral(String, IRI) -32 * @see RDF#createLiteral(String, String) -33 */ -34 public interface Literal extends RDFTerm { -35 -36 /** -37 * The lexical form of this literal, represented by a -38 * a href="http://www.unicode.org/versions/latest/; target="alexandria_uri">http://www.unicode.org/versions/latest/"Unicode string/a. -39 * -40 * @return The lexical form of this literal. -41 * @see a href= -42 * "http://www.w3.org/TR/rdf11-concepts/; target="alexandria_uri">http://www.w3.org/TR/rdf11-concepts/#dfn-lexical-form"RDF-1.1 -43 * Literal lexical form/a -44 */ -45 String getLexicalForm(); -46 -47 /** -48 * The IRI identifying the datatype that determines how the lexical form -49 * maps to a literal value. -50 * -51 * If the datatype IRI is -52 * a href="http://www.w3.org/1999/02/22-rdf-syntax-ns; target="alexandria_uri">http://www.w3.org/1999/02/22-rdf-syntax-ns#langString" -53 * http://www.w3.org/1999/02/22-rdf-syntax-ns; target="alexandria_uri">http://www.w3.org/1999/02/22-rdf-syntax-ns#langString/a, -54 * {@link #getLanguageTag()} must not return {@link Optional#empty()}, and -55 * it must return a valid -56 * a href="http://tools.ietf.org/html/bcp47; target="alexandria_uri">http://tools.ietf.org/html/bcp47"BCP47/a language tag. -57 * -58 * @return The datatype IRI for this literal. -59 * @see a href= -60 * "http://www.w3.org/TR/rdf11-concepts/; target="alexandria_uri">http://www.w3.org/TR/rdf11-concepts/#dfn-datatype-iri"RDF-1.1 -61 * Literal datatype IRI/a -62 */ -63 IRI getDatatype(); -64 -65 /** -66 * If and only if the datatype IRI is -67 * a href="http://www.w3.org/1999/02/22-rdf-syntax-ns; target="alexandria_uri">http://www.w3.org/1999/02/22-rdf-syntax-ns#langString" -68 * http://www.w3.org/1999/02/22-rdf-syntax-ns; target="alexandria_uri">http://www.w3.org/1999/02/22-rdf-syntax-ns#langString/a, the language -69 * tag for this Literal is a non-empty language tag as defined by -70 * a href="http://tools.ietf.org/html/bcp47; target="alexandria_uri">http://tools.ietf.org/html/bcp47"BCP47/a.br -71 * If the datatype IRI is not -72 * a href="http://www.w3.org/1999/02/22-rdf-syntax-ns; target="alexandria_uri">http://www.w3.org/1999/02/22-rdf-syntax-ns#langString" -73 * http://www.w3.org/1999/02/22-rdf-syntax-ns; target="alexandria_uri">http://www.w3.org/1999/02/22-rdf-syntax-ns#langString/a, this method -74 * must return {@link Optional#empty()}. -75 * -76 * Implementation note: If your application requires {@link Serializable} -77 * objects, it is best not to store an {@link Optional} in a field. It is -78 * recommended to use {@link Optional#ofNullable(Object)} to create the -79 * return value for this method. -80 * -81 * @return The {@link Optional} language tag for this literal. If -82 * {@link Optional#isPresent()} returns true, the value returned by -83 * {@link Optional#get()} must be a non-empty string conforming to -84 * BCP47. -85 * @see a href= -86 * "http://www.w3.org/TR/rdf11-concepts/; target="alexandria_uri">http://www.w3.org/TR/rdf11-concepts/#dfn-language-tag"RDF-1.1 -87 * Literal language tag/a -88 */ -89 OptionalString getLanguageTag(); -90 -91 /** -92 * Check it this Literal is equal to another Literal. blockquote -93 * a href="http://www.w3.org/TR/rdf11-concepts/; target="alexandria_uri">http://www.w3.org/TR/rdf11-concepts/#dfn-literal-term"Literal -94 * term equality/a: Two literals are term-equal (the same RDF literal) if -95 * and only if the two lexical forms, the two datatype IRIs, and the two -96 * language tags (if any) compare equal, character by character. Thus, two -97 *
svn commit: r1006438 [12/23] - in /websites/production/commons/content/proper/commons-rdf: ./ apidocs/ apidocs/org/apache/commons/rdf/api/ apidocs/org/apache/commons/rdf/api/class-use/ apidocs/org/apa
Modified: websites/production/commons/content/proper/commons-rdf/xref-test/org/apache/commons/rdf/api/AbstractDatasetTest.html == --- websites/production/commons/content/proper/commons-rdf/xref-test/org/apache/commons/rdf/api/AbstractDatasetTest.html (original) +++ websites/production/commons/content/proper/commons-rdf/xref-test/org/apache/commons/rdf/api/AbstractDatasetTest.html Thu Feb 9 01:59:06 2017 @@ -31,577 +31,761 @@ 23 import java.util.HashSet; 24 import java.util.Iterator; 25 import java.util.List; -26 import java.util.Map; -27 import java.util.Optional; -28 import java.util.Set; -29 import java.util.concurrent.ConcurrentHashMap; -30 import java.util.stream.Collectors; -31 import java.util.stream.Stream; -32 -33 import org.junit.Assume; -34 import org.junit.Before; -35 import org.junit.Test; -36 -37 /** -38 * Test Dataset implementation -39 * p -40 * To add to your implementation's tests, create a subclass with a name ending -41 * in codeTest/code and provide {@link #createFactory()} which minimally -42 * must support {@link RDF#createDataset()} and {@link RDF#createIRI(String)}, but -43 * ideally support all operations. -44 * p -45 * This test uses try-with-resources blocks for calls to {@link Dataset#stream()} -46 * and {@link Dataset#iterate()}. -47 * -48 * @see Dataset -49 * @see RDF -50 */ -51 public abstract class AbstractDatasetTest { -52 -53 protected RDF factory; -54 protected Dataset dataset; -55 protected IRI alice; -56 protected IRI bob; -57 protected IRI name; -58 protected IRI knows; -59 protected IRI member; -60 protected BlankNode bnode1; -61 protected BlankNode bnode2; -62 protected Literal aliceName; -63 protected Literal bobName; -64 protected Literal secretClubName; -65 protected Literal companyName; -66 protected Quad bobNameQuad; -67 private IRI isPrimaryTopicOf; -68 private IRI graph1; -69 private BlankNode graph2; -70 -71 /** -72 * -73 * This method must be overridden by the implementing test to provide a -74 * factory for the test to create {@link Dataset}, {@link IRI} etc. -75 * -76 * @return {@link RDF} instance to be tested. -77 */ -78 protected abstract RDF createFactory(); -79 -80 @Before -81 public void createDatasetAndAdd() { -82 factory = createFactory(); -83 dataset = factory.createDataset(); -84 assertEquals(0, dataset.size()); -85 -86 graph1 = factory.createIRI("http://example.com/graph1;); -87 graph2 = factory.createBlankNode(); -88 -89 alice = factory.createIRI("http://example.com/alice;); -90 bob = factory.createIRI("http://example.com/bob;); -91 name = factory.createIRI("http://xmlns.com/foaf/0.1/name;); -92 knows = factory.createIRI("http://xmlns.com/foaf/0.1/knows;); -93 member = factory.createIRI("http://xmlns.com/foaf/0.1/member;); -94 bnode1 = factory.createBlankNode("org1"); -95 bnode2 = factory.createBlankNode("org2"); -96 -97 secretClubName = factory.createLiteral("The Secret Club"); -98 companyName = factory.createLiteral("A company"); -99 aliceName = factory.createLiteral("Alice"); -100 bobName = factory.createLiteral("Bob", "en-US"); -101 -102 dataset.add(graph1, alice, name, aliceName); -103 dataset.add(graph1, alice, knows, bob); -104 -105 dataset.add(graph1, alice, member, bnode1); -106 -107 bobNameQuad = factory.createQuad(graph2, bob, name, bobName); -108 dataset.add(bobNameQuad); -109 -110 dataset.add(factory.createQuad(graph2, bob, member, bnode1)); -111 dataset.add(factory.createQuad(graph2, bob, member, bnode2)); -112 // NOTE: bnode1 used in both graph1 and graph2 -113 dataset.add(graph1, bnode1, name, secretClubName); -114 dataset.add(graph2, bnode2, name, companyName); -115 -116 // default graph describes graph1 and graph2 -117 isPrimaryTopicOf = factory.createIRI("http://xmlns.com/foaf/0.1/isPrimaryTopicOf;); -118 dataset.add(null, alice, isPrimaryTopicOf, graph1); -119 dataset.add(null, bob, isPrimaryTopicOf, graph2); -120 +26 import java.util.Locale; +27 import java.util.Map; +28 import java.util.Optional; +29 import java.util.Set; +30 import java.util.concurrent.ConcurrentHashMap; +31 import java.util.stream.Collectors; +32 import java.util.stream.Stream; +33 +34 import org.junit.Assume; +35 import org.junit.Before; +36 import org.junit.Test; +37 +38 /** +39 * Test Dataset implementation +40 * p +41 * To add to your implementation's tests, create a subclass with a name ending +42 * in codeTest/code
svn commit: r1006438 [8/23] - in /websites/production/commons/content/proper/commons-rdf: ./ apidocs/ apidocs/org/apache/commons/rdf/api/ apidocs/org/apache/commons/rdf/api/class-use/ apidocs/org/apac
Modified: websites/production/commons/content/proper/commons-rdf/apidocs/src-html/org/apache/commons/rdf/rdf4j/RDF4J.Option.html == --- websites/production/commons/content/proper/commons-rdf/apidocs/src-html/org/apache/commons/rdf/rdf4j/RDF4J.Option.html (original) +++ websites/production/commons/content/proper/commons-rdf/apidocs/src-html/org/apache/commons/rdf/rdf4j/RDF4J.Option.html Thu Feb 9 01:59:06 2017 @@ -45,553 +45,626 @@ 037import org.apache.commons.rdf.api.TripleLike; 038import org.apache.commons.rdf.rdf4j.impl.InternalRDF4JFactory; 039import org.eclipse.rdf4j.model.BNode; -040import org.eclipse.rdf4j.model.Model; -041import org.eclipse.rdf4j.model.Resource; -042import org.eclipse.rdf4j.model.Statement; -043import org.eclipse.rdf4j.model.Value; -044import org.eclipse.rdf4j.model.ValueFactory; -045import org.eclipse.rdf4j.model.impl.LinkedHashModel; -046import org.eclipse.rdf4j.model.impl.SimpleValueFactory; -047import org.eclipse.rdf4j.repository.Repository; -048import org.eclipse.rdf4j.repository.RepositoryConnection; -049import org.eclipse.rdf4j.repository.sail.SailRepository; -050import org.eclipse.rdf4j.sail.Sail; -051import org.eclipse.rdf4j.sail.memory.MemoryStore; -052 -053/** -054 * RDF4J implementation of RDF. -055 * p -056 * The {@link #RDF4J()} constructor uses a {@link SimpleValueFactory} to create -057 * corresponding RDF4J {@link Value} instances. Alternatively, this factory can -058 * be constructed with a different {@link ValueFactory} using -059 * {@link #RDF4J(ValueFactory)}. -060 * p -061 * {@link #asRDFTerm(Value)} can be used to convert any RDF4J {@link Value} to -062 * an RDFTerm. Note that adapted {@link BNode}s are considered equal if they are -063 * converted with the same {@link RDF4J} instance and have the same -064 * {@link BNode#getID()}. -065 * p -066 * {@link #createGraph()} creates a new Graph backed by {@link LinkedHashModel}. -067 * To use other models, see {@link #asGraph(Model)}. -068 * p -069 * To adapt a RDF4J {@link Repository} as a {@link Dataset} or {@link Graph}, -070 * use {@link #asDataset(Repository, Option...)} or -071 * {@link #asGraph(Repository, Option...)}. -072 * p -073 * {@link #asTriple(Statement)} can be used to convert a RDF4J {@link Statement} -074 * to a Commons RDF {@link Triple}, and equivalent {@link #asQuad(Statement)} to -075 * convert a {@link Quad}. -076 * p -077 * To convert any {@link Triple} or {@link Quad} to to RDF4J {@link Statement}, -078 * use {@link #asStatement(TripleLike)}. This recognises previously converted -079 * {@link RDF4JTriple}s and {@link RDF4JQuad}s without re-converting their -080 * {@link RDF4JTripleLike#asStatement()}. -081 * p -082 * Likewise, {@link #asValue(RDFTerm)} can be used to convert any Commons RDF -083 * {@link RDFTerm} to a corresponding RDF4J {@link Value}. This recognises -084 * previously converted {@link RDF4JTerm}s without re-converting their -085 * {@link RDF4JTerm#asValue()}. -086 * p -087 * For the purpose of {@link BlankNode} equivalence, this factory contains an -088 * internal {@link UUID} salt that is used by adapter methods like -089 * {@link #asQuad(Statement)}, {@link #asTriple(Statement)}, -090 * {@link #asRDFTerm(Value)} as well as {@link #createBlankNode(String)}. As -091 * RDF4J {@link BNode} instances from multiple repositories or models may have -092 * the same {@link BNode#getID()}, converting them with the above methods might -093 * cause accidental {@link BlankNode} equivalence. Note that the {@link Graph} -094 * and {@link Dataset} adapter methods like -095 * {@link #asDataset(Repository, Option...)} and -096 * {@link #asGraph(Repository, Option...)} therefore uses a unique {@link RDF4J} -097 * internally. -098 * -099 * @see RDF -100 * -101 */ -102public final class RDF4J implements RDF { -103 -104/** -105 * InternalRDF4JFactory is deliberately abstract -106 */ -107private static InternalRDF4JFactory rdf4j = new InternalRDF4JFactory() { -108}; -109 -110public enum Option { -111/** -112 * The Graph/Dataset should include any inferred statements -113 */ -114includeInferred, -115/** -116 * The graph/dataset should handle {@link Repository#initialize()} (if -117 * needed) and {@link Repository#shutDown()} on {@link Graph#close()} / -118 * {@link Dataset#close()}. -119 */ -120handleInitAndShutdown -121} -122 -123private final UUID salt; +040import org.eclipse.rdf4j.model.IRI; +041import org.eclipse.rdf4j.model.Literal; +042import org.eclipse.rdf4j.model.Model; +043import org.eclipse.rdf4j.model.Resource; +044import org.eclipse.rdf4j.model.Statement; +045import org.eclipse.rdf4j.model.Value; +046import org.eclipse.rdf4j.model.ValueFactory; +047import org.eclipse.rdf4j.model.impl.LinkedHashModel; +048import
svn commit: r1006438 [13/23] - in /websites/production/commons/content/proper/commons-rdf: ./ apidocs/ apidocs/org/apache/commons/rdf/api/ apidocs/org/apache/commons/rdf/api/class-use/ apidocs/org/apa
Modified: websites/production/commons/content/proper/commons-rdf/xref-test/org/apache/commons/rdf/api/AbstractGraphTest.html == --- websites/production/commons/content/proper/commons-rdf/xref-test/org/apache/commons/rdf/api/AbstractGraphTest.html (original) +++ websites/production/commons/content/proper/commons-rdf/xref-test/org/apache/commons/rdf/api/AbstractGraphTest.html Thu Feb 9 01:59:06 2017 @@ -35,519 +35,662 @@ 27 import java.util.HashSet; 28 import java.util.Iterator; 29 import java.util.List; -30 import java.util.Map; -31 import java.util.Optional; -32 import java.util.concurrent.ConcurrentHashMap; -33 import java.util.stream.Stream; -34 -35 import org.junit.Assume; -36 import org.junit.Before; -37 import org.junit.Test; -38 -39 /** -40 * Test Graph implementation -41 * p -42 * To add to your implementation's tests, create a subclass with a name ending -43 * in codeTest/code and provide {@link #createFactory()} which minimally -44 * must support {@link RDF#createGraph()} and {@link RDF#createIRI(String)}, but -45 * ideally support all operations. -46 * p -47 * This test uses try-with-resources blocks for calls to {@link Graph#stream()} -48 * and {@link Graph#iterate()}. -49 * -50 * @see Graph -51 * @see RDF -52 */ -53 public abstract class AbstractGraphTest { -54 -55 protected RDF factory; -56 protected Graph graph; -57 protected IRI alice; -58 protected IRI bob; -59 protected IRI name; -60 protected IRI knows; -61 protected IRI member; -62 protected BlankNode bnode1; -63 protected BlankNode bnode2; -64 protected Literal aliceName; -65 protected Literal bobName; -66 protected Literal secretClubName; -67 protected Literal companyName; -68 protected Triple bobNameTriple; -69 -70 /** -71 * -72 * This method must be overridden by the implementing test to provide a -73 * factory for the test to create {@link Graph}, {@link IRI} etc. -74 * -75 * @return {@link RDF} instance to be tested. -76 */ -77 protected abstract RDF createFactory(); -78 -79 @Before -80 public void createGraphAndAdd() { -81 factory = createFactory(); -82 graph = factory.createGraph(); -83 assertEquals(0, graph.size()); -84 -85 alice = factory.createIRI("http://example.com/alice;); -86 bob = factory.createIRI("http://example.com/bob;); -87 name = factory.createIRI("http://xmlns.com/foaf/0.1/name;); -88 knows = factory.createIRI("http://xmlns.com/foaf/0.1/knows;); -89 member = factory.createIRI("http://xmlns.com/foaf/0.1/member;); -90 try { -91 bnode1 = factory.createBlankNode("org1"); -92 bnode2 = factory.createBlankNode("org2"); -93 } catch (final UnsupportedOperationException ex) { -94 // leave as null -95 } -96 -97 try { -98 secretClubName = factory.createLiteral("The Secret Club"); -99 companyName = factory.createLiteral("A company"); -100 aliceName = factory.createLiteral("Alice"); -101 bobName = factory.createLiteral("Bob", "en-US"); -102 } catch (final UnsupportedOperationException ex) { -103 // leave as null -104 } -105 -106 if (aliceName != null) { -107 graph.add(alice, name, aliceName); -108 } -109 graph.add(alice, knows, bob); -110 -111 if (bnode1 != null) { -112 graph.add(alice, member, bnode1); -113 } -114 -115 if (bobName != null) { -116 try { -117 bobNameTriple = factory.createTriple(bob, name, bobName); -118 } catch (final UnsupportedOperationException ex) { -119 // leave as null -120 } -121 if (bobNameTriple != null) { -122 graph.add(bobNameTriple); -123 } -124 } -125 if (bnode1 != null) { -126 graph.add(factory.createTriple(bob, member, bnode1)); -127 graph.add(factory.createTriple(bob, member, bnode2)); -128 if (secretClubName != null) { -129 graph.add(bnode1, name, secretClubName); -130 graph.add(bnode2, name, companyName); -131 } -132 } -133 } -134 -135 @Test -136 public void size() throws Exception { -137 assertTrue(graph.size() 0); -138 Assume.assumeNotNull(bnode1, bnode2, aliceName, bobName, secretClubName, companyName, bobNameTriple); -139 // Can only reliably predict size if we could create all triples -140 assertEquals(8, graph.size()); -141 } -142 -143 @Test -144 public void iterate() throws Exception { -145 -146
svn commit: r1006438 [5/23] - in /websites/production/commons/content/proper/commons-rdf: ./ apidocs/ apidocs/org/apache/commons/rdf/api/ apidocs/org/apache/commons/rdf/api/class-use/ apidocs/org/apac
Modified: websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/rdf4j/impl/package-tree.html == --- websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/rdf4j/impl/package-tree.html (original) +++ websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/rdf4j/impl/package-tree.html Thu Feb 9 01:59:06 2017 @@ -133,6 +133,6 @@ -Copyright 20152016 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. +Copyright 20152017 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. \ No newline at end of file Modified: websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/rdf4j/impl/package-use.html == --- websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/rdf4j/impl/package-use.html (original) +++ websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/rdf4j/impl/package-use.html Thu Feb 9 01:59:06 2017 @@ -120,6 +120,6 @@ -Copyright 20152016 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. +Copyright 20152017 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. \ No newline at end of file Modified: websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/rdf4j/package-summary.html == --- websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/rdf4j/package-summary.html (original) +++ websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/rdf4j/package-summary.html Thu Feb 9 01:59:06 2017 @@ -274,6 +274,6 @@ -Copyright 20152016 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. +Copyright 20152017 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. \ No newline at end of file Modified: websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/rdf4j/package-tree.html == --- websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/rdf4j/package-tree.html (original) +++ websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/rdf4j/package-tree.html Thu Feb 9 01:59:06 2017 @@ -258,6 +258,6 @@ -Copyright 20152016 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. +Copyright 20152017 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. \ No newline at end of file Modified: websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/rdf4j/package-use.html == --- websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/rdf4j/package-use.html (original) +++ websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/rdf4j/package-use.html Thu Feb 9 01:59:06 2017 @@ -301,6 +301,6 @@ -Copyright 20152016 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. +Copyright 20152017 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. \ No newline at end of file Modified: websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/simple/DatasetGraphView.html == --- websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/simple/DatasetGraphView.html (original) +++ websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/simple/DatasetGraphView.html Thu Feb 9 01:59:06 2017 @@ -633,6 +633,6 @@ implements Copyright 20152016 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. +Copyright 20152017 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. \ No newline at end of file Modified: websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/simple/SimpleRDF.html == --- websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/simple/SimpleRDF.html (original) +++ websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/simple/SimpleRDF.html Thu Feb 9 01:59:06 2017 @@ -627,6 +627,6 @@ implements Copyright 20152016 https://www.apache.org/;>The Apache Software Foundation. All rights
svn commit: r1006438 [19/23] - in /websites/production/commons/content/proper/commons-rdf: ./ apidocs/ apidocs/org/apache/commons/rdf/api/ apidocs/org/apache/commons/rdf/api/class-use/ apidocs/org/apa
Modified: websites/production/commons/content/proper/commons-rdf/xref/org/apache/commons/rdf/jena/JenaRDFTerm.html == --- websites/production/commons/content/proper/commons-rdf/xref/org/apache/commons/rdf/jena/JenaRDFTerm.html (original) +++ websites/production/commons/content/proper/commons-rdf/xref/org/apache/commons/rdf/jena/JenaRDFTerm.html Thu Feb 9 01:59:06 2017 @@ -43,6 +43,6 @@ 35 } -Copyright 20152016 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. +Copyright 20152017 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. \ No newline at end of file Modified: websites/production/commons/content/proper/commons-rdf/xref/org/apache/commons/rdf/jena/JenaTriple.html == --- websites/production/commons/content/proper/commons-rdf/xref/org/apache/commons/rdf/jena/JenaTriple.html (original) +++ websites/production/commons/content/proper/commons-rdf/xref/org/apache/commons/rdf/jena/JenaTriple.html Thu Feb 9 01:59:06 2017 @@ -35,6 +35,6 @@ 27 } -Copyright 20152016 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. +Copyright 20152017 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. \ No newline at end of file Modified: websites/production/commons/content/proper/commons-rdf/xref/org/apache/commons/rdf/jena/JenaTripleLike.html == --- websites/production/commons/content/proper/commons-rdf/xref/org/apache/commons/rdf/jena/JenaTripleLike.html (original) +++ websites/production/commons/content/proper/commons-rdf/xref/org/apache/commons/rdf/jena/JenaTripleLike.html Thu Feb 9 01:59:06 2017 @@ -53,6 +53,6 @@ 45 } -Copyright 20152016 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. +Copyright 20152017 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. \ No newline at end of file Modified: websites/production/commons/content/proper/commons-rdf/xref/org/apache/commons/rdf/jena/experimental/JenaRDFParser.html == --- websites/production/commons/content/proper/commons-rdf/xref/org/apache/commons/rdf/jena/experimental/JenaRDFParser.html (original) +++ websites/production/commons/content/proper/commons-rdf/xref/org/apache/commons/rdf/jena/experimental/JenaRDFParser.html Thu Feb 9 01:59:06 2017 @@ -114,6 +114,6 @@ 106 } -Copyright 20152016 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. +Copyright 20152017 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. \ No newline at end of file Modified: websites/production/commons/content/proper/commons-rdf/xref/org/apache/commons/rdf/jena/experimental/package-summary.html == --- websites/production/commons/content/proper/commons-rdf/xref/org/apache/commons/rdf/jena/experimental/package-summary.html (original) +++ websites/production/commons/content/proper/commons-rdf/xref/org/apache/commons/rdf/jena/experimental/package-summary.html Thu Feb 9 01:59:06 2017 @@ -63,7 +63,7 @@ - Copyright 20152016 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. + Copyright 20152017 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. \ No newline at end of file Modified: websites/production/commons/content/proper/commons-rdf/xref/org/apache/commons/rdf/jena/impl/AbstractJenaRDFTerm.html == --- websites/production/commons/content/proper/commons-rdf/xref/org/apache/commons/rdf/jena/impl/AbstractJenaRDFTerm.html (original) +++ websites/production/commons/content/proper/commons-rdf/xref/org/apache/commons/rdf/jena/impl/AbstractJenaRDFTerm.html Thu Feb 9 01:59:06 2017 @@ -55,6 +55,6 @@ 47 } -Copyright 20152016 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. +Copyright 20152017 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. \ No newline at end of file Modified: websites/production/commons/content/proper/commons-rdf/xref/org/apache/commons/rdf/jena/impl/AbstractQuadLike.html == --- websites/production/commons/content/proper/commons-rdf/xref/org/apache/commons/rdf/jena/impl/AbstractQuadLike.html (original) +++
svn commit: r1006438 [1/23] - in /websites/production/commons/content/proper/commons-rdf: ./ apidocs/ apidocs/org/apache/commons/rdf/api/ apidocs/org/apache/commons/rdf/api/class-use/ apidocs/org/apac
Author: stain Date: Thu Feb 9 01:59:06 2017 New Revision: 1006438 Log: Site checkin for project Commons RDF Added: websites/production/commons/content/proper/commons-rdf/xref-test/org/apache/commons/rdf/integrationtests/JSONLDParsingTest.html websites/production/commons/content/proper/commons-rdf/xref-test/org/apache/commons/rdf/jena/DefaultGraphInQuadTest.html websites/production/commons/content/proper/commons-rdf/xref-test/org/apache/commons/rdf/jena/GeneralizedRDFQuadTest.html websites/production/commons/content/proper/commons-rdf/xref-test/org/apache/commons/rdf/jena/GeneralizedRDFTripleTest.html websites/production/commons/content/proper/commons-rdf/xref-test/org/apache/commons/rdf/jsonldjava/JsonLdComparisonTest.html websites/production/commons/content/proper/commons-rdf/xref-test/org/apache/commons/rdf/rdf4j/RDF4JMethodOverloadsTest.html Modified: websites/production/commons/content/proper/commons-rdf/apidocs/constant-values.html websites/production/commons/content/proper/commons-rdf/apidocs/deprecated-list.html websites/production/commons/content/proper/commons-rdf/apidocs/help-doc.html websites/production/commons/content/proper/commons-rdf/apidocs/index-all.html websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/api/BlankNode.html websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/api/BlankNodeOrIRI.html websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/api/Dataset.html websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/api/Graph.html websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/api/GraphLike.html websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/api/IRI.html websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/api/Literal.html websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/api/Quad.html websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/api/QuadLike.html websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/api/RDF.html websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/api/RDFSyntax.html websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/api/RDFTerm.html websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/api/RDFTermFactory.html websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/api/Triple.html websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/api/TripleLike.html websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/api/class-use/BlankNode.html websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/api/class-use/BlankNodeOrIRI.html websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/api/class-use/Dataset.html websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/api/class-use/Graph.html websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/api/class-use/GraphLike.html websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/api/class-use/IRI.html websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/api/class-use/Literal.html websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/api/class-use/Quad.html websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/api/class-use/QuadLike.html websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/api/class-use/RDF.html websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/api/class-use/RDFSyntax.html websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/api/class-use/RDFTerm.html websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/api/class-use/RDFTermFactory.html websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/api/class-use/Triple.html websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/api/class-use/TripleLike.html websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/api/package-summary.html websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/api/package-tree.html websites/production/commons/content/proper/commons-rdf/apidocs/org/apache/commons/rdf/api/package-use.html
svn commit: r1006438 [10/23] - in /websites/production/commons/content/proper/commons-rdf: ./ apidocs/ apidocs/org/apache/commons/rdf/api/ apidocs/org/apache/commons/rdf/api/class-use/ apidocs/org/apa
Modified: websites/production/commons/content/proper/commons-rdf/checkstyle-aggregate.html == --- websites/production/commons/content/proper/commons-rdf/checkstyle-aggregate.html (original) +++ websites/production/commons/content/proper/commons-rdf/checkstyle-aggregate.html Thu Feb 9 01:59:06 2017 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Apache Commons RDF Checkstyle Results @@ -40,7 +40,7 @@ https://commons.apache.org/proper/commons-rdf/;>Commons RDF -Last Published: 15 December 2016 +Last Published: 09 February 2017 | Version: 0.4.0-SNAPSHOT @@ -305,7 +305,7 @@ api/src/main/java/org/apache/commons/rdf/api/Literal.java 0 0 -2 +3 api/src/main/java/org/apache/commons/rdf/api/RDF.java 0 @@ -385,7 +385,7 @@ jena/src/main/java/org/apache/commons/rdf/jena/impl/AbstractQuadLike.java 0 0 -5 +4 jena/src/main/java/org/apache/commons/rdf/jena/impl/InternalJenaFactory.java 0 @@ -587,24 +587,30 @@ Error imports UnusedImports +Unused import - java.util.Locale. +21 + +Error +imports +UnusedImports Unused import - java.util.Objects. -21 +22 api/src/main/java/org/apache/commons/rdf/api/RDF.java - + Severity Category Rule Message Line - + Error imports UnusedImports Unused import - java.io.Serializable. 20 - + Error imports UnusedImports @@ -613,25 +619,25 @@ api/src/main/java/org/apache/commons/rdf/api/RDFSyntax.java - + Severity Category Rule Message Line - + Error design VisibilityModifier Variable 'mediaType' must be private and have accessor methods. 114 - + Error design VisibilityModifier Variable 'fileExtension' must be private and have accessor methods. 122 - + Error design VisibilityModifier @@ -640,13 +646,13 @@ api/src/main/java/org/apache/commons/rdf/api/RDFTerm.java - + Severity Category Rule Message Line - + Error whitespace FileTabCharacter @@ -655,13 +661,13 @@ api/src/main/java/org/apache/commons/rdf/api/Triple.java - + Severity Category Rule Message Line - + Error imports UnusedImports @@ -670,37 +676,37 @@ api/src/main/java/org/apache/commons/rdf/experimental/RDFParser.java - + Severity Category Rule Message Line - + Error imports UnusedImports Unused import - java.nio.charset.StandardCharsets. 22 - + Error imports UnusedImports Unused import - java.util.Optional. 24 - + Error imports UnusedImports Unused import - org.apache.commons.rdf.api.BlankNode. 28 - + Error imports UnusedImports Unused import - org.apache.commons.rdf.api.RDFTerm. 34 - + Error imports UnusedImports @@ -709,13 +715,13 @@ api/src/main/java/org/apache/commons/rdf/experimental/package-info.java - + Severity Category Rule Message Line - + Error misc NewlineAtEndOfFile @@ -724,13 +730,13 @@ jena/src/main/java/org/apache/commons/rdf/jena/JenaBlankNode.java - + Severity Category Rule Message Line - + Error imports UnusedImports @@ -739,19 +745,19 @@ jena/src/main/java/org/apache/commons/rdf/jena/JenaDataset.java - + Severity Category Rule Message Line - + Error imports UnusedImports Unused import - org.apache.commons.rdf.api.Dataset. 21 - + Error imports UnusedImports @@ -760,13 +766,13 @@ jena/src/main/java/org/apache/commons/rdf/jena/JenaGeneralizedQuadLike.java - + Severity Category Rule Message Line - + Error imports UnusedImports @@ -775,19 +781,19 @@ jena/src/main/java/org/apache/commons/rdf/jena/JenaGeneralizedTripleLike.java - + Severity Category Rule Message Line - + Error imports UnusedImports Unused import - org.apache.commons.rdf.api.RDFTerm. 20 - + Error imports UnusedImports @@ -796,13 +802,13 @@ jena/src/main/java/org/apache/commons/rdf/jena/JenaIRI.java - + Severity Category Rule Message Line - + Error imports UnusedImports @@ -811,13 +817,13 @@ jena/src/main/java/org/apache/commons/rdf/jena/JenaLiteral.java - + Severity Category Rule Message Line - + Error imports UnusedImports @@ -826,19 +832,19 @@ jena/src/main/java/org/apache/commons/rdf/jena/JenaRDF.java - + Severity Category Rule Message Line - + Error imports UnusedImports Unused import - org.apache.commons.rdf.api.Dataset. 26 - + Error imports UnusedImports @@ -847,13 +853,13 @@ jena/src/main/java/org/apache/commons/rdf/jena/JenaTripleLike.java - + Severity Category Rule Message Line - + Error imports UnusedImports @@ -862,13 +868,13 @@ jena/src/main/java/org/apache/commons/rdf/jena/experimental/package-info.java - + Severity Category Rule Message Line - + Error misc NewlineAtEndOfFile @@ -877,41 +883,35 @@ jena/src/main/java/org/apache/commons/rdf/jena/impl/AbstractQuadLike.java - + Severity Category Rule Message Line - + Error