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/21 16:09:29 UTC
[isis] 04/11: ISIS-2264: removes remainder of WebAppConfiguration
class
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 52be174a396afd4073d53fb74af9936ac75b5628
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Jan 21 11:37:28 2020 +0000
ISIS-2264: removes remainder of WebAppConfiguration class
just call to WebAppContextPath where nec.
---
.../isis/core/config/IsisModuleCoreConfig.java | 2 -
.../config/viewer/wicket/WebAppConfiguration.java | 56 ----------------------
.../menubars/MenuBarsLoaderServiceDefault.java | 12 ++---
.../wicket/ui/components/welcome/WelcomePanel.java | 4 +-
.../ui/components/widgets/favicon/Favicon.java | 8 ++--
.../ui/components/widgets/navbar/BrandLogo.java | 8 ++--
.../ui/components/widgets/navbar/BrandName.java | 10 ++--
.../isis/viewer/wicket/ui/pages/WebPageBase.java | 10 ++--
.../accmngt/signup/RegistrationFormPanel.java | 4 +-
.../isis/viewer/wicket/ui/panels/PanelBase.java | 12 ++---
10 files changed, 33 insertions(+), 93 deletions(-)
diff --git a/core/config/src/main/java/org/apache/isis/core/config/IsisModuleCoreConfig.java b/core/config/src/main/java/org/apache/isis/core/config/IsisModuleCoreConfig.java
index 7b183a2..d0e09af 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/IsisModuleCoreConfig.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/IsisModuleCoreConfig.java
@@ -31,7 +31,6 @@ import org.apache.isis.core.commons.IsisModuleCoreCommons;
import org.apache.isis.core.config.beans.IsisBeanFactoryPostProcessorForSpring;
import org.apache.isis.core.config.converters.PatternsConverter;
import org.apache.isis.core.config.validators.PatternOptionalStringConstraintValidator;
-import org.apache.isis.core.config.viewer.wicket.WebAppConfiguration;
import org.apache.isis.core.config.viewer.wicket.WebAppContextPath;
@Configuration
@@ -45,7 +44,6 @@ import org.apache.isis.core.config.viewer.wicket.WebAppContextPath;
PatternOptionalStringConstraintValidator.class,
// @Service's
- WebAppConfiguration.class,
WebAppContextPath.class,
})
@EnableConfigurationProperties({
diff --git a/core/config/src/main/java/org/apache/isis/core/config/viewer/wicket/WebAppConfiguration.java b/core/config/src/main/java/org/apache/isis/core/config/viewer/wicket/WebAppConfiguration.java
deleted file mode 100644
index 527f8c5..0000000
--- a/core/config/src/main/java/org/apache/isis/core/config/viewer/wicket/WebAppConfiguration.java
+++ /dev/null
@@ -1,56 +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.viewer.wicket;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
-
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.annotation.Primary;
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Service;
-
-import org.apache.isis.applib.annotation.OrderPrecedence;
-import org.apache.isis.core.config.IsisConfiguration;
-
-/**
- * @since 2.0
- */
-@Service
-@Singleton
-@Named("isisConfig.WebAppConfiguration")
-@Order(OrderPrecedence.MIDPOINT)
-@Primary
-@Qualifier("Default")
-public class WebAppConfiguration {
-
- private final WebAppContextPath webAppContextPath;
-
- @Inject
- public WebAppConfiguration(
- final WebAppContextPath webAppContextPath) {
- this.webAppContextPath = webAppContextPath;
- }
-
- public String contextPathSensitive(String url) {
- return webAppContextPath.prependContextPathIfLocal(url);
- }
-
-}
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java
index bffe94e..8337459 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java
@@ -41,7 +41,7 @@ import org.apache.isis.applib.services.menu.MenuBarsLoaderService;
import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
import org.apache.isis.core.config.IsisConfiguration;
-import org.apache.isis.core.config.viewer.wicket.WebAppConfiguration;
+import org.apache.isis.core.config.viewer.wicket.WebAppContextPath;
import lombok.val;
import lombok.extern.log4j.Log4j2;
@@ -115,18 +115,16 @@ public class MenuBarsLoaderServiceDefault implements MenuBarsLoaderService {
}
log.warn(
- String.format("Configured '%s' failes to provide a readable resource for "
- + "the Menubars-Layout.",
- WebAppConfiguration.class.getName()));
+ String.format("'%s': could not find readable resource for the Menubars-Layout.",
+ WebAppContextPath.class.getName()));
warnedOnce = true;
}
private void severeCannotLoad(Exception cause) {
log.error(
- String.format("Configured '%s' failes to provide a readable resource for "
- + "the Menubars-Layout.",
- WebAppConfiguration.class.getName()),
+ String.format("'%s': could not find readable resource for the Menubars-Layout.",
+ WebAppContextPath.class.getName()),
cause);
}
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.java
index 40924e8..8ce69c5 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.java
@@ -23,7 +23,7 @@ import javax.inject.Inject;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.isis.core.config.viewer.wicket.WebAppConfiguration;
+import org.apache.isis.core.config.viewer.wicket.WebAppContextPath;
import org.apache.isis.viewer.wicket.model.models.WelcomeModel;
import org.apache.isis.viewer.wicket.ui.pages.home.HomePage;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
@@ -38,7 +38,7 @@ public class WelcomePanel extends PanelAbstract<WelcomeModel> {
private static final String ID_MESSAGE = "message";
- @Inject private transient WebAppConfiguration webAppConfigBean;
+ @Inject private transient WebAppContextPath webAppContextPath;
public WelcomePanel(final String id, final WelcomeModel model) {
super(id, model);
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/favicon/Favicon.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/favicon/Favicon.java
index 036b1af..f4885cc 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/favicon/Favicon.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/favicon/Favicon.java
@@ -25,7 +25,7 @@ import org.apache.wicket.markup.html.WebComponent;
import org.apache.wicket.util.string.Strings;
import org.apache.isis.core.config.IsisConfiguration;
-import org.apache.isis.core.config.viewer.wicket.WebAppConfiguration;
+import org.apache.isis.core.config.viewer.wicket.WebAppContextPath;
/**
* A component for application favorite icon
@@ -34,16 +34,16 @@ public class Favicon extends WebComponent {
private static final long serialVersionUID = 1L;
- @Inject private transient WebAppConfiguration webAppConfigBean;
@Inject private transient IsisConfiguration isisConfiguration;
+ @Inject private transient WebAppContextPath webAppContextPath;
private String url;
private String contentType;
public Favicon(String id) {
super(id);
- if(webAppConfigBean!=null) {
- url = webAppConfigBean.contextPathSensitive(isisConfiguration.getViewer().getWicket().getApplication().getFaviconUrl());
+ if(webAppContextPath!=null) {
+ url = webAppContextPath.prependContextPathIfLocal(isisConfiguration.getViewer().getWicket().getApplication().getFaviconUrl());
contentType = isisConfiguration.getViewer().getWicket().getApplication().getFaviconContentType();
}
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandLogo.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandLogo.java
index 1debc11..ecf1b70 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandLogo.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandLogo.java
@@ -24,7 +24,7 @@ import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.WebComponent;
import org.apache.isis.core.config.IsisConfiguration;
-import org.apache.isis.core.config.viewer.wicket.WebAppConfiguration;
+import org.apache.isis.core.config.viewer.wicket.WebAppContextPath;
/**
* A component used as a brand logo in the top-left corner of the navigation bar
@@ -35,8 +35,8 @@ public class BrandLogo extends WebComponent {
private final Placement placement;
- @Inject private transient WebAppConfiguration webAppConfigBean;
@Inject private transient IsisConfiguration isisConfiguration;
+ @Inject private transient WebAppContextPath webAppContextPath;
/**
* Constructor.
@@ -63,8 +63,8 @@ public class BrandLogo extends WebComponent {
}
private String url() {
- String logoHeaderUrl = webAppConfigBean.contextPathSensitive(isisConfiguration.getViewer().getWicket().getApplication().getBrandLogoHeader()) .getBrandLogoHeader();
- String logoSigninUrl = webAppConfigBean.getBrandLogoSignin();
+ String logoHeaderUrl = webAppContextPath.prependContextPathIfLocal(isisConfiguration.getViewer().getWicket().getApplication().getBrandLogoHeader());
+ String logoSigninUrl = webAppContextPath.prependContextPathIfLocal(isisConfiguration.getViewer().getWicket().getApplication().getBrandLogoSignin());
return placement.urlFor(logoHeaderUrl, logoSigninUrl);
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandName.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandName.java
index 7b152ef..7f235cd 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandName.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandName.java
@@ -24,7 +24,7 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.Model;
import org.apache.isis.core.config.IsisConfiguration;
-import org.apache.isis.core.config.viewer.wicket.WebAppConfiguration;
+import org.apache.isis.core.config.viewer.wicket.WebAppContextPath;
/**
* A component used as a brand logo in the top-left corner of the navigation bar
@@ -35,8 +35,8 @@ public class BrandName extends Label {
private final Placement placement;
- @Inject private transient WebAppConfiguration webAppConfigBean;
@Inject private transient IsisConfiguration isisConfiguration;
+ @Inject private transient WebAppContextPath webAppContextPath;
private String logoHeaderUrl;
private String logoSigninUrl;
@@ -52,10 +52,10 @@ public class BrandName extends Label {
super(id);
this.placement = placement;
- if(webAppConfigBean!=null) {
+ if(webAppContextPath!=null) {
applicationName = isisConfiguration.getViewer().getWicket().getApplication().getName();
- logoHeaderUrl = webAppConfigBean.contextPathSensitive(isisConfiguration.getViewer().getWicket().getApplication().getBrandLogoHeader());
- logoSigninUrl = webAppConfigBean.contextPathSensitive(isisConfiguration.getViewer().getWicket().getApplication().getBrandLogoSignin());
+ logoHeaderUrl = webAppContextPath.prependContextPathIfLocal(isisConfiguration.getViewer().getWicket().getApplication().getBrandLogoHeader());
+ logoSigninUrl = webAppContextPath.prependContextPathIfLocal(isisConfiguration.getViewer().getWicket().getApplication().getBrandLogoSignin());
}
setDefaultModel(Model.of(applicationName));
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java
index b3084fc..6385a81 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java
@@ -23,10 +23,10 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.isis.core.config.IsisConfiguration;
-import org.apache.isis.core.config.viewer.wicket.WebAppConfiguration;
+import org.apache.isis.core.config.viewer.wicket.WebAppContextPath;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
-import org.apache.isis.viewer.wicket.model.common.CommonContextUtils;
import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.viewer.wicket.model.common.CommonContextUtils;
/**
* Provides all the system dependencies for sub-classes.
@@ -36,8 +36,8 @@ public abstract class WebPageBase extends WebPage implements IsisWebAppCommonCon
private static final long serialVersionUID = 1L;
- private transient WebAppConfiguration webAppConfigBean;
private transient IsisConfiguration isisConfiguration;
+ private transient WebAppContextPath webAppContextPath;
private transient PageClassRegistry pageClassRegistry;
private transient IsisWebAppCommonContext commonContext;
private transient IsisSessionFactory isisSessionFactory;
@@ -59,8 +59,8 @@ public abstract class WebPageBase extends WebPage implements IsisWebAppCommonCon
return isisConfiguration = computeIfAbsent(IsisConfiguration.class, isisConfiguration);
}
- public WebAppConfiguration getWebAppConfigBean() {
- return webAppConfigBean = computeIfAbsent(WebAppConfiguration.class, webAppConfigBean);
+ public WebAppContextPath getWebAppContextPath() {
+ return webAppContextPath = computeIfAbsent(WebAppContextPath.class, webAppContextPath);
}
public PageClassRegistry getPageClassRegistry() {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPanel.java
index 3f35be0..4061450 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPanel.java
@@ -34,7 +34,7 @@ import org.apache.wicket.validation.validator.EmailAddressValidator;
import org.apache.isis.applib.services.userreg.EmailNotificationService;
import org.apache.isis.applib.services.userreg.events.EmailRegistrationEvent;
-import org.apache.isis.core.config.viewer.wicket.WebAppConfiguration;
+import org.apache.isis.core.config.viewer.wicket.WebAppContextPath;
import org.apache.isis.viewer.wicket.model.models.PageType;
import org.apache.isis.viewer.wicket.ui.components.widgets.bootstrap.FormGroup;
import org.apache.isis.viewer.wicket.ui.pages.EmailVerificationUrlService;
@@ -55,7 +55,7 @@ public class RegistrationFormPanel extends PanelBase<Void> {
@Inject private transient EmailNotificationService emailNotificationService;
@Inject private transient EmailVerificationUrlService emailVerificationUrlService;
@Inject private transient PageNavigationService pageNavigationService;
- @Inject private transient WebAppConfiguration webAppConfigBean;
+ @Inject private transient WebAppContextPath webAppContextPath;
/**
* Constructor
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java
index 757462b..c7caf3b 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java
@@ -29,10 +29,11 @@ import org.apache.isis.applib.services.i18n.LocaleProvider;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.applib.services.userreg.EmailNotificationService;
import org.apache.isis.core.config.IsisConfiguration;
-import org.apache.isis.core.config.viewer.wicket.WebAppConfiguration;
+import org.apache.isis.core.config.viewer.wicket.WebAppContextPath;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.core.security.authentication.MessageBroker;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import org.apache.isis.viewer.wicket.model.common.CommonContextUtils;
import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
@@ -44,7 +45,6 @@ import org.apache.isis.viewer.wicket.ui.components.tree.themes.TreeThemeProvider
import org.apache.isis.viewer.wicket.ui.pages.EmailVerificationUrlService;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
import org.apache.isis.viewer.wicket.ui.pages.PageNavigationService;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
/**
* Provides the <em>common context</em> for all implementing sub-classes.
@@ -55,7 +55,7 @@ public class PanelBase<T> extends GenericPanel<T> implements IsisWebAppCommonCon
private static final long serialVersionUID = 1L;
private transient WicketViewerSettings wicketViewerSettings;
- private transient WebAppConfiguration webAppConfigBean;
+ private transient WebAppContextPath webAppContextPath;
private transient IsisConfiguration isisConfiguration;
private transient PageClassRegistry pageClassRegistry;
private transient ImageResourceCache imageCache;
@@ -86,9 +86,9 @@ public class PanelBase<T> extends GenericPanel<T> implements IsisWebAppCommonCon
public WicketViewerSettings getWicketViewerSettings() {
return wicketViewerSettings = computeIfAbsent(WicketViewerSettings.class, wicketViewerSettings);
}
-
- public WebAppConfiguration getWebAppConfigBean() {
- return webAppConfigBean = computeIfAbsent(WebAppConfiguration.class, webAppConfigBean);
+
+ public WebAppContextPath getWebAppContextPath() {
+ return webAppContextPath = computeIfAbsent(WebAppContextPath.class, webAppContextPath);
}
public IsisConfiguration getIsisConfiguration() {