You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by da...@apache.org on 2023/11/01 17:12:59 UTC
(causeway) 02/02: CAUSEWAY-3639: adds fix
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch CAUSEWAY-3639
in repository https://gitbox.apache.org/repos/asf/causeway.git
commit c01029e19f6de72ec6a8bc99a7aad9120e9ed04e
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Nov 1 15:48:26 2023 +0000
CAUSEWAY-3639: adds fix
---
.../object/domainobject/DomainObjectAnnotationFacetFactory.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
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 612a61c28e..525a842fef 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
@@ -21,6 +21,7 @@ package org.apache.causeway.core.metamodel.facets.object.domainobject;
import java.lang.reflect.Modifier;
import java.util.List;
import java.util.Optional;
+import java.util.Set;
import java.util.stream.Collectors;
import javax.inject.Inject;
@@ -560,8 +561,8 @@ implements
.addValidator(
new MetaModelValidatorAbstract(getMetaModelContext(), spec->!spec.isAbstract()){
- final _Multimaps.ListMultimap<String, ObjectSpecification> specsByLogicalTypeName =
- _Multimaps.newConcurrentListMultimap();
+ final _Multimaps.SetMultimap<String, ObjectSpecification> specsByLogicalTypeName =
+ _Multimaps.newConcurrentSetMultimap();
@Override
public void validateObjectEnter(final ObjectSpecification objSpec) {
@@ -614,11 +615,11 @@ implements
return true;
}
- private boolean isObjectTypeCollision(final List<ObjectSpecification> specs) {
+ private boolean isObjectTypeCollision(final Set<ObjectSpecification> specs) {
return specs.size()>1;
}
- private String asCsv(final List<ObjectSpecification> specList) {
+ private String asCsv(final Set<ObjectSpecification> specList) {
return stream(specList)
.map(ObjectSpecification::getFullIdentifier)
.sorted()