1803 fix (#656)

* Added addWhere( AbstractQueryBuilder )

* simplified code

* updated javadoc

* removed unused imports

* updated javadoc
5 files changed