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 2021/04/16 14:57:35 UTC
[isis] branch master updated: ISIS-2549: move
ConfigurationViewServiceDefault to 'webapp'
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
The following commit(s) were added to refs/heads/master by this push:
new 9aeb7c8 ISIS-2549: move ConfigurationViewServiceDefault to 'webapp'
9aeb7c8 is described below
commit 9aeb7c8250e9186b88e69b36db4685d40dec4e4d
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Apr 16 16:56:22 2021 +0200
ISIS-2549: move ConfigurationViewServiceDefault to 'webapp'
also make list of used WebModules visible as information in the UI
---
.../runtimeservices/IsisModuleCoreRuntimeServices.java | 4 +---
.../org/apache/isis/core/webapp/IsisModuleCoreWebapp.java | 3 +++
.../webapp}/confmenu/ConfigurationViewServiceDefault.java | 15 +++++++++++++--
.../apache/isis/core/webapp/modules/WebModuleContext.java | 3 ++-
4 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/IsisModuleCoreRuntimeServices.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/IsisModuleCoreRuntimeServices.java
index ef44cf4..9291c88 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/IsisModuleCoreRuntimeServices.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/IsisModuleCoreRuntimeServices.java
@@ -32,7 +32,6 @@ import org.apache.isis.core.runtimeservices.bookmarks.BookmarkServiceDefault;
import org.apache.isis.core.runtimeservices.clock.ClockServiceDefault;
import org.apache.isis.core.runtimeservices.command.CommandDtoFactoryDefault;
import org.apache.isis.core.runtimeservices.command.CommandExecutorServiceDefault;
-import org.apache.isis.core.runtimeservices.confmenu.ConfigurationViewServiceDefault;
import org.apache.isis.core.runtimeservices.email.EmailServiceDefault;
import org.apache.isis.core.runtimeservices.eventbus.EventBusServiceSpring;
import org.apache.isis.core.runtimeservices.executor.MemberExecutorServiceDefault;
@@ -59,8 +58,8 @@ import org.apache.isis.core.runtimeservices.session.InteractionFactoryDefault;
import org.apache.isis.core.runtimeservices.sudo.SudoServiceDefault;
import org.apache.isis.core.runtimeservices.transaction.TransactionServiceSpring;
import org.apache.isis.core.runtimeservices.urlencoding.UrlEncodingServiceWithCompression;
-import org.apache.isis.core.runtimeservices.user.ImpersonatedUserHolderDefault;
import org.apache.isis.core.runtimeservices.user.ImpersonateMenuAdvisorDefault;
+import org.apache.isis.core.runtimeservices.user.ImpersonatedUserHolderDefault;
import org.apache.isis.core.runtimeservices.user.UserServiceDefault;
import org.apache.isis.core.runtimeservices.userreg.EmailNotificationServiceDefault;
import org.apache.isis.core.runtimeservices.wrapper.WrapperFactoryDefault;
@@ -81,7 +80,6 @@ import org.apache.isis.core.runtimeservices.xmlsnapshot.XmlSnapshotServiceDefaul
CommandDtoFactoryDefault.class,
CommandExecutorServiceDefault.class,
CommandPublisherDefault.class,
- ConfigurationViewServiceDefault.class,
EmailNotificationServiceDefault.class,
EmailServiceDefault.class,
ExceptionRecognizerServiceDefault.class,
diff --git a/core/webapp/src/main/java/org/apache/isis/core/webapp/IsisModuleCoreWebapp.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/IsisModuleCoreWebapp.java
index 8e2af31..9f2daa2 100644
--- a/core/webapp/src/main/java/org/apache/isis/core/webapp/IsisModuleCoreWebapp.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/IsisModuleCoreWebapp.java
@@ -27,6 +27,7 @@ import org.springframework.web.context.WebApplicationContext;
import org.apache.isis.core.interaction.session.MessageBroker;
import org.apache.isis.core.runtime.IsisModuleCoreRuntime;
+import org.apache.isis.core.webapp.confmenu.ConfigurationViewServiceDefault;
import org.apache.isis.core.webapp.health.HealthIndicatorUsingHealthCheckService;
import org.apache.isis.core.webapp.modules.logonlog.WebModuleLogOnExceptionLogger;
import org.apache.isis.core.webapp.modules.templresources.WebModuleTemplateResources;
@@ -38,10 +39,12 @@ import org.apache.isis.core.webapp.webappctx.IsisWebAppContextInitializer;
IsisModuleCoreRuntime.class,
// @Service's
+ ConfigurationViewServiceDefault.class,
WebModuleLogOnExceptionLogger.class,
WebModuleTemplateResources.class,
// @Component's
+
HealthIndicatorUsingHealthCheckService.class,
// (not annotated)
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/confmenu/ConfigurationViewServiceDefault.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/confmenu/ConfigurationViewServiceDefault.java
similarity index 93%
rename from core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/confmenu/ConfigurationViewServiceDefault.java
rename to core/webapp/src/main/java/org/apache/isis/core/webapp/confmenu/ConfigurationViewServiceDefault.java
index c16cd86..be6fd37 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/confmenu/ConfigurationViewServiceDefault.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/confmenu/ConfigurationViewServiceDefault.java
@@ -16,12 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.runtimeservices.confmenu;
+package org.apache.isis.core.webapp.confmenu;
+import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.TreeSet;
+import java.util.stream.Collectors;
import javax.annotation.PostConstruct;
import javax.inject.Inject;
@@ -35,6 +37,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.confview.ConfigurationProperty;
import org.apache.isis.applib.services.confview.ConfigurationViewService;
+import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.internal.base._Lazy;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.collections._Maps;
@@ -43,6 +46,7 @@ import org.apache.isis.core.config.IsisConfiguration.Core.Config.ConfigurationPr
import org.apache.isis.core.config.IsisModuleCoreConfig;
import org.apache.isis.core.config.environment.IsisSystemEnvironment;
import org.apache.isis.core.config.util.ValueMaskingUtil;
+import org.apache.isis.core.webapp.modules.WebModule;
import lombok.RequiredArgsConstructor;
import lombok.val;
@@ -52,7 +56,7 @@ import lombok.extern.log4j.Log4j2;
* @since 2.0
*/
@Service
-@Named("isis.runtimeservices.ConfigurationViewServiceDefault")
+@Named("isis.webapp.ConfigurationViewServiceDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
@@ -64,6 +68,7 @@ implements
private final IsisSystemEnvironment systemEnvironment;
private final IsisConfiguration configuration;
+ private final List<WebModule> webModules;
private final IsisModuleCoreConfig.ConfigProps configProps;
@@ -132,6 +137,12 @@ implements
addSystemProperty("java.vm.version", map);
addSystemProperty("java.vm.info", map);
+ add("Filters", Can.ofCollection(webModules)
+ .stream()
+ .map(WebModule::getName)
+ .collect(Collectors.joining(", ")),
+ map);
+
return map;
}
diff --git a/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/WebModuleContext.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/WebModuleContext.java
index d064578..95741fb 100644
--- a/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/WebModuleContext.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/WebModuleContext.java
@@ -42,7 +42,8 @@ import lombok.extern.log4j.Log4j2;
* @since 2.0
*
*/
-@Log4j2 @RequiredArgsConstructor
+@RequiredArgsConstructor
+@Log4j2
public class WebModuleContext {
private final StringBuilder protectedPath = new StringBuilder();