You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commonsrdf.apache.org by st...@apache.org on 2016/11/15 13:31:29 UTC

[5/5] incubator-commonsrdf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-commonsrdf

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-commonsrdf


Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/87ac556b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/87ac556b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/87ac556b

Branch: refs/heads/master
Commit: 87ac556b74401c666449bca71948d9f4504d6528
Parents: 633baf0 d9b47b7
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Tue Nov 15 13:31:10 2016 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Tue Nov 15 13:31:10 2016 +0000

----------------------------------------------------------------------
 .../org/apache/commons/rdf/api/Dataset.java     |  11 +-
 .../java/org/apache/commons/rdf/api/Graph.java  |  11 +-
 .../java/org/apache/commons/rdf/api/Quad.java   |   8 +-
 .../org/apache/commons/rdf/api/RDFSyntax.java   |   6 +-
 .../apache/commons/rdf/api/RDFTermFactory.java  |  12 +-
 .../java/org/apache/commons/rdf/api/Triple.java |   3 +
 .../commons/rdf/experimental/RDFParser.java     |   4 +-
 .../commons/rdf/api/AbstractBlankNodeTest.java  |  48 +++----
 .../commons/rdf/api/AbstractDatasetTest.java    | 114 ++++++++--------
 .../commons/rdf/api/AbstractGraphTest.java      | 104 +++++++-------
 .../apache/commons/rdf/api/AbstractRDFTest.java |  72 +++++-----
 .../commons/rdf/api/DefaultDatasetTest.java     |   4 +-
 .../commons/rdf/api/DefaultGraphTest.java       |   4 +-
 .../apache/commons/rdf/api/DefaultQuadTest.java |   4 +-
 .../apache/commons/rdf/api/DummyDataset.java    |  18 +--
 .../org/apache/commons/rdf/api/DummyGraph.java  |  14 +-
 .../org/apache/commons/rdf/api/DummyIRI.java    |   4 +-
 .../org/apache/commons/rdf/api/DummyQuad.java   |   4 +-
 .../apache/commons/rdf/api/DummyQuadTest.java   |   2 +-
 .../org/apache/commons/rdf/api/DummyTriple.java |   4 +-
 .../apache/commons/rdf/api/DummyTripleTest.java |   2 +-
 .../rdf/integrationtests/AllToAllTest.java      |  54 ++++----
 .../commons/rdf/jena/ConversionException.java   |   6 +-
 .../org/apache/commons/rdf/jena/JenaRDF.java    | 136 ++++++++++---------
 .../rdf/jena/experimental/JenaRDFParser.java    |  22 +--
 .../rdf/jena/impl/AbstractJenaRDFTerm.java      |   8 +-
 .../commons/rdf/jena/impl/AbstractQuadLike.java |  12 +-
 .../rdf/jena/impl/InternalJenaFactory.java      |  44 +++---
 .../rdf/jena/impl/JenaBlankNodeImpl.java        |  17 ++-
 .../commons/rdf/jena/impl/JenaDatasetImpl.java  |  47 +++----
 .../jena/impl/JenaGeneralizedQuadLikeImpl.java  |   4 +-
 .../impl/JenaGeneralizedTripleLikeImpl.java     |   4 +-
 .../commons/rdf/jena/impl/JenaGraphImpl.java    |  31 +++--
 .../commons/rdf/jena/impl/JenaIRIImpl.java      |  17 ++-
 .../commons/rdf/jena/impl/JenaLiteralImpl.java  |  20 +--
 .../commons/rdf/jena/impl/JenaQuadImpl.java     |  14 +-
 .../commons/rdf/jena/impl/JenaTripleImpl.java   |  17 ++-
 .../commons/rdf/jena/JenaServiceLoaderTest.java |   4 +-
 .../commons/rdf/jena/TestBlankNodeJena.java     |   2 +-
 .../jena/TestJenaGraphToCommonsRDFGraph.java    |  30 ++--
 .../commons/rdf/jena/TestRDFParserBuilder.java  |   4 +-
 .../commons/rdf/jsonldjava/JsonLdBlankNode.java |   8 +-
 .../commons/rdf/jsonldjava/JsonLdDataset.java   |  22 +--
 .../commons/rdf/jsonldjava/JsonLdGraph.java     |  24 ++--
 .../commons/rdf/jsonldjava/JsonLdGraphLike.java |  47 +++----
 .../commons/rdf/jsonldjava/JsonLdIRI.java       |   8 +-
 .../commons/rdf/jsonldjava/JsonLdLiteral.java   |  10 +-
 .../commons/rdf/jsonldjava/JsonLdQuad.java      |   6 +-
 .../commons/rdf/jsonldjava/JsonLdQuadLike.java  |   7 +-
 .../commons/rdf/jsonldjava/JsonLdRDF.java       |  54 ++++----
 .../commons/rdf/jsonldjava/JsonLdTerm.java      |   3 +-
 .../commons/rdf/jsonldjava/JsonLdTriple.java    |   6 +-
 .../rdf/jsonldjava/JsonLdUnionGraph.java        |  18 +--
 .../jsonldjava/experimental/JsonLdParser.java   |  28 ++--
 .../rdf/jsonldjava/JsonLdBlankNodeTest.java     |   2 +-
 .../rdf/jsonldjava/JsonLdParserBuilderTest.java |  14 +-
 .../rdf/jsonldjava/JsonLdServiceLoaderTest.java |   4 +-
 .../org/apache/commons/rdf/rdf4j/RDF4J.java     |  90 ++++++------
 .../rdf/rdf4j/experimental/RDF4JParser.java     |  55 ++++----
 .../commons/rdf/rdf4j/impl/AbstractRDFTerm.java |   3 +-
 .../rdf4j/impl/AbstractRepositoryGraphLike.java |   5 +-
 .../commons/rdf/rdf4j/impl/BlankNodeImpl.java   |  15 +-
 .../rdf/rdf4j/impl/ConvertedStatements.java     |  12 +-
 .../apache/commons/rdf/rdf4j/impl/IRIImpl.java  |   9 +-
 .../rdf/rdf4j/impl/InternalRDF4JFactory.java    |  20 +--
 .../commons/rdf/rdf4j/impl/LiteralImpl.java     |   9 +-
 .../commons/rdf/rdf4j/impl/ModelGraphImpl.java  |  29 ++--
 .../apache/commons/rdf/rdf4j/impl/QuadImpl.java |  14 +-
 .../rdf/rdf4j/impl/RepositoryDatasetImpl.java   |  93 +++++++------
 .../rdf/rdf4j/impl/RepositoryGraphImpl.java     |  71 +++++-----
 .../commons/rdf/rdf4j/impl/TripleImpl.java      |  10 +-
 .../apache/commons/rdf/rdf4j/BlankNodeTest.java |   2 +-
 .../commons/rdf/rdf4j/MemoryGraphTest.java      |  28 ++--
 .../commons/rdf/rdf4j/NativeStoreGraphTest.java |  28 ++--
 .../rdf/rdf4j/RDF4JServiceLoaderTest.java       |   4 +-
 .../commons/rdf/simple/BlankNodeImpl.java       |   8 +-
 .../commons/rdf/simple/DatasetGraphView.java    |  20 +--
 .../apache/commons/rdf/simple/DatasetImpl.java  |  56 ++++----
 .../apache/commons/rdf/simple/GraphImpl.java    |  47 ++++---
 .../org/apache/commons/rdf/simple/IRIImpl.java  |   6 +-
 .../apache/commons/rdf/simple/LiteralImpl.java  |  14 +-
 .../org/apache/commons/rdf/simple/QuadImpl.java |   6 +-
 .../apache/commons/rdf/simple/SimpleRDF.java    |  16 +--
 .../rdf/simple/SimpleRDFTermFactory.java        |  22 ++-
 .../apache/commons/rdf/simple/TripleImpl.java   |   6 +-
 .../org/apache/commons/rdf/simple/Types.java    |  10 +-
 .../simple/experimental/AbstractRDFParser.java  |  62 +++++----
 .../simple/experimental/RDFParseException.java  |  10 +-
 .../commons/rdf/simple/BlankNodeImplTest.java   |   2 +-
 .../rdf/simple/DummyRDFParserBuilder.java       |   6 +-
 .../rdf/simple/SimpleServiceLoaderTest.java     |   4 +-
 .../commons/rdf/simple/TestWritingGraph.java    |  34 ++---
 .../experimental/AbstractRDFParserTest.java     |  60 ++++----
 93 files changed, 1089 insertions(+), 1004 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/87ac556b/jena/src/main/java/org/apache/commons/rdf/jena/impl/InternalJenaFactory.java
----------------------------------------------------------------------
diff --cc jena/src/main/java/org/apache/commons/rdf/jena/impl/InternalJenaFactory.java
index e5eec42,f465309..031ba7c
--- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/InternalJenaFactory.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/InternalJenaFactory.java
@@@ -59,13 -58,7 +59,13 @@@ import org.apache.jena.system.JenaSyste
   */
  public abstract class InternalJenaFactory {
  
 +    static { 
 +        // http://jena.apache.org/documentation/notes/system-initialization.html
 +        JenaSystem.init();
 +    }
 +    
 +    
-     public JenaBlankNode createBlankNode(String id, UUID salt) {
+     public JenaBlankNode createBlankNode(final String id, final UUID salt) {
          return new JenaBlankNodeImpl(NodeFactory.createBlankNode(id), salt);
      }