This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/causeway.git
from 309658d098 Merge pull request #1625 from
apache/dependabot/maven/master/com.github.javaparser-javaparser-core-3.25.3
add 51d6f91691 CAUSEWAY-3051: simplify MM validator type hierarchy
add 130b3a5c8e CAUSEWAY-3051: cleaning up validators (1)
add 9ef864ab18 CAUSEWAY-3051: cleaning up validators (2)
add cab2c8fadf CAUSEWAY-3051: minor runtime optimization
add 78517e3168 CAUSEWAY-3051: test scenario fixes
add fc1455dc7e CAUSEWAY-3051: java-doc and more refactoring
add 6c099edbaa CAUSEWAY-3051: relax strictness of member-id clash checks
add 9ed1d80361 CAUSEWAY-3051: corrects test expectations
add edac3a23fe CAUSEWAY-3051: simplify act/prob/coll factory methods
add 02193e030d CAUSEWAY-3051: prepares ObjectSpecificationAbstract for
member-id clash reporting
add 86ade94759 CAUSEWAY-3051: implements member-id clash reporting
add bb986a08dd CAUSEWAY-3051: implement tests
add 9866dd2d5e CAUSEWAY-3051: relax checks: allow for method overrides
(regular members)
new 821df92764 Merge pull request #1629 from
apache/3051.validate.memberId.clash
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/causeway/applib/Identifier.java | 8 +-
.../config/beans/CausewayBeanTypeRegistry.java | 18 +-
.../progmodel/ProgrammingModelConstants.java | 8 +-
.../action/ActionAnnotationFacetFactory.java | 6 +-
...reteTypeToBeIncludedWithMetamodelValidator.java | 45 ++--
...nChoicesForCollectionParameterFacetFactory.java | 2 +-
.../actions/action/ActionOverloadingValidator.java | 37 ++-
.../annotation/HomePageFacetAnnotationFactory.java | 20 +-
.../actions/layout/ActionLayoutFacetFactory.java | 6 +-
.../CollectionAnnotationFacetFactory.java | 6 +-
.../layout/CollectionLayoutFacetFactory.java | 6 +-
.../annotation/SortedByFacetAnnotationFactory.java | 2 +-
.../metamodel/facets/jaxb/JaxbFacetFactory.java | 2 +-
.../BookmarkPolicyFacetFallbackFactory.java | 2 +-
.../DomainObjectAnnotationFacetFactory.java | 11 +-
.../DomainServiceFacetAnnotationFactory.java | 2 +-
.../logicaltype/LogicalTypeMalformedValidator.java | 56 +++--
.../LogicalTypeFacetFromClassNameFactory.java | 2 +-
.../NavigableParentAnnotationFacetFactory.java | 2 +-
.../annotation/TitleAnnotationFacetFactory.java | 2 +-
.../object/viewmodel/ViewModelFacetFactory.java | 2 +-
.../parameter/ParameterAnnotationFacetFactory.java | 6 +-
.../property/PropertyAnnotationFacetFactory.java | 13 +-
.../propertylayout/PropertyLayoutFacetFactory.java | 6 +-
.../ValueSemanticsAnnotationFacetFactory.java | 10 +-
.../core/metamodel/layout/DeweyOrderSet.java | 12 +-
...tionEnforcesMetamodelContributionValidator.java | 18 +-
.../MethodPrefixBasedFacetFactoryAbstract.java | 22 +-
...tProcessor.java => MetaModelPostProcessor.java} | 21 +-
...ct.java => MetaModelPostProcessorAbstract.java} | 6 +-
...ssOnActionFromConfiguredRegexPostProcessor.java | 4 +-
.../all/DescribedAsFromTypePostProcessor.java | 4 +-
...stProcessor.java => SanityChecksValidator.java} | 51 ++--
.../i18n/SynthesizeObjectNamingPostProcessor.java | 4 +-
.../all/i18n/TranslationPostProcessor.java | 4 +-
.../authorization/AuthorizationPostProcessor.java | 4 +-
...ynthesizeDomainEventsForMixinPostProcessor.java | 4 +-
...NavigationFacetFromHiddenTypePostProcessor.java | 4 +-
.../object/ProjectionFacetsPostProcessor.java | 4 +-
.../param/ChoicesAndDefaultsPostProcessor.java | 4 +-
.../param/TypicalLengthFromTypePostProcessor.java | 4 +-
.../DisabledFromImmutablePostProcessor.java | 4 +-
.../core/metamodel/progmodel/ProgrammingModel.java | 29 +--
.../progmodel/ProgrammingModelAbstract.java | 14 +-
.../progmodel/ProgrammingModelInitFilter.java | 4 +-
.../ProgrammingModelInitFilterDefault.java | 4 +-
.../dflt/ProgrammingModelFacetsJava11.java | 15 +-
.../title/TitlesAndTranslationsValidator.java | 25 +-
.../core/metamodel/spec/feature/ObjectMember.java | 2 +
.../specloader/SpecificationLoaderDefault.java | 30 +--
.../specloader/{_Util.java => _LogUtil.java} | 2 +-
.../core/metamodel/specloader/_ValidateUtil.java | 125 ++++++++++
.../specloader/facetprocessor/FacetProcessor.java | 5 +-
.../specloader/postprocessor/PostProcessor.java | 69 ++----
.../specimpl/ObjectSpecificationAbstract.java | 123 +++++-----
.../specimpl/_MemberIdClashReporting.java | 89 +++++++
...rSortingUtils.java => _MemberSortingUtils.java} | 25 +-
.../specimpl/dflt/ObjectSpecificationDefault.java | 45 ++--
.../specloader/validator/MetaModelValidator.java | 91 +++++++-
.../validator/MetaModelValidatorAbstract.java | 13 ++
...ModelValidatorForAmbiguousMixinAnnotations.java | 45 ----
...etaModelValidatorForConflictingOptionality.java | 84 -------
.../validator/MetaModelVisitingValidator.java | 38 ---
.../MetaModelVisitingValidatorAbstract.java | 45 ----
.../validator/ValidationFailureUtils.java | 130 +++++++++++
.../specloader/validator/ValidationFailures.java | 15 +-
.../ordering/memberorder/DeweyOrderSetTest.java | 28 +--
.../specimpl/MixedInMemberNamingStrategyTest.java | 73 +++---
.../facets/TenantedAuthorizationPostProcessor.java | 4 +-
.../PdfJsViewerFacetFromAnnotationFactory.java | 6 +-
.../jdo/metamodel/JdoProgrammingModel.java | 4 +-
.../query/JdoQueryAnnotationFacetFactory.java | 5 +-
...ava => MetaModelValidatorForJdoqlAbstract.java} | 16 +-
...a => MetaModelValidatorForJdoqlFromClause.java} | 6 +-
...MetaModelValidatorForJdoqlVariablesClause.java} | 6 +-
...BigDecimalFromColumnAnnotationFacetFactory.java | 2 +-
.../MandatoryFromColumnAnnotationFacetFactory.java | 2 +-
...xLengthFromJdoColumnAnnotationFacetFactory.java | 2 +-
.../DomainModelTest_usingBadDomain.java | 30 ++-
.../testdomain/model/bad/InvalidMemberIdClash.java | 258 +++++++++++++++++++++
80 files changed, 1201 insertions(+), 762 deletions(-)
rename
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/postprocessors/{ObjectSpecificationPostProcessor.java
=> MetaModelPostProcessor.java} (79%)
rename
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/postprocessors/{ObjectSpecificationPostProcessorAbstract.java
=> MetaModelPostProcessorAbstract.java} (90%)
rename
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/postprocessors/all/{SanityChecksPostProcessor.java
=> SanityChecksValidator.java} (59%)
rename
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/{_Util.java
=> _LogUtil.java} (99%)
create mode 100644
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/_ValidateUtil.java
create mode 100644
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/_MemberIdClashReporting.java
rename
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/{MemberSortingUtils.java
=> _MemberSortingUtils.java} (92%)
delete mode 100644
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/validator/MetaModelValidatorForAmbiguousMixinAnnotations.java
delete mode 100644
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/validator/MetaModelValidatorForConflictingOptionality.java
delete mode 100644
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/validator/MetaModelVisitingValidator.java
delete mode 100644
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/validator/MetaModelVisitingValidatorAbstract.java
create mode 100644
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/validator/ValidationFailureUtils.java
rename
persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/query/{MetaModelVisitingValidatorForClauseAbstract.java
=> MetaModelValidatorForJdoqlAbstract.java} (90%)
rename
persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/query/{MetaModelVisitingValidatorForFromClause.java
=> MetaModelValidatorForJdoqlFromClause.java} (95%)
rename
persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/query/{MetaModelVisitingValidatorForVariablesClause.java
=> MetaModelValidatorForJdoqlVariablesClause.java} (93%)
create mode 100644
regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/bad/InvalidMemberIdClash.java
