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 2020/03/02 14:07:43 UTC
[isis] branch master updated (656d504 -> a7bfdff)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 656d504 ISIS-2296: more fixes
new d419d21 ISIS-2296: remove experimental code
new a7bfdff ISIS-2296: remove internal _Config for good
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:
.../config/unittestsupport/internal/_Config.java | 119 -------------
.../unittestsupport/internal/_Config_Instance.java | 193 ---------------------
.../internal/_Config_LifecycleResource.java | 98 -----------
.../unittestsupport/internal/_Config_Parsers.java | 117 -------------
.../unittestsupport/internal/_Config_trim.java | 49 ------
.../metamodel/MetaModelContext_forTesting.java | 4 +-
.../DomainObjectAnnotationFacetFactoryTest.java | 3 +-
.../DomainObjectLayoutFactoryTest.java | 1 -
.../PropertyAnnotationFacetFactoryTest.java | 4 -
.../BigDecimalValueSemanticsProviderTest.java | 3 +-
.../value/ByteValueSemanticsProviderTest.java | 1 -
.../value/DoubleValueSemanticsProviderTest.java | 1 -
.../value/FloatValueSemanticsProviderTest.java | 1 -
.../value/IntValueSemanticsProviderTest.java | 1 -
.../JavaSqlDateValueSemanticsProviderTest.java | 1 -
.../JavaSqlTimeValueSemanticsProviderTest.java | 1 -
.../JavaUtilDateValueSemanticsProviderTest.java | 1 -
.../value/LongValueSemanticsProviderTest.java | 1 -
.../value/ShortValueSemanticsProviderTest.java | 1 -
.../ValueSemanticsProviderAbstractTestCase.java | 1 -
.../requestscope/IsisRequestCycleFilter.java | 65 -------
.../requestscope/WebModuleRequestCycleFilter.java | 84 ---------
.../transactions/TransactionRollbackTest.java | 44 ++---
23 files changed, 17 insertions(+), 777 deletions(-)
delete mode 100644 core/config/src/test/java/org/apache/isis/core/config/unittestsupport/internal/_Config.java
delete mode 100644 core/config/src/test/java/org/apache/isis/core/config/unittestsupport/internal/_Config_Instance.java
delete mode 100644 core/config/src/test/java/org/apache/isis/core/config/unittestsupport/internal/_Config_LifecycleResource.java
delete mode 100644 core/config/src/test/java/org/apache/isis/core/config/unittestsupport/internal/_Config_Parsers.java
delete mode 100644 core/config/src/test/java/org/apache/isis/core/config/unittestsupport/internal/_Config_trim.java
delete mode 100644 core/webapp/src/main/java/org/apache/isis/core/webapp/modules/requestscope/IsisRequestCycleFilter.java
delete mode 100644 core/webapp/src/main/java/org/apache/isis/core/webapp/modules/requestscope/WebModuleRequestCycleFilter.java
[isis] 01/02: ISIS-2296: remove experimental code
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit d419d21f4ce59f617157e24a685c526c99caddc7
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Mar 2 15:04:35 2020 +0100
ISIS-2296: remove experimental code
---
.../requestscope/IsisRequestCycleFilter.java | 65 -----------------
.../requestscope/WebModuleRequestCycleFilter.java | 84 ----------------------
.../transactions/TransactionRollbackTest.java | 44 ++++--------
3 files changed, 13 insertions(+), 180 deletions(-)
diff --git a/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/requestscope/IsisRequestCycleFilter.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/requestscope/IsisRequestCycleFilter.java
deleted file mode 100644
index c9a2768..0000000
--- a/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/requestscope/IsisRequestCycleFilter.java
+++ /dev/null
@@ -1,65 +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.core.webapp.modules.requestscope;
-
-import java.io.IOException;
-
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-
-import org.springframework.beans.factory.annotation.Autowired;
-
-import org.apache.isis.core.security.authentication.AuthenticationSession;
-
-//import org.springframework.beans.factory.annotation.Autowired;
-//
-//import org.apache.isis.applib.services.exceprecog.ExceptionRecognizerForType;
-//import org.apache.isis.applib.services.exceprecog.ExceptionRecognizerService;
-//import org.apache.isis.core.commons.collections.Can;
-//
-//import lombok.val;
-import lombok.extern.log4j.Log4j2;
-
-/**
- * Simply logs the URL of any request that causes an exception to be thrown.
- */
-@Log4j2
-public class IsisRequestCycleFilter implements Filter {
-
- @Autowired private AuthenticationSession authenticationSession;
-
- @Override
- public void init(FilterConfig filterConfig) throws ServletException {
- }
-
- @Override
- public void destroy() {
- }
-
- @Override
- public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
- chain.doFilter(request, response);
- }
-
-
-}
diff --git a/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/requestscope/WebModuleRequestCycleFilter.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/requestscope/WebModuleRequestCycleFilter.java
deleted file mode 100644
index 228267b..0000000
--- a/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/requestscope/WebModuleRequestCycleFilter.java
+++ /dev/null
@@ -1,84 +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.core.webapp.modules.requestscope;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextListener;
-import javax.servlet.ServletException;
-
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Service;
-
-import org.apache.isis.applib.annotation.OrderPrecedence;
-import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.core.commons.collections.Can;
-import org.apache.isis.core.webapp.modules.WebModuleAbstract;
-
-import lombok.Getter;
-
-/**
- * WebModule to hook into request-cycles of protected servlets.
- * Allows the framework to make a unique IsisSession instance available for each request-cycle.
- *
- * @implSpec filter must be configured with the servlet context filter chain after
- * an AuthenticationSession was made available
- *
- * @since 2.0
- */
-@Service
-@Named("isisWebapp.WebModuleLogOnExceptionLogger")
-@Order(OrderPrecedence.EARLY - 99)
-@Qualifier("WebModuleRequestCycleFilter")
-public final class WebModuleRequestCycleFilter
-extends WebModuleAbstract {
-
- private static final String FILTER_NAME = "IsisRequestCycleFilter";
-
-
- @Getter
- private final String name = "Request Cycle Filter";
-
- @Inject
- public WebModuleRequestCycleFilter(final ServiceInjector serviceInjector) {
- super(serviceInjector);
- }
-
-
- @Override
- public Can<ServletContextListener> init(ServletContext ctx) throws ServletException {
-
- registerFilter(ctx, FILTER_NAME, IsisRequestCycleFilter.class)
- .ifPresent(filterReg -> {
- filterReg.addMappingForUrlPatterns(
- null,
- true, // filterReg is forced last
- webModuleContext.getProtectedPaths().toArray(String.class));
- });
-
- return Can.empty(); // registers no listeners
- }
-
-
- // -- HELPER
-
-
-}
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest.java
index 7eebb9f..65a90cb 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest.java
@@ -32,12 +32,12 @@ import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.config.presets.IsisPresets;
-import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
import org.apache.isis.testdomain.jdo.JdoTestDomainPersona;
import org.apache.isis.testdomain.jdo.entities.JdoBook;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
+import org.apache.isis.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
@Smoketest
@SpringBootTest(
@@ -45,29 +45,23 @@ import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
Configuration_usingJdo.class,
})
@TestPropertySource(IsisPresets.UseLog4j2Test)
-class TransactionRollbackTest {
+class TransactionRollbackTest extends IsisIntegrationTestAbstract {
- @Inject FixtureScripts fixtureScripts;
- @Inject TransactionService transactionService;
- @Inject RepositoryService repository;
- @Inject IsisSessionFactory isisSessionFactory;
+ @Inject private FixtureScripts fixtureScripts;
+ @Inject private TransactionService transactionService;
+ @Inject private RepositoryService repository;
@BeforeEach
void setUp() {
// cleanup
fixtureScripts.runPersona(JdoTestDomainPersona.PurgeAll);
-
}
@Test
void happyCaseTx_shouldCommit() {
- isisSessionFactory.runAnonymous(()->{
-
- // expected pre condition
- assertEquals(0, repository.allInstances(JdoBook.class).size());
-
- });
+ // expected pre condition
+ assertEquals(0, repository.allInstances(JdoBook.class).size());
transactionService.executeWithinTransaction(()->{
@@ -76,25 +70,17 @@ class TransactionRollbackTest {
});
- isisSessionFactory.runAnonymous(()->{
-
- // expected post condition
- assertEquals(1, repository.allInstances(JdoBook.class).size());
-
- });
+ // expected post condition
+ assertEquals(1, repository.allInstances(JdoBook.class).size());
}
@Test
void whenExceptionWithinTx_shouldRollback() {
- isisSessionFactory.runAnonymous(()->{
-
- // expected pre condition
- assertEquals(0, repository.allInstances(JdoBook.class).size());
+ // expected pre condition
+ assertEquals(0, repository.allInstances(JdoBook.class).size());
- });
-
assertThrows(RuntimeException.class, ()->{
transactionService.executeWithinTransaction(()->{
@@ -107,12 +93,8 @@ class TransactionRollbackTest {
});
- isisSessionFactory.runAnonymous(()->{
-
- // expected post condition
- assertEquals(0, repository.allInstances(JdoBook.class).size());
-
- });
+ // expected post condition
+ assertEquals(0, repository.allInstances(JdoBook.class).size());
}
[isis] 02/02: ISIS-2296: remove internal _Config for good
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit a7bfdff244bfc8a7119941076dc9963851c06dd9
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Mar 2 15:07:32 2020 +0100
ISIS-2296: remove internal _Config for good
---
.../config/unittestsupport/internal/_Config.java | 119 -------------
.../unittestsupport/internal/_Config_Instance.java | 193 ---------------------
.../internal/_Config_LifecycleResource.java | 98 -----------
.../unittestsupport/internal/_Config_Parsers.java | 117 -------------
.../unittestsupport/internal/_Config_trim.java | 49 ------
.../metamodel/MetaModelContext_forTesting.java | 4 +-
.../DomainObjectAnnotationFacetFactoryTest.java | 3 +-
.../DomainObjectLayoutFactoryTest.java | 1 -
.../PropertyAnnotationFacetFactoryTest.java | 4 -
.../BigDecimalValueSemanticsProviderTest.java | 3 +-
.../value/ByteValueSemanticsProviderTest.java | 1 -
.../value/DoubleValueSemanticsProviderTest.java | 1 -
.../value/FloatValueSemanticsProviderTest.java | 1 -
.../value/IntValueSemanticsProviderTest.java | 1 -
.../JavaSqlDateValueSemanticsProviderTest.java | 1 -
.../JavaSqlTimeValueSemanticsProviderTest.java | 1 -
.../JavaUtilDateValueSemanticsProviderTest.java | 1 -
.../value/LongValueSemanticsProviderTest.java | 1 -
.../value/ShortValueSemanticsProviderTest.java | 1 -
.../ValueSemanticsProviderAbstractTestCase.java | 1 -
20 files changed, 4 insertions(+), 597 deletions(-)
diff --git a/core/config/src/test/java/org/apache/isis/core/config/unittestsupport/internal/_Config.java b/core/config/src/test/java/org/apache/isis/core/config/unittestsupport/internal/_Config.java
deleted file mode 100644
index b56c854..0000000
--- a/core/config/src/test/java/org/apache/isis/core/config/unittestsupport/internal/_Config.java
+++ /dev/null
@@ -1,119 +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.core.config.unittestsupport.internal;
-
-import java.util.Map;
-
-import org.apache.isis.core.commons.internal.collections._Maps;
-import org.apache.isis.core.commons.internal.context._Context;
-import org.apache.isis.core.config.unittestsupport.IsisConfigurationLegacy;
-
-import lombok.val;
-
-/**
- * @since 2.0
- */
-public class _Config {
-
- // -- CONFIG ACCESS
-
- public static IsisConfigurationLegacy getConfiguration() {
- return getLifecycleResource().getConfiguration();
- }
-
- // -- CLEAR
-
- /**
- * Most likely used for testing.
- * <p>
- * Throws away any configuration resources currently on this life-cycle's context.
- * Makes a new config builder singleton instance lazily available.
- */
- public static void clear() {
- _Context.remove(_Config_LifecycleResource.class);
- }
-
- // -- PROPERTY ACCESS BEFORE FINALIZING CONFIG
-
-// public static void putAll(Map<String, String> map) {
-// properties().putAll(map);
-// }
-//
-// public static void put(String key, String value) {
-// properties().put(key, value);
-// }
-//
-// public static void put(String key, boolean value) {
-// properties().put(key, ""+value);
-// }
-
- // -- PROPERTY PEEKING
-
- public static String peekAtString(String key) {
- return properties().get(key);
- }
-
- public static String peekAtString(String key, String defaultValue) {
- val stringValue = properties().get(key);
- return stringValue!=null
- ? stringValue
- : defaultValue;
- }
-
- public static Boolean peekAtBoolean(String key) {
- return _Config_Parsers.parseBoolean(properties().get(key));
- }
-
- public static boolean peekAtBoolean(String key, boolean defaultValue) {
- val booleanValue = _Config_Parsers.parseBoolean(properties().get(key));
- return booleanValue!=null
- ? booleanValue
- : defaultValue;
- }
-
- // -- HELPER - PROPERTIES
-
- private static Map<String, String> properties() {
- _Config_LifecycleResource lifecycle = getLifecycleResource();
- val properties = lifecycle.getMutableProperties()
- .orElseThrow(lifecycle::configurationAlreadyInUse);
- return properties;
- }
-
- private static Map<String, String> defaultProperties() {
- val properties = _Maps.<String, String>newHashMap();
- return properties;
- }
-
- // -- HELPER - LIFECYCLE
-
- private static _Config_LifecycleResource getLifecycleResource() {
- final _Config_LifecycleResource lifecycle =
- _Context.computeIfAbsent(_Config_LifecycleResource.class, ()->createLifecycleResource());
- return lifecycle;
- }
-
- private static _Config_LifecycleResource createLifecycleResource() {
- return new _Config_LifecycleResource(defaultProperties());
- }
-
-
-
-
-}
diff --git a/core/config/src/test/java/org/apache/isis/core/config/unittestsupport/internal/_Config_Instance.java b/core/config/src/test/java/org/apache/isis/core/config/unittestsupport/internal/_Config_Instance.java
deleted file mode 100644
index b80d80e..0000000
--- a/core/config/src/test/java/org/apache/isis/core/config/unittestsupport/internal/_Config_Instance.java
+++ /dev/null
@@ -1,193 +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.core.config.unittestsupport.internal;
-
-import java.awt.Color;
-import java.awt.Font;
-import java.util.Map;
-import java.util.function.Function;
-
-import javax.annotation.Nullable;
-
-import org.apache.isis.core.commons.internal._Constants;
-import org.apache.isis.core.commons.internal.base._Strings;
-import org.apache.isis.core.commons.internal.collections._Maps;
-import org.apache.isis.core.config.unittestsupport.IsisConfigurationLegacy;
-
-import static org.apache.isis.core.commons.internal.base._With.computeIfAbsent;
-
-import lombok.RequiredArgsConstructor;
-import lombok.val;
-
-@RequiredArgsConstructor(staticName = "ofProperties")
-final class _Config_Instance implements IsisConfigurationLegacy {
-
- private final Map<String, String> properties;
- private final Function<String, Boolean> booleanParser;
- private final Function<String, Integer> integerParser;
- private final Function<String, Color> colorParser;
- private final Function<String, Font> fontParser;
- private final Function<String, String[]> listParser;
-
- @Override
- public boolean getBoolean(String name) {
- return computeIfAbsent(booleanParser.apply(getString(name)), ()->false);
- }
-
- @Override
- public boolean getBoolean(String name, boolean defaultValue) {
- return computeIfAbsent(booleanParser.apply(getString(name)), ()->defaultValue);
- }
-
- @Override
- public Color getColor(String name) {
- return colorParser.apply(getString(name));
- }
-
- @Override
- public Color getColor(String name, Color defaultValue) {
- return computeIfAbsent(colorParser.apply(getString(name)), ()->defaultValue);
- }
-
- @Override
- public Font getFont(String name) {
- return fontParser.apply(getString(name));
- }
-
- @Override
- public Font getFont(String name, Font defaultValue) {
- return computeIfAbsent(fontParser.apply(getString(name)), ()->defaultValue);
- }
-
- @Override
- public String[] getList(String name) {
- return computeIfAbsent(listParser.apply(getString(name)), ()->_Constants.emptyStringArray);
- }
-
- @Override
- public String[] getList(String name, String defaultListAsCommaSeparatedArray) {
- return computeIfAbsent(listParser.apply(getString(name)), ()->listParser.apply(defaultListAsCommaSeparatedArray));
- }
-
- @Override
- public int getInteger(String name) {
- return computeIfAbsent(integerParser.apply(getString(name)), ()->0);
- }
-
- @Override
- public int getInteger(String name, int defaultValue) {
- return computeIfAbsent(integerParser.apply(getString(name)), ()->defaultValue);
- }
-
- @Override
- public String getString(String name) {
- return properties.get(name);
- }
-
- @Override
- public String getString(String name, String defaultValue) {
- return properties.getOrDefault(name, defaultValue);
- }
-
- @Override
- public boolean hasProperty(String name) {
- return properties.containsKey(name);
- }
-
- @Override
- public boolean isEmpty() {
- return properties.isEmpty();
- }
-
- // -- CONVERSION
-
- @Override
- public Map<String, String> copyToMap() {
- Map<String, String> copy = _Maps.newHashMap();
- properties.forEach(copy::put);
- return copy;
- }
-
- @Override
- public IsisConfigurationLegacy copy() {
- val copy = _Maps.<String, String>newHashMap();
- properties.forEach(copy::put);
- return new _Config_Instance(copy,
- booleanParser,
- integerParser,
- colorParser,
- fontParser,
- listParser);
- }
-
- @Override
- public IsisConfigurationLegacy subset(@Nullable String withPrefix) {
- if(_Strings.isNullOrEmpty(withPrefix)) {
- return copy();
- }
-
- val prefixWithTerminalDot = _Strings.suffix(withPrefix, ".");
- val filteredByPrefix = _Maps.<String, String>newHashMap();
-
- properties.forEach((k, v)->{
- if(k.startsWith(prefixWithTerminalDot)) {
- filteredByPrefix.put(k, v);
- }
- });
-
- return new _Config_Instance(filteredByPrefix,
- booleanParser,
- integerParser,
- colorParser,
- fontParser,
- listParser);
- }
-
- @Override
- public IsisConfigurationLegacy subsetWithNamesStripped(String withPrefix) {
- if(_Strings.isNullOrEmpty(withPrefix)) {
- return copy();
- }
-
- val prefixWithTerminalDot = _Strings.suffix(withPrefix, ".");
- val prefixLen = prefixWithTerminalDot.length();
- val filteredByPrefix = _Maps.<String, String>newHashMap();
-
- properties.forEach((k, v)->{
- if(k.startsWith(prefixWithTerminalDot)) {
-
- val strippedKey = k.substring(prefixLen);
-
- if(strippedKey.length()>0) {
- filteredByPrefix.put(strippedKey, v);
- }
- }
- });
-
- return new _Config_Instance(filteredByPrefix,
- booleanParser,
- integerParser,
- colorParser,
- fontParser,
- listParser);
- }
-
-
-
-}
diff --git a/core/config/src/test/java/org/apache/isis/core/config/unittestsupport/internal/_Config_LifecycleResource.java b/core/config/src/test/java/org/apache/isis/core/config/unittestsupport/internal/_Config_LifecycleResource.java
deleted file mode 100644
index 5142e0c..0000000
--- a/core/config/src/test/java/org/apache/isis/core/config/unittestsupport/internal/_Config_LifecycleResource.java
+++ /dev/null
@@ -1,98 +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.core.config.unittestsupport.internal;
-
-import java.util.Map;
-import java.util.Optional;
-
-import org.apache.isis.core.commons.internal.base._Lazy;
-import org.apache.isis.core.config.unittestsupport.IsisConfigurationLegacy;
-
-import static org.apache.isis.core.commons.internal.base._With.requires;
-
-import lombok.val;
-import lombok.extern.log4j.Log4j2;
-
-@Log4j2
-class _Config_LifecycleResource {
-
- private final Map<String, String> mutableProperties;
- private final _Lazy<IsisConfigurationLegacy> configuration;
-
- _Config_LifecycleResource(final Map<String, String> mutableProperties) {
- requires(mutableProperties, "mutableProperties");
- this.mutableProperties = mutableProperties;
- this.configuration = _Lazy.threadSafe(this::build);
- }
-
- IsisConfigurationLegacy getConfiguration() {
- return configuration.get();
- }
-
- /**
- * Returns an empty Optional, if {@link _Config_LifecycleResource#getConfiguration()} was called earlier. This
- * is to ensure, immutability once config was 'finalized'.
- * @return
- */
- Optional<Map<String, String>> getMutableProperties() {
- if(!configuration.isMemoized()) {
- return Optional.of(mutableProperties);
- }
- return Optional.empty();
- }
-
- private IsisConfigurationLegacy build() {
-
- // we throw an exception, catch it and keep it for later, to provide
- // causal information, in case the builder is accessed after it already
- // built the configuration
- try {
- throw new IllegalStateException("IsisConfiguration Build (previously already triggered by ...)");
- } catch(IllegalStateException e) {
- this.configurationBuildStacktrace = e;
- }
-
- val config = _Config_Instance.ofProperties(
- _Config_trim.trim(mutableProperties),
- _Config_Parsers::parseBoolean,
- _Config_Parsers::parseInteger,
- _Config_Parsers::parseColor,
- _Config_Parsers::parseFont,
- _Config_Parsers::parseList);
-
- log.debug("=== Config Finalized ===");
-
- return config;
-
- }
-
- // -- HELPER -- EXCEPTIONS
-
- private IllegalStateException configurationBuildStacktrace;
-
- IllegalStateException configurationAlreadyInUse() {
-
- IllegalStateException cause = configurationBuildStacktrace;
-
- return new IllegalStateException("The IsisConfigurationBuilder is no longer valid, because it has "
- + "already built the IsisConfiguration for this application's life-cycle.", cause);
- }
-
-
-}
diff --git a/core/config/src/test/java/org/apache/isis/core/config/unittestsupport/internal/_Config_Parsers.java b/core/config/src/test/java/org/apache/isis/core/config/unittestsupport/internal/_Config_Parsers.java
deleted file mode 100644
index 6bef0a1..0000000
--- a/core/config/src/test/java/org/apache/isis/core/config/unittestsupport/internal/_Config_Parsers.java
+++ /dev/null
@@ -1,117 +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.core.config.unittestsupport.internal;
-
-import java.awt.Color;
-import java.awt.Font;
-
-import javax.annotation.Nullable;
-
-import org.apache.isis.core.commons.internal.base._Strings;
-import org.apache.isis.core.commons.internal.collections._Arrays;
-
-import lombok.val;
-import lombok.extern.log4j.Log4j2;
-
-@Log4j2
-final class _Config_Parsers {
-
- // -- BOOLEAN
-
- static @Nullable Boolean parseBoolean(@Nullable String input) {
- if(input==null) {
- return null;
- }
- val literal = input.toLowerCase();
- switch (literal) {
- case "false":
- case "0":
- case "no":
- return Boolean.FALSE;
-
- case "true":
- case "1":
- case "yes":
- return Boolean.TRUE;
-
- default:
- break;
- }
- return null;
- }
-
- // -- INTEGER
-
- static @Nullable Integer parseInteger(@Nullable String input) {
- if(input==null) {
- return null;
- }
- try {
- return Integer.parseInt(input);
- } catch (Exception e) {
- log.warn("failed to parse Integer from input '{}', falling back to <null>", input);
- }
- return null;
- }
-
- // -- COLOR
-
- static @Nullable Color parseColor(@Nullable String input) {
- if(input==null) {
- return null;
- }
- try {
- return Color.decode(input);
- } catch (Exception e) {
- log.warn("failed to parse Color from input '{}', falling back to <null>", input);
- }
- return null;
- }
-
- // -- FONT
-
- static @Nullable Font parseFont(@Nullable String input) {
- if(input==null) {
- return null;
- }
- try {
- return Font.decode(input);
- } catch (Exception e) {
- log.warn("failed to parse Font from input '{}', falling back to <null>", input);
- }
- return null;
- }
-
- // -- LIST OF STRINGS
-
- static @Nullable String[] parseList(@Nullable String input) {
- if(input==null) {
- return null;
- }
- try {
- return _Strings.splitThenStream(input, ",")
- .map(String::trim)
- .collect(_Arrays.toArray(String.class));
- } catch (Exception e) {
- log.warn("failed to parse List (of Strings) from input '{}', falling back to <null>", input);
- }
- return null;
- }
-
-}
diff --git a/core/config/src/test/java/org/apache/isis/core/config/unittestsupport/internal/_Config_trim.java b/core/config/src/test/java/org/apache/isis/core/config/unittestsupport/internal/_Config_trim.java
deleted file mode 100644
index aa19617..0000000
--- a/core/config/src/test/java/org/apache/isis/core/config/unittestsupport/internal/_Config_trim.java
+++ /dev/null
@@ -1,49 +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.core.config.unittestsupport.internal;
-
-import java.util.Map;
-
-import org.apache.isis.core.commons.internal.collections._Maps;
-
-import lombok.val;
-
-final class _Config_trim {
-
- /**
- * Given {@code map}, for every key trim the corresponding value.
- * Filter any absent values, but keep empty Strings.
- * @param map
- */
- static Map<String, String> trim(Map<String, String> map) {
-
- val trimmed = _Maps.<String, String> newHashMap();
-
- map.forEach((k, v)->{
-
- if(v!=null) {
- trimmed.put(k, v.trim());
- }
-
- });
-
- return trimmed;
- }
-
-}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_forTesting.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_forTesting.java
index 57c008f..84a676f 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_forTesting.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_forTesting.java
@@ -42,7 +42,6 @@ import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.config.beans.IsisBeanTypeRegistry;
import org.apache.isis.core.config.beans.IsisBeanTypeRegistryHolder;
-import org.apache.isis.core.config.unittestsupport.internal._Config;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.objectmanager.ObjectManager;
import org.apache.isis.core.metamodel.objectmanager.ObjectManagerDefault;
@@ -175,10 +174,11 @@ public final class MetaModelContext_forTesting implements MetaModelContext {
}
private static IsisConfiguration newIsisConfiguration() {
+ val properties = _Maps.<String, String>newHashMap();
val config = new IsisConfiguration(new AbstractEnvironment() {
@Override
public String getProperty(String key) {
- return _Config.getConfiguration().getString(key);
+ return properties.get(key);
}
});
return config;
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 82c2254..705268e 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
@@ -38,11 +38,11 @@ import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.config.metamodel.facets.AuditObjectsConfiguration;
import org.apache.isis.core.config.metamodel.facets.EditingObjectsConfiguration;
import org.apache.isis.core.config.metamodel.facets.PublishObjectsConfiguration;
-import org.apache.isis.core.metamodel.facets.object.audit.AuditableFacet;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryJUnit4TestCase;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessClassContext;
import org.apache.isis.core.metamodel.facets.ObjectSpecIdFacetFactory.ProcessObjectSpecIdContext;
+import org.apache.isis.core.metamodel.facets.object.audit.AuditableFacet;
import org.apache.isis.core.metamodel.facets.object.autocomplete.AutoCompleteFacet;
import org.apache.isis.core.metamodel.facets.object.domainobject.auditing.AuditableFacetForDomainObjectAnnotation;
import org.apache.isis.core.metamodel.facets.object.domainobject.auditing.AuditableFacetForDomainObjectAnnotationAsConfigured;
@@ -62,7 +62,6 @@ import org.apache.isis.core.metamodel.facets.object.publishedobject.PublishedObj
import org.apache.isis.core.metamodel.facets.object.viewmodel.ViewModelFacet;
import org.apache.isis.core.metamodel.facets.objectvalue.choices.ChoicesFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
-import org.apache.isis.core.config.unittestsupport.internal._Config;
import lombok.val;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java
index 5aa52ff..4b9ca31 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java
@@ -36,7 +36,6 @@ 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.applib.layout.component.CssClassFaPosition;
-import org.apache.isis.core.config.unittestsupport.internal._Config;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryJUnit4TestCase;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
index 085ccb1..1345502 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
@@ -32,17 +32,13 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.MementoSerialization;
-import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.annotation.Optionality;
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.core.config.unittestsupport.internal._Config;
import org.apache.isis.core.metamodel.commons.matchers.IsisMatchers;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.facetapi.Facet;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigDecimalValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigDecimalValueSemanticsProviderTest.java
index fed8658..af320db 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigDecimalValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigDecimalValueSemanticsProviderTest.java
@@ -27,12 +27,11 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
-import org.apache.isis.core.metamodel.facets.value.bigdecimal.BigDecimalValueSemanticsProvider;
import org.apache.isis.core.metamodel.context.MetaModelContextAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
-import org.apache.isis.core.config.unittestsupport.internal._Config;
+import org.apache.isis.core.metamodel.facets.value.bigdecimal.BigDecimalValueSemanticsProvider;
public class BigDecimalValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ByteValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ByteValueSemanticsProviderTest.java
index 7aba076..b8cf76b 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ByteValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ByteValueSemanticsProviderTest.java
@@ -31,7 +31,6 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.core.metamodel.facets.value.bytes.ByteValueSemanticsProviderAbstract;
import org.apache.isis.core.metamodel.facets.value.bytes.ByteWrapperValueSemanticsProvider;
-import org.apache.isis.core.config.unittestsupport.internal._Config;
public class ByteValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DoubleValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DoubleValueSemanticsProviderTest.java
index 6ab70be..b966e43 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DoubleValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DoubleValueSemanticsProviderTest.java
@@ -30,7 +30,6 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.core.metamodel.facets.value.doubles.DoubleWrapperValueSemanticsProvider;
-import org.apache.isis.core.config.unittestsupport.internal._Config;
public class DoubleValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/FloatValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/FloatValueSemanticsProviderTest.java
index 54a1bbc..75a387d 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/FloatValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/FloatValueSemanticsProviderTest.java
@@ -31,7 +31,6 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.core.metamodel.facets.value.floats.FloatValueSemanticsProviderAbstract;
import org.apache.isis.core.metamodel.facets.value.floats.FloatWrapperValueSemanticsProvider;
-import org.apache.isis.core.config.unittestsupport.internal._Config;
public class FloatValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/IntValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/IntValueSemanticsProviderTest.java
index a95a95b..738d6fe 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/IntValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/IntValueSemanticsProviderTest.java
@@ -31,7 +31,6 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.core.metamodel.facets.value.integer.IntValueSemanticsProviderAbstract;
import org.apache.isis.core.metamodel.facets.value.integer.IntWrapperValueSemanticsProvider;
-import org.apache.isis.core.config.unittestsupport.internal._Config;
public class IntValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java
index 983d006..ee33317 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java
@@ -36,7 +36,6 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.core.metamodel.facets.value.datesql.JavaSqlDateValueSemanticsProvider;
-import org.apache.isis.core.config.unittestsupport.internal._Config;
public class JavaSqlDateValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java
index b051b5f..06d2595 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java
@@ -33,7 +33,6 @@ import org.apache.isis.core.metamodel.context.MetaModelContextAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.value.timesql.JavaSqlTimeValueSemanticsProvider;
-import org.apache.isis.core.config.unittestsupport.internal._Config;
public class JavaSqlTimeValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java
index 5146974..f809c04 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java
@@ -35,7 +35,6 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.core.metamodel.facets.value.dateutil.JavaUtilDateValueSemanticsProvider;
-import org.apache.isis.core.config.unittestsupport.internal._Config;
public class JavaUtilDateValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/LongValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/LongValueSemanticsProviderTest.java
index a2fff31..a9f715d 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/LongValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/LongValueSemanticsProviderTest.java
@@ -31,7 +31,6 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.core.metamodel.facets.value.longs.LongValueSemanticsProviderAbstract;
import org.apache.isis.core.metamodel.facets.value.longs.LongWrapperValueSemanticsProvider;
-import org.apache.isis.core.config.unittestsupport.internal._Config;
public class LongValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ShortValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ShortValueSemanticsProviderTest.java
index 64addcf..06cd41b 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ShortValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ShortValueSemanticsProviderTest.java
@@ -31,7 +31,6 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.core.metamodel.facets.value.shortint.ShortValueSemanticsProviderAbstract;
import org.apache.isis.core.metamodel.facets.value.shortint.ShortWrapperValueSemanticsProvider;
-import org.apache.isis.core.config.unittestsupport.internal._Config;
public class ShortValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
index 0f18133..11aee6e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
@@ -36,7 +36,6 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail;
-import org.apache.isis.core.config.unittestsupport.internal._Config;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.core.metamodel.MetaModelContext_forTesting;