small fixes to @Find and @HQL methods

don't include session parameter type where not necessary

tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/annotation/AbstractFinderMethod.java

@@ -88,11 +88,17 @@ public abstract class AbstractFinderMethod extends AbstractQueryMethod  {
 				.append("{@link ")
 				.append(annotationMetaEntity.importType(entity))
 				.append("} by ");
-		int paramCount = paramNames.size();
+		long paramCount = paramTypes.stream()
-		for (int i = 0; i < paramCount; i++) {
+				.filter(type -> !isOrderParam(type) && !isPageParam(type)
-			String param = paramNames.get(i);
+						&& !isSessionParameter(type))
-			if ( i>0 ) {
+				.count();
-				if ( i + 1 == paramCount) {
+		int count = 0;
+		for (int i = 0; i < paramTypes.size(); i++) {
+			String type = paramTypes.get(i);
+			if ( !isPageParam(type) && !isOrderParam(type)
+					&& !isSessionParameter(type) ) {
+				if ( count>0 ) {
+					if ( count + 1 == paramCount) {
 						declaration
 								.append(paramCount>2 ? ", and " : " and "); //Oxford comma
 					}
@@ -101,7 +107,9 @@ public abstract class AbstractFinderMethod extends AbstractQueryMethod  {
 								.append(", ");
 					}
 				}
-			final String path = param.replace('$', '.');
+				count++;
+				final String path = paramNames.get(i)
+						.replace('$', '.');
 				declaration
 						.append("{@link ")
 						.append(annotationMetaEntity.importType(entity))
@@ -111,6 +119,7 @@ public abstract class AbstractFinderMethod extends AbstractQueryMethod  {
 						.append(path)
 						.append("}");
 			}
+		}
 		declaration
 				.append('.')
 				.append("\n *");

tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/annotation/QueryMethod.java

@@ -254,7 +254,8 @@ public class QueryMethod extends AbstractQueryMethod {
 		else {
 			return stem + "_"
 					+ paramTypes.stream()
-							.filter(name -> !isPageParam(name) && !isOrderParam(name))
+							.filter(type -> !isPageParam(type) && !isOrderParam(type)
+									&& !isSessionParameter(type))
 							.map(StringHelper::unqualify)
 							.reduce((x,y) -> x + '_' + y)
 							.orElse("");