You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2018/10/25 16:55:26 UTC
[3/4] jena git commit: Cleanup formatting.
Cleanup formatting.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/4dc260ee
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/4dc260ee
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/4dc260ee
Branch: refs/heads/master
Commit: 4dc260eeb2f627f724f6a382f42819f3c9b51cd6
Parents: c89ed12
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Oct 24 14:34:26 2018 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Oct 24 14:34:26 2018 +0100
----------------------------------------------------------------------
.../jena/sparql/engine/binding/Binding.java | 1 -
.../sparql/engine/binding/BindingUtils.java | 75 ++++++++++----------
2 files changed, 37 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/4dc260ee/jena-arq/src/main/java/org/apache/jena/sparql/engine/binding/Binding.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/binding/Binding.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/binding/Binding.java
index 90f7e92..ddf4578 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/binding/Binding.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/binding/Binding.java
@@ -41,5 +41,4 @@ public interface Binding
/** Is this an empty binding? No variables. */
public boolean isEmpty() ;
-
}
http://git-wip-us.apache.org/repos/asf/jena/blob/4dc260ee/jena-arq/src/main/java/org/apache/jena/sparql/engine/binding/BindingUtils.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/binding/BindingUtils.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/binding/BindingUtils.java
index aa2d538..08ae260 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/binding/BindingUtils.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/binding/BindingUtils.java
@@ -16,82 +16,81 @@
* limitations under the License.
*/
-package org.apache.jena.sparql.engine.binding ;
+package org.apache.jena.sparql.engine.binding;
-import java.util.Iterator ;
+import java.util.Iterator;
-import org.apache.jena.atlas.logging.Log ;
-import org.apache.jena.graph.Node ;
-import org.apache.jena.query.QuerySolution ;
-import org.apache.jena.rdf.model.RDFNode ;
-import org.apache.jena.sparql.ARQInternalErrorException ;
-import org.apache.jena.sparql.core.ResultBinding ;
-import org.apache.jena.sparql.core.Var ;
+import org.apache.jena.atlas.logging.Log;
+import org.apache.jena.graph.Node;
+import org.apache.jena.query.QuerySolution;
+import org.apache.jena.rdf.model.RDFNode;
+import org.apache.jena.sparql.ARQInternalErrorException;
+import org.apache.jena.sparql.core.ResultBinding;
+import org.apache.jena.sparql.core.Var;
public class BindingUtils {
/** Convert a query solution to a binding */
public static Binding asBinding(QuerySolution qSolution) {
if ( qSolution == null )
- return null ;
+ return null;
if ( qSolution instanceof ResultBinding )
// Only named variables.
- return new BindingProjectNamed(((ResultBinding)qSolution).getBinding()) ;
- BindingMap binding = BindingFactory.create() ;
- addToBinding(binding, qSolution) ;
- return binding ;
+ return new BindingProjectNamed(((ResultBinding)qSolution).getBinding());
+ BindingMap binding = BindingFactory.create();
+ addToBinding(binding, qSolution);
+ return binding;
}
public static void addToBinding(BindingMap binding, QuerySolution qSolution) {
if ( qSolution == null )
- return ;
+ return;
for ( Iterator<String> iter = qSolution.varNames() ; iter.hasNext() ; ) {
- String n = iter.next() ;
+ String n = iter.next();
- RDFNode x = qSolution.get(n) ;
+ RDFNode x = qSolution.get(n);
if ( Var.isBlankNodeVarName(n) )
- continue ;
+ continue;
try {
- binding.add(Var.alloc(n), x.asNode()) ;
- }
- catch (ARQInternalErrorException ex) {
+ binding.add(Var.alloc(n), x.asNode());
+ } catch (ARQInternalErrorException ex) {
// bad binding attempt.
- Log.warn(BindingUtils.class, "Attempt to bind " + n + " when already bound") ;
+ Log.warn(BindingUtils.class, "Attempt to bind " + n + " when already bound");
}
}
}
public static void addAll(BindingMap dest, Binding src) {
- Iterator<Var> iter = src.vars() ;
+ Iterator<Var> iter = src.vars();
for ( ; iter.hasNext() ; ) {
- Var v = iter.next() ;
- Node n = src.get(v) ;
- dest.add(v, n) ;
+ Var v = iter.next();
+ Node n = src.get(v);
+ dest.add(v, n);
}
}
/** Merge two bindings, assuming they are compatible. */
public static Binding merge(Binding bind1, Binding bind2) {
- //Create binding from LHS
- BindingMap b2 = BindingFactory.create(bind1) ;
- Iterator<Var> vIter = bind2.vars() ;
+ // Create binding from LHS
+ BindingMap b2 = BindingFactory.create(bind1);
+ Iterator<Var> vIter = bind2.vars();
// Add any variables from the RHS
for ( ; vIter.hasNext() ; ) {
- Var v = vIter.next() ;
- if ( ! b2.contains(v) )
- b2.add(v, bind2.get(v)) ;
+ Var v = vIter.next();
+ if ( !b2.contains(v) )
+ b2.add(v, bind2.get(v));
else {
// Checking!
- Node n1 = bind1.get(v) ;
- Node n2 = bind2.get(v) ;
- if ( ! n1.equals(n2) )
- Log.warn(BindingUtils.class, "merge: Mismatch : "+n1+" != "+n2);
+ Node n1 = bind1.get(v);
+ Node n2 = bind2.get(v);
+ if ( !n1.equals(n2) )
+ Log.warn(BindingUtils.class, "merge: Mismatch : " + n1 + " != " + n2);
}
}
- return b2 ;
+ return b2;
}
public static boolean equals(Binding b1, Binding b2) {
- return BindingBase.equals(b1, b2) ;
+ return BindingBase.equals(b1, b2);
}
}