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/13 23:28:06 UTC
[isis] 02/05: ISIS-2050: moves introspectObjectSpecId() so called
directly from constructor of ObjectSpec.
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 b66a4efbd11f18babf69037e437456e4e2706d4d
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Dec 13 07:27:42 2018 +0100
ISIS-2050: moves introspectObjectSpecId() so called directly from constructor of ObjectSpec.
---
.../isis/core/metamodel/specloader/SpecificationLoader.java | 1 -
.../specloader/specimpl/ObjectSpecificationAbstract.java | 7 -------
.../specloader/specimpl/dflt/ObjectSpecificationDefault.java | 2 ++
.../standalonelist/ObjectSpecificationOnStandaloneList.java | 10 +++-------
4 files changed, 5 insertions(+), 15 deletions(-)
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 b1b3450..0dc7c06 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
@@ -511,7 +511,6 @@ public class SpecificationLoader implements ApplicationScopedComponent {
servicesInjector, facetProcessor, natureOfServiceIfAny, postProcessor);
}
- objectSpec.introspectObjectSpecId();
return objectSpec;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
index 83ed039..df5d7a6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
@@ -251,13 +251,6 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
//region > Introspection
- public void introspectObjectSpecId() {
- doIntrospectObjectSpecId();
- }
-
- protected void doIntrospectObjectSpecId() {
- facetProcessor.processObjectSpecId(correspondingClass, this);
- }
/**
* Keeps introspecting up to the level required.
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
index 5fbe7bb..81c289d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
@@ -106,6 +106,8 @@ public class ObjectSpecificationDefault extends ObjectSpecificationAbstract impl
this.isService = natureOfServiceIfAny != null;
this.facetedMethodsBuilder = new FacetedMethodsBuilder(this, facetedMethodsBuilderContext);
+
+ facetProcessor.processObjectSpecId(correspondingClass, this);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/ObjectSpecificationOnStandaloneList.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/ObjectSpecificationOnStandaloneList.java
index 95cdb96..5ed83a5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/ObjectSpecificationOnStandaloneList.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/ObjectSpecificationOnStandaloneList.java
@@ -54,6 +54,9 @@ public class ObjectSpecificationOnStandaloneList extends ObjectSpecificationAbst
final PostProcessor postProcessor) {
super(FreeStandingList.class, NAME, servicesInjector, facetProcessor, postProcessor);
this.specId = new ObjectSpecId(getCorrespondingClass().getName());
+
+ FacetUtil.addFacet(
+ new ObjectSpecIdFacetOnStandaloneList(specId, this));
}
//endregion
@@ -61,13 +64,6 @@ public class ObjectSpecificationOnStandaloneList extends ObjectSpecificationAbst
//region > Introspection
@Override
- protected void doIntrospectObjectSpecId() {
- this.specId = new ObjectSpecId(getCorrespondingClass().getName());
- FacetUtil.addFacet(
- new ObjectSpecIdFacetOnStandaloneList(specId, this));
- }
-
- @Override
protected void introspectTypeHierarchy() {
loadSpecOfSuperclass(Object.class);