(causeway) branch master updated: CAUSEWAY-3697: refine MM validation message

[ahuber]

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/causeway.git


The following commit(s) were added to refs/heads/master by this push:
     new d892bbf808 CAUSEWAY-3697: refine MM validation message
d892bbf808 is described below

commit d892bbf808e91aae3722b5a38d39e9e5eb9613c5
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Thu Mar 14 22:23:01 2024 +0100

    CAUSEWAY-3697: refine MM validation message
---
 .../causeway/core/config/progmodel/ProgrammingModelConstants.java   | 6 +++---
 .../object/domainobject/DomainObjectAnnotationFacetFactory.java     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/core/config/src/main/java/org/apache/causeway/core/config/progmodel/ProgrammingModelConstants.java
 
b/core/config/src/main/java/org/apache/causeway/core/config/progmodel/ProgrammingModelConstants.java
index 3df55d14aa..4dc15423ba 100644
--- 
a/core/config/src/main/java/org/apache/causeway/core/config/progmodel/ProgrammingModelConstants.java
+++ 
b/core/config/src/main/java/org/apache/causeway/core/config/progmodel/ProgrammingModelConstants.java
@@ -463,10 +463,10 @@ public final class ProgrammingModelConstants {
         NON_UNIQUE_LOGICAL_TYPE_NAME_OR_ALIAS("Logical type name (or alias) 
${logicalTypeName} "
                 + "mapped to multiple non-abstract classes:\n"
                 + "${csv}"),
-        PROXIED_SERVICE_BEAN_NOT_ALLOWED_TO_CONTRIBUTE_TO_UI("Logical type 
name (or alias) ${logicalTypeName} "
+        PROXIED_SERVICE_BEAN_NOT_ALLOWED_TO_CONTRIBUTE("Logical type name (or 
alias) ${logicalTypeName} "
                 + "mapped to at least one proxied class:\n"
-                + "${csv}. Proxied service beans are not allowed to contribute 
to the UI. "
-                + "E.g. don't mix @Transactional with 
@DomainServicenature=VIEW)"),
+                + "${csv}. Proxied service beans are not allowed to contribute 
actions to the UI or Web-API(s). "
+                + "E.g. don't mix @Transactional with @DomainService"),
         UNKNONW_SORT_WITH_ACTION("${type}: is a (concrete) but UNKNOWN sort, 
yet has ${actionCount} actions: ${actions}"),
         ACTION_METHOD_OVERLOADING_NOT_ALLOWED("Action method overloading is 
not allowed, "
                 + "yet ${type} has action(s) that have a the same member name: 
${overloadedNames}"),
diff --git 
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
 
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
index 19a7d102e1..4571cff30a 100644
--- 
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
+++ 
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
@@ -600,7 +600,7 @@ implements
 
                                 proxies.forEach(spec->{
                                     ValidationFailure.raiseFormatted(spec,
-                                        
ProgrammingModelConstants.Violation.PROXIED_SERVICE_BEAN_NOT_ALLOWED_TO_CONTRIBUTE_TO_UI
+                                        
ProgrammingModelConstants.Violation.PROXIED_SERVICE_BEAN_NOT_ALLOWED_TO_CONTRIBUTE
                                             .builder()
                                             .addVariable("logicalTypeName", 
spec.getLogicalTypeName())
                                             .addVariable("csv", 
asCsv(proxies.toList()))