Fix identity of BindingFacesMessage; it broke since introduction of

equals/hashCode for FacesMessage in jakartaee/faces#1823 Reproducer: trigger 2 different bean validation errors on the same property
eclipse-ee4j · Dec 26, 2024 · 9964486 · 9964486
1 parent 83af87b
commit 9964486
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 0 deletions.
diff --git a/impl/src/main/java/com/sun/faces/util/MessageFactory.java b/impl/src/main/java/com/sun/faces/util/MessageFactory.java
@@ -19,6 +19,7 @@
 import java.text.MessageFormat;
 import java.util.Locale;
 import java.util.MissingResourceException;
+import java.util.Objects;
 import java.util.ResourceBundle;
 
 import jakarta.el.ValueExpression;
@@ -322,6 +323,19 @@ private String getFormattedString(String msgtext, Object[] params) {
         private final Locale locale;
         private final Object[] parameters;
         private Object[] resolvedParameters;
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(super.hashCode(), locale, parameters, resolvedParameters);
+        }
+
+        @Override
+        public boolean equals(Object object) {
+            return super.equals(object)
+                && Objects.equals(locale, ((BindingFacesMessage) object).locale)
+                && Objects.equals(parameters, ((BindingFacesMessage) object).parameters)
+                && Objects.equals(resolvedParameters, ((BindingFacesMessage) object).resolvedParameters);
+        }
     }
 
 } // end of class MessageFactory
diff --git a/impl/src/main/java/jakarta/faces/validator/MessageFactory.java b/impl/src/main/java/jakarta/faces/validator/MessageFactory.java
@@ -19,6 +19,7 @@
 import java.text.MessageFormat;
 import java.util.Locale;
 import java.util.MissingResourceException;
+import java.util.Objects;
 import java.util.ResourceBundle;
 
 import jakarta.el.ValueExpression;
@@ -322,6 +323,19 @@ private String getFormattedString(String msgtext, Object[] params) {
         private Locale locale;
         private Object[] parameters;
         private Object[] resolvedParameters;
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(super.hashCode(), locale, parameters, resolvedParameters);
+        }
+
+        @Override
+        public boolean equals(Object object) {
+            return super.equals(object)
+                && Objects.equals(locale, ((BindingFacesMessage) object).locale)
+                && Objects.equals(parameters, ((BindingFacesMessage) object).parameters)
+                && Objects.equals(resolvedParameters, ((BindingFacesMessage) object).resolvedParameters);
+        }
     }
 
 } // end of class MessageFactory