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 2018/12/17 22:32:01 UTC
[isis] 01/02: ISIS-2050: load specs only to TYPE (not MEMBERS)
everywhere; only adds described as facet (derived from type) if is do-op.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2050
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 27bd4d36a78b886dcd2387e7d6d07e19122365ec
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Dec 17 19:29:10 2018 +0000
ISIS-2050: load specs only to TYPE (not MEMBERS) everywhere; only adds described as facet (derived from type) if is do-op.
---
.../facets/SingleClassValueFacetAbstract.java | 2 +-
.../actions/layout/ActionLayoutFacetFactory.java | 4 ++--
...butedFacetDerivedFromDomainServiceFacetFactory.java | 2 +-
...otContributedFacetDerivedFromMixinFacetFactory.java | 2 +-
...eMenuFacetDerivedFromDomainServiceFacetFactory.java | 2 +-
.../CollectionAccessorFacetViaAccessorFactory.java | 2 +-
.../collection/CollectionAnnotationFacetFactory.java | 2 +-
...edFacetOnCollectionDerivedFromImmutableFactory.java | 2 +-
.../method/DisabledObjectFacetViaMethodFactory.java | 2 +-
.../method/HiddenObjectFacetViaMethodFactory.java | 3 +--
.../CopyImmutableFacetOntoMembersFactory.java | 2 +-
...etOnCollectionDerivedFromViewModelFacetFactory.java | 3 +--
...opertyDerivedFromRecreatableObjectFacetFactory.java | 3 +--
...ableObjectFacetDeclarativeInitializingAbstract.java | 4 ++--
.../vsp/ValueSemanticsProviderAndFacetAbstract.java | 4 ++--
.../ActionParameterAutoCompleteFacetAbstract.java | 2 +-
.../choices/ActionParameterChoicesFacetAbstract.java | 2 +-
...eterChoicesFacetDerivedFromChoicesFacetFactory.java | 2 +-
.../choices/method/ActionChoicesFacetViaMethod.java | 2 +-
...ionParameterDefaultFacetDerivedFromTypeFactory.java | 2 +-
...nParameterAnnotationElseDerivedFromTypeFactory.java | 2 +-
...gthFacetOnParameterDerivedFromTypeFacetFactory.java | 2 +-
.../MaskFacetOnParameterAnnotationFactory.java | 7 +++----
.../PropertyOrCollectionAccessorFacetAbstract.java | 2 +-
.../PropertyAccessorFacetViaAccessorFactory.java | 2 +-
.../method/PropertyAutoCompleteFacetMethod.java | 2 +-
.../PropertyChoicesFacetDerivedFromChoicesFacet.java | 3 +--
...ertyChoicesFacetDerivedFromChoicesFacetFactory.java | 2 +-
.../choices/method/PropertyChoicesFacetViaMethod.java | 2 +-
.../PropertyDefaultFacetDerivedFromTypeFactory.java | 2 +-
.../defaults/method/PropertyDefaultFacetViaMethod.java | 2 +-
...bledFacetOnPropertyDerivedFromImmutableFactory.java | 2 +-
.../property/PropertyAnnotationFacetFactory.java | 2 +-
...ngthFacetOnPropertyDerivedFromTypeFacetFactory.java | 2 +-
.../MaskFacetOnPropertyAnnotationFactory.java | 7 +++----
.../param/DeriveFacetsPostProcessor.java | 8 ++------
.../appfeat/ApplicationFeatureRepositoryDefault.java | 2 +-
.../container/DomainObjectContainerDefault.java | 3 +--
.../factory/FactoryServiceInternalDefault.java | 5 ++---
.../services/grid/GridSystemServiceAbstract.java | 6 ++----
.../services/grid/bootstrap3/GridSystemServiceBS3.java | 6 ++----
.../services/layout/LayoutServiceDefault.java | 3 +--
.../services/metamodel/MetaModelServiceDefault.java | 7 +++----
.../core/metamodel/specloader/SpecificationLoader.java | 7 +++++--
.../specloader/specimpl/FacetedMethodsBuilder.java | 5 ++---
.../specloader/specimpl/ObjectActionDefault.java | 4 ++--
.../specloader/specimpl/ObjectActionMixedIn.java | 2 +-
.../specimpl/ObjectActionParameterAbstract.java | 10 +++++-----
.../specloader/specimpl/ObjectMemberAbstract.java | 10 +++++-----
.../specimpl/OneToManyAssociationContributee.java | 2 +-
.../specimpl/OneToManyAssociationMixedIn.java | 4 ++--
.../specimpl/OneToOneAssociationMixedIn.java | 2 +-
.../facets/object/query/VisitorForFromClause.java | 2 +-
.../facets/object/query/VisitorForVariablesClause.java | 2 +-
.../metamodel/facets/AbstractFacetFactoryTest.java | 2 +-
.../action/ActionAnnotationFacetFactoryTest.java | 4 ++--
.../ActionLayoutAnnotationFacetFactoryJunit4Test.java | 18 +++++++++---------
...ctionLayoutXmlLayoutAnnotationFacetFactoryTest.java | 8 ++++----
...dFacetDerivedFromDomainServiceFacetFactoryTest.java | 10 +++++-----
...uFacetDerivedFromDomainServiceFacetFactoryTest.java | 10 +++++-----
.../CollectionAnnotationFacetFactoryTest.java | 4 ++--
.../parameter/ParameterAnnotationFacetFactoryTest.java | 4 ++--
.../property/PropertyAnnotationFacetFactoryTest.java | 4 ++--
.../specloader/ObjectReflectorDefaultTest_object.java | 4 ++--
.../ObjectFixtureFilePersistor.java | 2 +-
.../org/apache/isis/core/runtime/memento/Memento.java | 2 +-
.../isis/core/runtime/memento/StandaloneData.java | 2 +-
.../core/runtime/persistence/adapter/PojoAdapter.java | 2 +-
.../persistence/query/PersistenceQueryAbstract.java | 2 +-
.../services/background/BackgroundServiceDefault.java | 2 +-
.../command/CommandDtoServiceInternalDefault.java | 2 +-
.../PersistenceSessionServiceInternalDefault.java | 2 +-
.../persistence/DataNucleusApplicationComponents.java | 2 +-
.../system/persistence/PersistenceQueryFactory.java | 2 +-
.../runtime/system/persistence/PersistenceSession.java | 4 ++--
.../core/runtime/system/ObjectMemberAbstractTest.java | 2 +-
.../system/OneToManyAssociationDefaultTest.java | 2 +-
.../wicket/model/mementos/CollectionMemento.java | 2 +-
.../viewer/wicket/model/mementos/PropertyMemento.java | 2 +-
.../isis/viewer/wicket/model/mementos/SpecUtils.java | 2 +-
.../wicket/model/models/EntityCollectionModel.java | 4 ++--
.../handlers/DomainObjectInvocationHandler.java | 2 +-
.../WrapperFactoryDefaultTest_wrappedObject.java | 4 ++--
...pperFactoryDefaultTest_wrappedObject_transient.java | 2 +-
...application.services.homepage.HomePageViewModel.xml | 1 -
.../domainapp.modules.simple.dom.impl.SimpleObject.xml | 2 --
86 files changed, 139 insertions(+), 158 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleClassValueFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleClassValueFacetAbstract.java
index 8e18903..a8c744f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleClassValueFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleClassValueFacetAbstract.java
@@ -55,7 +55,7 @@ public abstract class SingleClassValueFacetAbstract extends FacetAbstract implem
public ObjectSpecification valueSpec() {
final Class<?> valueType = value();
return valueType != null ? getSpecificationLoader().loadSpecification(valueType,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED) : null;
+ IntrospectionState.TYPE_INTROSPECTED) : null;
}
private SpecificationLoader getSpecificationLoader() {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutFacetFactory.java
index 29c751a..294cbf2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutFacetFactory.java
@@ -141,10 +141,10 @@ public class ActionLayoutFacetFactory extends FacetFactoryAbstract implements Co
}
}
- protected boolean isContributingServiceOrMixinObject(final ProcessMethodContext processMethodContext) {
+ private boolean isContributingServiceOrMixinObject(final ProcessMethodContext processMethodContext) {
final Class<?> cls = processMethodContext.getCls();
final ObjectSpecification spec = getSpecificationLoader().loadSpecification(cls,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
return isContributingService(spec) || isMixinObject(spec);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacetFactory.java
index 5429da8..17fcd17 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacetFactory.java
@@ -40,7 +40,7 @@ public class NotContributedFacetDerivedFromDomainServiceFacetFactory extends Fac
final Method method = processMethodContext.getMethod();
final Class<?> declaringClass = method.getDeclaringClass();
final ObjectSpecification spec = getSpecificationLoader().loadSpecification(declaringClass,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
final DomainServiceFacet domainServiceFacet = spec.getFacet(DomainServiceFacet.class);
if(domainServiceFacet == null || domainServiceFacet.isNoop()) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromMixinFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromMixinFacetFactory.java
index 17bc77a..7e90fad 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromMixinFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromMixinFacetFactory.java
@@ -40,7 +40,7 @@ public class NotContributedFacetDerivedFromMixinFacetFactory extends FacetFactor
final Method method = processMethodContext.getMethod();
final Class<?> declaringClass = method.getDeclaringClass();
final ObjectSpecification spec = getSpecificationLoader().loadSpecification(declaringClass,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
final MixinFacet mixinFacet = spec.getFacet(MixinFacet.class);
if(mixinFacet == null || mixinFacet.isNoop()) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacetFactory.java
index bc48bce..3a7550a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacetFactory.java
@@ -41,7 +41,7 @@ public class NotInServiceMenuFacetDerivedFromDomainServiceFacetFactory extends F
final Method method = processMethodContext.getMethod();
final Class<?> declaringClass = method.getDeclaringClass();
final ObjectSpecification spec = getSpecificationLoader().loadSpecification(declaringClass,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
final DomainServiceFacet domainServiceFacet = spec.getFacet(DomainServiceFacet.class);
if(domainServiceFacet == null || domainServiceFacet.isNoop()) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/accessor/CollectionAccessorFacetViaAccessorFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/accessor/CollectionAccessorFacetViaAccessorFactory.java
index ea172ae..0624823 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/accessor/CollectionAccessorFacetViaAccessorFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/accessor/CollectionAccessorFacetViaAccessorFactory.java
@@ -56,7 +56,7 @@ public class CollectionAccessorFacetViaAccessorFactory
final Class<?> cls = processMethodContext.getCls();
final ObjectSpecification typeSpec = getSpecificationLoader().loadSpecification(cls,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
final FacetHolder holder = processMethodContext.getFacetHolder();
FacetUtil.addFacet(
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java
index 598ca29..44728ef 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java
@@ -111,7 +111,7 @@ public class CollectionAnnotationFacetFactory extends FacetFactoryAbstract imple
final Class<?> cls = processMethodContext.getCls();
final ObjectSpecification typeSpec = getSpecificationLoader().loadSpecification(cls,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
final FacetHolder holder = processMethodContext.getFacetHolder();
final PropertyOrCollectionAccessorFacet getterFacet = holder.getFacet(PropertyOrCollectionAccessorFacet.class);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/disabled/fromimmutable/DisabledFacetOnCollectionDerivedFromImmutableFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/disabled/fromimmutable/DisabledFacetOnCollectionDerivedFromImmutableFactory.java
index 1892323..9ce53fa 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/disabled/fromimmutable/DisabledFacetOnCollectionDerivedFromImmutableFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/disabled/fromimmutable/DisabledFacetOnCollectionDerivedFromImmutableFactory.java
@@ -37,7 +37,7 @@ public class DisabledFacetOnCollectionDerivedFromImmutableFactory extends FacetF
public void process(final ProcessMethodContext processMethodContext) {
final Class<?> declaringClass = processMethodContext.getMethod().getDeclaringClass();
final ObjectSpecification spec = getSpecificationLoader().loadSpecification(declaringClass,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
if (spec.containsDoOpFacet(ImmutableFacet.class)) {
final ImmutableFacet immutableFacet = spec.getFacet(ImmutableFacet.class);
final FacetedMethod facetHolder = processMethodContext.getFacetHolder();
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/disabled/method/DisabledObjectFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/disabled/method/DisabledObjectFacetViaMethodFactory.java
index 53111df..c77850e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/disabled/method/DisabledObjectFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/disabled/method/DisabledObjectFacetViaMethodFactory.java
@@ -86,7 +86,7 @@ public class DisabledObjectFacetViaMethodFactory extends MethodPrefixBasedFacetF
final FacetedMethod member = processMethodContext.getFacetHolder();
final Class<?> owningClass = processMethodContext.getCls();
final ObjectSpecification owningSpec = getSpecificationLoader().loadSpecification(owningClass,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
final DisabledObjectFacet facet = owningSpec.getFacet(DisabledObjectFacet.class);
if (facet != null) {
facet.copyOnto(member);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/hidden/method/HiddenObjectFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/hidden/method/HiddenObjectFacetViaMethodFactory.java
index 8da7493..f366272 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/hidden/method/HiddenObjectFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/hidden/method/HiddenObjectFacetViaMethodFactory.java
@@ -68,8 +68,7 @@ public class HiddenObjectFacetViaMethodFactory extends MethodPrefixBasedFacetFac
public void process(final ProcessMethodContext processMethodContext) {
final FacetedMethod member = processMethodContext.getFacetHolder();
final Class<?> owningClass = processMethodContext.getCls();
- final ObjectSpecification owningSpec = getSpecificationLoader().loadSpecification(owningClass,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ final ObjectSpecification owningSpec = getSpecificationLoader().loadSpecification(owningClass, IntrospectionState.TYPE_INTROSPECTED);
final HiddenObjectFacet facet = owningSpec.getFacet(HiddenObjectFacet.class);
if (facet != null) {
facet.copyOnto(member);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/immutableannot/CopyImmutableFacetOntoMembersFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/immutableannot/CopyImmutableFacetOntoMembersFactory.java
index c030b5a..5e52599 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/immutableannot/CopyImmutableFacetOntoMembersFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/immutableannot/CopyImmutableFacetOntoMembersFactory.java
@@ -37,7 +37,7 @@ public class CopyImmutableFacetOntoMembersFactory extends FacetFactoryAbstract {
final FacetedMethod member = processMethodContext.getFacetHolder();
final Class<?> owningClass = processMethodContext.getCls();
final ObjectSpecification owningSpec = getSpecificationLoader().loadSpecification(owningClass,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
final ImmutableFacet facet = owningSpec.getFacet(ImmutableFacet.class);
if (facet != null) {
facet.copyOnto(member);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/DisabledFacetOnCollectionDerivedFromViewModelFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/DisabledFacetOnCollectionDerivedFromViewModelFacetFactory.java
index 8aa6944..b5a7302 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/DisabledFacetOnCollectionDerivedFromViewModelFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/DisabledFacetOnCollectionDerivedFromViewModelFacetFactory.java
@@ -40,8 +40,7 @@ public class DisabledFacetOnCollectionDerivedFromViewModelFacetFactory extends F
public void process(final ProcessMethodContext processMethodContext) {
final Method method = processMethodContext.getMethod();
final Class<?> declaringClass = method.getDeclaringClass();
- final ObjectSpecification spec = getSpecificationLoader().loadSpecification(declaringClass,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ final ObjectSpecification spec = getSpecificationLoader().loadSpecification(declaringClass, IntrospectionState.TYPE_INTROSPECTED);
if (!spec.containsDoOpFacet(ViewModelFacet.class)) {
return;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/DisabledFacetOnPropertyDerivedFromRecreatableObjectFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/DisabledFacetOnPropertyDerivedFromRecreatableObjectFacetFactory.java
index b21341a..e2448f6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/DisabledFacetOnPropertyDerivedFromRecreatableObjectFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/DisabledFacetOnPropertyDerivedFromRecreatableObjectFacetFactory.java
@@ -39,8 +39,7 @@ public class DisabledFacetOnPropertyDerivedFromRecreatableObjectFacetFactory ext
public void process(final ProcessMethodContext processMethodContext) {
final Method method = processMethodContext.getMethod();
final Class<?> declaringClass = method.getDeclaringClass();
- final ObjectSpecification spec = getSpecificationLoader().loadSpecification(declaringClass,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ final ObjectSpecification spec = getSpecificationLoader().loadSpecification(declaringClass, IntrospectionState.TYPE_INTROSPECTED);
if (!spec.containsDoOpFacet(ViewModelFacet.class)) {
return;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetDeclarativeInitializingAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetDeclarativeInitializingAbstract.java
index b6da00c..62b7de8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetDeclarativeInitializingAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetDeclarativeInitializingAbstract.java
@@ -75,7 +75,7 @@ public abstract class RecreatableObjectFacetDeclarativeInitializingAbstract exte
ObjectAdapter viewModelAdapter = adapterManager.getAdapterFor(viewModelPojo);
if(viewModelAdapter == null) {
final ObjectSpecification objectSpecification = specificationLoader.loadSpecification(viewModelPojo.getClass(),
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
final ObjectSpecId objectSpecId = objectSpecification.getSpecId();
viewModelAdapter = adapterManager.mapRecreatedPojo(new RootOid(objectSpecId, mementoStr, Oid.State.VIEWMODEL), viewModelPojo);
}
@@ -118,7 +118,7 @@ public abstract class RecreatableObjectFacetDeclarativeInitializingAbstract exte
ObjectAdapter viewModelAdapter = adapterManager.getAdapterFor(viewModelPojo);
if(viewModelAdapter == null) {
final ObjectSpecification objectSpecification = specificationLoader.loadSpecification(viewModelPojo.getClass(),
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
final ObjectSpecId objectSpecId = objectSpecification.getSpecId();
viewModelAdapter = adapterManager.mapRecreatedPojo(RootOid.create(objectSpecId, UUID.randomUUID().toString()), viewModelPojo);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderAndFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderAndFacetAbstract.java
index 9f81dc3..c1fa121 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderAndFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderAndFacetAbstract.java
@@ -107,7 +107,7 @@ public abstract class ValueSemanticsProviderAndFacetAbstract<T> extends FacetAbs
public ObjectSpecification getSpecification() {
if (specification == null) {
specification = getSpecificationLoader().loadSpecification(getAdaptedClass(),
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
}
return specification;
}
@@ -314,7 +314,7 @@ public abstract class ValueSemanticsProviderAndFacetAbstract<T> extends FacetAbs
protected ObjectAdapter createAdapter(final Class<?> type, final Object object) {
final ObjectSpecification specification = getSpecificationLoader().loadSpecification(type,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
if (specification.isNotCollection()) {
return getAdapterManager().adapterFor(object);
} else {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/autocomplete/ActionParameterAutoCompleteFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/autocomplete/ActionParameterAutoCompleteFacetAbstract.java
index 2b226a0..d0eb0e9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/autocomplete/ActionParameterAutoCompleteFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/autocomplete/ActionParameterAutoCompleteFacetAbstract.java
@@ -55,7 +55,7 @@ public abstract class ActionParameterAutoCompleteFacetAbstract extends FacetAbst
}
protected ObjectSpecification getSpecification(final Class<?> type) {
- return type != null ? getSpecificationLoader().loadSpecification(type, IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED) : null;
+ return type != null ? getSpecificationLoader().loadSpecification(type, IntrospectionState.TYPE_INTROSPECTED) : null;
}
@Override
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/ActionParameterChoicesFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/ActionParameterChoicesFacetAbstract.java
index 863bde8..9f465b9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/ActionParameterChoicesFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/ActionParameterChoicesFacetAbstract.java
@@ -55,7 +55,7 @@ public abstract class ActionParameterChoicesFacetAbstract extends FacetAbstract
}
protected ObjectSpecification getSpecification(final Class<?> type) {
- return type != null ? getSpecificationLoader().loadSpecification(type, IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED) : null;
+ return type != null ? getSpecificationLoader().loadSpecification(type, IntrospectionState.TYPE_INTROSPECTED) : null;
}
// /////////////////////////////////////////////////////////
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/enums/ActionParameterChoicesFacetDerivedFromChoicesFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/enums/ActionParameterChoicesFacetDerivedFromChoicesFacetFactory.java
index a67f6d8..61b4f80 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/enums/ActionParameterChoicesFacetDerivedFromChoicesFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/enums/ActionParameterChoicesFacetDerivedFromChoicesFacetFactory.java
@@ -39,7 +39,7 @@ public class ActionParameterChoicesFacetDerivedFromChoicesFacetFactory extends F
public void processParams(final ProcessParameterContext processParameterContext) {
final Class<?> paramType = processParameterContext.getMethod().getParameterTypes()[processParameterContext.getParamNum()];
- if(!getSpecificationLoader().loadSpecification(paramType, IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED).containsDoOpFacet(ChoicesFacet.class)) {
+ if(!getSpecificationLoader().loadSpecification(paramType, IntrospectionState.TYPE_INTROSPECTED).containsDoOpFacet(ChoicesFacet.class)) {
return;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/method/ActionChoicesFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/method/ActionChoicesFacetViaMethod.java
index f077dee..fd01dfe 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/method/ActionChoicesFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/method/ActionChoicesFacetViaMethod.java
@@ -133,7 +133,7 @@ public class ActionChoicesFacetViaMethod extends ActionChoicesFacetAbstract impl
}
protected ObjectSpecification getSpecification(final Class<?> type) {
- return type != null ? getSpecificationLoader().loadSpecification(type, IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED) : null;
+ return type != null ? getSpecificationLoader().loadSpecification(type, IntrospectionState.TYPE_INTROSPECTED) : null;
}
// ///////////////////////////////////////////////////////
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/defaults/fromtype/ActionParameterDefaultFacetDerivedFromTypeFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/defaults/fromtype/ActionParameterDefaultFacetDerivedFromTypeFactory.java
index 6daf178..fb73fbc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/defaults/fromtype/ActionParameterDefaultFacetDerivedFromTypeFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/defaults/fromtype/ActionParameterDefaultFacetDerivedFromTypeFactory.java
@@ -60,7 +60,7 @@ public class ActionParameterDefaultFacetDerivedFromTypeFactory extends FacetFact
private DefaultedFacet getDefaultedFacet(final Class<?> paramType) {
final ObjectSpecification paramTypeSpec = getSpecificationLoader().loadSpecification(paramType,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
return paramTypeSpec.getFacet(DefaultedFacet.class);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/describedas/annotderived/DescribedAsFacetOnParameterAnnotationElseDerivedFromTypeFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/describedas/annotderived/DescribedAsFacetOnParameterAnnotationElseDerivedFromTypeFactory.java
index c0abdcf..e3353e8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/describedas/annotderived/DescribedAsFacetOnParameterAnnotationElseDerivedFromTypeFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/describedas/annotderived/DescribedAsFacetOnParameterAnnotationElseDerivedFromTypeFactory.java
@@ -66,7 +66,7 @@ public class DescribedAsFacetOnParameterAnnotationElseDerivedFromTypeFactory ext
private DescribedAsFacet getDescribedAsFacet(final Class<?> type) {
final ObjectSpecification paramTypeSpec = getSpecificationLoader().loadSpecification(type,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
return paramTypeSpec.getFacet(DescribedAsFacet.class);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/typicallen/fromtype/TypicalLengthFacetOnParameterDerivedFromTypeFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/typicallen/fromtype/TypicalLengthFacetOnParameterDerivedFromTypeFacetFactory.java
index e19cd7d..79696eb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/typicallen/fromtype/TypicalLengthFacetOnParameterDerivedFromTypeFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/typicallen/fromtype/TypicalLengthFacetOnParameterDerivedFromTypeFacetFactory.java
@@ -50,7 +50,7 @@ public class TypicalLengthFacetOnParameterDerivedFromTypeFacetFactory extends Fa
private TypicalLengthFacet getTypicalLengthFacet(final Class<?> type) {
final ObjectSpecification paramTypeSpec = getSpecificationLoader().loadSpecification(type,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
return paramTypeSpec.getFacet(TypicalLengthFacet.class);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/validating/maskannot/MaskFacetOnParameterAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/validating/maskannot/MaskFacetOnParameterAnnotationFactory.java
index 0429aae..e59c483 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/validating/maskannot/MaskFacetOnParameterAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/validating/maskannot/MaskFacetOnParameterAnnotationFactory.java
@@ -67,22 +67,21 @@ public class MaskFacetOnParameterAnnotationFactory extends FacetFactoryAbstract
}
}
- private boolean addMaskFacetAndCorrespondingTitleFacet(final Mask annotation, final Class<?> cls, final AbstractProcessWithMethodContext processContext) {
+ private void addMaskFacetAndCorrespondingTitleFacet(final Mask annotation, final Class<?> cls, final AbstractProcessWithMethodContext processContext) {
final FacetHolder holder = processContext.getFacetHolder();
final MaskFacet maskFacet = validator.flagIfPresent(createMaskFacet(annotation, holder), processContext);
if (maskFacet == null) {
- return false;
+ return;
}
FacetUtil.addFacet(maskFacet);
final ObjectSpecification type = getSpecificationLoader().loadSpecification(cls,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
final TitleFacet underlyingTitleFacet = type.getFacet(TitleFacet.class);
if (underlyingTitleFacet != null) {
final TitleFacet titleFacet = new TitleFacetBasedOnMask(maskFacet, underlyingTitleFacet);
FacetUtil.addFacet(titleFacet);
}
- return true;
}
private MaskFacet createMaskFacet(final Mask annotation, final FacetHolder holder) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propcoll/accessor/PropertyOrCollectionAccessorFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propcoll/accessor/PropertyOrCollectionAccessorFacetAbstract.java
index 8155b5d..1537a77 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propcoll/accessor/PropertyOrCollectionAccessorFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propcoll/accessor/PropertyOrCollectionAccessorFacetAbstract.java
@@ -78,7 +78,7 @@ public abstract class PropertyOrCollectionAccessorFacetAbstract
final InteractionInitiatedBy interactionInitiatedBy);
protected ObjectSpecification getSpecification(final Class<?> type) {
- return type != null ? getSpecificationLoader().loadSpecification(type, IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED) : null;
+ return type != null ? getSpecificationLoader().loadSpecification(type, IntrospectionState.TYPE_INTROSPECTED) : null;
}
// //////////////////////////////////////
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/accessor/PropertyAccessorFacetViaAccessorFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/accessor/PropertyAccessorFacetViaAccessorFactory.java
index edb60e8..e9cb2a2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/accessor/PropertyAccessorFacetViaAccessorFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/accessor/PropertyAccessorFacetViaAccessorFactory.java
@@ -53,7 +53,7 @@ public class PropertyAccessorFacetViaAccessorFactory extends PropertyOrCollectio
final Class<?> cls = processMethodContext.getCls();
final ObjectSpecification typeSpec = getSpecificationLoader().loadSpecification(cls,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
final FacetHolder property = processMethodContext.getFacetHolder();
FacetUtil.addFacet(
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/autocomplete/method/PropertyAutoCompleteFacetMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/autocomplete/method/PropertyAutoCompleteFacetMethod.java
index c88e3bf..b6751d4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/autocomplete/method/PropertyAutoCompleteFacetMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/autocomplete/method/PropertyAutoCompleteFacetMethod.java
@@ -131,7 +131,7 @@ public class PropertyAutoCompleteFacetMethod extends PropertyAutoCompleteFacetAb
protected ObjectSpecification getSpecification(final Class<?> type) {
- return type != null ? getSpecificationLoader().loadSpecification(type, IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED) : null;
+ return type != null ? getSpecificationLoader().loadSpecification(type, IntrospectionState.TYPE_INTROSPECTED) : null;
}
// ////////////////////////////////////////////
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/enums/PropertyChoicesFacetDerivedFromChoicesFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/enums/PropertyChoicesFacetDerivedFromChoicesFacet.java
index 3bc65b3..89ca1a8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/enums/PropertyChoicesFacetDerivedFromChoicesFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/enums/PropertyChoicesFacetDerivedFromChoicesFacet.java
@@ -52,8 +52,7 @@ public class PropertyChoicesFacetDerivedFromChoicesFacet extends PropertyChoices
}
public ObjectSpecification getSpecification(final Class<?> type) {
- return type == null ? null : getSpecificationLoader().loadSpecification(type,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ return type == null ? null : getSpecificationLoader().loadSpecification(type, IntrospectionState.TYPE_INTROSPECTED);
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/enums/PropertyChoicesFacetDerivedFromChoicesFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/enums/PropertyChoicesFacetDerivedFromChoicesFacetFactory.java
index 5254feb..603b604 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/enums/PropertyChoicesFacetDerivedFromChoicesFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/enums/PropertyChoicesFacetDerivedFromChoicesFacetFactory.java
@@ -39,7 +39,7 @@ public class PropertyChoicesFacetDerivedFromChoicesFacetFactory extends FacetFac
final Class<?> returnType = processMethodContext.getMethod().getReturnType();
- if(!getSpecificationLoader().loadSpecification(returnType, IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED).containsDoOpFacet(ChoicesFacet.class)) {
+ if(!getSpecificationLoader().loadSpecification(returnType, IntrospectionState.TYPE_INTROSPECTED).containsDoOpFacet(ChoicesFacet.class)) {
return;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/method/PropertyChoicesFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/method/PropertyChoicesFacetViaMethod.java
index c578468..ab7790f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/method/PropertyChoicesFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/method/PropertyChoicesFacetViaMethod.java
@@ -77,7 +77,7 @@ public class PropertyChoicesFacetViaMethod extends PropertyChoicesFacetAbstract
return ObjectExtensions.asArray(options);
}
final ObjectSpecification specification = specificationLookup.loadSpecification(choicesClass,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
return CollectionUtils.getCollectionAsObjectArray(options, specification, getAdapterManager());
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/defaults/fromtype/PropertyDefaultFacetDerivedFromTypeFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/defaults/fromtype/PropertyDefaultFacetDerivedFromTypeFactory.java
index 2fbaa4e..3c1c6dc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/defaults/fromtype/PropertyDefaultFacetDerivedFromTypeFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/defaults/fromtype/PropertyDefaultFacetDerivedFromTypeFactory.java
@@ -60,7 +60,7 @@ public class PropertyDefaultFacetDerivedFromTypeFactory extends FacetFactoryAbst
private DefaultedFacet getDefaultedFacet(final Class<?> paramType) {
final ObjectSpecification paramTypeSpec = getSpecificationLoader().loadSpecification(paramType,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
return paramTypeSpec.getFacet(DefaultedFacet.class);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/defaults/method/PropertyDefaultFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/defaults/method/PropertyDefaultFacetViaMethod.java
index 49e8ccc..54a6906 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/defaults/method/PropertyDefaultFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/defaults/method/PropertyDefaultFacetViaMethod.java
@@ -76,7 +76,7 @@ public class PropertyDefaultFacetViaMethod extends PropertyDefaultFacetAbstract
private ObjectAdapter createAdapter(final Class<?> type, final Object object) {
final ObjectSpecification specification = getSpecificationLoader().loadSpecification(type,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
if (specification.isNotCollection()) {
return getAdapterManager().adapterFor(object);
} else {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/disabled/fromimmutable/DisabledFacetOnPropertyDerivedFromImmutableFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/disabled/fromimmutable/DisabledFacetOnPropertyDerivedFromImmutableFactory.java
index 064c9ad..49c5b21 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/disabled/fromimmutable/DisabledFacetOnPropertyDerivedFromImmutableFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/disabled/fromimmutable/DisabledFacetOnPropertyDerivedFromImmutableFactory.java
@@ -38,7 +38,7 @@ public class DisabledFacetOnPropertyDerivedFromImmutableFactory extends FacetFac
public void process(final ProcessMethodContext processMethodContext) {
final Class<?> declaringClass = processMethodContext.getMethod().getDeclaringClass();
final ObjectSpecification spec = getSpecificationLoader().loadSpecification(
- declaringClass, IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ declaringClass, IntrospectionState.TYPE_INTROSPECTED);
if (spec.containsDoOpFacet(ImmutableFacet.class)) {
final ImmutableFacet immutableFacet = spec.getFacet(ImmutableFacet.class);
final FacetedMethod facetHolder = processMethodContext.getFacetHolder();
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
index 5a9a5f5..cf45080 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
@@ -140,7 +140,7 @@ public class PropertyAnnotationFacetFactory extends FacetFactoryAbstract impleme
final Class<?> cls = processMethodContext.getCls();
final ObjectSpecification typeSpec = getSpecificationLoader().loadSpecification(cls,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
final FacetedMethod holder = processMethodContext.getFacetHolder();
final PropertyOrCollectionAccessorFacet getterFacet = holder.getFacet(PropertyOrCollectionAccessorFacet.class);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/typicallen/fromtype/TypicalLengthFacetOnPropertyDerivedFromTypeFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/typicallen/fromtype/TypicalLengthFacetOnPropertyDerivedFromTypeFacetFactory.java
index 5916c27..e5a0945 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/typicallen/fromtype/TypicalLengthFacetOnPropertyDerivedFromTypeFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/typicallen/fromtype/TypicalLengthFacetOnPropertyDerivedFromTypeFacetFactory.java
@@ -50,7 +50,7 @@ public class TypicalLengthFacetOnPropertyDerivedFromTypeFacetFactory extends Fac
private TypicalLengthFacet getTypicalLengthFacet(final Class<?> type) {
final ObjectSpecification paramTypeSpec = getSpecificationLoader().loadSpecification(type,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
return paramTypeSpec.getFacet(TypicalLengthFacet.class);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/maskannot/MaskFacetOnPropertyAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/maskannot/MaskFacetOnPropertyAnnotationFactory.java
index a559c0b..0a91e69 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/maskannot/MaskFacetOnPropertyAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/maskannot/MaskFacetOnPropertyAnnotationFactory.java
@@ -90,22 +90,21 @@ public class MaskFacetOnPropertyAnnotationFactory extends FacetFactoryAbstract i
return annotation != null ? new MaskFacetOnPropertyAnnotation(annotation.value(), null, holder) : null;
}
- private boolean addMaskFacetAndCorrespondingTitleFacet(final Mask annotation, final Class<?> cls, final AbstractProcessWithMethodContext processContext) {
+ private void addMaskFacetAndCorrespondingTitleFacet(final Mask annotation, final Class<?> cls, final AbstractProcessWithMethodContext processContext) {
final FacetHolder facetHolder = processContext.getFacetHolder();
final MaskFacet maskFacet = validator.flagIfPresent(createMaskFacet(annotation, facetHolder), processContext);
if (maskFacet == null) {
- return false;
+ return;
}
FacetUtil.addFacet(maskFacet);
final ObjectSpecification type = getSpecificationLoader().loadSpecification(cls,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
final TitleFacet underlyingTitleFacet = type.getFacet(TitleFacet.class);
if (underlyingTitleFacet != null) {
final TitleFacet titleFacet = new TitleFacetBasedOnMask(maskFacet, underlyingTitleFacet);
FacetUtil.addFacet(titleFacet);
}
- return true;
}
@Override
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/param/DeriveFacetsPostProcessor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/param/DeriveFacetsPostProcessor.java
index 8c390b2..10981aa 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/param/DeriveFacetsPostProcessor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/param/DeriveFacetsPostProcessor.java
@@ -358,9 +358,7 @@ public class DeriveFacetsPostProcessor implements ObjectSpecificationPostProcess
}
final ObjectSpecification returnSpec = objectAction.getReturnType();
final DescribedAsFacet specFacet = returnSpec.getFacet(DescribedAsFacet.class);
- //TODO: this ought to check if a do-op; if you come across this, you can probably change it (just taking smaller steps for now)
- //if(existsAndIsDoOp(specFacet)) {
- if(specFacet != null) {
+ if(existsAndIsDoOp(specFacet)) {
FacetUtil.addFacet(new DescribedAsFacetOnMemberDerivedFromType(specFacet, facetedMethodFor(objectAction)));
}
}
@@ -494,9 +492,7 @@ public class DeriveFacetsPostProcessor implements ObjectSpecificationPostProcess
}
final ObjectSpecification returnSpec = objectAssociation.getSpecification();
final DescribedAsFacet specFacet = returnSpec.getFacet(DescribedAsFacet.class);
- //TODO: this ought to check if a do-op; if you come across this, you can probably change it (just taking smaller steps for now)
- //if(existsAndIsDoOp(specFacet)) {
- if(specFacet != null) {
+ if(existsAndIsDoOp(specFacet)) {
FacetUtil.addFacet(
new DescribedAsFacetOnMemberDerivedFromType(specFacet, facetedMethodFor(objectAssociation)));
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
index b257715..073ff0c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
@@ -118,7 +118,7 @@ public class ApplicationFeatureRepositoryDefault implements ApplicationFeatureRe
private Collection<ObjectSpecification> primeMetaModel() {
final List<Object> services = serviceRegistry.getRegisteredServices();
for (final Object service : services) {
- specificationLoader.loadSpecification(service.getClass(), IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ specificationLoader.loadSpecification(service.getClass(), IntrospectionState.TYPE_INTROSPECTED);
}
return specificationLoader.allSpecifications();
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
index 7296d2c..4b30080 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
@@ -107,8 +107,7 @@ public class DomainObjectContainerDefault
@SuppressWarnings("unchecked")
@Override
public <T> T newViewModelInstance(Class<T> ofClass, String memento) {
- final ObjectSpecification spec = specificationLoader.loadSpecification(ofClass,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ final ObjectSpecification spec = specificationLoader.loadSpecification(ofClass, IntrospectionState.TYPE_INTROSPECTED);
if (!spec.containsFacet(ViewModelFacet.class)) {
throw new IsisException("Type must be a ViewModel: " + ofClass);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/factory/FactoryServiceInternalDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/factory/FactoryServiceInternalDefault.java
index 21a5fef..e67ee73 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/factory/FactoryServiceInternalDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/factory/FactoryServiceInternalDefault.java
@@ -47,7 +47,7 @@ public class FactoryServiceInternalDefault implements FactoryService {
@SuppressWarnings("unchecked")
public <T> T instantiate(final Class<T> domainClass) {
final ObjectSpecification spec = specificationLoader.loadSpecification(domainClass,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
final ObjectAdapter adapter = doCreateTransientInstance(spec);
return (T) adapter.getObject();
}
@@ -64,8 +64,7 @@ public class FactoryServiceInternalDefault implements FactoryService {
@Programmatic
@Override
public <T> T mixin(final Class<T> mixinClass, final Object mixedIn) {
- final ObjectSpecification objectSpec = specificationLoader.loadSpecification(mixinClass,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ final ObjectSpecification objectSpec = specificationLoader.loadSpecification(mixinClass, IntrospectionState.TYPE_INTROSPECTED);
final MixinFacet mixinFacet = objectSpec.getFacet(MixinFacet.class);
if(mixinFacet == null) {
throw new NonRecoverableException("Class '" + mixinClass.getName() + " is not a mixin");
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridSystemServiceAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridSystemServiceAbstract.java
index 841d13c..9cfb5ec 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridSystemServiceAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridSystemServiceAbstract.java
@@ -203,8 +203,7 @@ public abstract class GridSystemServiceAbstract<G extends org.apache.isis.applib
final Class<?> domainClass) {
- final ObjectSpecification objectSpec = specificationLoader.loadSpecification(domainClass,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ final ObjectSpecification objectSpec = specificationLoader.loadSpecification(domainClass, IntrospectionState.TYPE_INTROSPECTED);
final Map<String, OneToOneAssociation> oneToOneAssociationById =
ObjectMember.Util.mapById(getOneToOneAssociations(objectSpec));
@@ -404,8 +403,7 @@ public abstract class GridSystemServiceAbstract<G extends org.apache.isis.applib
public void complete(final G grid, final Class<?> domainClass) {
normalize(grid, domainClass);
- final ObjectSpecification objectSpec = specificationLoader.loadSpecification(domainClass,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ final ObjectSpecification objectSpec = specificationLoader.loadSpecification(domainClass, IntrospectionState.TYPE_INTROSPECTED);
grid.visit(new Grid.VisitorAdapter() {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java
index 5ac4226..b771ac9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java
@@ -87,8 +87,7 @@ public class GridSystemServiceBS3 extends GridSystemServiceAbstract<BS3Grid> {
public Grid defaultGrid(final Class<?> domainClass) {
final BS3Grid bs3Grid = new BS3Grid();
- final ObjectSpecification objectSpec = specificationLoader.loadSpecification(domainClass,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ final ObjectSpecification objectSpec = specificationLoader.loadSpecification(domainClass, IntrospectionState.TYPE_INTROSPECTED);
bs3Grid.setDomainClass(domainClass);
final BS3Row headerRow = new BS3Row();
@@ -170,8 +169,7 @@ public class GridSystemServiceBS3 extends GridSystemServiceAbstract<BS3Grid> {
final Class<?> domainClass) {
- final ObjectSpecification objectSpec = specificationLoader.loadSpecification(domainClass,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ final ObjectSpecification objectSpec = specificationLoader.loadSpecification(domainClass, IntrospectionState.TYPE_INTROSPECTED);
final Map<String, OneToOneAssociation> oneToOneAssociationById =
ObjectMember.Util.mapById(getOneToOneAssociations(objectSpec));
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/layout/LayoutServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/layout/LayoutServiceDefault.java
index df3eec5..a2dcb6f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/layout/LayoutServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/layout/LayoutServiceDefault.java
@@ -71,8 +71,7 @@ public class LayoutServiceDefault implements LayoutService2 {
protected Grid toGrid(final Class<?> domainClass, final Style style) {
if (style == Style.CURRENT) {
- final ObjectSpecification objectSpec = specificationLoader.loadSpecification(domainClass,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ final ObjectSpecification objectSpec = specificationLoader.loadSpecification(domainClass, IntrospectionState.TYPE_INTROSPECTED);
final GridFacet facet = objectSpec.getFacet(GridFacet.class);
return facet != null? facet.getGrid(): null;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
index 609b119..bbc0773 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
@@ -91,7 +91,7 @@ public class MetaModelServiceDefault implements MetaModelService6 {
return null;
}
final ObjectSpecification objectSpecification = specificationLookup.loadSpecification(domainType,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
final ObjectSpecIdFacet objectSpecIdFacet = objectSpecification.getFacet(ObjectSpecIdFacet.class);
final ObjectSpecId objectSpecId = objectSpecIdFacet.value();
return objectSpecId.asString();
@@ -101,8 +101,7 @@ public class MetaModelServiceDefault implements MetaModelService6 {
public void rebuild(final Class<?> domainType) {
specificationLookup.invalidateCache(domainType);
gridService.remove(domainType);
- specificationLookup.loadSpecification(domainType,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ specificationLookup.loadSpecification(domainType, IntrospectionState.TYPE_INTROSPECTED);
}
// //////////////////////////////////////
@@ -189,7 +188,7 @@ public class MetaModelServiceDefault implements MetaModelService6 {
return null;
}
final ObjectSpecification objectSpec = specificationLookup.loadSpecification(domainType,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
if(objectSpec.isService()) {
return Sort.DOMAIN_SERVICE;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
index 0ee470e..d3a3bb0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
@@ -19,7 +19,6 @@ package org.apache.isis.core.metamodel.specloader;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
-import java.util.Set;
import java.util.concurrent.Callable;
import java.util.concurrent.Future;
@@ -28,7 +27,6 @@ import com.google.common.base.Predicate;
import com.google.common.collect.FluentIterable;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -436,6 +434,11 @@ public class SpecificationLoader implements ApplicationScopedComponent {
}
@Programmatic
+ public ObjectSpecification loadSpecification(final Class<?> type) {
+ return loadSpecification(type, IntrospectionState.TYPE_INTROSPECTED);
+ }
+
+ @Programmatic
public ObjectSpecification loadSpecification(final Class<?> type, final IntrospectionState upTo) {
final ObjectSpecification spec = internalLoadSpecification(type, null, upTo);
if(spec == null) {
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 034174d..a278ee9 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
@@ -331,7 +331,7 @@ public class FacetedMethodsBuilder {
specificationTraverser.traverseTypes(method, typesToLoad);
}
getSpecificationLoader().loadSpecifications(typesToLoad, introspectedClass,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
// now create FacetedMethods for collections and for properties
final List<FacetedMethod> associationFacetedMethods = Lists.newArrayList();
@@ -514,8 +514,7 @@ public class FacetedMethodsBuilder {
private boolean isAllParamTypesValid(final Method actionMethod) {
for (final Class<?> paramType : actionMethod.getParameterTypes()) {
- final ObjectSpecification paramSpec = getSpecificationLoader().loadSpecification(paramType,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ final ObjectSpecification paramSpec = getSpecificationLoader().loadSpecification(paramType, IntrospectionState.TYPE_INTROSPECTED);
if (paramSpec == null) {
return false;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionDefault.java
index fe09a70..630ebd7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionDefault.java
@@ -129,7 +129,7 @@ public class ObjectActionDefault extends ObjectMemberAbstract implements ObjectA
return false;
}
return getReturnType() != getSpecificationLoader().loadSpecification(void.class,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
}
@@ -491,7 +491,7 @@ public class ObjectActionDefault extends ObjectMemberAbstract implements ObjectA
for (int i = 0; i < parameterCount; i++) {
if (parameterDefaultPojos[i] != null) {
final ObjectSpecification componentSpec = getSpecificationLoader().loadSpecification(parameterDefaultPojos[i].getClass(),
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
final ObjectSpecification parameterSpec = parameters.get(i).getSpecification();
if (!componentSpec.isOfType(parameterSpec)) {
throw new DomainModelException("Defaults type incompatible with parameter " + (i + 1) + " type; expected " + parameterSpec.getFullIdentifier() + ", but was " + componentSpec.getFullIdentifier());
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java
index 7d149fd..033b622 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java
@@ -249,7 +249,7 @@ public class ObjectActionMixedIn extends ObjectActionDefault implements MixedInM
@Override
public ObjectSpecification getMixinType() {
- return getSpecificationLoader().loadSpecification(mixinType, IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ return getSpecificationLoader().loadSpecification(mixinType, IntrospectionState.TYPE_INTROSPECTED);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
index 719ead7..85f325a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
@@ -427,16 +427,16 @@ public abstract class ObjectActionParameterAbstract implements ObjectActionParam
// check type, but wrap first
// (eg we treat int.class and java.lang.Integer.class as compatible with each other)
- final Class<? extends Object> choiceClass = object.getClass();
+ final Class<?> choiceClass = object.getClass();
final Class<?> paramClass = paramSpec.getCorrespondingClass();
- final Class<? extends Object> choiceWrappedClass = ClassExtensions.asWrappedIfNecessary(choiceClass);
- final Class<? extends Object> paramWrappedClass = ClassExtensions.asWrappedIfNecessary(paramClass);
+ final Class<?> choiceWrappedClass = ClassExtensions.asWrappedIfNecessary(choiceClass);
+ final Class<?> paramWrappedClass = ClassExtensions.asWrappedIfNecessary(paramClass);
final ObjectSpecification choiceWrappedSpec = specificationLookup.loadSpecification(choiceWrappedClass,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
final ObjectSpecification paramWrappedSpec = specificationLookup.loadSpecification(paramWrappedClass,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
// TODO: should implement this instead as a MetaModelValidator
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 3acb5cd..db990da 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
@@ -66,7 +66,7 @@ import org.apache.isis.schema.utils.CommandDtoUtils;
public abstract class ObjectMemberAbstract implements ObjectMember {
public static ObjectSpecification getSpecification(final SpecificationLoader specificationLookup, final Class<?> type) {
- return type == null ? null : specificationLookup.loadSpecification(type, IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ return type == null ? null : specificationLookup.loadSpecification(type, IntrospectionState.TYPE_INTROSPECTED);
}
//region > fields
@@ -328,17 +328,17 @@ public abstract class ObjectMemberAbstract implements ObjectMember {
/**
* For mixins
*/
- protected ObjectAdapter mixinAdapterFor(
+ ObjectAdapter mixinAdapterFor(
final Class<?> mixinType,
final ObjectAdapter mixedInAdapter) {
final ObjectSpecification objectSpecification = getSpecificationLoader().loadSpecification(mixinType,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
final MixinFacet mixinFacet = objectSpecification.getFacet(MixinFacet.class);
final Object mixinPojo = mixinFacet.instantiate(mixedInAdapter.getObject());
return getPersistenceSessionService().adapterFor(mixinPojo);
}
- public static String determineNameFrom(final ObjectAction mixinAction) {
+ static String determineNameFrom(final ObjectAction mixinAction) {
return StringExtensions.asCapitalizedName(suffix(mixinAction));
}
@@ -351,7 +351,7 @@ public abstract class ObjectMemberAbstract implements ObjectMember {
return suffix.replaceAll(" ","");
}
- static String suffix(final ObjectAction mixinAction) {
+ private static String suffix(final ObjectAction mixinAction) {
return deriveMemberNameFrom(mixinAction.getOnType().getSingularName());
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationContributee.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationContributee.java
index 205e40c..35f2ce5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationContributee.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationContributee.java
@@ -64,7 +64,7 @@ public class OneToManyAssociationContributee extends OneToManyAssociationDefault
// TODO: a bit of a hack; ought really to set up a fallback TypeOfFacetDefault which ensures that there is always
// a TypeOfFacet for any contributee associations created from contributed actions.
Class<? extends Object> cls = actionTypeOfFacet != null? actionTypeOfFacet.value(): Object.class;
- return specificationLookup.loadSpecification(cls, IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ return specificationLookup.loadSpecification(cls, IntrospectionState.TYPE_INTROSPECTED);
}
public OneToManyAssociationContributee(
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationMixedIn.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationMixedIn.java
index 1edaa58..d5aec7a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationMixedIn.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationMixedIn.java
@@ -79,7 +79,7 @@ public class OneToManyAssociationMixedIn extends OneToManyAssociationDefault imp
// TODO: a bit of a hack; ought really to set up a fallback TypeOfFacetDefault which ensures that there is always
// a TypeOfFacet for any mixedIn associations created from mixin actions.
Class<? extends Object> cls = actionTypeOfFacet != null? actionTypeOfFacet.value(): Object.class;
- return specificationLookup.loadSpecification(cls, IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ return specificationLookup.loadSpecification(cls, IntrospectionState.TYPE_INTROSPECTED);
}
public OneToManyAssociationMixedIn(
@@ -213,7 +213,7 @@ public class OneToManyAssociationMixedIn extends OneToManyAssociationDefault imp
@Override
public ObjectSpecification getMixinType() {
- return getSpecificationLoader().loadSpecification(mixinType, IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ return getSpecificationLoader().loadSpecification(mixinType, IntrospectionState.TYPE_INTROSPECTED);
}
//endregion
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationMixedIn.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationMixedIn.java
index 954ce46..f55d253 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationMixedIn.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationMixedIn.java
@@ -194,7 +194,7 @@ public class OneToOneAssociationMixedIn extends OneToOneAssociationDefault imple
@Override
public ObjectSpecification getMixinType() {
- return getSpecificationLoader().loadSpecification(mixinType, IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ return getSpecificationLoader().loadSpecification(mixinType, IntrospectionState.TYPE_INTROSPECTED);
}
private PublishingServiceInternal getPublishingServiceInternal() {
diff --git a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/query/VisitorForFromClause.java b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/query/VisitorForFromClause.java
index 578bde7..dc16529 100644
--- a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/query/VisitorForFromClause.java
+++ b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/query/VisitorForFromClause.java
@@ -50,7 +50,7 @@ class VisitorForFromClause extends VisitorForClauseAbstract {
return;
}
final ObjectSpecification fromSpec = getSpecificationLoader().loadSpecification(classNameFromClause,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
List<ObjectSpecification> subclasses = fromSpec.subclasses(Hierarchical.Depth.TRANSITIVE);
if(subclasses.contains(objectSpec)) {
return;
diff --git a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/query/VisitorForVariablesClause.java b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/query/VisitorForVariablesClause.java
index 326f46a..1a38e19 100644
--- a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/query/VisitorForVariablesClause.java
+++ b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/query/VisitorForVariablesClause.java
@@ -45,7 +45,7 @@ class VisitorForVariablesClause extends VisitorForClauseAbstract {
final String className = objectSpec.getCorrespondingClass().getName();
ObjectSpecification objectSpecification = getSpecificationLoader().loadSpecification(classNameFromClause,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
JdoPersistenceCapableFacet persistenceCapableFacet =
objectSpecification.getFacet(JdoPersistenceCapableFacet.class);
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java
index f41d188..b87624d 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java
@@ -145,7 +145,7 @@ public abstract class AbstractFacetFactoryTest extends TestCase {
protected void allowing_specificationLoader_loadSpecification_any_willReturn(final ObjectSpecification objectSpecification) {
context.checking(new Expectations() {{
allowing(mockSpecificationLoader).loadSpecification(with(any(Class.class)),
- with(equal(IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED)));
+ with(equal(IntrospectionState.TYPE_INTROSPECTED)));
will(returnValue(objectSpecification));
}});
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
index d536617..3b39dad 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
@@ -117,10 +117,10 @@ public class ActionAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4
void allowingLoadSpecificationRequestsFor(final Class<?> cls, final Class<?> returnType) {
context.checking(new Expectations() {{
- allowing(mockSpecificationLoader).loadSpecification(cls, IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ allowing(mockSpecificationLoader).loadSpecification(cls, IntrospectionState.TYPE_INTROSPECTED);
will(returnValue(mockTypeSpec));
- allowing(mockSpecificationLoader).loadSpecification(returnType, IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ allowing(mockSpecificationLoader).loadSpecification(returnType, IntrospectionState.TYPE_INTROSPECTED);
will(returnValue(mockReturnTypeSpec));
}});
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutAnnotationFacetFactoryJunit4Test.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutAnnotationFacetFactoryJunit4Test.java
index 7b90914..26d51ab 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutAnnotationFacetFactoryJunit4Test.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutAnnotationFacetFactoryJunit4Test.java
@@ -70,7 +70,7 @@ public class ActionLayoutAnnotationFacetFactoryJunit4Test extends AbstractFacetF
context.checking(new Expectations() {{
allowing(mockSpecificationLoader).loadSpecification(CustomerService.class,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
will(returnValue(mockObjSpec));
allowing(mockObjSpec).getFacet(DomainServiceFacet.class);
@@ -105,7 +105,7 @@ public class ActionLayoutAnnotationFacetFactoryJunit4Test extends AbstractFacetF
context.checking(new Expectations() {{
allowing(mockSpecificationLoader).loadSpecification(CustomerService.class,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
will(returnValue(mockObjSpec));
allowing(mockObjSpec).getFacet(DomainServiceFacet.class);
@@ -141,7 +141,7 @@ public class ActionLayoutAnnotationFacetFactoryJunit4Test extends AbstractFacetF
context.checking(new Expectations() {{
allowing(mockSpecificationLoader).loadSpecification(CustomerService.class,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
will(returnValue(mockObjSpec));
allowing(mockObjSpec).getFacet(DomainServiceFacet.class);
@@ -180,7 +180,7 @@ public class ActionLayoutAnnotationFacetFactoryJunit4Test extends AbstractFacetF
context.checking(new Expectations() {{
allowing(mockSpecificationLoader).loadSpecification(CustomerService.class,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
will(returnValue(mockObjSpec));
allowing(mockObjSpec).getFacet(DomainServiceFacet.class);
@@ -217,7 +217,7 @@ public class ActionLayoutAnnotationFacetFactoryJunit4Test extends AbstractFacetF
context.checking(new Expectations() {{
allowing(mockSpecificationLoader).loadSpecification(CustomerService.class,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
will(returnValue(mockObjSpec));
allowing(mockObjSpec).getFacet(DomainServiceFacet.class);
@@ -255,7 +255,7 @@ public class ActionLayoutAnnotationFacetFactoryJunit4Test extends AbstractFacetF
context.checking(new Expectations() {{
allowing(mockSpecificationLoader).loadSpecification(CustomerService.class,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
will(returnValue(mockObjSpec));
allowing(mockObjSpec).getFacet(DomainServiceFacet.class);
@@ -294,7 +294,7 @@ public class ActionLayoutAnnotationFacetFactoryJunit4Test extends AbstractFacetF
context.checking(new Expectations() {{
allowing(mockSpecificationLoader).loadSpecification(CustomerService.class,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
will(returnValue(mockObjSpec));
allowing(mockObjSpec).getFacet(DomainServiceFacet.class);
@@ -333,7 +333,7 @@ public class ActionLayoutAnnotationFacetFactoryJunit4Test extends AbstractFacetF
context.checking(new Expectations() {{
allowing(mockSpecificationLoader).loadSpecification(CustomerService.class,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
will(returnValue(mockObjSpec));
allowing(mockObjSpec).getFacet(DomainServiceFacet.class);
@@ -372,7 +372,7 @@ public class ActionLayoutAnnotationFacetFactoryJunit4Test extends AbstractFacetF
context.checking(new Expectations() {{
allowing(mockSpecificationLoader).loadSpecification(Customer.class,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
will(returnValue(mockObjSpec));
allowing(mockObjSpec).getFacet(DomainServiceFacet.class);
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutXmlLayoutAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutXmlLayoutAnnotationFacetFactoryTest.java
index 91e0fb4..a5266b7 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutXmlLayoutAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutXmlLayoutAnnotationFacetFactoryTest.java
@@ -67,7 +67,7 @@ public class ActionLayoutXmlLayoutAnnotationFacetFactoryTest extends AbstractFac
context.checking(new Expectations() {
{
allowing(mockSpecificationLoader).loadSpecification(Customer.class,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
will(returnValue(mockObjSpec));
allowing(mockObjSpec).getFacet(MixinFacet.class);
@@ -107,7 +107,7 @@ public class ActionLayoutXmlLayoutAnnotationFacetFactoryTest extends AbstractFac
context.checking(new Expectations() {
{
allowing(mockSpecificationLoader).loadSpecification(Customer.class,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
will(returnValue(mockObjSpec));
allowing(mockObjSpec).getFacet(MixinFacet.class);
@@ -143,7 +143,7 @@ public class ActionLayoutXmlLayoutAnnotationFacetFactoryTest extends AbstractFac
context.checking(new Expectations() {
{
allowing(mockSpecificationLoader).loadSpecification(Customer.class,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
will(returnValue(mockObjSpec));
allowing(mockObjSpec).getFacet(DomainServiceFacet.class);
@@ -180,7 +180,7 @@ public class ActionLayoutXmlLayoutAnnotationFacetFactoryTest extends AbstractFac
context.checking(new Expectations() {
{
allowing(mockSpecificationLoader).loadSpecification(Customer.class,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
will(returnValue(mockObjSpec));
allowing(mockObjSpec).getFacet(DomainServiceFacet.class);
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacetFactoryTest.java
index 618be4c..8ddd541 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacetFactoryTest.java
@@ -62,7 +62,7 @@ public class NotContributedFacetDerivedFromDomainServiceFacetFactoryTest extends
context.checking(new Expectations() {{
allowing(mockSpecificationLoader).loadSpecification(CustomerService.class,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
will(returnValue(mockObjSpec));
allowing(mockObjSpec).getFacet(DomainServiceFacet.class);
@@ -99,7 +99,7 @@ public class NotContributedFacetDerivedFromDomainServiceFacetFactoryTest extends
context.checking(new Expectations() {{
allowing(mockSpecificationLoader).loadSpecification(CustomerService.class,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
will(returnValue(mockObjSpec));
allowing(mockObjSpec).getFacet(DomainServiceFacet.class);
@@ -136,7 +136,7 @@ public class NotContributedFacetDerivedFromDomainServiceFacetFactoryTest extends
context.checking(new Expectations() {{
allowing(mockSpecificationLoader).loadSpecification(CustomerService.class,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
will(returnValue(mockObjSpec));
allowing(mockObjSpec).getFacet(DomainServiceFacet.class);
@@ -170,7 +170,7 @@ public class NotContributedFacetDerivedFromDomainServiceFacetFactoryTest extends
context.checking(new Expectations() {{
allowing(mockSpecificationLoader).loadSpecification(CustomerService.class,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
will(returnValue(mockObjSpec));
allowing(mockObjSpec).getFacet(DomainServiceFacet.class);
@@ -203,7 +203,7 @@ public class NotContributedFacetDerivedFromDomainServiceFacetFactoryTest extends
context.checking(new Expectations() {{
allowing(mockSpecificationLoader).loadSpecification(CustomerService.class,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
will(returnValue(mockObjSpec));
allowing(mockObjSpec).getFacet(DomainServiceFacet.class);
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacetFactoryTest.java
index 96e901d..de5e42d 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacetFactoryTest.java
@@ -62,7 +62,7 @@ public class NotInServiceMenuFacetDerivedFromDomainServiceFacetFactoryTest exten
context.checking(new Expectations() {{
allowing(mockSpecificationLoader).loadSpecification(CustomerService.class,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
will(returnValue(mockObjSpec));
allowing(mockObjSpec).getFacet(DomainServiceFacet.class);
@@ -99,7 +99,7 @@ public class NotInServiceMenuFacetDerivedFromDomainServiceFacetFactoryTest exten
context.checking(new Expectations() {{
allowing(mockSpecificationLoader).loadSpecification(CustomerService.class,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
will(returnValue(mockObjSpec));
allowing(mockObjSpec).getFacet(DomainServiceFacet.class);
@@ -136,7 +136,7 @@ public class NotInServiceMenuFacetDerivedFromDomainServiceFacetFactoryTest exten
context.checking(new Expectations() {{
allowing(mockSpecificationLoader).loadSpecification(CustomerService.class,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
will(returnValue(mockObjSpec));
allowing(mockObjSpec).getFacet(DomainServiceFacet.class);
@@ -170,7 +170,7 @@ public class NotInServiceMenuFacetDerivedFromDomainServiceFacetFactoryTest exten
context.checking(new Expectations() {{
allowing(mockSpecificationLoader).loadSpecification(CustomerService.class,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
will(returnValue(mockObjSpec));
allowing(mockObjSpec).getFacet(DomainServiceFacet.class);
@@ -203,7 +203,7 @@ public class NotInServiceMenuFacetDerivedFromDomainServiceFacetFactoryTest exten
context.checking(new Expectations() {{
allowing(mockSpecificationLoader).loadSpecification(CustomerService.class,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
will(returnValue(mockObjSpec));
allowing(mockObjSpec).getFacet(DomainServiceFacet.class);
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java
index 6ba5af8..dbd5088 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java
@@ -98,10 +98,10 @@ public class CollectionAnnotationFacetFactoryTest extends AbstractFacetFactoryJU
void allowingLoadSpecificationRequestsFor(final Class<?> cls, final Class<?> returnType) {
context.checking(new Expectations() {
{
- allowing(mockSpecificationLoader).loadSpecification(cls, IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ allowing(mockSpecificationLoader).loadSpecification(cls, IntrospectionState.TYPE_INTROSPECTED);
will(returnValue(mockTypeSpec));
- allowing(mockSpecificationLoader).loadSpecification(returnType, IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ allowing(mockSpecificationLoader).loadSpecification(returnType, IntrospectionState.TYPE_INTROSPECTED);
will(returnValue(mockReturnTypeSpec));
}
});
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactoryTest.java
index e36d17c..2578828 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactoryTest.java
@@ -67,10 +67,10 @@ public class ParameterAnnotationFacetFactoryTest extends AbstractFacetFactoryJUn
void allowingLoadSpecificationRequestsFor(final Class<?> cls, final Class<?> returnType) {
context.checking(new Expectations() {{
- allowing(mockSpecificationLoader).loadSpecification(cls, IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ allowing(mockSpecificationLoader).loadSpecification(cls, IntrospectionState.TYPE_INTROSPECTED);
will(returnValue(mockTypeSpec));
- allowing(mockSpecificationLoader).loadSpecification(returnType, IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ allowing(mockSpecificationLoader).loadSpecification(returnType, IntrospectionState.TYPE_INTROSPECTED);
will(returnValue(mockReturnTypeSpec));
}});
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
index fd0edfe..3c0e2be 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
@@ -105,10 +105,10 @@ public class PropertyAnnotationFacetFactoryTest extends AbstractFacetFactoryJUni
void allowingLoadSpecificationRequestsFor(final Class<?> cls, final Class<?> returnType) {
context.checking(new Expectations() {{
- allowing(mockSpecificationLoader).loadSpecification(cls, IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ allowing(mockSpecificationLoader).loadSpecification(cls, IntrospectionState.TYPE_INTROSPECTED);
will(returnValue(mockTypeSpec));
- allowing(mockSpecificationLoader).loadSpecification(returnType, IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ allowing(mockSpecificationLoader).loadSpecification(returnType, IntrospectionState.TYPE_INTROSPECTED);
will(returnValue(mockReturnTypeSpec));
}});
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefaultTest_object.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefaultTest_object.java
index edf63c8..55f0f54 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefaultTest_object.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefaultTest_object.java
@@ -37,12 +37,12 @@ import org.apache.isis.core.metamodel.specloader.specimpl.IntrospectionState;
public class ObjectReflectorDefaultTest_object extends SpecificationLoaderTestAbstract {
- public abstract static class TestDomainObject implements Persistable {
+ abstract static class TestDomainObject implements Persistable {
}
@Override
protected ObjectSpecification loadSpecification(final SpecificationLoader reflector) {
- return reflector.loadSpecification(TestDomainObject.class, IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ return reflector.loadSpecification(TestDomainObject.class, IntrospectionState.TYPE_INTROSPECTED);
}
@Test
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureFilePersistor.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureFilePersistor.java
index 8fcc385..de0f431 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureFilePersistor.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureFilePersistor.java
@@ -217,7 +217,7 @@ class LoadedObjects {
if (object == null) {
final String className = data.substring(0, pos);
final ObjectSpecification specification = specificationLoader.loadSpecification(className,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
object = persistenceSession.createTransientInstance(specification);
idMap.put(id, object);
objects.add(object.getObject());
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Memento.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Memento.java
index 5aa7ff1..5008363 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Memento.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Memento.java
@@ -197,7 +197,7 @@ public class Memento implements Serializable {
return null;
}
final ObjectSpecification spec =
- getSpecificationLoader().loadSpecification(data.getClassName(), IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ getSpecificationLoader().loadSpecification(data.getClassName(), IntrospectionState.TYPE_INTROSPECTED);
ObjectAdapter adapter;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/StandaloneData.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/StandaloneData.java
index 63da4b4..259e66b 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/StandaloneData.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/StandaloneData.java
@@ -121,7 +121,7 @@ public class StandaloneData extends Data {
return getPersistenceSession().adapterFor(objectAsSerializable);
} else {
final ObjectSpecification spec = getIsisSessionFactory().getSpecificationLoader().loadSpecification(getClassName(),
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
final EncodableFacet encodeableFacet = spec.getFacet(EncodableFacet.class);
return encodeableFacet.fromEncodedString(objectAsEncodedString);
}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
index 9277fcd..0c5846f 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
@@ -105,7 +105,7 @@ public class PojoAdapter extends InstanceAbstract implements ObjectAdapter {
protected ObjectSpecification loadSpecification() {
final Class<?> aClass = getObject().getClass();
final ObjectSpecification specification = specificationLoader.loadSpecification(aClass,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
return specification;
}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryAbstract.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryAbstract.java
index cfbb2a1..061fe18 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryAbstract.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryAbstract.java
@@ -61,7 +61,7 @@ public abstract class PersistenceQueryAbstract implements PersistenceQuery, Enco
this.start = range.length > 0 ? range[0]:0;
this.count = range.length > 1 ? range[1]:0;
- specification = specificationLoader.loadSpecification(specName, IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ specification = specificationLoader.loadSpecification(specName, IntrospectionState.TYPE_INTROSPECTED);
// nothing to do
}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundServiceDefault.java
index 154051c..629bcc1 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundServiceDefault.java
@@ -99,7 +99,7 @@ public class BackgroundServiceDefault implements BackgroundService2 {
}
private ObjectSpecification getSpecification(final Class<?> type) {
- return specificationLoader.loadSpecification(type, IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ return specificationLoader.loadSpecification(type, IntrospectionState.TYPE_INTROSPECTED);
}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandDtoServiceInternalDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandDtoServiceInternalDefault.java
index cc5c4a3..ff47e94 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandDtoServiceInternalDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandDtoServiceInternalDefault.java
@@ -101,7 +101,7 @@ public class CommandDtoServiceInternalDefault implements CommandDtoServiceIntern
}
private ObjectSpecification getSpecification(final Class<?> type) {
- return specificationLoader.loadSpecification(type, IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ return specificationLoader.loadSpecification(type, IntrospectionState.TYPE_INTROSPECTED);
}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/PersistenceSessionServiceInternalDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/PersistenceSessionServiceInternalDefault.java
index 783a3eb..8cdec6e 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/PersistenceSessionServiceInternalDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/PersistenceSessionServiceInternalDefault.java
@@ -128,7 +128,7 @@ public class PersistenceSessionServiceInternalDefault implements PersistenceSess
@Override
public Bookmark bookmarkFor(Class<?> cls, String identifier) {
final ObjectSpecification objectSpec = getSpecificationLoader().loadSpecification(cls,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
String objectType = objectSpec.getSpecId().asString();
return new Bookmark(objectType, identifier);
}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents.java
index 4f2f20b..984f468 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents.java
@@ -228,7 +228,7 @@ public class DataNucleusApplicationComponents implements ApplicationScopedCompon
final Map<String, JdoNamedQuery> namedQueryByName = Maps.newHashMap();
for (final String persistableClassName: persistableClassNames) {
final ObjectSpecification spec = specificationLoader.loadSpecification(persistableClassName,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
final JdoQueryFacet facet = spec.getFacet(JdoQueryFacet.class);
if (facet == null) {
continue;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceQueryFactory.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceQueryFactory.java
index 5a1b19a..647d4ce 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceQueryFactory.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceQueryFactory.java
@@ -100,7 +100,7 @@ public class PersistenceQueryFactory {
}
private ObjectSpecification specFor(final Query<?> query) {
- return specificationLoader.loadSpecification(query.getResultType(), IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ return specificationLoader.loadSpecification(query.getResultType(), IntrospectionState.TYPE_INTROSPECTED);
}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
index 7aab0cd..2892455 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
@@ -1451,7 +1451,7 @@ public class PersistenceSession implements
// need to create (and possibly map) the adapter.
final ObjectSpecification objSpec = specificationLoader.loadSpecification(pojo.getClass(),
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
// we create value facets as standalone (so not added to maps)
if (objSpec.containsFacet(ValueFacet.class)) {
@@ -2277,7 +2277,7 @@ public class PersistenceSession implements
private ObjectSpecification objectSpecFor(final Object pojo) {
final Class<?> pojoClass = pojo.getClass();
- return getSpecificationLoader().loadSpecification(pojoClass, IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ return getSpecificationLoader().loadSpecification(pojoClass, IntrospectionState.TYPE_INTROSPECTED);
}
//endregion
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
index 0a15e59..408160a9 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
@@ -128,7 +128,7 @@ public class ObjectMemberAbstractTest {
allowing(mockSpecificationLoader).lookupBySpecId(ObjectSpecId.of("CUS"));
will(returnValue(mockSpecForCustomer));
allowing(mockSpecificationLoader).loadSpecification(with(any(Class.class)),
- with(equal(IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED)));
+ with(equal(IntrospectionState.TYPE_INTROSPECTED)));
will(returnValue(mockSpecForCustomer));
allowing(mockSpecForCustomer).isService();
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationDefaultTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationDefaultTest.java
index ef58bef..a646545 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationDefaultTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationDefaultTest.java
@@ -109,7 +109,7 @@ public class OneToManyAssociationDefaultTest {
private void allowingSpecLoaderToReturnSpecs() {
context.checking(new Expectations() {
{
- allowing(mockSpecificationLoader).loadSpecification(Order.class, IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ allowing(mockSpecificationLoader).loadSpecification(Order.class, IntrospectionState.TYPE_INTROSPECTED);
}
});
}
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/CollectionMemento.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/CollectionMemento.java
index db53469..e9e35a7 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/CollectionMemento.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/CollectionMemento.java
@@ -41,7 +41,7 @@ public class CollectionMemento implements Serializable {
final IsisSessionFactory isisSessionFactory) {
final SpecificationLoader specificationLoader = isisSessionFactory.getSpecificationLoader();
return specificationLoader.loadSpecification(association.getIdentifier().toClassIdentityString(),
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
}
private final ObjectSpecId owningType;
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/PropertyMemento.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/PropertyMemento.java
index 3eeae69..0f6195b 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/PropertyMemento.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/PropertyMemento.java
@@ -38,7 +38,7 @@ public class PropertyMemento implements Serializable {
final IsisSessionFactory isisSessionFactory) {
final SpecificationLoader specificationLoader = isisSessionFactory.getSpecificationLoader();
return specificationLoader.loadSpecification(property.getIdentifier().toClassIdentityString(),
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
}
private final ObjectSpecId owningSpecId;
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/SpecUtils.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/SpecUtils.java
index 7e27f4b..9dc0bc4 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/SpecUtils.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/SpecUtils.java
@@ -36,7 +36,7 @@ public final class SpecUtils {
}
// attempt to load directly.
- return specificationLoader.loadSpecification(objectSpecId.asString(), IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ return specificationLoader.loadSpecification(objectSpecId.asString(), IntrospectionState.TYPE_INTROSPECTED);
}
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
index 295c6ef..48f7ec8 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
@@ -272,7 +272,7 @@ public class EntityCollectionModel extends ModelAbstract<List<ObjectAdapter>> im
};
IterableExtensions.fold(Iterables.transform(pojos, function), closure);
elementSpec = sessionFactory.getSpecificationLoader().loadSpecification(closure.getLowestCommonSuperclass(),
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
} else {
elementSpec = collectionAsAdapter.getElementSpecification();
}
@@ -458,7 +458,7 @@ public class EntityCollectionModel extends ModelAbstract<List<ObjectAdapter>> im
public ObjectSpecification getTypeOfSpecification() {
if (typeOfSpec == null) {
- typeOfSpec = getSpecificationLoader().loadSpecification(typeOf, IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ typeOfSpec = getSpecificationLoader().loadSpecification(typeOf, IntrospectionState.TYPE_INTROSPECTED);
}
return typeOfSpec;
}
diff --git a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/DomainObjectInvocationHandler.java b/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/DomainObjectInvocationHandler.java
index b161f86..89a263d 100644
--- a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/DomainObjectInvocationHandler.java
+++ b/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/DomainObjectInvocationHandler.java
@@ -943,7 +943,7 @@ public class DomainObjectInvocationHandler<T> extends DelegatingInvocationHandle
}
private ObjectSpecification getSpecification(final Class<?> type) {
- return getSpecificationLoader().loadSpecification(type, IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ return getSpecificationLoader().loadSpecification(type, IntrospectionState.TYPE_INTROSPECTED);
}
// /////////////////////////////////////////////////////////////////
diff --git a/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java b/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
index 72ee318..972c378 100644
--- a/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
+++ b/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
@@ -174,7 +174,7 @@ public class WrapperFactoryDefaultTest_wrappedObject {
allowing(mockServicesInjector).getSpecificationLoader();
will(returnValue(mockSpecificationLoader));
- allowing(mockSpecificationLoader).loadSpecification(String.class, IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ allowing(mockSpecificationLoader).loadSpecification(String.class, IntrospectionState.TYPE_INTROSPECTED);
will(returnValue(mockStringSpec));
allowing(mockStringSpec).getShortIdentifier();
@@ -196,7 +196,7 @@ public class WrapperFactoryDefaultTest_wrappedObject {
will(returnValue(mockEmployeeSpec));
allowing(mockSpecificationLoader).loadSpecification(Employee.class,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
will(returnValue(mockEmployeeSpec));
allowing(mockEmployeeSpec).getMember(methodOf(Employee.class, "getEmployeeRepository"));
diff --git a/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java b/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
index 555997e..24f17e5 100644
--- a/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
+++ b/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
@@ -165,7 +165,7 @@ public class WrapperFactoryDefaultTest_wrappedObject_transient {
will(returnValue(mockPasswordIdentifier));
allowing(mockSpecificationLoader).loadSpecification(Employee.class,
- IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+ IntrospectionState.TYPE_INTROSPECTED);
will(returnValue(mockEmployeeSpec));
allowing(mockEmployeeSpec).getMember(with(setPasswordMethod));
diff --git a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.application.services.homepage.HomePageViewModel.xml b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.application.services.homepage.HomePageViewModel.xml
index 0548356..640a594 100644
--- a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.application.services.homepage.HomePageViewModel.xml
+++ b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.application.services.homepage.HomePageViewModel.xml
@@ -71,7 +71,6 @@
<mml:facet id="org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet" fqcn="org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacetInferredFromGenerics">
<mml:attr name="value">domainapp.modules.simple.dom.impl.SimpleObject</mml:attr>
</mml:facet>
- <mml:facet id="org.apache.isis.core.metamodel.facets.all.describedas.DescribedAsFacet" fqcn="org.apache.isis.core.metamodel.facets.members.describedas.annotprop.DescribedAsFacetOnMemberDerivedFromType"/>
<mml:facet id="org.apache.isis.core.metamodel.facets.all.named.NamedFacet" fqcn="org.apache.isis.core.metamodel.facets.all.i18n.NamedFacetTranslated">
<mml:attr name="context">domainapp.application.services.homepage.HomePageViewModel#objects</mml:attr>
<mml:attr name="originalText">Objects</mml:attr>
diff --git a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.modules.simple.dom.impl.SimpleObject.xml b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.modules.simple.dom.impl.SimpleObject.xml
index ad36bf2..d51a587 100644
--- a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.modules.simple.dom.impl.SimpleObject.xml
+++ b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.modules.simple.dom.impl.SimpleObject.xml
@@ -340,7 +340,6 @@
</mml:prop>
<mml:prop id="name">
<mml:facets>
- <mml:facet id="org.apache.isis.core.metamodel.facets.all.describedas.DescribedAsFacet" fqcn="org.apache.isis.core.metamodel.facets.members.describedas.annotprop.DescribedAsFacetOnMemberDerivedFromType"/>
<mml:facet id="org.apache.isis.core.metamodel.facets.all.named.NamedFacet" fqcn="org.apache.isis.core.metamodel.facets.all.i18n.NamedFacetTranslated">
<mml:attr name="context">domainapp.modules.simple.dom.impl.SimpleObject#name</mml:attr>
<mml:attr name="originalText">Name</mml:attr>
@@ -418,7 +417,6 @@
</mml:prop>
<mml:prop id="notes">
<mml:facets>
- <mml:facet id="org.apache.isis.core.metamodel.facets.all.describedas.DescribedAsFacet" fqcn="org.apache.isis.core.metamodel.facets.members.describedas.annotprop.DescribedAsFacetOnMemberDerivedFromType"/>
<mml:facet id="org.apache.isis.core.metamodel.facets.all.named.NamedFacet" fqcn="org.apache.isis.core.metamodel.facets.all.i18n.NamedFacetTranslated">
<mml:attr name="context">domainapp.modules.simple.dom.impl.SimpleObject#notes</mml:attr>
<mml:attr name="originalText">Notes</mml:attr>