HV-2057 Sonar: do not use Double Brace Initialization

Author: marko-bekhta

engine/src/main/java/org/hibernate/validator/internal/engine/messageinterpolation/el/BeanMethodsELContext.java

@@ -19,16 +19,18 @@
  * @author Guillaume Smet
  */
 public class BeanMethodsELContext extends StandardELContext {
-	private static final ELResolver DEFAULT_RESOLVER = new CompositeELResolver() {
-		{
-			add( new RootResolver() );
-			add( new ArrayELResolver( true ) );
-			add( new ListELResolver( true ) );
-			add( new MapELResolver( true ) );
-			add( new ResourceBundleELResolver() );
-			add( new BeanELResolver( true ) );
-		}
-	};
+	private static final ELResolver DEFAULT_RESOLVER;
+
+	static {
+		CompositeELResolver resolver = new CompositeELResolver();
+		resolver.add( new RootResolver() );
+		resolver.add( new ArrayELResolver( true ) );
+		resolver.add( new ListELResolver( true ) );
+		resolver.add( new MapELResolver( true ) );
+		resolver.add( new ResourceBundleELResolver() );
+		resolver.add( new BeanELResolver( true ) );
+		DEFAULT_RESOLVER = resolver;
+	}
 
 	public BeanMethodsELContext(ExpressionFactory expressionFactory) {
 		super( expressionFactory );

engine/src/main/java/org/hibernate/validator/internal/engine/messageinterpolation/el/BeanPropertiesElContext.java

@@ -17,16 +17,18 @@
  * @author Guillaume Smet
  */
 public class BeanPropertiesElContext extends StandardELContext {
-	private static final ELResolver DEFAULT_RESOLVER = new CompositeELResolver() {
-		{
-			add( new RootResolver() );
-			add( new ArrayELResolver( true ) );
-			add( new ListELResolver( true ) );
-			add( new MapELResolver( true ) );
-			add( new ResourceBundleELResolver() );
-			add( new BeanPropertiesELResolver() );
-		}
-	};
+	private static final ELResolver DEFAULT_RESOLVER;
+
+	static {
+		CompositeELResolver resolver = new CompositeELResolver();
+		resolver.add( new RootResolver() );
+		resolver.add( new ArrayELResolver( true ) );
+		resolver.add( new ListELResolver( true ) );
+		resolver.add( new MapELResolver( true ) );
+		resolver.add( new ResourceBundleELResolver() );
+		resolver.add( new BeanPropertiesELResolver() );
+		DEFAULT_RESOLVER = resolver;
+	}
 
 	public BeanPropertiesElContext(ExpressionFactory expressionFactory) {
 		super( expressionFactory );

engine/src/main/java/org/hibernate/validator/internal/engine/messageinterpolation/el/VariablesELContext.java

@@ -18,19 +18,20 @@
  */
 public class VariablesELContext extends StandardELContext {
 
-	private static final ELResolver DEFAULT_RESOLVER = new CompositeELResolver() {
-
-		{
-			add( new RootResolver() );
-			add( new ArrayELResolver( true ) );
-			add( new ListELResolver( true ) );
-			add( new MapELResolver( true ) );
-			add( new ResourceBundleELResolver() );
-			// this one is required so that expressions containing method calls are returned as is
-			// if not there, the expression is replaced by an empty string
-			add( new NoOpElResolver() );
-		}
-	};
+	private static final ELResolver DEFAULT_RESOLVER;
+
+	static {
+		CompositeELResolver resolver = new CompositeELResolver();
+		resolver.add( new RootResolver() );
+		resolver.add( new ArrayELResolver( true ) );
+		resolver.add( new ListELResolver( true ) );
+		resolver.add( new MapELResolver( true ) );
+		resolver.add( new ResourceBundleELResolver() );
+		// this one is required so that expressions containing method calls are returned as is
+		// if not there, the expression is replaced by an empty string
+		resolver.add( new NoOpElResolver() );
+		DEFAULT_RESOLVER = resolver;
+	}
 
 	public VariablesELContext(ExpressionFactory expressionFactory) {
 		super( expressionFactory );