Naming/PR feedback

prime-framework · Oct 26, 2024 · d425fc7 · d425fc7
1 parent 6130538
commit d425fc7
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/src/main/java/org/primeframework/mvc/action/config/ActionConfiguration.java b/src/main/java/org/primeframework/mvc/action/config/ActionConfiguration.java
@@ -50,6 +50,8 @@ public class ActionConfiguration {
 
   public final boolean allowUnknownParameters;
 
+  public final List<String> alternateMessageURIs;
+
   public final Action annotation;
 
   public final Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<>();
@@ -60,8 +62,6 @@ public class ActionConfiguration {
 
   public final Map<HTTPMethod, ExecuteMethodConfiguration> executeMethods;
 
-  public final List<String> fallbackActionMessageURIs;
-
   public final Map<String, FileUpload> fileUploadMembers;
 
   public final List<Method> formPrepareMethods;
@@ -125,15 +125,15 @@ public ActionConfiguration(Class<?> actionClass,
                              List<Method> preValidationMethods,
                              Field unknownParametersField,
                              Set<String> validContentTypes,
-                             List<String> fallbackActionMessageURIs) {
+                             List<String> alternateMessageURIs) {
     Objects.requireNonNull(actionClass);
 
     this.actionClass = actionClass;
     this.allowUnknownParameters = allowUnknownParameters;
     this.constraintValidationMethods = constraintValidationMethods;
     this.formPrepareMethods = formPrepareMethods;
     this.authorizationMethods = authorizationMethods;
-    this.fallbackActionMessageURIs = fallbackActionMessageURIs;
+    this.alternateMessageURIs = alternateMessageURIs;
     this.jwtAuthorizationMethods = jwtAuthorizationMethods;
     this.preValidationMethods = preValidationMethods;
     this.postValidationMethods = postValidationMethods;

diff --git a/src/main/java/org/primeframework/mvc/message/l10n/ResourceBundleMessageProvider.java b/src/main/java/org/primeframework/mvc/message/l10n/ResourceBundleMessageProvider.java
@@ -138,11 +138,11 @@ protected String findMessage(ActionInvocation actionInvocation, String key) {
 
     ActionConfiguration config = actionInvocation.configuration;
     if (config != null) {
-      return config.fallbackActionMessageURIs.stream()
-                                             .map(uri -> findMessage(uri, key))
-                                             .filter(Objects::nonNull)
-                                             .findFirst()
-                                             .orElse(null);
+      return config.alternateMessageURIs.stream()
+                                        .map(uri -> findMessage(uri, key))
+                                        .filter(Objects::nonNull)
+                                        .findFirst()
+                                        .orElse(null);
     }
 
     return null;

diff --git a/src/test/web/messages/alternate-message-resources-annotated.properties b/src/test/web/messages/alternate-message-resources-annotated.properties
@@ -13,4 +13,4 @@
 # either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 #
-normal_message=normal_message
+normal_message=Normal message
diff --git a/src/test/web/messages/nested/nested-message.properties b/src/test/web/messages/nested/nested-message.properties
@@ -13,4 +13,4 @@
 # either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 #
-nested_message=nested_message
+nested_message=Nested message