add "stream" and "parallelStream" query names
more accurate collection query detection for method references
combine two classes into one to reduce duplication