commonsrdf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject [1/6] incubator-commonsrdf git commit: getTriple() -> asJenaTriple() etc
Date Mon, 04 Jul 2016 15:56:18 GMT
Repository: incubator-commonsrdf
Updated Branches:
  refs/heads/jena 4675e77f1 -> f3b377cd9


getTriple() -> asJenaTriple()  etc


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

Branch: refs/heads/jena
Commit: 535d6246b4a1ba8a992880e469cd29cc964d3d3d
Parents: 4675e77
Author: Stian Soiland-Reyes <stain@apache.org>
Authored: Mon Jul 4 15:21:21 2016 +0100
Committer: Stian Soiland-Reyes <stain@apache.org>
Committed: Mon Jul 4 15:21:21 2016 +0100

----------------------------------------------------------------------
 .../main/java/org/apache/commons/rdf/jena/JenaCommonsRDF.java  | 6 +++---
 jena/src/main/java/org/apache/commons/rdf/jena/JenaGraph.java  | 2 +-
 jena/src/main/java/org/apache/commons/rdf/jena/JenaNode.java   | 2 +-
 jena/src/main/java/org/apache/commons/rdf/jena/JenaQuad.java   | 2 +-
 .../java/org/apache/commons/rdf/jena/JenaRDFParserBuilder.java | 2 +-
 jena/src/main/java/org/apache/commons/rdf/jena/JenaTriple.java | 2 +-
 .../java/org/apache/commons/rdf/jena/impl/AbstractRDFTerm.java | 2 +-
 .../java/org/apache/commons/rdf/jena/impl/BlankNodeImpl.java   | 2 +-
 .../main/java/org/apache/commons/rdf/jena/impl/GraphImpl.java  | 2 +-
 .../main/java/org/apache/commons/rdf/jena/impl/IRIImpl.java    | 2 +-
 .../java/org/apache/commons/rdf/jena/impl/LiteralImpl.java     | 6 +++---
 .../main/java/org/apache/commons/rdf/jena/impl/QuadImpl.java   | 2 +-
 .../main/java/org/apache/commons/rdf/jena/impl/TripleImpl.java | 2 +-
 13 files changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/535d6246/jena/src/main/java/org/apache/commons/rdf/jena/JenaCommonsRDF.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/JenaCommonsRDF.java b/jena/src/main/java/org/apache/commons/rdf/jena/JenaCommonsRDF.java
