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 2014/10/30 14:59:22 UTC
[6/8] git commit: ISIS-939: pruning defunct uses of
CollectionTypeRegistry and other subcomponents.
ISIS-939: pruning defunct uses of CollectionTypeRegistry and other subcomponents.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/989d6587
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/989d6587
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/989d6587
Branch: refs/heads/master
Commit: 989d6587231e76649a91aa468bd49fb481f4bf55
Parents: 06929ab
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Oct 29 08:51:40 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Oct 29 08:51:40 2014 +0000
----------------------------------------------------------------------
...tSpecIdFacetDerivedFromClassNameFactory.java | 2 +-
.../spec/feature/ObjectMemberContext.java | 7 --
.../specloader/ObjectReflectorDefault.java | 2 -
.../CollectionTypeRegistry.java | 2 +-
.../facetprocessor/FacetProcessor.java | 15 +----
.../specimpl/FacetedMethodsBuilder.java | 6 +-
.../specimpl/ObjectMemberAbstract.java | 4 +-
.../dflt/ObjectSpecificationDefault.java | 1 +
.../JdoDiscriminatorAnnotationFacetFactory.java | 2 +-
.../metamodel/app/IsisMetaModelTest_init.java | 7 --
.../metamodel/facets/ProgrammableReflector.java | 19 ------
.../ClassSubstitutorTest_getClass.java | 66 +++++++++++++++++++
.../ClassSubstitutor_getClass.java | 67 --------------------
.../PersistenceSessionObjectStoreTest.java | 2 -
.../runtime/system/ObjectActionImplTest.java | 2 -
.../system/OneToManyAssociationImplTest.java | 16 ++---
16 files changed, 83 insertions(+), 137 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/989d6587/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/classname/ObjectSpecIdFacetDerivedFromClassNameFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/classname/ObjectSpecIdFacetDerivedFromClassNameFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/classname/ObjectSpecIdFacetDerivedFromClassNameFactory.java
index 31401ac..477887d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/classname/ObjectSpecIdFacetDerivedFromClassNameFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/classname/ObjectSpecIdFacetDerivedFromClassNameFactory.java
@@ -28,7 +28,7 @@ import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitut
public class ObjectSpecIdFacetDerivedFromClassNameFactory extends FacetFactoryAbstract {
- private ClassSubstitutor classSubstitutor = new ClassSubstitutor();
+ private final ClassSubstitutor classSubstitutor = new ClassSubstitutor();
public ObjectSpecIdFacetDerivedFromClassNameFactory() {
super(FeatureType.OBJECTS_ONLY);
http://git-wip-us.apache.org/repos/asf/isis/blob/989d6587/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMemberContext.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMemberContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMemberContext.java
index b26f81c..3807e04 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMemberContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMemberContext.java
@@ -22,7 +22,6 @@ import org.apache.isis.core.metamodel.adapter.ServicesProvider;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.spec.SpecificationLoader;
-import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
public class ObjectMemberContext {
@@ -33,8 +32,6 @@ public class ObjectMemberContext {
private final QuerySubmitter querySubmitter;
private final ServicesProvider servicesProvider;
- private final CollectionTypeRegistry collectionTypeRegistry = new CollectionTypeRegistry();
-
public ObjectMemberContext(
final DeploymentCategory deploymentCategory,
final AuthenticationSessionProvider authenticationSessionProvider,
@@ -75,8 +72,4 @@ public class ObjectMemberContext {
public QuerySubmitter getQuerySubmitter() {
return querySubmitter;
}
-
- public CollectionTypeRegistry getCollectionTypeRegistry() {
- return collectionTypeRegistry;
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/989d6587/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java
index 02a6ca1..8634828 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java
@@ -51,7 +51,6 @@ import org.apache.isis.core.metamodel.runtimecontext.noruntime.RuntimeContextNoR
import org.apache.isis.core.metamodel.spec.*;
import org.apache.isis.core.metamodel.spec.feature.ObjectMemberContext;
import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutor;
-import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
import org.apache.isis.core.metamodel.specloader.facetprocessor.FacetProcessor;
import org.apache.isis.core.metamodel.specloader.specimpl.CreateObjectContext;
import org.apache.isis.core.metamodel.specloader.specimpl.FacetedMethodsBuilderContext;
@@ -102,7 +101,6 @@ public final class ObjectReflectorDefault implements SpecificationLoaderSpi, App
private final static Logger LOG = LoggerFactory.getLogger(ObjectReflectorDefault.class);
private final ClassSubstitutor classSubstitutor = new ClassSubstitutor();
- private final CollectionTypeRegistry collectionTypeRegistry = new CollectionTypeRegistry();
/**
* Injected in the constructor.
http://git-wip-us.apache.org/repos/asf/isis/blob/989d6587/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/collectiontyperegistry/CollectionTypeRegistry.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/collectiontyperegistry/CollectionTypeRegistry.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/collectiontyperegistry/CollectionTypeRegistry.java
index 1ba859e..b3d953f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/collectiontyperegistry/CollectionTypeRegistry.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/collectiontyperegistry/CollectionTypeRegistry.java
@@ -36,7 +36,7 @@ import org.apache.isis.core.metamodel.spec.feature.OneToManyFeature.CollectionSe
*/
public class CollectionTypeRegistry {
- private final List<Class<?>> collectionTypes = new ArrayList<Class<?>>();
+ private final List<Class<?>> collectionTypes = new ArrayList<>();
private Class<?>[] collectionTypesAsArray = new Class[0];
/**
http://git-wip-us.apache.org/repos/asf/isis/blob/989d6587/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/facetprocessor/FacetProcessor.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/facetprocessor/FacetProcessor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/facetprocessor/FacetProcessor.java
index d23f12b..469aba7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/facetprocessor/FacetProcessor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/facetprocessor/FacetProcessor.java
@@ -44,8 +44,6 @@ import static org.hamcrest.CoreMatchers.notNullValue;
public class FacetProcessor implements RuntimeContextAware {
- private final CollectionTypeRegistry collectionTypeRegistry = new CollectionTypeRegistry();
-
private final IsisConfiguration configuration;
private final ProgrammingModel programmingModel;
@@ -459,21 +457,13 @@ public class FacetProcessor implements RuntimeContextAware {
return methodRemover != null ? methodRemover : MethodRemoverConstants.NULL;
}
- // ////////////////////////////////////////////////////////////////////
- // Dependencies (injected in constructor)
- // ////////////////////////////////////////////////////////////////////
+
+ //region > dependencies
private IsisConfiguration getIsisConfiguration() {
return configuration;
}
- private CollectionTypeRegistry getCollectionTypeRepository() {
- return collectionTypeRegistry;
- }
-
- // ////////////////////////////////////////////////////////////////////
- // Dependencies (injected via setter due to *Aware)
- // ////////////////////////////////////////////////////////////////////
private RuntimeContext getRuntimeContext() {
return runtimeContext;
@@ -489,5 +479,6 @@ public class FacetProcessor implements RuntimeContextAware {
this.runtimeContext = runtimeContext;
}
+ //endregion
}
http://git-wip-us.apache.org/repos/asf/isis/blob/989d6587/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/FacetedMethodsBuilder.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
index 20bc08b..7dc0a0e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
@@ -191,12 +191,10 @@ public class FacetedMethodsBuilder {
if (facetsFacet != null) {
final Class<? extends FacetFactory>[] facetFactories = facetsFacet.facetFactories();
for (final Class<? extends FacetFactory> facetFactorie : facetFactories) {
- FacetFactory facetFactory = null;
+ FacetFactory facetFactory;
try {
facetFactory = facetFactorie.newInstance();
- } catch (final InstantiationException e) {
- throw new IsisException(e);
- } catch (final IllegalAccessException e) {
+ } catch (final InstantiationException | IllegalAccessException e) {
throw new IsisException(e);
}
getFacetProcessor().injectDependenciesInto(facetFactory);
http://git-wip-us.apache.org/repos/asf/isis/blob/989d6587/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java
index 6b4f183..ca267dd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java
@@ -56,6 +56,8 @@ public abstract class ObjectMemberAbstract implements ObjectMember {
return type == null ? null : specificationLookup.loadSpecification(type);
}
+ private final CollectionTypeRegistry collectionTypeRegistry = new CollectionTypeRegistry();
+
protected final String defaultName;
private final String id;
private final FacetedMethod facetedMethod;
@@ -65,7 +67,6 @@ public abstract class ObjectMemberAbstract implements ObjectMember {
private final AdapterManager adapterManager;
private final ServicesProvider servicesProvider;
private final QuerySubmitter querySubmitter;
- private final CollectionTypeRegistry collectionTypeRegistry;
private final DeploymentCategory deploymentCategory;
protected ObjectMemberAbstract(final FacetedMethod facetedMethod, final FeatureType featureType, final ObjectMemberContext objectMemberContext) {
@@ -84,7 +85,6 @@ public abstract class ObjectMemberAbstract implements ObjectMember {
this.adapterManager = objectMemberContext.getAdapterManager();
this.servicesProvider = objectMemberContext.getServicesProvider();
this.querySubmitter = objectMemberContext.getQuerySubmitter();
- this.collectionTypeRegistry = objectMemberContext.getCollectionTypeRegistry();
}
// /////////////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/isis/blob/989d6587/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
index 94fbfff..e0d90bb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
@@ -61,6 +61,7 @@ import org.apache.isis.core.metamodel.specloader.specimpl.*;
public class ObjectSpecificationDefault extends ObjectSpecificationAbstract implements DebuggableWithTitle, FacetHolder {
private final static Logger LOG = LoggerFactory.getLogger(ObjectSpecificationDefault.class);
+
private final ClassSubstitutor classSubstitutor = new ClassSubstitutor();
private static String determineShortName(final Class<?> introspectedClass) {
http://git-wip-us.apache.org/repos/asf/isis/blob/989d6587/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/discriminator/JdoDiscriminatorAnnotationFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/discriminator/JdoDiscriminatorAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/discriminator/JdoDiscriminatorAnnotationFacetFactory.java
index bde6dc9..a179e19 100644
--- a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/discriminator/JdoDiscriminatorAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/discriminator/JdoDiscriminatorAnnotationFacetFactory.java
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitut
public class JdoDiscriminatorAnnotationFacetFactory extends FacetFactoryAbstract {
- private ClassSubstitutor classSubstitutor = new ClassSubstitutor();
+ private final ClassSubstitutor classSubstitutor = new ClassSubstitutor();
public JdoDiscriminatorAnnotationFacetFactory() {
super(FeatureType.OBJECTS_ONLY);
http://git-wip-us.apache.org/repos/asf/isis/blob/989d6587/core/metamodel/src/test/java/org/apache/isis/core/metamodel/app/IsisMetaModelTest_init.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/app/IsisMetaModelTest_init.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/app/IsisMetaModelTest_init.java
index 2f8b97d..fb3ba4c 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/app/IsisMetaModelTest_init.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/app/IsisMetaModelTest_init.java
@@ -39,8 +39,6 @@ import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.spec.ObjectInstantiator;
import org.apache.isis.core.metamodel.spec.SpecificationLoader;
-import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutor;
-import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
import org.apache.isis.core.unittestsupport.jmocking.IsisActions;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
@@ -71,19 +69,14 @@ public class IsisMetaModelTest_init {
@Mock
private FacetDecorator mockFacetDecorator;
@Mock
- private CollectionTypeRegistry mockCollectionTypeRegistry;
- @Mock
private RuntimeContext mockRuntimeContext;
- private ClassSubstitutor classSubstitutor;
-
private IsisMetaModel metaModel;
@Before
public void setUp() {
expectingMetaModelToBeInitialized();
metaModel = new IsisMetaModel(mockRuntimeContext, mockProgrammingModelFacets);
- classSubstitutor = new ClassSubstitutor();
}
private void expectingMetaModelToBeInitialized() {
http://git-wip-us.apache.org/repos/asf/isis/blob/989d6587/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ProgrammableReflector.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ProgrammableReflector.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ProgrammableReflector.java
index 4476261..3222efb 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ProgrammableReflector.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ProgrammableReflector.java
@@ -33,7 +33,6 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.SpecificationLoaderAbstract;
import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
-import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
import org.apache.isis.core.metamodel.specloader.validator.ValidationFailures;
public class ProgrammableReflector extends SpecificationLoaderAbstract implements SpecificationLoaderSpi, ApplicationScopedComponent, RuntimeContextAware {
@@ -42,30 +41,13 @@ public class ProgrammableReflector extends SpecificationLoaderAbstract implement
public void init() {
}
- public void installServiceSpecification(final Class<?> cls) {
- }
-
private Collection<ObjectSpecification> allSpecificationsReturn;
- public void setAllSpecificationsReturn(final Collection<ObjectSpecification> allSpecificationsReturn) {
- this.allSpecificationsReturn = allSpecificationsReturn;
- }
-
@Override
public Collection<ObjectSpecification> allSpecifications() {
return allSpecificationsReturn;
}
- private CollectionTypeRegistry getCollectionTypeRegistryReturn;
-
- public void setGetCollectionTypeRegistryReturn(final CollectionTypeRegistry getCollectionTypeRegistryReturn) {
- this.getCollectionTypeRegistryReturn = getCollectionTypeRegistryReturn;
- }
-
- public CollectionTypeRegistry getCollectionTypeRegistry() {
- return getCollectionTypeRegistryReturn;
- }
-
@Override
public ObjectSpecification loadSpecification(final Class<?> type) {
return loadSpecification(type.getName());
@@ -86,7 +68,6 @@ public class ProgrammableReflector extends SpecificationLoaderAbstract implement
public void shutdown() {
}
-
@Override
public boolean loaded(final Class<?> cls) {
throw new NotYetImplementedException();
http://git-wip-us.apache.org/repos/asf/isis/blob/989d6587/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutorTest_getClass.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutorTest_getClass.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutorTest_getClass.java
new file mode 100644
index 0000000..7852bfe
--- /dev/null
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutorTest_getClass.java
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.isis.core.metamodel.specloader.classsubstitutor;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class ClassSubstitutorTest_getClass {
+
+ private ClassSubstitutor classSubstitutor;
+
+ @Before
+ public void setUp() throws Exception {
+ classSubstitutor = new ClassSubstitutor();
+ }
+
+ public static class SomeDomainObject {
+
+ public static enum SomeEnum {
+ Foo {
+ @Override
+ public void x() {
+ }
+ };
+ public abstract void x();
+ }
+ }
+
+ @Test
+ public void regularDomainObject() throws Exception {
+ Class<?> cls = classSubstitutor.getClass(SomeDomainObject.class);
+ assertEquals(SomeDomainObject.class, cls);
+ }
+
+ @Test
+ public void someEnum() throws Exception {
+ Class<?> cls = classSubstitutor.getClass(SomeDomainObject.SomeEnum.class);
+ assertEquals(SomeDomainObject.SomeEnum.class, cls);
+ }
+
+ @Test
+ public void someAnonymousSubtypeOfEnum() throws Exception {
+ Class<?> cls = classSubstitutor.getClass(SomeDomainObject.SomeEnum.Foo.getClass());
+ assertEquals(SomeDomainObject.SomeEnum.class, cls);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/989d6587/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutor_getClass.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutor_getClass.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutor_getClass.java
deleted file mode 100644
index 016a61c..0000000
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutor_getClass.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.metamodel.specloader.classsubstitutor;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-
-public class ClassSubstitutor_getClass {
-
- private ClassSubstitutor classSubstitutor;
-
- @Before
- public void setUp() throws Exception {
- classSubstitutor = new ClassSubstitutor();
- }
-
- public static class SomeDomainObject {
-
- public static enum SomeEnum {
- Foo {
- @Override
- public void x() {
- }
- };
- public abstract void x();
- }
- }
-
- @Test
- public void regularDomainObject() throws Exception {
- Class<?> cls = classSubstitutor.getClass(SomeDomainObject.class);
- assertEquals(SomeDomainObject.class, cls);
- }
-
- @Test
- public void someEnum() throws Exception {
- Class<?> cls = classSubstitutor.getClass(SomeDomainObject.SomeEnum.class);
- assertEquals(SomeDomainObject.SomeEnum.class, cls);
- }
-
- @Test
- public void someAnonymousSubtypeOfEnum() throws Exception {
- Class<?> cls = classSubstitutor.getClass(SomeDomainObject.SomeEnum.Foo.getClass());
- assertEquals(SomeDomainObject.SomeEnum.class, cls);
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/989d6587/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/PersistenceSessionObjectStoreTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/PersistenceSessionObjectStoreTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/PersistenceSessionObjectStoreTest.java
index 9086dbb..448fa19 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/PersistenceSessionObjectStoreTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/PersistenceSessionObjectStoreTest.java
@@ -81,8 +81,6 @@ public class PersistenceSessionObjectStoreTest {
@Mock
private ObjectStoreSpi mockObjectStore;
@Mock
- private ObjectFactory objectFactory;
- @Mock
private PersistAlgorithm mockPersistAlgorithm;
@Mock
private AuditingService3 mockAuditingService3;
http://git-wip-us.apache.org/repos/asf/isis/blob/989d6587/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionImplTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionImplTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionImplTest.java
index efb8aa6..ba3e31c 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionImplTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionImplTest.java
@@ -64,8 +64,6 @@ public class ObjectActionImplTest {
private ServicesProvider mockServicesProvider;
@Mock
private QuerySubmitter mockQuerySubmitter;
- @Mock
- private CollectionTypeRegistry mockCollectionTypeRegistry;
@Before
public void setUp() throws Exception {
http://git-wip-us.apache.org/repos/asf/isis/blob/989d6587/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationImplTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationImplTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationImplTest.java
index 174103d..c2268d2 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationImplTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationImplTest.java
@@ -19,16 +19,11 @@
package org.apache.isis.core.runtime.system;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
-
import org.jmock.Expectations;
import org.jmock.auto.Mock;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-
import org.apache.isis.applib.Identifier;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -37,18 +32,21 @@ import org.apache.isis.core.metamodel.adapter.ServicesProvider;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.facets.FacetedMethod;
-import org.apache.isis.core.metamodel.facets.collections.modify.CollectionAddToFacet;
import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionAddToFacet;
import org.apache.isis.core.metamodel.facets.propcoll.notpersisted.NotPersistedFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.metamodel.spec.feature.ObjectMemberContext;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
-import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
import org.apache.isis.core.metamodel.specloader.specimpl.OneToManyAssociationImpl;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+
public class OneToManyAssociationImplTest {
private static final String COLLECTION_ID = "orders";
@@ -84,9 +82,7 @@ public class OneToManyAssociationImplTest {
private ServicesProvider mockServicesProvider;
@Mock
private CollectionAddToFacet mockCollectionAddToFacet;
- @Mock
- private CollectionTypeRegistry mockCollectionTypeRegistry;
-
+
private OneToManyAssociation association;
@Before