From 09cc94c4d9f9093ba990c4bdd8c660056ea9826b Mon Sep 17 00:00:00 2001
From: Sanne Grinovero <sanne@hibernate.org>
Date: Mon, 8 Jul 2019 21:07:06 +0100
Subject: [PATCH] HHH-13496 Some missing 'final' modifiers on constants

---
 .../boot/registry/selector/internal/StrategySelectorImpl.java  | 2 +-
 .../hibernate/internal/util/compare/RowVersionComparator.java  | 3 ++-
 .../expression/function/ParameterizedFunctionExpression.java   | 2 +-
 .../java/org/hibernate/service/StandardServiceInitiators.java  | 2 +-
 hibernate-core/src/main/java/org/hibernate/sql/Template.java   | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/StrategySelectorImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/StrategySelectorImpl.java
index be2a450fa0..9c0019de9f 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/StrategySelectorImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/StrategySelectorImpl.java
@@ -31,7 +31,7 @@ public class StrategySelectorImpl implements StrategySelector {
 	private static final Logger log = Logger.getLogger( StrategySelectorImpl.class );
 
 
-	public static StrategyCreator STANDARD_STRATEGY_CREATOR = strategyClass -> {
+	public static final StrategyCreator STANDARD_STRATEGY_CREATOR = strategyClass -> {
 		try {
 			return strategyClass.newInstance();
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/compare/RowVersionComparator.java b/hibernate-core/src/main/java/org/hibernate/internal/util/compare/RowVersionComparator.java
index a48d0d4969..f7f28c2cb4 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/compare/RowVersionComparator.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/compare/RowVersionComparator.java
@@ -12,7 +12,8 @@ import java.util.Comparator;
  * @author Gail Badner
  */
 public final class RowVersionComparator implements Comparator<byte[]> {
-	public static RowVersionComparator INSTANCE = new RowVersionComparator();
+
+	public static final RowVersionComparator INSTANCE = new RowVersionComparator();
 
 	private RowVersionComparator() {
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/internal/expression/function/ParameterizedFunctionExpression.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/internal/expression/function/ParameterizedFunctionExpression.java
index 2cb49e85ad..de2297b264 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/internal/expression/function/ParameterizedFunctionExpression.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/internal/expression/function/ParameterizedFunctionExpression.java
@@ -26,7 +26,7 @@ public class ParameterizedFunctionExpression<X>
 		extends BasicFunctionExpression<X>
 		implements FunctionExpression<X> {
 
-	public static List<String> STANDARD_JPA_FUNCTION_NAMES = Arrays.asList(
+	public static final List<String> STANDARD_JPA_FUNCTION_NAMES = Arrays.asList(
 			// 4.6.17.2.1
 			"CONCAT",
 			"SUBSTRING",
diff --git a/hibernate-core/src/main/java/org/hibernate/service/StandardServiceInitiators.java b/hibernate-core/src/main/java/org/hibernate/service/StandardServiceInitiators.java
index 0eedc5624d..b0ed1484ec 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/StandardServiceInitiators.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/StandardServiceInitiators.java
@@ -47,7 +47,7 @@ public final class StandardServiceInitiators {
 	private StandardServiceInitiators() {
 	}
 
-	public static List<StandardServiceInitiator> LIST = buildStandardServiceInitiatorList();
+	public static final List<StandardServiceInitiator> LIST = buildStandardServiceInitiatorList();
 
 	private static List<StandardServiceInitiator> buildStandardServiceInitiatorList() {
 		final ArrayList<StandardServiceInitiator> serviceInitiators = new ArrayList<StandardServiceInitiator>();
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/Template.java b/hibernate-core/src/main/java/org/hibernate/sql/Template.java
index a22867658f..31c1d400ee 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/Template.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/Template.java
@@ -677,7 +677,7 @@ public final class Template {
 		).injectAliases( LEGACY_ORDER_BY_ALIAS_RESOLVER );
 	}
 
-	public static OrderByAliasResolver LEGACY_ORDER_BY_ALIAS_RESOLVER = new OrderByAliasResolver() {
+	public static final OrderByAliasResolver LEGACY_ORDER_BY_ALIAS_RESOLVER = new OrderByAliasResolver() {
 		@Override
 		public String resolveTableAlias(String columnReference) {
 			return TEMPLATE;