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 2019/09/29 13:19:02 UTC

[isis] branch ISIS-2086 updated (1703c18 -> d254653)

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a change to branch ISIS-2086
in repository https://gitbox.apache.org/repos/asf/isis.git.


    from 1703c18  ISIS-2086: refactors 'isis.services.publish.objects" to type-safe config
     new 4b71995  ISIS-2086: refactors "isis.objects.editing" to type-safe config
     new d254653  ISIS-2086: refactors 'isis.viewers.collectionLayout.defaultView' to type-safe config

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../org/apache/isis/config/IsisConfiguration.java  | 15 +++++++
 .../auditing/DefaultViewConfiguration.java}        | 15 ++++---
 .../editing/EditingObjectsConfiguration.java}      | 14 +++---
 .../layout/CollectionLayoutFacetFactory.java       |  2 +-
 ...aultViewFacetForCollectionLayoutAnnotation.java |  6 +--
 .../DomainObjectAnnotationFacetFactory.java        |  2 +-
 .../auditing/DefaultViewConfiguration.java         | 50 ----------------------
 .../editing/EditingObjectsConfiguration.java       | 40 -----------------
 .../ImmutableFacetForDomainObjectAnnotation.java   |  6 +--
 .../DomainObjectAnnotationFacetFactoryTest.java    | 16 +++----
 .../DefaultViewConfiguration_parseValue_Test.java  | 50 ----------------------
 11 files changed, 47 insertions(+), 169 deletions(-)
 copy core/{metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/AuditableFacetForDomainObjectAnnotationAsConfigured.java => config/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/DefaultViewConfiguration.java} (71%)
 copy core/config/src/main/java/org/apache/isis/{config/property/ConfigProperty.java => metamodel/facets/object/domainobject/editing/EditingObjectsConfiguration.java} (78%)
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/DefaultViewConfiguration.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/EditingObjectsConfiguration.java
 delete mode 100644 core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/DefaultViewConfiguration_parseValue_Test.java


[isis] 02/02: ISIS-2086: refactors 'isis.viewers.collectionLayout.defaultView' to type-safe config

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch ISIS-2086
in repository https://gitbox.apache.org/repos/asf/isis.git

commit d2546534760d07c840201d51e5e71bc19f99adff
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Sep 29 14:18:42 2019 +0100

    ISIS-2086: refactors 'isis.viewers.collectionLayout.defaultView' to type-safe config
---
 .../org/apache/isis/config/IsisConfiguration.java  |  8 ++++
 .../auditing/DefaultViewConfiguration.java         | 28 +++---------
 .../layout/CollectionLayoutFacetFactory.java       |  2 +-
 ...aultViewFacetForCollectionLayoutAnnotation.java |  6 +--
 .../DefaultViewConfiguration_parseValue_Test.java  | 50 ----------------------
 5 files changed, 19 insertions(+), 75 deletions(-)

diff --git a/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java b/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
index 1728e88..57acc4a 100644
--- a/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
@@ -34,6 +34,7 @@ import org.apache.isis.commons.internal.base._Strings;
 import org.apache.isis.commons.internal.collections._Maps;
 import org.apache.isis.metamodel.facets.actions.action.command.CommandActionsConfiguration;
 import org.apache.isis.metamodel.facets.actions.action.publishing.PublishActionsConfiguration;
