Polishing.

Simplify PersistenceProvider by removing PresenceDetector interface. Refine presence detection to make present field final. Add warning suppressions as we know that we duplicate code (similar code) and that ANTLR doesn't generate methods with nullable annotations.

See #3170
Original pull request: #3176

Author: mp911de

spring-data-jpa/src/main/java/org/springframework/data/jpa/provider/PersistenceProvider.java

@@ -55,7 +55,7 @@
  * @author Greg Turnquist
  * @author Yuriy Tsarkov
  */
-public enum PersistenceProvider implements QueryExtractor, ProxyIdAccessor, QueryComment, PresenceDetector {
+public enum PersistenceProvider implements QueryExtractor, ProxyIdAccessor, QueryComment {
 
 	/**
 	 * Hibernate persistence provider.
@@ -204,7 +204,7 @@ public String getCommentHintKey() {
 	private final Iterable<String> entityManagerClassNames;
 	private final Iterable<String> metamodelClassNames;
 
-	private boolean present;
+	private final boolean present;
 
 	/**
 	 * Creates a new {@link PersistenceProvider}.
@@ -218,12 +218,16 @@ public String getCommentHintKey() {
 		this.entityManagerClassNames = entityManagerClassNames;
 		this.metamodelClassNames = metamodelClassNames;
 
-		this.present = false;
-		entityManagerClassNames.forEach(entityManagerClassName -> {
+		boolean present = false;
+		for (String entityManagerClassName : entityManagerClassNames) {
+
 			if (ClassUtils.isPresent(entityManagerClassName, PersistenceProvider.class.getClassLoader())) {
-				this.present = true;
+				present = true;
+				break;
 			}
-		});
+		}
+
+		this.present = present;
 	}
 
 	/**
@@ -340,7 +344,6 @@ public static Object unwrapTypedParameterValue(@Nullable Object value) {
 				: value;
 	}
 
-	@Override
 	public boolean isPresent() {
 		return this.present;
 	}

spring-data-jpa/src/main/java/org/springframework/data/jpa/provider/PresenceDetector.java

@@ -26,6 +26,7 @@
  * @author Greg Turnquist
  * @since 3.2
  */
+@SuppressWarnings({ "ConstantConditions", "DuplicatedCode" })
 class EqlQueryRenderer extends EqlBaseVisitor<List<JpaQueryParsingToken>> {
 
 	@Override

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/EqlQueryRenderer.java

@@ -26,6 +26,7 @@
  * @author Greg Turnquist
  * @since 3.1
  */
+@SuppressWarnings({ "ConstantConditions", "DuplicatedCode" })
 class HqlQueryRenderer extends HqlBaseVisitor<List<JpaQueryParsingToken>> {
 
 	@Override

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/HqlQueryRenderer.java

@@ -26,6 +26,7 @@
  * @author Greg Turnquist
  * @since 3.1
  */
+@SuppressWarnings({ "ConstantConditions", "DuplicatedCode" })
 class JpqlQueryRenderer extends JpqlBaseVisitor<List<JpaQueryParsingToken>> {
 
 	@Override