[GitHub] jena pull request #479: JENA-1515 - Ensures values added to subQuery are not...

[asfgit]

Github user asfgit closed the pull request at:

https://github.com/apache/jena/pull/479


---

[GitHub] jena pull request #479: JENA-1515 - Ensures values added to subQuery are not...

[afs]

Github user afs commented on a diff in the pull request:

https://github.com/apache/jena/pull/479#discussion_r224923241
  
--- Diff: 
jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/ElementRewriter.java
 ---
@@ -103,17 +103,13 @@ public void visit(ElementBind el) {
@Override
public void visit(ElementData el) {
ElementData retval = new ElementData();
-   Iterator vars = el.getVars().iterator();
-   Iterator bindings = el.getRows().iterator();
-   while (vars.hasNext()) {
-   Var v = vars.next();
-   if (values.containsKey(v)) {
-   bindings.next(); // skip the binding
-   } else {
-   retval.add(v);
-   retval.add(rewrite(bindings.next()));
-   }
+   for (Var v : el.getVars()) {
+   retval.add(v);
}
+   for (Binding binding : el.getRows())
+   {
--- End diff --

Code layout. Some of same-line { , some next line {


---

[GitHub] jena pull request #479: JENA-1515 - Ensures values added to subQuery are not...

[Claudenw]

Github user Claudenw commented on a diff in the pull request:

https://github.com/apache/jena/pull/479#discussion_r224920678
  
--- Diff: 
jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/ElementRewriter.java
 ---
@@ -103,17 +103,13 @@ public void visit(ElementBind el) {
@Override
public void visit(ElementData el) {
ElementData retval = new ElementData();
-   Iterator vars = el.getVars().iterator();
-   Iterator bindings = el.getRows().iterator();
-   while (vars.hasNext()) {
-   Var v = vars.next();
-   if (values.containsKey(v)) {
-   bindings.next(); // skip the binding
-   } else {
-   retval.add(v);
-   retval.add(rewrite(bindings.next()));
-   }
+   for (Var v : el.getVars()) {
+   retval.add(v);
}
+   for (Binding binding : el.getRows())
+   {
--- End diff --

not sure what this comment means.  The style of the looping is different 
and has a different result.


---

[GitHub] jena pull request #479: JENA-1515 - Ensures values added to subQuery are not...

[afs]

Github user afs commented on a diff in the pull request:

https://github.com/apache/jena/pull/479#discussion_r223217292
  
--- Diff: 
jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/ElementRewriter.java
 ---
@@ -103,17 +103,13 @@ public void visit(ElementBind el) {
@Override
public void visit(ElementData el) {
ElementData retval = new ElementData();
-   Iterator vars = el.getVars().iterator();
-   Iterator bindings = el.getRows().iterator();
-   while (vars.hasNext()) {
-   Var v = vars.next();
-   if (values.containsKey(v)) {
-   bindings.next(); // skip the binding
-   } else {
-   retval.add(v);
-   retval.add(rewrite(bindings.next()));
-   }
+   for (Var v : el.getVars()) {
+   retval.add(v);
}
+   for (Binding binding : el.getRows())
+   {
--- End diff --

Minor: different style. There is more of this later.


---