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 11:48:32 UTC
[isis] branch v2 updated: ISIS-2086: moving IsisConfigurationLegacy
to 'test-scope'
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 bc9c398 ISIS-2086: moving IsisConfigurationLegacy to 'test-scope'
bc9c398 is described below
commit bc9c398b7b72677a27a12da532ab957642321149
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Oct 25 13:48:20 2019 +0200
ISIS-2086: moving IsisConfigurationLegacy to 'test-scope'
- no longer required by core, only required for JUnit tests
---
.../metamodel/specloader/IntrospectionMode.java | 1 -
.../isis/metamodel/MetaModelContext_usingIoc.java | 8 ++---
.../annotation/SortedByFacetAnnotationFactory.java | 1 -
...aViewModelLayoutAnnotationUsingIconUiEvent.java | 1 -
.../object/encodeable/EncoderDecoderUtil.java | 11 -------
.../facets/object/parseable/ParserUtil.java | 11 -------
.../isis/config/IsisConfigurationLegacy.java | 34 ----------------------
.../org/apache/isis/config/internal/_Config.java | 0
.../isis/config/internal/_Config_Instance.java | 0
.../config/internal/_Config_LifecycleResource.java | 0
.../isis/config/internal/_Config_Parsers.java | 0
.../apache/isis/config/internal/_Config_trim.java | 0
.../isis/config/property/ConfigProperty.java | 0
.../config/property/ConfigPropertyAbstract.java | 0
.../config/property/ConfigPropertyBoolean.java | 0
.../isis/config/property/ConfigPropertyEnum.java | 0
.../isis/config/property/ConfigPropertyString.java | 0
17 files changed, 3 insertions(+), 64 deletions(-)
diff --git a/core/config/src/main/java/org/apache/isis/metamodel/specloader/IntrospectionMode.java b/core/config/src/main/java/org/apache/isis/metamodel/specloader/IntrospectionMode.java
index c29fe17..efbdf60 100644
--- a/core/config/src/main/java/org/apache/isis/metamodel/specloader/IntrospectionMode.java
+++ b/core/config/src/main/java/org/apache/isis/metamodel/specloader/IntrospectionMode.java
@@ -18,7 +18,6 @@
*/
package org.apache.isis.metamodel.specloader;
-import org.apache.isis.commons.internal.context._Context;
import org.apache.isis.commons.internal.environment.DeploymentType;
import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
import org.apache.isis.config.IsisConfiguration;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/MetaModelContext_usingIoc.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/MetaModelContext_usingIoc.java
index dae3c9c..9f456ab 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/MetaModelContext_usingIoc.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/MetaModelContext_usingIoc.java
@@ -35,8 +35,6 @@ import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.commons.internal.ioc.IocContainer;
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.services.ServiceUtil;
@@ -60,9 +58,9 @@ class MetaModelContext_usingIoc implements MetaModelContext {
this.iocContainer = iocContainer;
}
- @Getter(lazy=true)
- private final IsisConfigurationLegacy configurationLegacy =
- _Config.getConfiguration();
+// @Getter(lazy=true)
+// private final IsisConfigurationLegacy configurationLegacy =
+// _Config.getConfiguration();
@Getter(lazy=true)
private final IsisSystemEnvironment systemEnvironment =
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/sortedby/annotation/SortedByFacetAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/sortedby/annotation/SortedByFacetAnnotationFactory.java
index b4f52ae..6772612 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/sortedby/annotation/SortedByFacetAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/sortedby/annotation/SortedByFacetAnnotationFactory.java
@@ -22,7 +22,6 @@ package org.apache.isis.metamodel.facets.collections.sortedby.annotation;
import java.util.Comparator;
import java.util.stream.Stream;
-import org.apache.isis.config.IsisConfigurationLegacy;
import org.apache.isis.metamodel.facetapi.FeatureType;
import org.apache.isis.metamodel.facetapi.MetaModelRefiner;
import org.apache.isis.metamodel.facets.FacetFactoryAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/IconFacetViaViewModelLayoutAnnotationUsingIconUiEvent.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/IconFacetViaViewModelLayoutAnnotationUsingIconUiEvent.java
index bd698f1..2869350 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/IconFacetViaViewModelLayoutAnnotationUsingIconUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/IconFacetViaViewModelLayoutAnnotationUsingIconUiEvent.java
@@ -27,7 +27,6 @@ import org.apache.isis.applib.annotation.ViewModelLayout;
import org.apache.isis.applib.events.ui.IconUiEvent;
import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.config.IsisConfigurationLegacy;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.object.icon.IconFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/encodeable/EncoderDecoderUtil.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/encodeable/EncoderDecoderUtil.java
index e7b0cb5..99edb6c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/encodeable/EncoderDecoderUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/encodeable/EncoderDecoderUtil.java
@@ -20,8 +20,6 @@
package org.apache.isis.metamodel.facets.object.encodeable;
import org.apache.isis.applib.adapters.EncoderDecoder;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.config.IsisConfigurationLegacy;
import org.apache.isis.metamodel.commons.ClassUtil;
import org.apache.isis.metamodel.facetapi.FacetHolder;
@@ -30,15 +28,6 @@ public final class EncoderDecoderUtil {
private EncoderDecoderUtil() {
}
-// public static final String ENCODER_DECODER_NAME_KEY_PREFIX = "isis.reflector.java.facets.encoderDecoder.";
-// public static final String ENCODER_DECODER_NAME_KEY_SUFFIX = ".encoderDecoderName";
-//
-// public static String encoderDecoderNameFromConfiguration(final Class<?> type, final IsisConfigurationLegacy configuration) {
-// final String key = ENCODER_DECODER_NAME_KEY_PREFIX + type.getCanonicalName() + ENCODER_DECODER_NAME_KEY_SUFFIX;
-// final String encoderDecoderName = configuration.getString(key);
-// return !_Strings.isNullOrEmpty(encoderDecoderName) ? encoderDecoderName : null;
-// }
-
public static Class<?> encoderDecoderOrNull(final Class<?> candidateClass, final String classCandidateName) {
final Class<?> type = candidateClass != null ? ClassUtil.implementingClassOrNull(candidateClass.getName(), EncoderDecoder.class, FacetHolder.class) : null;
return type != null ? type : ClassUtil.implementingClassOrNull(classCandidateName, EncoderDecoder.class, FacetHolder.class);
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/ParserUtil.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/ParserUtil.java
index fc1029d..4d64aff 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/ParserUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/ParserUtil.java
@@ -20,8 +20,6 @@
package org.apache.isis.metamodel.facets.object.parseable;
import org.apache.isis.applib.adapters.Parser;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.config.IsisConfigurationLegacy;
import org.apache.isis.metamodel.commons.ClassUtil;
import org.apache.isis.metamodel.facetapi.FacetHolder;
@@ -32,15 +30,6 @@ public final class ParserUtil {
private ParserUtil() {
}
-// public static final String PARSER_NAME_KEY_PREFIX = "isis.reflector.java.facets.parser.";
-// public static final String PARSER_NAME_KEY_SUFFIX = ".parserName";
-
-// public static String parserNameFromConfiguration(final Class<?> type, final IsisConfigurationLegacy configuration) {
-// final String key = PARSER_NAME_KEY_PREFIX + type.getCanonicalName() + PARSER_NAME_KEY_SUFFIX;
-// final String parserName = configuration.getString(key);
-// return !_Strings.isNullOrEmpty(parserName) ? parserName : null;
-// }
-
public static Class<? extends Parser<?>> parserOrNull(final Class<?> candidateClass, final String classCandidateName) {
final Class<? extends Parser<?>> type = candidateClass != null
diff --git a/core/config/src/main/java/org/apache/isis/config/IsisConfigurationLegacy.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/IsisConfigurationLegacy.java
similarity index 83%
rename from core/config/src/main/java/org/apache/isis/config/IsisConfigurationLegacy.java
rename to core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/IsisConfigurationLegacy.java
index a238b7a..6a4d71e 100644
--- a/core/config/src/main/java/org/apache/isis/config/IsisConfigurationLegacy.java
+++ b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/IsisConfigurationLegacy.java
@@ -22,12 +22,6 @@ package org.apache.isis.config;
import java.awt.Color;
import java.awt.Font;
import java.util.Map;
-import java.util.TreeMap;
-
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
-
-import lombok.val;
/**
* Immutable set of properties representing the configuration of the running
@@ -206,32 +200,4 @@ public interface IsisConfigurationLegacy {
*/
Map<String, String> copyToMap();
- // -- TO STRING
-
- default public String toStringFormatted(IsisSystemEnvironment isisSystemEnvironment) {
-
- val sb = new StringBuilder();
- val configuration = this.subset("isis");
-
- final Map<String, String> map =
- ConfigurationConstants.maskIfProtected(configuration.copyToMap(), TreeMap::new);
-
- String head = String.format("APACHE ISIS %s (%s) ",
- getVersion(), isisSystemEnvironment.getDeploymentType().name());
- 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)->{
- sb.append(k+" -> "+v).append("\n");
- });
- sb.append("================================================\n");
-
- return sb.toString();
- }
-
}
diff --git a/core/config/src/main/java/org/apache/isis/config/internal/_Config.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/internal/_Config.java
similarity index 100%
rename from core/config/src/main/java/org/apache/isis/config/internal/_Config.java
rename to core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/internal/_Config.java
diff --git a/core/config/src/main/java/org/apache/isis/config/internal/_Config_Instance.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/internal/_Config_Instance.java
similarity index 100%
rename from core/config/src/main/java/org/apache/isis/config/internal/_Config_Instance.java
rename to core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/internal/_Config_Instance.java
diff --git a/core/config/src/main/java/org/apache/isis/config/internal/_Config_LifecycleResource.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/internal/_Config_LifecycleResource.java
similarity index 100%
rename from core/config/src/main/java/org/apache/isis/config/internal/_Config_LifecycleResource.java
rename to core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/internal/_Config_LifecycleResource.java
diff --git a/core/config/src/main/java/org/apache/isis/config/internal/_Config_Parsers.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/internal/_Config_Parsers.java
similarity index 100%
rename from core/config/src/main/java/org/apache/isis/config/internal/_Config_Parsers.java
rename to core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/internal/_Config_Parsers.java
diff --git a/core/config/src/main/java/org/apache/isis/config/internal/_Config_trim.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/internal/_Config_trim.java
similarity index 100%
rename from core/config/src/main/java/org/apache/isis/config/internal/_Config_trim.java
rename to core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/internal/_Config_trim.java
diff --git a/core/config/src/main/java/org/apache/isis/config/property/ConfigProperty.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/property/ConfigProperty.java
similarity index 100%
rename from core/config/src/main/java/org/apache/isis/config/property/ConfigProperty.java
rename to core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/property/ConfigProperty.java
diff --git a/core/config/src/main/java/org/apache/isis/config/property/ConfigPropertyAbstract.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/property/ConfigPropertyAbstract.java
similarity index 100%
rename from core/config/src/main/java/org/apache/isis/config/property/ConfigPropertyAbstract.java
rename to core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/property/ConfigPropertyAbstract.java
diff --git a/core/config/src/main/java/org/apache/isis/config/property/ConfigPropertyBoolean.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/property/ConfigPropertyBoolean.java
similarity index 100%
rename from core/config/src/main/java/org/apache/isis/config/property/ConfigPropertyBoolean.java
rename to core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/property/ConfigPropertyBoolean.java
diff --git a/core/config/src/main/java/org/apache/isis/config/property/ConfigPropertyEnum.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/property/ConfigPropertyEnum.java
similarity index 100%
rename from core/config/src/main/java/org/apache/isis/config/property/ConfigPropertyEnum.java
rename to core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/property/ConfigPropertyEnum.java
diff --git a/core/config/src/main/java/org/apache/isis/config/property/ConfigPropertyString.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/property/ConfigPropertyString.java
similarity index 100%
rename from core/config/src/main/java/org/apache/isis/config/property/ConfigPropertyString.java
rename to core/testsupport/unittestsupport/src/main/java/org/apache/isis/config/property/ConfigPropertyString.java