index 80941b0..6fc280c 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/JenaCommonsRDF.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/JenaCommonsRDF.java
@@ -59,7 +59,7 @@ public class JenaCommonsRDF {
      */
     public static Node toJena(RDFTerm term) {
         if ( term instanceof JenaNode )
-            return ((JenaNode)term).getNode() ;
+            return ((JenaNode)term).asJenaNode() ;
         
         if ( term instanceof IRI ) 
             return NodeFactory.createURI(((IRI)term).getIRIString()) ;
@@ -85,7 +85,7 @@ public class JenaCommonsRDF {
      */
     public static org.apache.jena.graph.Triple toJena(Triple triple) {
         if ( triple instanceof JenaTriple )
-            return ((JenaTriple)triple).getTriple() ;
+            return ((JenaTriple)triple).asJenaTriple() ;
         return new org.apache.jena.graph.Triple(toJena(triple.getSubject()), toJena(triple.getPredicate()),
toJena(triple.getObject()) ) ;   
     }
 
@@ -95,7 +95,7 @@ public class JenaCommonsRDF {
      */
     public static org.apache.jena.graph.Graph toJena(Graph graph) {
         if ( graph instanceof JenaGraph )
-            return ((JenaGraph)graph).getGraph() ;
+            return ((JenaGraph)graph).asJenaGraph() ;
         org.apache.jena.graph.Graph g = GraphFactory.createGraphMem() ;
         graph.stream().forEach(t->g.add(toJena(t))) ; 
         return g ;   

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/535d6246/jena/src/main/java/org/apache/commons/rdf/jena/JenaGraph.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/JenaGraph.java b/jena/src/main/java/org/apache/commons/rdf/jena/JenaGraph.java
index 0760f77..a101da4 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/JenaGraph.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/JenaGraph.java
@@ -22,5 +22,5 @@ import org.apache.jena.graph.Graph ;
 
 /** Access the Jena graph backing this object */ 
 public interface JenaGraph extends org.apache.commons.rdf.api.Graph {
-    public Graph getGraph() ;
+    public Graph asJenaGraph() ;
 }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/535d6246/jena/src/main/java/org/apache/commons/rdf/jena/JenaNode.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/JenaNode.java b/jena/src/main/java/org/apache/commons/rdf/jena/JenaNode.java
index 23085b6..0a47d9f 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/JenaNode.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/JenaNode.java
@@ -23,5 +23,5 @@ import org.apache.jena.graph.Node ;
 
 /** Access the Jena node backing this object */ 
 public interface JenaNode extends RDFTerm {
-    public Node getNode() ;
+    public Node asJenaNode() ;
 }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/535d6246/jena/src/main/java/org/apache/commons/rdf/jena/JenaQuad.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/JenaQuad.java b/jena/src/main/java/org/apache/commons/rdf/jena/JenaQuad.java
index 532f481..a9c4f05 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/JenaQuad.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/JenaQuad.java
@@ -22,5 +22,5 @@ import org.apache.jena.sparql.core.Quad;
 
 /** Access the Jena quad backing this object */ 
 public interface JenaQuad extends org.apache.commons.rdf.api.Quad {
-    public Quad getQuad() ;
+    public Quad asJenaQuad() ;
 }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/535d6246/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFParserBuilder.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFParserBuilder.java b/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFParserBuilder.java
index d999861..bc73e55 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFParserBuilder.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFParserBuilder.java
@@ -43,7 +43,7 @@ public class JenaRDFParserBuilder extends AbstractRDFParserBuilder<JenaRDFParser
 	protected void parseSynchronusly() throws IOException {
 		StreamRDF dest;
 		if (getTargetGraph().isPresent() && getTargetGraph().get() instanceof JenaGraph)
{
-			Graph jenaGraph = ((JenaGraph)getTargetGraph().get()).getGraph();
+			Graph jenaGraph = ((JenaGraph)getTargetGraph().get()).asJenaGraph();
 			dest = StreamRDFLib.graph(jenaGraph);
 		} else {		
 			dest = JenaCommonsRDF.streamJenaToCommonsRDF(getRdfTermFactory().get(), getTarget());

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/535d6246/jena/src/main/java/org/apache/commons/rdf/jena/JenaTriple.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/JenaTriple.java b/jena/src/main/java/org/apache/commons/rdf/jena/JenaTriple.java
index 8800887..f8e93ed 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/JenaTriple.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/JenaTriple.java
@@ -22,5 +22,5 @@ import org.apache.jena.graph.Triple ;
 
 /** Access the Jena triple backing this object */ 
 public interface JenaTriple extends org.apache.commons.rdf.api.Triple {
-    public Triple getTriple() ;
+    public Triple asJenaTriple() ;
 }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/535d6246/jena/src/main/java/org/apache/commons/rdf/jena/impl/AbstractRDFTerm.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/AbstractRDFTerm.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/AbstractRDFTerm.java
index 4df9e6d..347ebf9 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/AbstractRDFTerm.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/AbstractRDFTerm.java
@@ -34,7 +34,7 @@ class AbstractRDFTerm implements JenaNode, RDFTerm {
     }
     
     @Override
-    public Node getNode() {
+    public Node asJenaNode() {
         return node ;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/535d6246/jena/src/main/java/org/apache/commons/rdf/jena/impl/BlankNodeImpl.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/BlankNodeImpl.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/BlankNodeImpl.java
index 195e99c..c443092 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/BlankNodeImpl.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/BlankNodeImpl.java
@@ -28,7 +28,7 @@ public class BlankNodeImpl extends AbstractRDFTerm implements BlankNode,
JenaNod
 
     @Override
     public String uniqueReference() {
-        return getNode().getBlankNodeLabel() ;
+        return asJenaNode().getBlankNodeLabel() ;
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/535d6246/jena/src/main/java/org/apache/commons/rdf/jena/impl/GraphImpl.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/GraphImpl.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/GraphImpl.java
index 282e93d..ab684c5 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/GraphImpl.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/GraphImpl.java
@@ -42,7 +42,7 @@ public class GraphImpl implements Graph, JenaGraph {
     }
     
     @Override
-    public org.apache.jena.graph.Graph getGraph() {
+    public org.apache.jena.graph.Graph asJenaGraph() {
         return graph ;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/535d6246/jena/src/main/java/org/apache/commons/rdf/jena/impl/IRIImpl.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/IRIImpl.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/IRIImpl.java
index 5f073a6..0716e8d 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/IRIImpl.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/IRIImpl.java
@@ -36,7 +36,7 @@ public class IRIImpl extends AbstractRDFTerm implements IRI, JenaNode {
 
     @Override
     public String getIRIString() {
-        return getNode().getURI() ;
+        return asJenaNode().getURI() ;
     }
     
     @Override

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/535d6246/jena/src/main/java/org/apache/commons/rdf/jena/impl/LiteralImpl.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/LiteralImpl.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/LiteralImpl.java
index 91584c4..345532d 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/LiteralImpl.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/LiteralImpl.java
@@ -33,17 +33,17 @@ public class LiteralImpl extends AbstractRDFTerm implements Literal {
 
     @Override
     public String getLexicalForm() {
-        return getNode().getLiteralLexicalForm() ;
+        return asJenaNode().getLiteralLexicalForm() ;
     }
 
     @Override
     public IRI getDatatype() {
-        return JenaFactory.createIRI(getNode().getLiteralDatatype().getURI()) ;
+        return JenaFactory.createIRI(asJenaNode().getLiteralDatatype().getURI()) ;
     }
 
     @Override
     public Optional<String> getLanguageTag() {
-        String x = getNode().getLiteralLanguage() ;
+        String x = asJenaNode().getLiteralLanguage() ;
         if ( x == null || x.isEmpty() )
             return Optional.empty() ; 
         return Optional.of(x) ;

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/535d6246/jena/src/main/java/org/apache/commons/rdf/jena/impl/QuadImpl.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/QuadImpl.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/QuadImpl.java
index a3546ce..905e47b 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/QuadImpl.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/QuadImpl.java
@@ -53,7 +53,7 @@ public class QuadImpl implements Quad, JenaQuad {
     }
 
     @Override
-    public org.apache.jena.sparql.core.Quad getQuad() {
+    public org.apache.jena.sparql.core.Quad asJenaQuad() {
         if ( quad == null ) {
             quad = org.apache.jena.sparql.core.Quad.create(
             		JenaCommonsRDF.toJena(graphName.orElse(null)), 

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/535d6246/jena/src/main/java/org/apache/commons/rdf/jena/impl/TripleImpl.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/TripleImpl.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/TripleImpl.java
index c77e594..fba7304 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/TripleImpl.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/TripleImpl.java
@@ -44,7 +44,7 @@ public class TripleImpl implements Triple, JenaTriple {
     }
 
     @Override
-    public org.apache.jena.graph.Triple getTriple() {
+    public org.apache.jena.graph.Triple asJenaTriple() {
         if ( triple == null )
             triple = org.apache.jena.graph.Triple.create(JenaCommonsRDF.toJena(subject),
JenaCommonsRDF.toJena(predicate), JenaCommonsRDF.toJena(object)) ;
         return triple ;


Mime
View raw message