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/09/27 11:07:23 UTC
[isis] branch v2 updated: ISIS-2086: update static methods in
IsisContext to reflect new configuration(s)
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 49a3ae7 ISIS-2086: update static methods in IsisContext to reflect new configuration(s)
49a3ae7 is described below
commit 49a3ae70207a3e7784f0e795471dc6cf99bbe318
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Sep 27 13:07:12 2019 +0200
ISIS-2086: update static methods in IsisContext to reflect new
configuration(s)
---
.../isis/runtime/services/hsqldb/HsqlDbManagerMenu.java | 2 +-
.../apache/isis/runtime/system/context/IsisContext.java | 14 +++++++++++---
.../apache/isis/runtime/system/session/IsisSession.java | 2 +-
.../isis/viewer/wicket/viewer/IsisWicketApplication.java | 2 +-
.../viewer/settings/WicketViewerSettingsDefault.java | 2 +-
.../viewer/wicket/model/models/BookmarkedPagesModel.java | 2 +-
.../viewer/wicket/model/models/EntityCollectionModel.java | 2 +-
.../wicket/model/models/whereami/WhereAmIModelDefault.java | 2 +-
.../scalars/datepicker/TextFieldWithDateTimePicker.java | 2 +-
.../widgets/themepicker/IsisWicketThemeSupport.java | 2 +-
.../widgets/themepicker/IsisWicketThemeSupportDefault.java | 2 +-
.../ui/components/widgets/themepicker/ThemeChooser.java | 2 +-
.../apache/isis/viewer/wicket/ui/pages/PageAbstract.java | 2 +-
.../ui/pages/accmngt/AccountManagementPageAbstract.java | 2 +-
.../isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java | 2 +-
.../apache/isis/viewer/wicket/ui/panels/PanelAbstract.java | 2 +-
.../java/org/apache/isis/applib/DomainObjectContainer.java | 6 +++---
17 files changed, 29 insertions(+), 21 deletions(-)
diff --git a/core/runtime-extensions/src/main/java/org/apache/isis/runtime/services/hsqldb/HsqlDbManagerMenu.java b/core/runtime-extensions/src/main/java/org/apache/isis/runtime/services/hsqldb/HsqlDbManagerMenu.java
index 6eb8756..f2c1709 100644
--- a/core/runtime-extensions/src/main/java/org/apache/isis/runtime/services/hsqldb/HsqlDbManagerMenu.java
+++ b/core/runtime-extensions/src/main/java/org/apache/isis/runtime/services/hsqldb/HsqlDbManagerMenu.java
@@ -50,7 +50,7 @@ public class HsqlDbManagerMenu {
@PostConstruct
public void init() {
- this.url = IsisContext.getConfiguration()
+ this.url = IsisContext.getConfigurationLegacy()
.getString("isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL");
}
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/context/IsisContext.java b/core/runtime/src/main/java/org/apache/isis/runtime/system/context/IsisContext.java
index 0ff9135..422566d 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/context/IsisContext.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/system/context/IsisContext.java
@@ -32,6 +32,7 @@ import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.commons.internal.context._Context;
import org.apache.isis.commons.internal.ioc.spring._Spring;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.IsisConfigurationLegacy;
import org.apache.isis.metamodel.MetaModelContext;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
@@ -109,12 +110,19 @@ public interface IsisContext {
}
/**
+ * @return framework's IsisConfigurationLegacy
+ * @throws NoSuchElementException - if IsisConfigurationLegacy not managed
+ */
+ public static IsisConfigurationLegacy getConfigurationLegacy() {
+ return MetaModelContext.current().getConfigurationLegacy();
+ }
+
+ /**
* @return framework's IsisConfiguration
* @throws NoSuchElementException - if IsisConfiguration not managed
*/
- public static IsisConfigurationLegacy getConfiguration() {
- return MetaModelContext.current().getConfigurationLegacy();
- //return _Config.getConfiguration();
+ public static IsisConfiguration getConfiguration() {
+ return MetaModelContext.current().getConfiguration();
}
/**
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/session/IsisSession.java b/core/runtime/src/main/java/org/apache/isis/runtime/system/session/IsisSession.java
index beaf8955..243efe4 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/session/IsisSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/system/session/IsisSession.java
@@ -63,7 +63,7 @@ public class IsisSession extends RuntimeContextBase {
final RuntimeEventService runtimeEventService,
final AuthenticationSession authenticationSession) {
- super(IsisContext.getConfiguration(),
+ super(IsisContext.getConfigurationLegacy(),
IsisContext.getServiceInjector(),
IsisContext.getServiceRegistry(),
IsisContext.getSpecificationLoader(),
diff --git a/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
index be5ce32..44fbb4d 100644
--- a/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
+++ b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
@@ -224,7 +224,7 @@ implements ComponentFactoryRegistryAccessor, PageClassRegistryAccessor, WicketVi
@Override
protected void init() {
- val configuration = IsisContext.getConfiguration();
+ val configuration = IsisContext.getConfigurationLegacy();
val serviceRegistry = IsisContext.getServiceRegistry();
//val serviceInjector = IsisContext.getServiceInjector();
diff --git a/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/WicketViewerSettingsDefault.java b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/WicketViewerSettingsDefault.java
index cfa7203..58781ab 100644
--- a/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/WicketViewerSettingsDefault.java
+++ b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/WicketViewerSettingsDefault.java
@@ -33,7 +33,7 @@ public class WicketViewerSettingsDefault implements WicketViewerSettings {
private static final long serialVersionUID = 1L;
IsisConfigurationLegacy getConfiguration() {
- return IsisContext.getConfiguration();
+ return IsisContext.getConfigurationLegacy();
}
@Override
diff --git a/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
index fb5e275..d1e9533 100644
--- a/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
+++ b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
@@ -144,7 +144,7 @@ public class BookmarkedPagesModel extends ModelAbstract<List<BookmarkTreeNode>>
protected IsisConfigurationLegacy getConfiguration() {
- return IsisContext.getConfiguration();
+ return IsisContext.getConfigurationLegacy();
}
diff --git a/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
index 1f7f99a..b5f714e 100644
--- a/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
+++ b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
@@ -93,7 +93,7 @@ implements LinksProvider, UiHintContainer {
List<ObjectAdapter> load(final EntityCollectionModel entityCollectionModel) {
//XXX lombok issue, cannot use val here
- boolean isBulkLoad = IsisContext.getConfiguration().getBoolean(KEY_BULK_LOAD, false);
+ boolean isBulkLoad = IsisContext.getConfigurationLegacy().getBoolean(KEY_BULK_LOAD, false);
final Stream<ObjectAdapter> resolveResults = isBulkLoad
? loadInBulk(entityCollectionModel)
: loadOneByOne(entityCollectionModel);
diff --git a/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModelDefault.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModelDefault.java
index 4c862d1..4bf31a7 100644
--- a/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModelDefault.java
+++ b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModelDefault.java
@@ -47,7 +47,7 @@ class WhereAmIModelDefault implements WhereAmIModel {
public WhereAmIModelDefault(EntityModel startOfChain) {
this.startOfChain = startOfChain;
- overrideFromConfigIfNew(IsisContext.getConfiguration());
+ overrideFromConfigIfNew(IsisContext.getConfigurationLegacy());
final ObjectAdapter adapter = startOfChain.getObject();
final Object startNode = adapter.getPojo();
diff --git a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java
index fab2919..763527c 100644
--- a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java
+++ b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java
@@ -163,7 +163,7 @@ public class TextFieldWithDateTimePicker<T> extends TextField<T> implements ICon
}
IsisConfigurationLegacy getConfiguration() {
- return IsisContext.getConfiguration();
+ return IsisContext.getConfigurationLegacy();
}
IsisSessionFactory getIsisSessionFactory() {
diff --git a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupport.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupport.java
index 1f0aa05..6ce7cd8 100644
--- a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupport.java
+++ b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupport.java
@@ -59,7 +59,7 @@ public interface IsisWicketThemeSupport {
/*private*/ static IsisWicketThemeSupport createInstance() {
- val configuration = IsisContext.getConfiguration();
+ val configuration = IsisContext.getConfigurationLegacy();
val themeSupportClassName = configuration.getString(
THEME_SUPPORT_PROVIDER_KEY, THEME_SUPPORT_DEFAULT_CLASS.getName());
diff --git a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupportDefault.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupportDefault.java
index 6aa6d94..e58e7e8 100644
--- a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupportDefault.java
+++ b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupportDefault.java
@@ -155,7 +155,7 @@ public class IsisWicketThemeSupportDefault implements IsisWicketThemeSupport {
}
private IsisConfigurationLegacy getConfiguration() {
- return IsisContext.getConfiguration();
+ return IsisContext.getConfigurationLegacy();
}
}
diff --git a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java
index bce3063..11b8a21 100644
--- a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java
+++ b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java
@@ -157,7 +157,7 @@ public class ThemeChooser extends Panel {
}
private IsisConfigurationLegacy getConfiguration() {
- return IsisContext.getConfiguration();
+ return IsisContext.getConfigurationLegacy();
}
IsisSessionFactory getIsisSessionFactory() {
diff --git a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
index 6d8e629..8a9051f 100644
--- a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
+++ b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
@@ -540,7 +540,7 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
// -- DEPS
protected IsisConfigurationLegacy getConfiguration() {
- return IsisContext.getConfiguration();
+ return IsisContext.getConfigurationLegacy();
}
protected ServiceRegistry getServiceRegistry() {
diff --git a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.java
index 068518e..9ac3079 100644
--- a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.java
+++ b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.java
@@ -139,7 +139,7 @@ public class AccountManagementPageAbstract extends WebPage {
// ///////////////////////////////////////////////////
protected IsisConfigurationLegacy getConfiguration() {
- return IsisContext.getConfiguration();
+ return IsisContext.getConfigurationLegacy();
}
protected IsisSessionFactory getIsisSessionFactory() {
diff --git a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java
index d9a142a..383b950 100644
--- a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java
+++ b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java
@@ -121,7 +121,7 @@ public class MmvErrorPage extends WebPage {
// ///////////////////////////////////////////////////
protected IsisConfigurationLegacy getConfiguration() {
- return IsisContext.getConfiguration();
+ return IsisContext.getConfigurationLegacy();
}
IsisSessionFactory getIsisSessionFactory() {
diff --git a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
index f747de7..cf08a7d 100644
--- a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
+++ b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
@@ -168,7 +168,7 @@ public abstract class PanelAbstract<T extends IModel<?>> extends Panel {
}
protected IsisConfigurationLegacy getConfiguration() {
- return IsisContext.getConfiguration();
+ return IsisContext.getConfigurationLegacy();
}
public SpecificationLoader getSpecificationLoader() {
diff --git a/extensions/legacy/src/main/java/org/apache/isis/applib/DomainObjectContainer.java b/extensions/legacy/src/main/java/org/apache/isis/applib/DomainObjectContainer.java
index c833b19..49b84c7 100644
--- a/extensions/legacy/src/main/java/org/apache/isis/applib/DomainObjectContainer.java
+++ b/extensions/legacy/src/main/java/org/apache/isis/applib/DomainObjectContainer.java
@@ -420,7 +420,7 @@ public class DomainObjectContainer {
@Deprecated
@Programmatic
public String getProperty(String name) {
- return IsisContext.getConfiguration().getString(name);
+ return IsisContext.getConfigurationLegacy().getString(name);
}
/**
@@ -429,7 +429,7 @@ public class DomainObjectContainer {
@Deprecated
@Programmatic
public String getProperty(String name, String defaultValue) {
- return IsisContext.getConfiguration().getString(name, defaultValue);
+ return IsisContext.getConfigurationLegacy().getString(name, defaultValue);
}
/**
@@ -438,7 +438,7 @@ public class DomainObjectContainer {
@Deprecated
@Programmatic
public List<String> getPropertyNames() {
- return new ArrayList<>(IsisContext.getConfiguration().copyToMap().keySet());
+ return new ArrayList<>(IsisContext.getConfigurationLegacy().copyToMap().keySet());
}
/**