You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2020/01/10 15:22:32 UTC
[isis] 18/21: ISIS-2259: moves constants defined in
ConfigurationConstants class elsewhere
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2259
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 88b8e18325cc9adff5014e1c26be67c092fea5df
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 14:15:32 2020 +0000
ISIS-2259: moves constants defined in ConfigurationConstants class elsewhere
---
core/config/pom.xml | 4 +--
.../isis/core/config/ConfigurationConstants.java | 41 ----------------------
.../apache/isis/core/config/IsisConfiguration.java | 5 +--
...ModuleConfig.java => IsisModuleCoreConfig.java} | 2 +-
.../apache/isis/core/config/util/ConfigUtil.java | 8 +++--
.../apache/isis/metamodel/IsisModuleMetamodel.java | 4 +--
.../identify/ObjectIdentifier_builtinHandlers.java | 4 +--
.../ServiceInjectorDefaultTest_usingFields.java | 4 +--
...InjectorDefaultTest_validateServices_happy.java | 4 +--
.../services/ServiceInjectorLegacyTest.java | 4 +--
.../standard/AuthorizationConstants.java | 4 +--
.../isis/testdomain/config/IsisConfigBeanTest.java | 4 +--
.../resources/MenuBarsResourceServerside.java | 5 +--
13 files changed, 28 insertions(+), 65 deletions(-)
diff --git a/core/config/pom.xml b/core/config/pom.xml
index 905ca19..616853c 100644
--- a/core/config/pom.xml
+++ b/core/config/pom.xml
@@ -34,8 +34,8 @@
</description>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.config</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/config</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.core.config</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/core/config</git-plugin.propertiesDir>
</properties>
<build>
diff --git a/core/config/src/main/java/org/apache/isis/core/config/ConfigurationConstants.java b/core/config/src/main/java/org/apache/isis/core/config/ConfigurationConstants.java
deleted file mode 100644
index 944e0c1..0000000
--- a/core/config/src/main/java/org/apache/isis/core/config/ConfigurationConstants.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.core.config;
-
-import java.util.List;
-
-import org.apache.isis.core.commons.internal.collections._Lists;
-
-import lombok.experimental.UtilityClass;
-
-@UtilityClass
-public final class ConfigurationConstants {
-
- public static final String LIST_SEPARATOR = ",";
- public static final String DELIMITER = ".";
- public static final String ROOT_PREFIX = "isis";
- public static final String ROOT = ROOT_PREFIX + DELIMITER;
-
- public static final List<String> PROTECTED_KEYS =
- _Lists.of("password", "apiKey", "authToken");
-
- // -- SERVICE SUPPORT
- public static final String SERVICE_IDENTIFIER = "1";
-}
diff --git a/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java b/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
index 10878ee..14bd2b8 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
@@ -67,11 +67,12 @@ import lombok.Data;
*
* @since 2.0
*/
-@ConfigurationProperties(ConfigurationConstants.ROOT_PREFIX)
+@ConfigurationProperties(IsisConfiguration.ROOT_PREFIX)
@Data
@Validated
public class IsisConfiguration {
+ public static final String ROOT_PREFIX = "isis";
@Autowired private ConfigurableEnvironment environment;
@Inject @Named("isis-settings") private Map<String, String> isisSettings;
@@ -1147,7 +1148,7 @@ public class IsisConfiguration {
private static Map<Pattern, String> toPatternMap(String cssClassPatterns) {
final Map<Pattern,String> valueByPattern = _Maps.newLinkedHashMap();
if(cssClassPatterns != null) {
- final StringTokenizer regexToCssClasses = new StringTokenizer(cssClassPatterns, ConfigurationConstants.LIST_SEPARATOR);
+ final StringTokenizer regexToCssClasses = new StringTokenizer(cssClassPatterns, ",");
final Map<String,String> valueByRegex = _Maps.newLinkedHashMap();
while (regexToCssClasses.hasMoreTokens()) {
String regexToCssClass = regexToCssClasses.nextToken().trim();
diff --git a/core/config/src/main/java/org/apache/isis/core/config/IsisModuleConfig.java b/core/config/src/main/java/org/apache/isis/core/config/IsisModuleCoreConfig.java
similarity index 98%
rename from core/config/src/main/java/org/apache/isis/core/config/IsisModuleConfig.java
rename to core/config/src/main/java/org/apache/isis/core/config/IsisModuleCoreConfig.java
index 4db74c4..5e38e4a 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/IsisModuleConfig.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/IsisModuleCoreConfig.java
@@ -51,7 +51,7 @@ import org.apache.isis.core.config.viewer.wicket.WebAppContextPath;
IsisConfiguration.class,
RestEasyConfiguration.class,
})
-public class IsisModuleConfig {
+public class IsisModuleCoreConfig {
@ConfigurationProperties(prefix = "isis")
@Bean("isis-settings")
diff --git a/core/config/src/main/java/org/apache/isis/core/config/util/ConfigUtil.java b/core/config/src/main/java/org/apache/isis/core/config/util/ConfigUtil.java
index 5c1b146..cfe57ed 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/util/ConfigUtil.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/util/ConfigUtil.java
@@ -18,17 +18,21 @@
*/
package org.apache.isis.core.config.util;
+import java.util.List;
import java.util.Map;
import java.util.function.Supplier;
import org.apache.isis.core.commons.internal.base._Strings;
-import org.apache.isis.core.config.ConfigurationConstants;
+import org.apache.isis.core.commons.internal.collections._Lists;
import lombok.experimental.UtilityClass;
@UtilityClass
public class ConfigUtil {
+ public static final List<String> PROTECTED_KEYS =
+ _Lists.of("password", "apiKey", "authToken");
+
public static Map<String, String> maskIfProtected(
final Map<String, String> inMap,
final Supplier<Map<String, String>> mapFactory) {
@@ -50,7 +54,7 @@ public class ConfigUtil {
return false;
}
final String toLowerCase = key.toLowerCase();
- for (String protectedKey : ConfigurationConstants.PROTECTED_KEYS) {
+ for (String protectedKey : PROTECTED_KEYS) {
if(toLowerCase.contains(protectedKey.toLowerCase())) {
return true;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/IsisModuleMetamodel.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/IsisModuleMetamodel.java
index dd7d186..c3514be 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/IsisModuleMetamodel.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/IsisModuleMetamodel.java
@@ -22,7 +22,7 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.apache.isis.applib.IsisModuleApplib;
-import org.apache.isis.core.config.IsisModuleConfig;
+import org.apache.isis.core.config.IsisModuleCoreConfig;
import org.apache.isis.metamodel.context.MetaModelContexts;
import org.apache.isis.metamodel.objectmanager.ObjectManagerDefault;
import org.apache.isis.metamodel.progmodel.ProgrammingModelInitFilterDefault;
@@ -56,7 +56,7 @@ import org.apache.isis.security.api.IsisModuleSecurityApi;
@Import({
// modules
IsisModuleApplib.class,
- IsisModuleConfig.class,
+ IsisModuleCoreConfig.class,
IsisModuleSecurityApi.class,
// @Configuration's
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/identify/ObjectIdentifier_builtinHandlers.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/identify/ObjectIdentifier_builtinHandlers.java
index c04e28b..daf1962 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/identify/ObjectIdentifier_builtinHandlers.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/identify/ObjectIdentifier_builtinHandlers.java
@@ -21,7 +21,6 @@ package org.apache.isis.metamodel.objectmanager.identify;
import java.util.UUID;
import org.apache.isis.core.commons.internal.exceptions._Exceptions;
-import org.apache.isis.core.config.ConfigurationConstants;
import org.apache.isis.metamodel.adapter.oid.Oid;
import org.apache.isis.metamodel.adapter.oid.RootOid;
import org.apache.isis.metamodel.facets.object.entity.EntityFacet;
@@ -34,6 +33,7 @@ import lombok.val;
class ObjectIdentifier_builtinHandlers {
+ public static final String SERVICE_IDENTIFIER = "1";
static class GuardAgainstRootOid implements Handler {
@@ -60,7 +60,7 @@ class ObjectIdentifier_builtinHandlers {
@Override
public RootOid handle(ManagedObject managedObject) {
- final String identifier = ConfigurationConstants.SERVICE_IDENTIFIER;
+ final String identifier = SERVICE_IDENTIFIER;
return Oid.Factory.persistentOf(managedObject.getSpecification().getSpecId(), identifier);
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorDefaultTest_usingFields.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorDefaultTest_usingFields.java
index 752d23f..4aa0f3a 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorDefaultTest_usingFields.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorDefaultTest_usingFields.java
@@ -37,7 +37,7 @@ import static org.junit.Assert.assertThat;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.repository.RepositoryService;
-import org.apache.isis.core.config.IsisModuleConfig;
+import org.apache.isis.core.config.IsisModuleCoreConfig;
import org.apache.isis.core.config.beans.IsisBeanFactoryPostProcessorForSpring;
import org.apache.isis.metamodel.services.registry.ServiceRegistryDefault;
@@ -46,7 +46,7 @@ import lombok.Getter;
@ActiveProfiles("test")
@SpringBootTest(classes = {
IsisBeanFactoryPostProcessorForSpring.class,
- IsisModuleConfig.class,
+ IsisModuleCoreConfig.class,
ServiceInjectorDefault.class,
ServiceRegistryDefault.class,
ServiceInjectorLegacyTest.Producers.class,
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorDefaultTest_validateServices_happy.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorDefaultTest_validateServices_happy.java
index 845814c..a580c84 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorDefaultTest_validateServices_happy.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorDefaultTest_validateServices_happy.java
@@ -34,13 +34,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.services.registry.ServiceRegistry;
-import org.apache.isis.core.config.IsisModuleConfig;
+import org.apache.isis.core.config.IsisModuleCoreConfig;
import org.apache.isis.core.config.beans.IsisBeanFactoryPostProcessorForSpring;
import org.apache.isis.metamodel.services.registry.ServiceRegistryDefault;
@ActiveProfiles("test")
@SpringBootTest(classes = {
- IsisModuleConfig.class,
+ IsisModuleCoreConfig.class,
ServiceInjectorDefault.class,
ServiceRegistryDefault.class,
ServiceInjectorLegacyTest.Producers.class,
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorLegacyTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorLegacyTest.java
index a07d795..504f74d 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorLegacyTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorLegacyTest.java
@@ -38,7 +38,7 @@ import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.core.config.IsisConfiguration;
-import org.apache.isis.core.config.IsisModuleConfig;
+import org.apache.isis.core.config.IsisModuleCoreConfig;
import org.apache.isis.core.config.beans.IsisBeanFactoryPostProcessorForSpring;
import org.apache.isis.metamodel.services.registry.ServiceRegistryDefault;
import org.apache.isis.metamodel.spec.InjectorMethodEvaluator;
@@ -50,7 +50,7 @@ import lombok.val;
@ActiveProfiles("test")
@SpringBootTest(classes = {
IsisBeanFactoryPostProcessorForSpring.class,
- IsisModuleConfig.class,
+ IsisModuleCoreConfig.class,
ServiceInjectorLegacy.class,
ServiceRegistryDefault.class,
ServiceInjectorLegacyTest.Producers.class,
diff --git a/core/security/src/main/java/org/apache/isis/security/api/authorization/standard/AuthorizationConstants.java b/core/security/src/main/java/org/apache/isis/security/api/authorization/standard/AuthorizationConstants.java
index 4a1ffe6..be462ac 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/authorization/standard/AuthorizationConstants.java
+++ b/core/security/src/main/java/org/apache/isis/security/api/authorization/standard/AuthorizationConstants.java
@@ -19,11 +19,9 @@
package org.apache.isis.security.api.authorization.standard;
-import org.apache.isis.core.config.ConfigurationConstants;
-
public final class AuthorizationConstants {
- private static final String ROOT = ConfigurationConstants.ROOT + "authorization.";
+ private static final String ROOT = "isis.authorization.";
public static final String LEARN = ROOT + "learn";
public static final boolean LEARN_DEFAULT = false;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest.java
index 6a04d22..bcb9b39 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest.java
@@ -28,14 +28,14 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.isis.core.config.IsisConfiguration;
-import org.apache.isis.core.config.IsisModuleConfig;
+import org.apache.isis.core.config.IsisModuleCoreConfig;
import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.testdomain.Smoketest;
@Smoketest
@SpringBootTest(
classes = {
- IsisModuleConfig.class
+ IsisModuleCoreConfig.class
}
)
@TestPropertySource({
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/MenuBarsResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/MenuBarsResourceServerside.java
index 0dad7fb..e02e89c 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/MenuBarsResourceServerside.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/MenuBarsResourceServerside.java
@@ -31,7 +31,6 @@ import org.apache.isis.applib.layout.component.ServiceActionLayoutData;
import org.apache.isis.applib.layout.links.Link;
import org.apache.isis.applib.layout.menubars.MenuBars;
import org.apache.isis.applib.services.menu.MenuBarsService;
-import org.apache.isis.core.config.ConfigurationConstants;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.metamodel.context.MetaModelContext;
import org.apache.isis.viewer.restfulobjects.applib.Rel;
@@ -46,6 +45,8 @@ import org.apache.isis.viewer.restfulobjects.viewer.resources.serialization.Seri
@Component
public class MenuBarsResourceServerside extends ResourceAbstract implements MenuBarsResource {
+ public static final String SERVICE_IDENTIFIER = "1";
+
@Inject
public MenuBarsResourceServerside(
final MetaModelContext metaModelContext,
@@ -86,7 +87,7 @@ public class MenuBarsResourceServerside extends ResourceAbstract implements Menu
final String objectType = actionLayoutData.getObjectType();
final String relativeUrl = String.format(
"objects/%s/%s/actions/%s",
- objectType, ConfigurationConstants.SERVICE_IDENTIFIER, actionLayoutData.getId());
+ objectType, SERVICE_IDENTIFIER, actionLayoutData.getId());
Link link = new Link(
Rel.ACTION.getName(),
HttpMethod.GET,