You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2020/01/09 18:25:45 UTC
[isis] 06/11: ISIS-2250: and special case for Vector also (legacy
collection class).
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit d17d15dc8680685b90b8351969073974eb6b2ce4
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Jan 9 15:58:11 2020 +0000
ISIS-2250: and special case for Vector also (legacy collection class).
---
.../classname/ObjectSpecIdFacetDerivedFromClassNameFactory.java | 5 +++--
.../services/classsubstitutor/ClassSubstitutorForCollections.java | 5 +++++
.../ObjectSpecIdFacetDerivedFromClassNameFactoryTest.java | 2 +-
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/objectspecid/classname/ObjectSpecIdFacetDerivedFromClassNameFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/objectspecid/classname/ObjectSpecIdFacetDerivedFromClassNameFactory.java
index 9807ab2..03efdc8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/objectspecid/classname/ObjectSpecIdFacetDerivedFromClassNameFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/objectspecid/classname/ObjectSpecIdFacetDerivedFromClassNameFactory.java
@@ -50,13 +50,14 @@ extends FacetFactoryAbstract
implements MetaModelRefiner, ObjectSpecIdFacetFactory {
@Inject
- private ClassSubstitutorRegistry classSubstitutorRegistry;
+ private ClassSubstitutorRegistry classSubstitutorRegistry =
+ // default for testing purposes only, overwritten in prod
+ new ClassSubstitutorRegistry(Collections.singletonList( new ClassSubstitutorDefault()));
public ObjectSpecIdFacetDerivedFromClassNameFactory() {
super(FeatureType.OBJECTS_ONLY);
}
- // default for testing purposes only, overwritten in prod
public ObjectSpecIdFacetDerivedFromClassNameFactory(ClassSubstitutorRegistry classSubstitutorRegistry) {
this();
this.classSubstitutorRegistry = classSubstitutorRegistry;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/classsubstitutor/ClassSubstitutorForCollections.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/classsubstitutor/ClassSubstitutorForCollections.java
index 209041e..be9b7d2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/classsubstitutor/ClassSubstitutorForCollections.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/classsubstitutor/ClassSubstitutorForCollections.java
@@ -23,6 +23,7 @@ import java.util.Collection;
import java.util.List;
import java.util.Set;
import java.util.SortedSet;
+import java.util.Vector;
import javax.inject.Named;
@@ -44,6 +45,10 @@ public class ClassSubstitutorForCollections implements ClassSubstitutor {
if(FreeStandingList.class.isAssignableFrom(cls)) {
return FreeStandingList.class;
}
+ // legacy
+ if(Vector.class.isAssignableFrom(cls)) {
+ return Vector.class;
+ }
if(List.class.isAssignableFrom(cls)) {
return List.class;
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/objectspecid/ObjectSpecIdFacetDerivedFromClassNameFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/objectspecid/ObjectSpecIdFacetDerivedFromClassNameFactoryTest.java
index 3a9c54d..aece70e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/objectspecid/ObjectSpecIdFacetDerivedFromClassNameFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/objectspecid/ObjectSpecIdFacetDerivedFromClassNameFactoryTest.java
@@ -44,7 +44,7 @@ public class ObjectSpecIdFacetDerivedFromClassNameFactoryTest extends AbstractFa
@Before
public void setUp() throws Exception {
- facetFactory = new ObjectSpecIdFacetDerivedFromClassNameFactory(new ClassSubstitutorRegistry(Collections.singletonList( new ClassSubstitutorDefault())));
+ facetFactory = new ObjectSpecIdFacetDerivedFromClassNameFactory();
}
public static class Customer {