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:01 UTC
[isis] 01/02: ISIS-1749: relaxes validation so that
@DomainObject(nature=EXTERNAL or INTERNAL) is allowed to be combined with
JAXB.
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 e3a5f6aed9e561c3c6a27836a553832ba45449dd
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Jan 2 15:34:35 2018 +0000
ISIS-1749: relaxes validation so that @DomainObject(nature=EXTERNAL or INTERNAL) is allowed to be combined with JAXB.
---
...atableObjectFacetForDomainObjectAnnotation.java | 20 +++-----------
.../DomainObjectAnnotationFacetFactoryTest.java | 32 +++++++++++-----------
2 files changed, 20 insertions(+), 32 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 2532eaa..267c4d3 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
@@ -54,27 +54,15 @@ public class RecreatableObjectFacetForDomainObjectAnnotation extends
return null;
case VIEW_MODEL:
+ case EXTERNAL_ENTITY:
+ case INMEMORY_ENTITY:
final ViewModelFacet existingFacet = holder.getFacet(ViewModelFacet.class);
if (existingFacet != null) {
- if (existingFacet.getArchitecturalLayer() == ArchitecturalLayer.APPLICATION) {
- // if compatible existing facet, then just ignore
- // (otherwise the metamodel
- return null;
- }
- // otherwise, we continue through and add the new facet making the existing one the
- // underlying. The metamodel validator on RecreatableObjectFacetFactory will then mark the
- // model as invalid because of incompatible semantics.
+ return null;
}
return new RecreatableObjectFacetForDomainObjectAnnotation(
holder,
- ArchitecturalLayer.APPLICATION,
- specificationLoader, adapterManager, servicesInjector, postConstructMethodCache);
-
- case EXTERNAL_ENTITY:
- case INMEMORY_ENTITY:
- return new RecreatableObjectFacetForDomainObjectAnnotation(
- holder,
- ArchitecturalLayer.DOMAIN,
+ nature == Nature.VIEW_MODEL ? ArchitecturalLayer.APPLICATION : ArchitecturalLayer.DOMAIN,
specificationLoader, adapterManager, servicesInjector, postConstructMethodCache);
}
// shouldn't happen, the above switch should match all cases.
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 505989f..ee798a9 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
@@ -160,7 +160,7 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
public void configured_value_set_to_all() {
allowingConfigurationToReturn("isis.services.audit.objects", "all");
- facetFactory.processAuditing(new ProcessClassContext(Customer.class, null, mockMethodRemover, facetHolder));
+ facetFactory.processAuditing(new ProcessClassContext(DomainObjectAnnotationFacetFactoryTest.Customer.class, null, mockMethodRemover, facetHolder));
final Facet facet = facetHolder.getFacet(AuditableFacet.class);
assertThat(facet, is(notNullValue()));
@@ -173,7 +173,7 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
public void configured_value_set_to_none() {
allowingConfigurationToReturn("isis.services.audit.objects", "none");
- facetFactory.process(new ProcessClassContext(Customer.class, null, mockMethodRemover, facetHolder));
+ facetFactory.process(new ProcessClassContext(DomainObjectAnnotationFacetFactoryTest.Customer.class, null, mockMethodRemover, facetHolder));
final Facet facet = facetHolder.getFacet(AuditableFacet.class);
Assert.assertNull(facet);
@@ -185,7 +185,7 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
public void configured_value_set_to_not_recognized() {
allowingConfigurationToReturn("isis.services.audit.objects", "foobar");
- facetFactory.process(new ProcessClassContext(Customer.class, null, mockMethodRemover, facetHolder));
+ facetFactory.process(new ProcessClassContext(DomainObjectAnnotationFacetFactoryTest.Customer.class, null, mockMethodRemover, facetHolder));
final Facet facet = facetHolder.getFacet(AuditableFacet.class);
Assert.assertNull(facet);
@@ -217,7 +217,7 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
@Test
public void does_not_have_annotation() {
- facetFactory.process(new ProcessClassContext(Customer.class, null, mockMethodRemover, facetHolder));
+ facetFactory.process(new ProcessClassContext(DomainObjectAnnotationFacetFactoryTest.Customer.class, null, mockMethodRemover, facetHolder));
final Facet facet = facetHolder.getFacet(AuditableFacet.class);
Assert.assertNull(facet);
@@ -354,7 +354,7 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
public void configured_value_set_to_all() {
allowingConfigurationToReturn("isis.services.publish.objects", "all");
- facetFactory.process(new ProcessClassContext(Customer.class, null, mockMethodRemover, facetHolder));
+ facetFactory.process(new ProcessClassContext(DomainObjectAnnotationFacetFactoryTest.Customer.class, null, mockMethodRemover, facetHolder));
final Facet facet = facetHolder.getFacet(PublishedObjectFacet.class);
Assert.assertNotNull(facet);
@@ -367,7 +367,7 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
public void configured_value_set_to_none() {
allowingConfigurationToReturn("isis.services.publish.objects", "none");
- facetFactory.process(new ProcessClassContext(Customer.class, null, mockMethodRemover, facetHolder));
+ facetFactory.process(new ProcessClassContext(DomainObjectAnnotationFacetFactoryTest.Customer.class, null, mockMethodRemover, facetHolder));
final Facet facet = facetHolder.getFacet(PublishedObjectFacet.class);
Assert.assertNull(facet);
@@ -379,7 +379,7 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
public void configured_value_set_to_not_recognized() {
allowingConfigurationToReturn("isis.services.publish.objects", "foobar");
- facetFactory.process(new ProcessClassContext(Customer.class, null, mockMethodRemover, facetHolder));
+ facetFactory.process(new ProcessClassContext(DomainObjectAnnotationFacetFactoryTest.Customer.class, null, mockMethodRemover, facetHolder));
final Facet facet = facetHolder.getFacet(PublishedObjectFacet.class);
Assert.assertNull(facet);
@@ -411,7 +411,7 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
@Test
public void does_not_have_annotation() {
- facetFactory.process(new ProcessClassContext(Customer.class, null, mockMethodRemover, facetHolder));
+ facetFactory.process(new ProcessClassContext(DomainObjectAnnotationFacetFactoryTest.Customer.class, null, mockMethodRemover, facetHolder));
final Facet facet = facetHolder.getFacet(PublishedObjectFacet.class);
Assert.assertNull(facet);
@@ -610,7 +610,7 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
@Test
public void whenNoDomainObjectAnnotation() {
- facetFactory.process(new ProcessClassContext(Customer.class, null, mockMethodRemover, facetHolder));
+ facetFactory.process(new ProcessClassContext(DomainObjectAnnotationFacetFactoryTest.Customer.class, null, mockMethodRemover, facetHolder));
final Facet facet = facetHolder.getFacet(AutoCompleteFacet.class);
Assert.assertNull(facet);
@@ -667,7 +667,7 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
@Test
public void whenNoDomainObjectAnnotation() {
- facetFactory.process(new ProcessClassContext(Customer.class, null, mockMethodRemover, facetHolder));
+ facetFactory.process(new ProcessClassContext(DomainObjectAnnotationFacetFactoryTest.Customer.class, null, mockMethodRemover, facetHolder));
final Facet facet = facetHolder.getFacet(ChoicesFacet.class);
Assert.assertNull(facet);
@@ -702,7 +702,7 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
public void configured_value_set_to_true() {
allowingConfigurationToReturn(EditingObjectsConfiguration.EDIT_OBJECTS_KEY, "true");
- facetFactory.process(new ProcessClassContext(Customer.class, null, mockMethodRemover, facetHolder));
+ facetFactory.process(new ProcessClassContext(DomainObjectAnnotationFacetFactoryTest.Customer.class, null, mockMethodRemover, facetHolder));
final Facet facet = facetHolder.getFacet(ImmutableFacet.class);
Assert.assertNull(facet);
@@ -714,7 +714,7 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
public void configured_value_set_to_false() {
allowingConfigurationToReturn(EditingObjectsConfiguration.EDIT_OBJECTS_KEY, "false");
- facetFactory.process(new ProcessClassContext(Customer.class, null, mockMethodRemover, facetHolder));
+ facetFactory.process(new ProcessClassContext(DomainObjectAnnotationFacetFactoryTest.Customer.class, null, mockMethodRemover, facetHolder));
final Facet facet = facetHolder.getFacet(ImmutableFacet.class);
Assert.assertNotNull(facet);
@@ -727,7 +727,7 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
public void configured_value_set_to_not_recognized() {
allowingConfigurationToReturn(EditingObjectsConfiguration.EDIT_OBJECTS_KEY, "foobar");
- facetFactory.process(new ProcessClassContext(Customer.class, null, mockMethodRemover, facetHolder));
+ facetFactory.process(new ProcessClassContext(DomainObjectAnnotationFacetFactoryTest.Customer.class, null, mockMethodRemover, facetHolder));
final Facet facet = facetHolder.getFacet(ImmutableFacet.class);
Assert.assertNull(facet);
@@ -760,7 +760,7 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
@Test
public void does_not_have_annotation() {
- facetFactory.process(new ProcessClassContext(Customer.class, null, mockMethodRemover, facetHolder));
+ facetFactory.process(new ProcessClassContext(DomainObjectAnnotationFacetFactoryTest.Customer.class, null, mockMethodRemover, facetHolder));
final Facet facet = facetHolder.getFacet(ImmutableFacet.class);
Assert.assertNull(facet);
@@ -892,7 +892,7 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
@Test
public void whenNoDomainObjectAnnotation() {
- facetFactory.process(new ProcessClassContext(Customer.class, null, mockMethodRemover, facetHolder));
+ facetFactory.process(new ProcessClassContext(DomainObjectAnnotationFacetFactoryTest.Customer.class, null, mockMethodRemover, facetHolder));
final Facet facet = facetHolder.getFacet(ObjectSpecIdFacet.class);
Assert.assertNull(facet);
@@ -1011,7 +1011,7 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
@Test
public void whenNoDomainObjectAnnotation() {
- facetFactory.process(new ProcessClassContext(Customer.class, null, mockMethodRemover, facetHolder));
+ facetFactory.process(new ProcessClassContext(DomainObjectAnnotationFacetFactoryTest.Customer.class, null, mockMethodRemover, facetHolder));
final Facet facet = facetHolder.getFacet(ViewModelFacet.class);
Assert.assertNull(facet);
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.