Re: svn commit: r1843780 - in /ofbiz/ofbiz-framework/trunk/framework/entity/src: main/java/org/apache/ofbiz/entity/condition/ test/java/org/apache/ofbiz/entity/

2018-10-15 Thread Gil Portenseigne 
Hello, 
I think that is an incompatibiliy with Windows newline char (\n vs
\r\n).

Thanks for the feedback, I'll improve that soon.

Gil

Le lundi 15 oct. 2018 à 18:09:30 (+0200), Jacques Le Roux a écrit :
> Hi Gil,
> 
> Not yet sure it's only me (Windows) but I get this locally
> 
> org.apache.ofbiz.entity.EntityConditionVisitorTests > basicTest FAILED
>     org.junit.ComparisonFailure at EntityConditionVisitorTests.java:83
> 
> Buildbot should run soon (after r1843921), and tells us...
> 
> Jacques
> 
> 
> Le 13/10/2018 à 21:50, p...@apache.org a écrit :
> > Author: pgil
> > Date: Sat Oct 13 19:50:27 2018
> > New Revision: 1843780
> > 
> > URL: http://svn.apache.org/viewvc?rev=1843780=rev
> > Log:
> > Improved: Rewrite EntityConditionVisitor interface to respect visitor 
> > Pattern
> > (OFBIZ-10593)
> > 
> > Remove visit methods from current EntityConditionBase type hierarchy.
> > Add or rewrite accept method in EntityCondition type hierachy.
> > Add documentation in EntityConditionVisitor, introducing implementation 
> > examples.
> > Add junit test validating documented examples.
> > Thanks to Mathieu Lirzin for your contribution, and Jacques for the review.
> > 
> > Added:
> >  
> > ofbiz/ofbiz-framework/trunk/framework/entity/src/test/java/org/apache/ofbiz/entity/EntityConditionVisitorTests.java
> >(with props)
> > Modified:
> >  
> > ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityComparisonOperator.java
> >  
> > ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityCondition.java
> >  
> > ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionBuilder.java
> >  
> > ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionFunction.java
> >  
> > ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionList.java
> >  
> > ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionListBase.java
> >  
> > ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionSubSelect.java
> >  
> > ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionValue.java
> >  
> > ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionVisitor.java
> >  
> > ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityDateFilterCondition.java
> >  
> > ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityExpr.java
> >  
> > ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityFieldMap.java
> >  
> > ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityFieldValue.java
> >  
> > ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityFunction.java
> >  
> > ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityJoinOperator.java
> >  
> > ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityOperator.java
> >  
> > ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityWhereString.java
> > 
> > Modified: 
> > ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityComparisonOperator.java
> > URL: 
> > http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityComparisonOperator.java?rev=1843780=1843779=1843780=diff
> > ==
> > --- 
> > ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityComparisonOperator.java
> >  (original)
> > +++ 
> > ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityComparisonOperator.java
> >  Sat Oct 13 19:50:27 2018
> > @@ -78,12 +78,6 @@ public abstract class EntityComparisonOp
> >   }
> >   @Override
> > -public void visit(EntityConditionVisitor visitor, L lhs, R rhs) {
> > -visitor.accept(lhs);
> > -visitor.accept(rhs);
> > -}
> > -
> > -@Override
> >   public void addSqlValue(StringBuilder sql, ModelEntity entity, 
> > List entityConditionParams, boolean compat, L lhs, R 
> > rhs, Datasource datasourceInfo) {
> >   // if this is an IN operator and the rhs Object isEmpty, add 
> > "1=0" instead of the normal SQL.  Note that "FALSE" does not work with all 
> > databases.
> > 
> > Modified: 
> >

Re: svn commit: r1843780 - in /ofbiz/ofbiz-framework/trunk/framework/entity/src: main/java/org/apache/ofbiz/entity/condition/ test/java/org/apache/ofbiz/entity/

2018-10-15 Thread Jacques Le Roux 

Hi Gil,

Not yet sure it's only me (Windows) but I get this locally

org.apache.ofbiz.entity.EntityConditionVisitorTests > basicTest FAILED
    org.junit.ComparisonFailure at EntityConditionVisitorTests.java:83

Buildbot should run soon (after r1843921), and tells us...

Jacques


Le 13/10/2018 à 21:50, p...@apache.org a écrit :

Author: pgil
Date: Sat Oct 13 19:50:27 2018
New Revision: 1843780

URL: http://svn.apache.org/viewvc?rev=1843780=rev
Log:
Improved: Rewrite EntityConditionVisitor interface to respect visitor Pattern
(OFBIZ-10593)

Remove visit methods from current EntityConditionBase type hierarchy.
Add or rewrite accept method in EntityCondition type hierachy.
Add documentation in EntityConditionVisitor, introducing implementation 
examples.
Add junit test validating documented examples.
Thanks to Mathieu Lirzin for your contribution, and Jacques for the review.

Added:
 
ofbiz/ofbiz-framework/trunk/framework/entity/src/test/java/org/apache/ofbiz/entity/EntityConditionVisitorTests.java
   (with props)
Modified:
 
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityComparisonOperator.java
 
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityCondition.java
 
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionBuilder.java
 
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionFunction.java
 
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionList.java
 
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionListBase.java
 
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionSubSelect.java
 
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionValue.java
 
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionVisitor.java
 
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityDateFilterCondition.java
 
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityExpr.java
 
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityFieldMap.java
 
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityFieldValue.java
 
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityFunction.java
 
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityJoinOperator.java
 
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityOperator.java
 
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityWhereString.java

Modified: 
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityComparisonOperator.java
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityComparisonOperator.java?rev=1843780=1843779=1843780=diff
==
--- 
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityComparisonOperator.java
 (original)
+++ 
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityComparisonOperator.java
 Sat Oct 13 19:50:27 2018
@@ -78,12 +78,6 @@ public abstract class EntityComparisonOp
  }
  
  @Override

-public void visit(EntityConditionVisitor visitor, L lhs, R rhs) {
-visitor.accept(lhs);
-visitor.accept(rhs);
-}
-
-@Override
  public void addSqlValue(StringBuilder sql, ModelEntity entity, 
List entityConditionParams, boolean compat, L lhs, R rhs, 
Datasource datasourceInfo) {
  
  // if this is an IN operator and the rhs Object isEmpty, add "1=0" instead of the normal SQL.  Note that "FALSE" does not work with all databases.


Modified: 
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityCondition.java
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityCondition.java?rev=1843780=1843779=1843780=diff
==
--- 
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityCondition.java
 (original)
+++