+import org.apache.isis.metamodel.facets.object.domainobject.auditing.DefaultViewConfiguration;
 import org.apache.isis.metamodel.facets.object.domainobject.editing.EditingObjectsConfiguration;
 import org.apache.isis.metamodel.facets.object.domainobject.publishing.PublishObjectsConfiguration;
 import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -425,6 +426,13 @@ public class IsisConfiguration {
     private final Viewers viewers = new Viewers();
     @Data
     public static class Viewers {
+
+        private final CollectionLayout collectionLayout = new CollectionLayout();
+        @Data
+        public static class CollectionLayout {
+            private DefaultViewConfiguration defaultView = DefaultViewConfiguration.HIDDEN;
+        }
+
         private final Paged paged = new Paged();
         @Data
         public static class Paged {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/DefaultViewConfiguration.java b/core/config/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/DefaultViewConfiguration.java
similarity index 57%
rename from core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/DefaultViewConfiguration.java
rename to core/config/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/DefaultViewConfiguration.java
index fe969f2..d960fb1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/DefaultViewConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/DefaultViewConfiguration.java
@@ -18,33 +18,19 @@
  */
 package org.apache.isis.metamodel.facets.object.domainobject.auditing;
 
-import org.apache.isis.config.IsisConfigurationLegacy;
+import org.apache.isis.config.IsisConfiguration;
 
 public enum DefaultViewConfiguration {
-    HIDDEN("hidden"),
-    TABLE("table");
+    HIDDEN(),
+    TABLE();
 
-    private static final String DEFAULT_VIEW_KEY = "isis.viewers.collectionLayout.defaultView";
-
-    private final String defaultView;
-
-    DefaultViewConfiguration(
-            final String defaultView) {
-
-        this.defaultView = defaultView;
+    public String toNameLower() {
+        return name().toLowerCase();
     }
 
-    public String getDefaultView() {
-        return defaultView;
+    public static DefaultViewConfiguration parse(IsisConfiguration configuration) {
+        return configuration.getViewers().getCollectionLayout().getDefaultView();
     }
 
-    public static DefaultViewConfiguration parse(IsisConfigurationLegacy configuration) {
-        final String configuredValue = configuration.getString(DEFAULT_VIEW_KEY);
-        return DefaultViewConfiguration.parseValue(configuredValue);
-    }
-
-    static DefaultViewConfiguration parseValue(final String value) {
-        return value != null && value.trim().toLowerCase().equals("table") ? TABLE : HIDDEN;
-    }
 
 }
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/CollectionLayoutFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/CollectionLayoutFacetFactory.java
index 229230f..89f674b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/CollectionLayoutFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/CollectionLayoutFacetFactory.java
@@ -68,7 +68,7 @@ public class CollectionLayoutFacetFactory extends FacetFactoryAbstract implement
 
         // defaultView
         DefaultViewFacet defaultViewFacet =
-                DefaultViewFacetForCollectionLayoutAnnotation.create(collectionLayouts, getConfigurationLegacy(), holder);
+                DefaultViewFacetForCollectionLayoutAnnotation.create(collectionLayouts, getConfiguration(), holder);
         FacetUtil.addFacet(defaultViewFacet);
 
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/DefaultViewFacetForCollectionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/DefaultViewFacetForCollectionLayoutAnnotation.java
index 1483d57..79b5b42 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/DefaultViewFacetForCollectionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/DefaultViewFacetForCollectionLayoutAnnotation.java
@@ -23,11 +23,11 @@ import java.util.List;
 
 import org.apache.isis.applib.annotation.CollectionLayout;
 import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.config.IsisConfiguration;
 import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.collections.collection.defaultview.DefaultViewFacet;
 import org.apache.isis.metamodel.facets.collections.collection.defaultview.DefaultViewFacetAbstract;
-import org.apache.isis.metamodel.facets.object.domainobject.auditing.DefaultViewConfiguration;
 
 public class DefaultViewFacetForCollectionLayoutAnnotation extends DefaultViewFacetAbstract {
 
@@ -37,14 +37,14 @@ public class DefaultViewFacetForCollectionLayoutAnnotation extends DefaultViewFa
 
     public static DefaultViewFacet create(
             final List<CollectionLayout> collectionLayouts,
-            final IsisConfigurationLegacy configuration,
+            final IsisConfiguration configuration,
             final FacetHolder holder) {
 
         final String defaultView = collectionLayouts.stream()
                 .map(CollectionLayout::defaultView)
                 .filter(_Strings::isNotEmpty)
                 .findFirst()
-                .orElseGet(() -> DefaultViewConfiguration.parse(configuration).getDefaultView());
+                .orElseGet(() -> configuration.getViewers().getCollectionLayout().getDefaultView().toNameLower());
         return new DefaultViewFacetForCollectionLayoutAnnotation(defaultView, holder);
     }
 }
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/DefaultViewConfiguration_parseValue_Test.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/DefaultViewConfiguration_parseValue_Test.java
deleted file mode 100644
index 2fe0aac..0000000
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/DefaultViewConfiguration_parseValue_Test.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.isis.metamodel.facets.object.domainobject.auditing;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-import static org.apache.isis.metamodel.facets.object.domainobject.auditing.DefaultViewConfiguration.HIDDEN;
-import static org.apache.isis.metamodel.facets.object.domainobject.auditing.DefaultViewConfiguration.TABLE;
-import static org.apache.isis.metamodel.facets.object.domainobject.auditing.DefaultViewConfiguration.parseValue;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
-
-public class DefaultViewConfiguration_parseValue_Test {
-
-
-    @Test
-    public void when_hidden() throws Exception {
-        Assert.assertThat(parseValue(null), is(equalTo(HIDDEN)));
-        Assert.assertThat(parseValue(""), is(equalTo(HIDDEN)));
-        Assert.assertThat(parseValue("hidden"), is(equalTo(HIDDEN)));
-        Assert.assertThat(parseValue("garbage"), is(equalTo(HIDDEN)));
-    }
-
-    @Test
-    public void when_table() throws Exception {
-        Assert.assertThat(parseValue("table"), is(equalTo(TABLE)));
-        Assert.assertThat(parseValue("TABLE"), is(equalTo(TABLE)));
-        Assert.assertThat(parseValue("tAbLe"), is(equalTo(TABLE)));
-        Assert.assertThat(parseValue("  table  "), is(equalTo(TABLE)));
-        Assert.assertThat(parseValue("  \ntable \n "), is(equalTo(TABLE)));
-    }
-
-}
\ No newline at end of file


[isis] 01/02: ISIS-2086: refactors "isis.objects.editing" to type-safe config

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch ISIS-2086
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 4b719957526926404ad9dc709d4f522ea1c8f478
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Sep 29 14:12:40 2019 +0100

    ISIS-2086: refactors "isis.objects.editing" to type-safe config
---
 .../java/org/apache/isis/config/IsisConfiguration.java   |  7 +++++++
 .../editing/EditingObjectsConfiguration.java             | 14 +-------------
 .../domainobject/DomainObjectAnnotationFacetFactory.java |  2 +-
 .../editing/ImmutableFacetForDomainObjectAnnotation.java |  6 +++---
 .../DomainObjectAnnotationFacetFactoryTest.java          | 16 ++++++++--------
 5 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java b/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
index f6f5061..1728e88 100644
--- a/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
@@ -34,6 +34,7 @@ import org.apache.isis.commons.internal.base._Strings;
 import org.apache.isis.commons.internal.collections._Maps;
 import org.apache.isis.metamodel.facets.actions.action.command.CommandActionsConfiguration;
 import org.apache.isis.metamodel.facets.actions.action.publishing.PublishActionsConfiguration;
+import org.apache.isis.metamodel.facets.object.domainobject.editing.EditingObjectsConfiguration;
 import org.apache.isis.metamodel.facets.object.domainobject.publishing.PublishObjectsConfiguration;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
@@ -55,6 +56,12 @@ import org.springframework.stereotype.Component;
 @Data
 public class IsisConfiguration {
 
+    private final Objects objects = new Objects();
+    @Data
+    public static class Objects {
+        private EditingObjectsConfiguration editing = EditingObjectsConfiguration.TRUE;
+    }
+
     private final Reflector reflector = new Reflector();
     @Data
     public static class Reflector {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/EditingObjectsConfiguration.java b/core/config/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/EditingObjectsConfiguration.java
similarity index 68%
rename from core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/EditingObjectsConfiguration.java
rename to core/config/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/EditingObjectsConfiguration.java
index 296f779..2b0708e3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/EditingObjectsConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/EditingObjectsConfiguration.java
@@ -18,23 +18,11 @@
  */
 package org.apache.isis.metamodel.facets.object.domainobject.editing;
 
+import org.apache.isis.config.IsisConfiguration;
 import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.metamodel.facets.object.domainobject.Util;
 
 public enum EditingObjectsConfiguration {
     TRUE,
     FALSE;
-
-    public static final String EDIT_OBJECTS_KEY = "isis.objects.editing";
-
-    public static EditingObjectsConfiguration parse(final IsisConfigurationLegacy configuration) {
-        final String configuredValue = configuration.getString(EDIT_OBJECTS_KEY);
-        return EditingObjectsConfiguration.parse(configuredValue);
-    }
-
-    private static EditingObjectsConfiguration parse(final String value) {
-        // must be explicitly disabled
-        return Util.parseNo(value)? FALSE : TRUE;
-    }
-
 }
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
index 53c6438..9a1b4ab 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
@@ -247,7 +247,7 @@ implements MetaModelValidatorRefiner, PostConstructMethodCache, ObjectSpecIdFace
 
         // check from @DomainObject(editing=...)
         ImmutableFacet facet = ImmutableFacetForDomainObjectAnnotation
-                .create(domainObjects, getConfigurationLegacy(), facetHolder);
+                .create(domainObjects, getConfiguration(), facetHolder);
 
         // then add
         FacetUtil.addFacet(facet);
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java
index 79f80ae..2934a68 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java
@@ -25,7 +25,7 @@ import java.util.Map;
 import org.apache.isis.applib.annotation.DomainObject;
 import org.apache.isis.applib.annotation.Editing;
 import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.config.IsisConfigurationLegacy;
+import org.apache.isis.config.IsisConfiguration;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facetapi.FacetUtil;
@@ -39,10 +39,10 @@ public class ImmutableFacetForDomainObjectAnnotation extends ImmutableFacetAbstr
 
     public static ImmutableFacet create(
             final List<DomainObject> domainObjects,
-            final IsisConfigurationLegacy configuration,
+            final IsisConfiguration configuration,
             final FacetHolder holder) {
 
-        final EditingObjectsConfiguration setting = EditingObjectsConfiguration.parse(configuration);
+        final EditingObjectsConfiguration setting = configuration.getObjects().getEditing();
 
         return domainObjects.stream()
                 .filter(domainObject -> domainObject.editing() != Editing.NOT_SPECIFIED)
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
index 4e5d938..2fc3238 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
@@ -583,7 +583,7 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
 
             @Test
             public void configured_value_set_to_true() {
-                allowingConfigurationToReturn(EditingObjectsConfiguration.EDIT_OBJECTS_KEY, "true");
+                allowingConfigurationToReturn("isis.objects.editing", "true");
 
                 facetFactory.process(new ProcessClassContext(DomainObjectAnnotationFacetFactoryTest.Customer.class, mockMethodRemover, facetHolder));
 
@@ -595,7 +595,7 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
 
             @Test
             public void configured_value_set_to_false() {
-                allowingConfigurationToReturn(EditingObjectsConfiguration.EDIT_OBJECTS_KEY, "false");
+                allowingConfigurationToReturn("isis.objects.editing", "false");
 
                 facetFactory.process(new ProcessClassContext(DomainObjectAnnotationFacetFactoryTest.Customer.class, mockMethodRemover, facetHolder));
 
@@ -608,7 +608,7 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
 
             @Test
             public void configured_value_set_to_not_recognized() {
-                allowingConfigurationToReturn(EditingObjectsConfiguration.EDIT_OBJECTS_KEY, "foobar");
+                allowingConfigurationToReturn("isis.objects.editing", "foobar");
 
                 facetFactory.process(new ProcessClassContext(DomainObjectAnnotationFacetFactoryTest.Customer.class, mockMethodRemover, facetHolder));
 
@@ -624,7 +624,7 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
 
             @Test
             public void configured_value_set_to_true() {
-                allowingConfigurationToReturn(EditingObjectsConfiguration.EDIT_OBJECTS_KEY, "true");
+                allowingConfigurationToReturn("isis.objects.editing", "true");
 
                 facetFactory.process(new ProcessClassContext(CustomerWithDomainObjectAndEditingSetToAsConfigured.class, mockMethodRemover, facetHolder));
 
@@ -636,7 +636,7 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
 
             @Test
             public void configured_value_set_to_false() {
-                allowingConfigurationToReturn(EditingObjectsConfiguration.EDIT_OBJECTS_KEY, "false");
+                allowingConfigurationToReturn("isis.objects.editing", "false");
 
                 facetFactory.process(new ProcessClassContext(CustomerWithDomainObjectAndEditingSetToAsConfigured.class, mockMethodRemover, facetHolder));
 
@@ -649,7 +649,7 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
 
             @Test
             public void configured_value_set_to_not_recognized() {
-                allowingConfigurationToReturn(EditingObjectsConfiguration.EDIT_OBJECTS_KEY, "foobar");
+                allowingConfigurationToReturn("isis.objects.editing", "foobar");
 
                 facetFactory.process(new ProcessClassContext(CustomerWithDomainObjectAndEditingSetToAsConfigured.class, mockMethodRemover, facetHolder));
 
@@ -664,7 +664,7 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
 
             @Test
             public void irrespective_of_configured_value() {
-                allowingConfigurationToReturn(EditingObjectsConfiguration.EDIT_OBJECTS_KEY, "false");
+                allowingConfigurationToReturn("isis.objects.editing", "false");
 
                 facetFactory.process(new ProcessClassContext(
                         CustomerWithDomainObjectAndEditingSetToEnabled.class, mockMethodRemover, facetHolder));
@@ -681,7 +681,7 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
 
             @Test
             public void irrespective_of_configured_value() {
-                allowingConfigurationToReturn(EditingObjectsConfiguration.EDIT_OBJECTS_KEY, "true");
+                allowingConfigurationToReturn("isis.objects.editing", "true");
 
                 facetFactory.process(new ProcessClassContext(
                         CustomerWithDomainObjectAndEditingSetToDisabled.class, mockMethodRemover, facetHolder));