You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2019/10/25 12:15:59 UTC
[isis] branch v2 updated: ISIS-2086: cleaning up and aligning
package names in 'unittestsuppot'
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/v2 by this push:
new ecbbb96 ISIS-2086: cleaning up and aligning package names in 'unittestsuppot'
ecbbb96 is described below
commit ecbbb9654bcb093b1eca6e4b9cc1228c0bd10241
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Oct 25 14:15:43 2019 +0200
ISIS-2086: cleaning up and aligning package names in 'unittestsuppot'
---
.../org/apache/isis/config/IsisConfiguration.java | 3 --
.../config/IsisConfiguration_createSubsetTest.java | 3 +-
.../isis/config/IsisConfiguration_primingTest.java | 2 +-
.../config/IsisConfiguration_specialCharTest.java | 3 +-
.../config/IsisConfiguration_whitespaceTest.java | 3 +-
.../metamodel/MetaModelContext_configTest.java | 4 +-
.../metamodel/MetaModelContext_forTesting.java | 4 +-
...ctionAnnotationFacetFactoryTest_Invocation.java | 2 +-
.../ViewModelSemanticCheckingFacetFactoryTest.java | 2 +-
.../object/defaults/DefaultedFacetFactoryTest.java | 2 +-
.../DomainObjectAnnotationFacetFactoryTest.java | 2 +-
.../DomainObjectLayoutFactoryTest.java | 2 +-
...eFacetAnnotationOrConfigurationFactoryTest.java | 2 +-
.../PropertyAnnotationFacetFactoryTest.java | 2 +-
.../BigDecimalValueSemanticsProviderTest.java | 2 +-
.../value/BigIntValueSemanticsProviderTest.java | 2 +-
.../value/ByteValueSemanticsProviderTest.java | 2 +-
.../value/DoubleValueSemanticsProviderTest.java | 2 +-
.../value/FloatValueSemanticsProviderTest.java | 2 +-
.../ImageValueSemanticsProviderAbstractTest.java | 2 +-
.../value/IntValueSemanticsProviderTest.java | 2 +-
.../JavaSqlDateValueSemanticsProviderTest.java | 2 +-
.../JavaSqlTimeValueSemanticsProviderTest.java | 2 +-
.../JavaUtilDateValueSemanticsProviderTest.java | 2 +-
.../value/LongValueSemanticsProviderTest.java | 2 +-
.../PercentageValueSemanticsProviderTest.java | 2 +-
.../value/ShortValueSemanticsProviderTest.java | 2 +-
.../ValueSemanticsProviderAbstractTestCase.java | 2 +-
...odaLocalDateTimeValueSemanticsProviderTest.java | 2 +-
...onRecognizerCompositeForJdoObjectStoreTest.java | 2 +-
.../WrapperFactoryDefaultTest_wrappedObject.java | 2 +-
.../confmenu/ConfigurationViewServiceDefault.java | 59 +++++++++++++++++++---
...ticatorOrAuthorizorTest_isVisibleInAnyRole.java | 2 +-
.../isis/config/property/ConfigProperty.java | 30 -----------
.../config/property/ConfigPropertyAbstract.java | 33 ------------
.../config/property/ConfigPropertyBoolean.java | 45 -----------------
.../isis/config/property/ConfigPropertyEnum.java | 41 ---------------
.../isis/config/property/ConfigPropertyString.java | 40 ---------------
.../config/IsisConfigurationLegacy.java | 2 +-
.../config/internal/_Config.java | 4 +-
.../config/internal/_Config_Instance.java | 4 +-
.../config/internal/_Config_LifecycleResource.java | 4 +-
.../config/internal/_Config_Parsers.java | 2 +-
.../config/internal/_Config_trim.java | 2 +-
.../server/ResourceContextTest_getArg.java | 2 +-
..._ensureCompatibleAcceptHeader_ContractTest.java | 2 +-
46 files changed, 99 insertions(+), 243 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 647f96d..f75d870 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
@@ -61,14 +61,11 @@ import lombok.val;
/**
- *
* Configuration 'beans' with meta-data (IDE-support).
*
* @see <a href="https://docs.spring.io/spring-boot/docs/current/reference/html/configuration-metadata.html">spring.io</a>
- * @apiNote should ultimately replace {@link IsisConfigurationLegacy}
*
* @since 2.0
- *
*/
@ConfigurationProperties(ConfigurationConstants.ROOT_PREFIX)
@Data
diff --git a/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_createSubsetTest.java b/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_createSubsetTest.java
index 0c38ce5..6ba7038 100644
--- a/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_createSubsetTest.java
+++ b/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_createSubsetTest.java
@@ -21,7 +21,8 @@ package org.apache.isis.config;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.apache.isis.config.internal._Config;
+import org.apache.isis.unittestsupport.config.IsisConfigurationLegacy;
+import org.apache.isis.unittestsupport.config.internal._Config;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_primingTest.java b/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_primingTest.java
index 942afda..c27a677 100644
--- a/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_primingTest.java
+++ b/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_primingTest.java
@@ -21,7 +21,7 @@ package org.apache.isis.config;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.apache.isis.config.internal._Config;
+import org.apache.isis.unittestsupport.config.internal._Config;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
diff --git a/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_specialCharTest.java b/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_specialCharTest.java
index 4826180..d529d9f 100644
--- a/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_specialCharTest.java
+++ b/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_specialCharTest.java
@@ -21,7 +21,8 @@ package org.apache.isis.config;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.apache.isis.config.internal._Config;
+import org.apache.isis.unittestsupport.config.IsisConfigurationLegacy;
+import org.apache.isis.unittestsupport.config.internal._Config;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_whitespaceTest.java b/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_whitespaceTest.java
index 536af18..9af4a48 100644
--- a/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_whitespaceTest.java
+++ b/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_whitespaceTest.java
@@ -21,7 +21,8 @@ package org.apache.isis.config;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.apache.isis.config.internal._Config;
+import org.apache.isis.unittestsupport.config.IsisConfigurationLegacy;
+import org.apache.isis.unittestsupport.config.internal._Config;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/MetaModelContext_configTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/MetaModelContext_configTest.java
index 968f2b2..6afa283 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/MetaModelContext_configTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/MetaModelContext_configTest.java
@@ -21,8 +21,8 @@ package org.apache.isis.metamodel;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.apache.isis.config.IsisConfigurationLegacy;
-import org.apache.isis.config.internal._Config;
+import org.apache.isis.unittestsupport.config.IsisConfigurationLegacy;
+import org.apache.isis.unittestsupport.config.internal._Config;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/MetaModelContext_forTesting.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/MetaModelContext_forTesting.java
index 165b0e4..294d234 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/MetaModelContext_forTesting.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/MetaModelContext_forTesting.java
@@ -35,8 +35,6 @@ import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.config.IsisConfigurationLegacy;
-import org.apache.isis.config.internal._Config;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.adapter.ObjectAdapterProvider;
import org.apache.isis.metamodel.progmodel.ProgrammingModel;
@@ -49,6 +47,8 @@ import org.apache.isis.security.authentication.AuthenticationSession;
import org.apache.isis.security.authentication.AuthenticationSessionProvider;
import org.apache.isis.security.authentication.manager.AuthenticationManager;
import org.apache.isis.security.authorization.manager.AuthorizationManager;
+import org.apache.isis.unittestsupport.config.IsisConfigurationLegacy;
+import org.apache.isis.unittestsupport.config.internal._Config;
import static java.util.Objects.requireNonNull;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Invocation.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Invocation.java
index c443754..f6acc0b 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Invocation.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Invocation.java
@@ -23,7 +23,6 @@ import org.junit.Test;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.events.domain.ActionDomainEvent;
-import org.apache.isis.config.internal._Config;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.isis.metamodel.facets.actions.action.invocation.ActionDomainEventFacet;
@@ -33,6 +32,7 @@ import org.apache.isis.metamodel.facets.actions.action.invocation.ActionDomainEv
import org.apache.isis.metamodel.facets.actions.action.invocation.ActionInvocationFacet;
import org.apache.isis.metamodel.facets.actions.action.invocation.ActionInvocationFacetForDomainEventFromActionAnnotation;
import org.apache.isis.metamodel.facets.actions.action.invocation.ActionInvocationFacetForDomainEventFromDefault;
+import org.apache.isis.unittestsupport.config.internal._Config;
import static org.apache.isis.metamodel.commons.matchers.IsisMatchers.classEqualTo;
import static org.junit.Assert.assertThat;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
index b5add14..d735b02 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
@@ -28,7 +28,6 @@ import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.commons.internal.context._Context;
import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.config.internal._Config;
import org.apache.isis.metamodel.MetaModelContext;
import org.apache.isis.metamodel.MetaModelContextAware;
import org.apache.isis.metamodel.MetaModelContext_forTesting;
@@ -38,6 +37,7 @@ import org.apache.isis.metamodel.progmodel.ProgrammingModelAbstract;
import org.apache.isis.metamodel.progmodel.ProgrammingModelInitFilterDefault;
import org.apache.isis.metamodel.specloader.validator.MetaModelValidatorAbstract;
import org.apache.isis.metamodel.specloader.validator.ValidationFailures;
+import org.apache.isis.unittestsupport.config.internal._Config;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import static org.hamcrest.CoreMatchers.containsString;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/defaults/DefaultedFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/defaults/DefaultedFacetFactoryTest.java
index 966c588..7f656bc 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/defaults/DefaultedFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/defaults/DefaultedFacetFactoryTest.java
@@ -21,10 +21,10 @@ package org.apache.isis.metamodel.facets.object.defaults;
import org.apache.isis.applib.adapters.DefaultsProvider;
import org.apache.isis.applib.annotation.Defaulted;
-import org.apache.isis.config.internal._Config;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.metamodel.facets.FacetFactory.ProcessClassContext;
import org.apache.isis.metamodel.facets.object.defaults.annotcfg.DefaultedFacetAnnotationElseConfigurationFactory;
+import org.apache.isis.unittestsupport.config.internal._Config;
public class DefaultedFacetFactoryTest extends AbstractFacetFactoryTest {
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 711bf40..ef43e40 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
@@ -30,7 +30,6 @@ import org.junit.Test;
import org.apache.isis.applib.annotation.Bounding;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.services.HasUniqueId;
-import org.apache.isis.config.internal._Config;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryJUnit4TestCase;
import org.apache.isis.metamodel.facets.FacetFactory.ProcessClassContext;
@@ -57,6 +56,7 @@ import org.apache.isis.metamodel.facets.object.publishedobject.PublishedObjectFa
import org.apache.isis.metamodel.facets.object.viewmodel.ViewModelFacet;
import org.apache.isis.metamodel.facets.objectvalue.choices.ChoicesFacet;
import org.apache.isis.metamodel.spec.ObjectSpecId;
+import org.apache.isis.unittestsupport.config.internal._Config;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.notNullValue;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java
index f391755..dc5a0a2 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java
@@ -28,7 +28,6 @@ import org.junit.Test;
import org.apache.isis.applib.annotation.BookmarkPolicy;
import org.apache.isis.applib.annotation.DomainObjectLayout;
import org.apache.isis.applib.annotation.ViewModelLayout;
-import org.apache.isis.config.internal._Config;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryJUnit4TestCase;
@@ -41,6 +40,7 @@ import org.apache.isis.metamodel.facets.members.cssclassfa.CssClassFaPosition;
import org.apache.isis.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacet;
import org.apache.isis.metamodel.facets.object.paged.PagedFacet;
import org.apache.isis.metamodel.facets.object.plural.PluralFacet;
+import org.apache.isis.unittestsupport.config.internal._Config;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java
index dfa95b7..848ac94 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java
@@ -24,7 +24,6 @@ import org.apache.isis.applib.adapters.DefaultsProvider;
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.Parser;
import org.apache.isis.applib.annotation.Value;
-import org.apache.isis.config.internal._Config;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.metamodel.facets.FacetFactory.ProcessClassContext;
import org.apache.isis.metamodel.facets.object.defaults.DefaultedFacet;
@@ -36,6 +35,7 @@ import org.apache.isis.metamodel.facets.object.value.annotcfg.ValueFacetAnnotati
import org.apache.isis.metamodel.facets.object.value.annotcfg.ValueFacetAnnotationOrConfigurationFactory;
import org.apache.isis.metamodel.facets.object.value.vsp.ValueSemanticsProviderUtil;
import org.apache.isis.metamodel.facets.objectvalue.typicallen.TypicalLengthFacet;
+import org.apache.isis.unittestsupport.config.internal._Config;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
public class ValueFacetAnnotationOrConfigurationFactoryTest extends AbstractFacetFactoryTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
index 0a468c3..ef852d2 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
@@ -35,7 +35,6 @@ import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.events.domain.PropertyDomainEvent;
import org.apache.isis.applib.spec.Specification;
-import org.apache.isis.config.internal._Config;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
@@ -73,6 +72,7 @@ import org.apache.isis.metamodel.facets.properties.update.modify.PropertySetterF
import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
+import org.apache.isis.unittestsupport.config.internal._Config;
import static org.apache.isis.metamodel.commons.matchers.IsisMatchers.classEqualTo;
import static org.hamcrest.CoreMatchers.is;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/BigDecimalValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/BigDecimalValueSemanticsProviderTest.java
index 5ca94a8..841457c 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/BigDecimalValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/BigDecimalValueSemanticsProviderTest.java
@@ -24,12 +24,12 @@ import java.math.BigDecimal;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.config.internal._Config;
import org.apache.isis.metamodel.MetaModelContextAware;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.metamodel.facets.value.bigdecimal.BigDecimalValueSemanticsProvider;
+import org.apache.isis.unittestsupport.config.internal._Config;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/BigIntValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/BigIntValueSemanticsProviderTest.java
index af4f4a7..6360f77 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/BigIntValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/BigIntValueSemanticsProviderTest.java
@@ -24,12 +24,12 @@ import java.math.BigInteger;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.config.internal._Config;
import org.apache.isis.metamodel.MetaModelContextAware;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.metamodel.facets.value.biginteger.BigIntegerValueSemanticsProvider;
+import org.apache.isis.unittestsupport.config.internal._Config;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/ByteValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/ByteValueSemanticsProviderTest.java
index a692d8f..e44c5b3 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/ByteValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/ByteValueSemanticsProviderTest.java
@@ -22,13 +22,13 @@ package org.apache.isis.metamodel.facets.value;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.config.internal._Config;
import org.apache.isis.metamodel.MetaModelContextAware;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.metamodel.facets.value.bytes.ByteValueSemanticsProviderAbstract;
import org.apache.isis.metamodel.facets.value.bytes.ByteWrapperValueSemanticsProvider;
+import org.apache.isis.unittestsupport.config.internal._Config;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/DoubleValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/DoubleValueSemanticsProviderTest.java
index ba64dd1..cc056cd 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/DoubleValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/DoubleValueSemanticsProviderTest.java
@@ -22,12 +22,12 @@ package org.apache.isis.metamodel.facets.value;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.config.internal._Config;
import org.apache.isis.metamodel.MetaModelContextAware;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.metamodel.facets.value.doubles.DoubleWrapperValueSemanticsProvider;
+import org.apache.isis.unittestsupport.config.internal._Config;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/FloatValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/FloatValueSemanticsProviderTest.java
index fee732d..0310690 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/FloatValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/FloatValueSemanticsProviderTest.java
@@ -22,13 +22,13 @@ package org.apache.isis.metamodel.facets.value;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.config.internal._Config;
import org.apache.isis.metamodel.MetaModelContextAware;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.metamodel.facets.value.floats.FloatValueSemanticsProviderAbstract;
import org.apache.isis.metamodel.facets.value.floats.FloatWrapperValueSemanticsProvider;
+import org.apache.isis.unittestsupport.config.internal._Config;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/ImageValueSemanticsProviderAbstractTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/ImageValueSemanticsProviderAbstractTest.java
index e5f5f35..89ef5e0 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/ImageValueSemanticsProviderAbstractTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/ImageValueSemanticsProviderAbstractTest.java
@@ -27,10 +27,10 @@ import org.junit.Rule;
import org.junit.Test;
import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.config.IsisConfigurationLegacy;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.value.image.ImageValueSemanticsProviderAbstract;
import org.apache.isis.metamodel.spec.ManagedObject;
+import org.apache.isis.unittestsupport.config.IsisConfigurationLegacy;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/IntValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/IntValueSemanticsProviderTest.java
index 0232297..75512cd 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/IntValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/IntValueSemanticsProviderTest.java
@@ -22,13 +22,13 @@ package org.apache.isis.metamodel.facets.value;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.config.internal._Config;
import org.apache.isis.metamodel.MetaModelContextAware;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.metamodel.facets.value.integer.IntValueSemanticsProviderAbstract;
import org.apache.isis.metamodel.facets.value.integer.IntWrapperValueSemanticsProvider;
+import org.apache.isis.unittestsupport.config.internal._Config;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java
index c6a0557..b50ecca 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java
@@ -28,12 +28,12 @@ import java.util.TimeZone;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.config.internal._Config;
import org.apache.isis.metamodel.MetaModelContextAware;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.metamodel.facets.value.datesql.JavaSqlDateValueSemanticsProvider;
+import org.apache.isis.unittestsupport.config.internal._Config;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java
index 9d54014..eb69c5f 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java
@@ -27,11 +27,11 @@ import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
-import org.apache.isis.config.internal._Config;
import org.apache.isis.metamodel.MetaModelContextAware;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.metamodel.facets.value.timesql.JavaSqlTimeValueSemanticsProvider;
+import org.apache.isis.unittestsupport.config.internal._Config;
import static org.junit.Assert.assertEquals;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java
index 0176494..d5133ae 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java
@@ -27,12 +27,12 @@ import java.util.TimeZone;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.config.internal._Config;
import org.apache.isis.metamodel.MetaModelContextAware;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.metamodel.facets.value.dateutil.JavaUtilDateValueSemanticsProvider;
+import org.apache.isis.unittestsupport.config.internal._Config;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/LongValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/LongValueSemanticsProviderTest.java
index d37cad6..6280af9 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/LongValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/LongValueSemanticsProviderTest.java
@@ -22,13 +22,13 @@ package org.apache.isis.metamodel.facets.value;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.config.internal._Config;
import org.apache.isis.metamodel.MetaModelContextAware;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.metamodel.facets.value.longs.LongValueSemanticsProviderAbstract;
import org.apache.isis.metamodel.facets.value.longs.LongWrapperValueSemanticsProvider;
+import org.apache.isis.unittestsupport.config.internal._Config;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/PercentageValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/PercentageValueSemanticsProviderTest.java
index 5d4e5e4..3d13b21 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/PercentageValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/PercentageValueSemanticsProviderTest.java
@@ -23,11 +23,11 @@ import org.junit.Before;
import org.junit.Test;
import org.apache.isis.applib.value.Percentage;
-import org.apache.isis.config.internal._Config;
import org.apache.isis.metamodel.MetaModelContextAware;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.metamodel.facets.value.percentage.PercentageValueSemanticsProvider;
+import org.apache.isis.unittestsupport.config.internal._Config;
import static org.junit.Assert.assertEquals;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/ShortValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/ShortValueSemanticsProviderTest.java
index cbb335e..5925121 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/ShortValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/ShortValueSemanticsProviderTest.java
@@ -22,13 +22,13 @@ package org.apache.isis.metamodel.facets.value;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.config.internal._Config;
import org.apache.isis.metamodel.MetaModelContextAware;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.metamodel.facets.value.shortint.ShortValueSemanticsProviderAbstract;
import org.apache.isis.metamodel.facets.value.shortint.ShortWrapperValueSemanticsProvider;
+import org.apache.isis.unittestsupport.config.internal._Config;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
index 0f225f8..b7c14ab 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
@@ -29,7 +29,6 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.config.internal._Config;
import org.apache.isis.metamodel.MetaModelContext;
import org.apache.isis.metamodel.MetaModelContext_forTesting;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
@@ -41,6 +40,7 @@ import org.apache.isis.metamodel.facets.object.parseable.parser.ParseableFacetUs
import org.apache.isis.metamodel.facets.object.value.vsp.ValueSemanticsProviderAndFacetAbstract;
import org.apache.isis.metamodel.services.persistsession.ObjectAdapterService;
import org.apache.isis.security.authentication.AuthenticationSessionProvider;
+import org.apache.isis.unittestsupport.config.internal._Config;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProviderTest.java
index f9f3154..ba73a12 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProviderTest.java
@@ -26,9 +26,9 @@ import org.junit.Rule;
import org.junit.Test;
import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.config.internal._Config;
import org.apache.isis.metamodel.MetaModelContext_forTesting;
import org.apache.isis.metamodel.facetapi.FacetHolder;
+import org.apache.isis.unittestsupport.config.internal._Config;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import static org.hamcrest.CoreMatchers.equalTo;
diff --git a/core/plugins/jdo/common/src/test/java/org/apache/isis/jdo/exceprecog/ExceptionRecognizerCompositeForJdoObjectStoreTest.java b/core/plugins/jdo/common/src/test/java/org/apache/isis/jdo/exceprecog/ExceptionRecognizerCompositeForJdoObjectStoreTest.java
index 1861bc4..279e3d6 100644
--- a/core/plugins/jdo/common/src/test/java/org/apache/isis/jdo/exceprecog/ExceptionRecognizerCompositeForJdoObjectStoreTest.java
+++ b/core/plugins/jdo/common/src/test/java/org/apache/isis/jdo/exceprecog/ExceptionRecognizerCompositeForJdoObjectStoreTest.java
@@ -22,7 +22,7 @@ import org.junit.Before;
import org.junit.Test;
import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.config.internal._Config;
+import org.apache.isis.unittestsupport.config.internal._Config;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
diff --git a/core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/wrapper/WrapperFactoryDefaultTest_wrappedObject.java b/core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
index ef32331..895d9d6 100644
--- a/core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
+++ b/core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
@@ -38,7 +38,6 @@ import org.apache.isis.applib.services.wrapper.DisabledException;
import org.apache.isis.applib.services.wrapper.HiddenException;
import org.apache.isis.applib.services.wrapper.InvalidException;
import org.apache.isis.applib.services.xactn.TransactionService;
-import org.apache.isis.config.internal._Config;
import org.apache.isis.metamodel.MetaModelContext;
import org.apache.isis.metamodel.MetaModelContext_forTesting;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
@@ -70,6 +69,7 @@ import org.apache.isis.runtime.system.session.IsisSessionFactory;
import org.apache.isis.schema.cmd.v1.CommandDto;
import org.apache.isis.security.authentication.AuthenticationSessionProvider;
import org.apache.isis.security.authentication.standard.SimpleSession;
+import org.apache.isis.unittestsupport.config.internal._Config;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/confmenu/ConfigurationViewServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/confmenu/ConfigurationViewServiceDefault.java
index 50280c0..bbfa623 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/confmenu/ConfigurationViewServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/confmenu/ConfigurationViewServiceDefault.java
@@ -18,11 +18,12 @@
*/
package org.apache.isis.runtime.services.confmenu;
-import java.util.HashMap;
import java.util.Map;
import java.util.Set;
+import java.util.TreeMap;
import java.util.TreeSet;
+import javax.annotation.PostConstruct;
import javax.inject.Inject;
import org.apache.isis.applib.annotation.DomainService;
@@ -30,23 +31,67 @@ import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.services.confview.ConfigurationProperty;
import org.apache.isis.applib.services.confview.ConfigurationViewService;
import org.apache.isis.commons.internal.base._Lazy;
+import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
import org.apache.isis.config.ConfigurationConstants;
import org.apache.isis.config.IsisConfiguration;
+import lombok.val;
+import lombok.extern.log4j.Log4j2;
+
/**
* @since 2.0
*/
@DomainService(nature = NatureOfService.DOMAIN)
+@Log4j2
public class ConfigurationViewServiceDefault implements ConfigurationViewService {
- @Inject private IsisSystemEnvironment isisSystemEnvironment;
- @Inject private IsisConfiguration isisConfiguration;
+ @Inject private IsisSystemEnvironment systemEnvironment;
+ @Inject private IsisConfiguration configuration;
@Override
public Set<ConfigurationProperty> allProperties() {
return new TreeSet<>(config.get().values());
}
+
+ @PostConstruct
+ public void postConstruct() {
+ log.info("\n\n" + toStringFormatted());
+ }
+
+ // -- DUMP AS STRING
+
+ /**
+ * to support config dumping, with sensitive data masked out
+ */
+ public String toStringFormatted() {
+
+ val sb = new StringBuilder();
+
+ String head = String.format("APACHE ISIS %s (%s) ",
+ IsisSystemEnvironment.VERSION,
+ systemEnvironment.getDeploymentType().name());
+
+ final Map<String, ConfigurationProperty> map = config.get();
+
+ final int fillCount = 46-head.length();
+ final int fillLeft = fillCount/2;
+ final int fillRight = fillCount-fillLeft;
+ head = _Strings.padStart("", fillLeft, ' ') + head + _Strings.padEnd("", fillRight, ' ');
+
+ sb.append("================================================\n");
+ sb.append("="+head+"=\n");
+ sb.append("================================================\n");
+ map.forEach((k, v)->{
+ if(!k.startsWith("[ ")) { // ignore additional info from below
+ sb.append(k+" -> "+v.getValue()).append("\n");
+ }
+ });
+ sb.append("================================================\n");
+
+ return sb.toString();
+ }
// -- HELPER
@@ -54,14 +99,14 @@ public class ConfigurationViewServiceDefault implements ConfigurationViewService
private Map<String, ConfigurationProperty> loadConfiguration() {
- final Map<String, ConfigurationProperty> map = new HashMap<>(); // sorting happens later
+ final Map<String, ConfigurationProperty> map = _Maps.newTreeMap();
- isisConfiguration.getAsMap().forEach((k, v)->add(k, v, map));
+ configuration.getAsMap().forEach((k, v)->add(k, v, map));
// for convenience add some additional info to the top ...
add("[ Isis Version ]", IsisSystemEnvironment.VERSION, map);
- add("[ Deployment Type ]", isisSystemEnvironment.getDeploymentType().name(), map);
- add("[ Unit Testing ]", ""+isisSystemEnvironment.isUnitTesting(), map);
+ add("[ Deployment Type ]", systemEnvironment.getDeploymentType().name(), map);
+ add("[ Unit Testing ]", ""+systemEnvironment.isUnitTesting(), map);
return map;
}
diff --git a/core/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java b/core/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
index 39d774e..7df96c5 100644
--- a/core/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
+++ b/core/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
@@ -32,11 +32,11 @@ import org.junit.Test;
import org.apache.isis.applib.Identifier;
import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.config.IsisConfigurationLegacy;
import org.apache.isis.security.authentication.AuthenticationRequest;
import org.apache.isis.security.authentication.AuthenticationRequestPassword;
import org.apache.isis.security.shiro.authentication.ShiroAuthenticator;
import org.apache.isis.security.shiro.authorization.ShiroAuthorizor;
+import org.apache.isis.unittestsupport.config.IsisConfigurationLegacy;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/property/ConfigProperty.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/property/ConfigProperty.java
deleted file mode 100644
index 644aa77..0000000
--- a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/property/ConfigProperty.java
+++ /dev/null
@@ -1,30 +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.config.property;
-
-import java.util.Map;
-
-import org.apache.isis.config.IsisConfigurationLegacy;
-
-public interface ConfigProperty<T> {
- T from(final IsisConfigurationLegacy configuration);
-
- Map.Entry<String,String> of(final T value);
-
-}
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/property/ConfigPropertyAbstract.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/property/ConfigPropertyAbstract.java
deleted file mode 100644
index c98abb5..0000000
--- a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/property/ConfigPropertyAbstract.java
+++ /dev/null
@@ -1,33 +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.config.property;
-
-import org.apache.isis.config.IsisConfigurationLegacy;
-
-public abstract class ConfigPropertyAbstract<T> implements ConfigProperty<T> {
- protected final String key;
- final T defaultValue;
- public ConfigPropertyAbstract(final String key, final T defaultValue) {
- this.key = key;
- this.defaultValue = defaultValue;
- }
- @Override
- public abstract T from(final IsisConfigurationLegacy configuration);
-
-}
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/property/ConfigPropertyBoolean.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/property/ConfigPropertyBoolean.java
deleted file mode 100644
index 27b10fd..0000000
--- a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/property/ConfigPropertyBoolean.java
+++ /dev/null
@@ -1,45 +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.config.property;
-
-import java.util.AbstractMap;
-import java.util.Map;
-
-import org.apache.isis.config.IsisConfigurationLegacy;
-
-public class ConfigPropertyBoolean extends ConfigPropertyAbstract<Boolean> {
-
- public ConfigPropertyBoolean(final String key, final boolean defaultValue) {
- super(key, defaultValue);
- }
-
- /**
- * @returns not-null
- */
- @Override
- public Boolean from(final IsisConfigurationLegacy configuration) {
- return configuration.getBoolean(key, defaultValue);
- }
-
- @Override
- public Map.Entry<String, String> of(final Boolean value) {
- return new AbstractMap.SimpleImmutableEntry<>(key, value.toString());
- }
-
-}
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/property/ConfigPropertyEnum.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/property/ConfigPropertyEnum.java
deleted file mode 100644
index adec7d6..0000000
--- a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/property/ConfigPropertyEnum.java
+++ /dev/null
@@ -1,41 +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.config.property;
-
-import java.util.AbstractMap;
-import java.util.Map;
-
-import org.apache.isis.config.IsisConfigurationLegacy;
-
-public class ConfigPropertyEnum<E extends Enum<E>> extends
-ConfigPropertyAbstract<E> {
- public ConfigPropertyEnum(final String key, final E defaultValue) {
- super(key, defaultValue);
- }
- @Override
- public E from(final IsisConfigurationLegacy configuration) {
- return Enum.valueOf(defaultValue.getDeclaringClass(), configuration.getString(key, defaultValue.name()).toUpperCase());
- }
-
- @Override
- public Map.Entry<String, String> of(final E value) {
- return new AbstractMap.SimpleImmutableEntry<>(key, value.name().toUpperCase());
- }
-
-}
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/property/ConfigPropertyString.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/property/ConfigPropertyString.java
deleted file mode 100644
index ad331df..0000000
--- a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/property/ConfigPropertyString.java
+++ /dev/null
@@ -1,40 +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.config.property;
-
-import java.util.AbstractMap;
-import java.util.Map;
-
-import org.apache.isis.config.IsisConfigurationLegacy;
-
-public class ConfigPropertyString extends ConfigPropertyAbstract<String> {
- public ConfigPropertyString(final String key, final String defaultValue) {
- super(key, defaultValue);
- }
- @Override
- public String from(final IsisConfigurationLegacy configuration) {
- return configuration.getString(key, defaultValue);
- }
-
- @Override
- public Map.Entry<String, String> of(final String value) {
- return new AbstractMap.SimpleImmutableEntry<>(key, value);
- }
-
-}
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/IsisConfigurationLegacy.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/IsisConfigurationLegacy.java
similarity index 99%
rename from core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/IsisConfigurationLegacy.java
rename to core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/IsisConfigurationLegacy.java
index 6a4d71e..68e6d70 100644
--- a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/IsisConfigurationLegacy.java
+++ b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/IsisConfigurationLegacy.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.config;
+package org.apache.isis.unittestsupport.config;
import java.awt.Color;
import java.awt.Font;
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/internal/_Config.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config.java
similarity index 96%
rename from core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/internal/_Config.java
rename to core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config.java
index 96bc665..8066ca2 100644
--- a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/internal/_Config.java
+++ b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.config.internal;
+package org.apache.isis.unittestsupport.config.internal;
import java.util.Map;
import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.commons.internal.context._Context;
-import org.apache.isis.config.IsisConfigurationLegacy;
+import org.apache.isis.unittestsupport.config.IsisConfigurationLegacy;
import lombok.val;
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/internal/_Config_Instance.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_Instance.java
similarity index 97%
rename from core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/internal/_Config_Instance.java
rename to core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_Instance.java
index 4455390..b2209c9 100644
--- a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/internal/_Config_Instance.java
+++ b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_Instance.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.config.internal;
+package org.apache.isis.unittestsupport.config.internal;
import java.awt.Color;
import java.awt.Font;
@@ -28,7 +28,7 @@ import javax.annotation.Nullable;
import org.apache.isis.commons.internal._Constants;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.config.IsisConfigurationLegacy;
+import org.apache.isis.unittestsupport.config.IsisConfigurationLegacy;
import static org.apache.isis.commons.internal.base._With.computeIfAbsent;
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/internal/_Config_LifecycleResource.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_LifecycleResource.java
similarity index 96%
rename from core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/internal/_Config_LifecycleResource.java
rename to core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_LifecycleResource.java
index 2c7bedd..a031bd6 100644
--- a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/internal/_Config_LifecycleResource.java
+++ b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_LifecycleResource.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.config.internal;
+package org.apache.isis.unittestsupport.config.internal;
import java.util.Map;
import java.util.Optional;
import org.apache.isis.commons.internal.base._Lazy;
-import org.apache.isis.config.IsisConfigurationLegacy;
+import org.apache.isis.unittestsupport.config.IsisConfigurationLegacy;
import static org.apache.isis.commons.internal.base._With.requires;
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/internal/_Config_Parsers.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_Parsers.java
similarity index 98%
rename from core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/internal/_Config_Parsers.java
rename to core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_Parsers.java
index fc78e89..d451773 100644
--- a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/internal/_Config_Parsers.java
+++ b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_Parsers.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.config.internal;
+package org.apache.isis.unittestsupport.config.internal;
import java.awt.Color;
import java.awt.Font;
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/internal/_Config_trim.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_trim.java
similarity index 96%
rename from core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/internal/_Config_trim.java
rename to core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_trim.java
index a2dc7dd..e809fa7 100644
--- a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/internal/_Config_trim.java
+++ b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_trim.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.config.internal;
+package org.apache.isis.unittestsupport.config.internal;
import java.util.Map;
diff --git a/core/viewer-restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_getArg.java b/core/viewer-restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_getArg.java
index 9c1a4fa..dfc7d62 100644
--- a/core/viewer-restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_getArg.java
+++ b/core/viewer-restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_getArg.java
@@ -34,7 +34,6 @@ import org.springframework.web.context.WebApplicationContext;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.commons.internal.url.UrlDecoderUtil;
-import org.apache.isis.config.IsisConfigurationLegacy;
import org.apache.isis.metamodel.MetaModelContext;
import org.apache.isis.metamodel.MetaModelContext_forTesting;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
@@ -42,6 +41,7 @@ import org.apache.isis.runtime.system.persistence.PersistenceSession;
import org.apache.isis.runtime.system.session.IsisSession;
import org.apache.isis.runtime.system.session.IsisSessionFactory;
import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.unittestsupport.config.IsisConfigurationLegacy;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
diff --git a/core/viewer-restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java b/core/viewer-restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
index 847b7e9..1623def 100644
--- a/core/viewer-restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
+++ b/core/viewer-restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
@@ -36,7 +36,6 @@ import org.springframework.web.context.WebApplicationContext;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.config.IsisConfigurationLegacy;
import org.apache.isis.metamodel.MetaModelContext;
import org.apache.isis.metamodel.MetaModelContext_forTesting;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
@@ -44,6 +43,7 @@ import org.apache.isis.runtime.system.persistence.PersistenceSession;
import org.apache.isis.runtime.system.session.IsisSession;
import org.apache.isis.runtime.system.session.IsisSessionFactory;
import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.unittestsupport.config.IsisConfigurationLegacy;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse.HttpStatusCode;