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/01/02 15:43:02 UTC
[isis] 02/02: ISIS-1749: removes the concept of ArchitecturalLayer
(internal API only, now unused, and I think flawed anyway)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 0cf51c9c156021e0aec688649ab2be0d3f36ad55
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Jan 2 15:36:59 2018 +0000
ISIS-1749: removes the concept of ArchitecturalLayer (internal API only, now unused, and I think flawed anyway)
... as mixed up specification vs implementation concerns
---
.../RecreatableObjectFacetForDomainObjectAnnotation.java | 4 +---
.../object/recreatable/RecreatableObjectFacetAbstract.java | 8 --------
...ecreatableObjectFacetDeclarativeInitializingAbstract.java | 3 +--
...atableObjectFacetForRecreatableDomainObjectInterface.java | 2 +-
...RecreatableObjectFacetForRecreatableObjectAnnotation.java | 2 +-
.../RecreatableObjectFacetForRecreatableObjectInterface.java | 2 +-
.../RecreatableObjectFacetForViewModelAnnotation.java | 2 +-
.../RecreatableObjectFacetForXmlRootElementAnnotation.java | 2 +-
.../metamodel/facets/object/viewmodel/ViewModelFacet.java | 11 -----------
.../domainobject/DomainObjectAnnotationFacetFactoryTest.java | 12 ------------
10 files changed, 7 insertions(+), 41 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/recreatable/RecreatableObjectFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/recreatable/RecreatableObjectFacetForDomainObjectAnnotation.java
index 267c4d3..17ce65d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/recreatable/RecreatableObjectFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/recreatable/RecreatableObjectFacetForDomainObjectAnnotation.java
@@ -62,7 +62,6 @@ public class RecreatableObjectFacetForDomainObjectAnnotation extends
}
return new RecreatableObjectFacetForDomainObjectAnnotation(
holder,
- nature == Nature.VIEW_MODEL ? ArchitecturalLayer.APPLICATION : ArchitecturalLayer.DOMAIN,
specificationLoader, adapterManager, servicesInjector, postConstructMethodCache);
}
// shouldn't happen, the above switch should match all cases.
@@ -71,12 +70,11 @@ public class RecreatableObjectFacetForDomainObjectAnnotation extends
private RecreatableObjectFacetForDomainObjectAnnotation(
final FacetHolder holder,
- final ArchitecturalLayer architecturalLayer,
final SpecificationLoader specificationLoader,
final AdapterManager adapterManager,
final ServicesInjector servicesInjector,
final PostConstructMethodCache postConstructMethodCache) {
- super(holder, architecturalLayer, RecreationMechanism.INITIALIZES, specificationLoader, adapterManager, servicesInjector,
+ super(holder, RecreationMechanism.INITIALIZES, specificationLoader, adapterManager, servicesInjector,
postConstructMethodCache);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetAbstract.java
index 2e1da5c..5fbbc20 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetAbstract.java
@@ -33,7 +33,6 @@ import org.apache.isis.core.metamodel.specloader.specimpl.dflt.ObjectSpecificati
public abstract class RecreatableObjectFacetAbstract extends MarkerFacetAbstract implements ViewModelFacet {
- private final ArchitecturalLayer architecturalLayer;
private final PostConstructMethodCache postConstructMethodCache;
private final ViewModelFacet.RecreationMechanism recreationMechanism;
protected final ServicesInjector servicesInjector;
@@ -44,12 +43,10 @@ public abstract class RecreatableObjectFacetAbstract extends MarkerFacetAbstract
public RecreatableObjectFacetAbstract(
final FacetHolder holder,
- final ArchitecturalLayer architecturalLayer,
final RecreationMechanism recreationMechanism,
final PostConstructMethodCache postConstructMethodCache,
final ServicesInjector servicesInjector) {
super(type(), holder);
- this.architecturalLayer = architecturalLayer;
this.postConstructMethodCache = postConstructMethodCache;
this.recreationMechanism = recreationMechanism;
this.servicesInjector = servicesInjector;
@@ -80,11 +77,6 @@ public abstract class RecreatableObjectFacetAbstract extends MarkerFacetAbstract
}
@Override
- public ArchitecturalLayer getArchitecturalLayer() {
- return architecturalLayer;
- }
-
- @Override
public RecreationMechanism getRecreationMechanism() {
return recreationMechanism;
}
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 bc15bec..1d3a4d2 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
@@ -48,13 +48,12 @@ public abstract class RecreatableObjectFacetDeclarativeInitializingAbstract exte
public RecreatableObjectFacetDeclarativeInitializingAbstract(
final FacetHolder holder,
- final ArchitecturalLayer architecturalLayer,
final RecreationMechanism recreationMechanism,
final SpecificationLoader specificationLoader,
final AdapterManager adapterManager,
final ServicesInjector servicesInjector,
final PostConstructMethodCache postConstructMethodCache) {
- super(holder, architecturalLayer, recreationMechanism, postConstructMethodCache, servicesInjector);
+ super(holder, recreationMechanism, postConstructMethodCache, servicesInjector);
this.specificationLoader = specificationLoader;
this.adapterManager = adapterManager;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetForRecreatableDomainObjectInterface.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetForRecreatableDomainObjectInterface.java
index 7ccd086..3bd72ff 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetForRecreatableDomainObjectInterface.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetForRecreatableDomainObjectInterface.java
@@ -30,7 +30,7 @@ public class RecreatableObjectFacetForRecreatableDomainObjectInterface extends R
final FacetHolder holder,
final PostConstructMethodCache postConstructMethodCache,
final ServicesInjector servicesInjector) {
- super(holder, ArchitecturalLayer.DOMAIN, RecreationMechanism.INITIALIZES, postConstructMethodCache, servicesInjector);
+ super(holder, RecreationMechanism.INITIALIZES, postConstructMethodCache, servicesInjector);
}
@Override
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetForRecreatableObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetForRecreatableObjectAnnotation.java
index d3de9dc..557ad8a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetForRecreatableObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetForRecreatableObjectAnnotation.java
@@ -34,7 +34,7 @@ public class RecreatableObjectFacetForRecreatableObjectAnnotation extends
final AdapterManager adapterManager,
final ServicesInjector servicesInjector,
final PostConstructMethodCache postConstructMethodCache) {
- super(holder, ArchitecturalLayer.APPLICATION, RecreationMechanism.INITIALIZES,
+ super(holder, RecreationMechanism.INITIALIZES,
specificationLoader, adapterManager, servicesInjector, postConstructMethodCache);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetForRecreatableObjectInterface.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetForRecreatableObjectInterface.java
index fb402f2..66da805 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetForRecreatableObjectInterface.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetForRecreatableObjectInterface.java
@@ -30,7 +30,7 @@ public class RecreatableObjectFacetForRecreatableObjectInterface extends Recreat
final FacetHolder holder,
final PostConstructMethodCache postConstructMethodCache,
final ServicesInjector servicesInjector) {
- super(holder, ArchitecturalLayer.APPLICATION, RecreationMechanism.INITIALIZES, postConstructMethodCache, servicesInjector);
+ super(holder, RecreationMechanism.INITIALIZES, postConstructMethodCache, servicesInjector);
}
@Override
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetForViewModelAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetForViewModelAnnotation.java
index 1c95e8f..a29d3e1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetForViewModelAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetForViewModelAnnotation.java
@@ -34,7 +34,7 @@ public class RecreatableObjectFacetForViewModelAnnotation extends
final AdapterManager adapterManager,
final ServicesInjector servicesInjector,
final PostConstructMethodCache postConstructMethodCache) {
- super(holder, ArchitecturalLayer.APPLICATION, RecreationMechanism.INITIALIZES,
+ super(holder, RecreationMechanism.INITIALIZES,
specificationLoader, adapterManager, servicesInjector, postConstructMethodCache);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetForXmlRootElementAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetForXmlRootElementAnnotation.java
index cd99f5f..3fa1dca 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetForXmlRootElementAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetForXmlRootElementAnnotation.java
@@ -32,7 +32,7 @@ public class RecreatableObjectFacetForXmlRootElementAnnotation extends Recreatab
final FacetHolder holder,
final ServicesInjector servicesInjector,
final PostConstructMethodCache postConstructMethodCache) {
- super(holder, ArchitecturalLayer.APPLICATION, RecreationMechanism.INSTANTIATES,
+ super(holder, RecreationMechanism.INSTANTIATES,
postConstructMethodCache, servicesInjector);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/viewmodel/ViewModelFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/viewmodel/ViewModelFacet.java
index c149703..e3e9537 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/viewmodel/ViewModelFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/viewmodel/ViewModelFacet.java
@@ -19,7 +19,6 @@
package org.apache.isis.core.metamodel.facets.object.viewmodel;
-import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.core.metamodel.facetapi.Facet;
/**
@@ -40,11 +39,6 @@ import org.apache.isis.core.metamodel.facetapi.Facet;
public interface ViewModelFacet extends Facet {
- public enum ArchitecturalLayer {
- APPLICATION,
- DOMAIN
- }
-
public enum RecreationMechanism {
/**
* Instantiates a new instance and then populates
@@ -108,9 +102,4 @@ public interface ViewModelFacet extends Facet {
*/
Object clone(Object pojo);
- /**
- * Currently metadata only, capturing the nature of the view model, eg {@link Nature#EXTERNAL_ENTITY} is a {@link ArchitecturalLayer#DOMAIN domain} layer where as {@link Nature#VIEW_MODEL} is {@link ArchitecturalLayer#APPLICATION application} layer.
- * @return
- */
- ArchitecturalLayer getArchitecturalLayer();
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
index ee798a9..dd65a1d 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
@@ -965,10 +965,6 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
Assert.assertNotNull(facet);
Assert.assertTrue(facet instanceof RecreatableObjectFacetForDomainObjectAnnotation);
- final RecreatableObjectFacetForDomainObjectAnnotation facetForDomainObjectAnnotation =
- (RecreatableObjectFacetForDomainObjectAnnotation) facet;
-
- assertThat(facetForDomainObjectAnnotation.getArchitecturalLayer(), is(ViewModelFacet.ArchitecturalLayer.APPLICATION));
expectNoMethodsRemoved();
}
@@ -983,10 +979,6 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
Assert.assertNotNull(facet);
Assert.assertTrue(facet instanceof RecreatableObjectFacetForDomainObjectAnnotation);
- final RecreatableObjectFacetForDomainObjectAnnotation facetForDomainObjectAnnotation =
- (RecreatableObjectFacetForDomainObjectAnnotation) facet;
-
- assertThat(facetForDomainObjectAnnotation.getArchitecturalLayer(), is(ViewModelFacet.ArchitecturalLayer.DOMAIN));
expectNoMethodsRemoved();
}
@@ -1000,10 +992,6 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
Assert.assertNotNull(facet);
Assert.assertTrue(facet instanceof RecreatableObjectFacetForDomainObjectAnnotation);
- final RecreatableObjectFacetForDomainObjectAnnotation facetForDomainObjectAnnotation =
- (RecreatableObjectFacetForDomainObjectAnnotation) facet;
-
- assertThat(facetForDomainObjectAnnotation.getArchitecturalLayer(), is(ViewModelFacet.ArchitecturalLayer.DOMAIN));
expectNoMethodsRemoved();
}
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.