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 2019/09/30 07:32:23 UTC
[isis] 03/04: ISIS-2086: adds #getConfiguration back for
RuntimeContextBase (RO)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2086
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 983654a2e78f09f0bf1181150cdf1f7ac4815eb1
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Sep 30 08:30:13 2019 +0100
ISIS-2086: adds #getConfiguration back for RuntimeContextBase (RO)
---
.../org/apache/isis/runtime/system/context/session/RuntimeContext.java | 2 ++
.../apache/isis/runtime/system/context/session/RuntimeContextBase.java | 3 +++
.../main/java/org/apache/isis/runtime/system/session/IsisSession.java | 3 ++-
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/RuntimeContext.java b/core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/RuntimeContext.java
index 1b00abc..55d894c 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/RuntimeContext.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/RuntimeContext.java
@@ -20,6 +20,7 @@ package org.apache.isis.runtime.system.context.session;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.registry.ServiceRegistry;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.IsisConfigurationLegacy;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.adapter.oid.Oid;
@@ -41,6 +42,7 @@ import org.apache.isis.security.authentication.AuthenticationSession;
public interface RuntimeContext {
AuthenticationSession getAuthenticationSession();
+ IsisConfiguration getConfiguration();
IsisConfigurationLegacy getConfigurationLegacy();
SpecificationLoader getSpecificationLoader();
ServiceInjector getServiceInjector();
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/RuntimeContextBase.java b/core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/RuntimeContextBase.java
index 563d641..cc8a80f 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/RuntimeContextBase.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/RuntimeContextBase.java
@@ -24,6 +24,7 @@ import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.commons.internal.base._Lazy;
+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;
@@ -54,6 +55,7 @@ public abstract class RuntimeContextBase implements RuntimeContext {
// -- FINAL FIELDS
+ @Getter protected final IsisConfiguration configuration;
@Getter protected final IsisConfigurationLegacy configurationLegacy;
@Getter protected final ServiceInjector serviceInjector;
@Getter protected final ServiceRegistry serviceRegistry;
@@ -67,6 +69,7 @@ public abstract class RuntimeContextBase implements RuntimeContext {
protected RuntimeContextBase() {
val mmc = MetaModelContext.current();
+ configuration = mmc.getConfiguration();
configurationLegacy = mmc.getConfigurationLegacy();
serviceInjector = mmc.getServiceInjector();
serviceRegistry = mmc.getServiceRegistry();
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 243efe4..21149f8 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,8 @@ public class IsisSession extends RuntimeContextBase {
final RuntimeEventService runtimeEventService,
final AuthenticationSession authenticationSession) {
- super(IsisContext.getConfigurationLegacy(),
+ super( IsisContext.getConfiguration(),
+ IsisContext.getConfigurationLegacy(),
IsisContext.getServiceInjector(),
IsisContext.getServiceRegistry(),
IsisContext.getSpecificationLoader(),