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 2020/03/21 16:14:09 UTC
[isis] branch master updated: ISIS-2320: batch replace isisSession
-> isisInteraction
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 531883a ISIS-2320: batch replace isisSession -> isisInteraction
531883a is described below
commit 531883a6e0b0e140697574f813fc0a03e3f3e19e
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sat Mar 21 17:13:57 2020 +0100
ISIS-2320: batch replace isisSession -> isisInteraction
---
.../context/session/IsisSessionLifecycleEvent.java | 2 +-
.../runtime/context/session/RuntimeContext.java | 2 +-
.../context/session/RuntimeContextBase.java | 8 ++---
.../transaction/IsisTransactionObject.java | 6 ++--
.../session/scope/IsisInteractionScope.java | 8 ++---
...isInteractionScopeBeanFactoryPostProcessor.java | 12 +++----
.../command/CommandExecutorServiceDefault.java | 6 ++--
.../session/IsisInteractionFactoryDefault.java | 38 +++++++++++-----------
.../runtimeservices/user/UserServiceDefault.java | 6 ++--
.../wrapper/WrapperFactoryDefault.java | 8 ++---
.../webapp/context/IsisWebAppCommonContext.java | 2 +-
.../service/JdoPersistenceLifecycleService.java | 8 ++---
.../IsisPlatformTransactionManagerForJdo.java | 12 +++----
.../resources/DomainObjectResourceServerside.java | 4 +--
.../resources/DomainServiceResourceServerside.java | 4 +--
.../resources/DomainTypeResourceServerside.java | 4 +--
.../resources/HomePageResourceServerside.java | 4 +--
.../viewer/resources/ImageResourceServerside.java | 4 +--
.../resources/MenuBarsResourceServerside.java | 4 +--
.../viewer/resources/ResourceAbstract.java | 8 ++---
.../viewer/resources/UserResourceServerside.java | 4 +--
.../resources/VersionResourceServerside.java | 4 +--
...ulObjectsSessionFilter_lookupPassThru_Test.java | 12 +++----
.../wicket/ui/panels/FormExecutorDefault.java | 4 +--
.../AuthenticatedWebSessionForIsis.java | 2 +-
.../viewer/integration/LocalizerForIsis.java | 4 +--
.../viewer/integration/WebRequestCycleForIsis.java | 2 +-
...uthenticatedWebSessionForIsis_Authenticate.java | 2 +-
28 files changed, 91 insertions(+), 93 deletions(-)
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/IsisSessionLifecycleEvent.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/IsisSessionLifecycleEvent.java
index 9f2a461..e9e3e46 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/IsisSessionLifecycleEvent.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/IsisSessionLifecycleEvent.java
@@ -32,7 +32,7 @@ public class IsisSessionLifecycleEvent {
CLOSING,
}
- @Getter IsisInteraction isisSession;
+ @Getter IsisInteraction isisInteraction;
@Getter EventType eventType;
}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/RuntimeContext.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/RuntimeContext.java
index 616f516..a7f5f6d 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/RuntimeContext.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/RuntimeContext.java
@@ -35,7 +35,7 @@ public interface RuntimeContext {
MetaModelContext getMetaModelContext();
- IsisInteractionTracker getIsisSessionTracker();
+ IsisInteractionTracker getIsisInteractionTracker();
IsisConfiguration getConfiguration();
SpecificationLoader getSpecificationLoader();
ServiceInjector getServiceInjector();
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/RuntimeContextBase.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/RuntimeContextBase.java
index 152a42f..588cd4f 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/RuntimeContextBase.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/RuntimeContextBase.java
@@ -50,7 +50,7 @@ public abstract class RuntimeContextBase implements RuntimeContext {
@Getter(onMethod = @__(@Override)) protected final ServiceInjector serviceInjector;
@Getter(onMethod = @__(@Override)) protected final ServiceRegistry serviceRegistry;
@Getter(onMethod = @__(@Override)) protected final SpecificationLoader specificationLoader;
- @Getter(onMethod = @__(@Override)) protected final IsisInteractionTracker isisSessionTracker;
+ @Getter(onMethod = @__(@Override)) protected final IsisInteractionTracker isisInteractionTracker;
@Getter protected final IsisInteractionFactory isisInteractionFactory;
@Getter protected final AuthenticationManager authenticationManager;
@@ -71,13 +71,13 @@ public abstract class RuntimeContextBase implements RuntimeContext {
this.homePageSupplier = mmc::getHomePageAdapter;
this.isisInteractionFactory = serviceRegistry.lookupServiceElseFail(IsisInteractionFactory.class);
this.authenticationManager = serviceRegistry.lookupServiceElseFail(AuthenticationManager.class);
- this.isisSessionTracker = serviceRegistry.lookupServiceElseFail(IsisInteractionTracker.class);
+ this.isisInteractionTracker = serviceRegistry.lookupServiceElseFail(IsisInteractionTracker.class);
}
// -- AUTH
public AuthenticationSessionTracker getAuthenticationSessionTracker() {
- return isisSessionTracker;
+ return isisInteractionTracker;
}
@Override
@@ -85,7 +85,7 @@ public abstract class RuntimeContextBase implements RuntimeContext {
// we do the logout (removes this session from those valid)
// similar code in wicket viewer (AuthenticatedWebSessionForIsis#onInvalidate())
- isisSessionTracker
+ isisInteractionTracker
.currentAuthenticationSession()
.ifPresent(authenticationSession->{
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/IsisTransactionObject.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/IsisTransactionObject.java
index e1c4a97..efee180 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/IsisTransactionObject.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/IsisTransactionObject.java
@@ -41,15 +41,15 @@ public class IsisTransactionObject implements SmartTransactionObject {
TEST_SCOPED
}
- public static IsisTransactionObject of(Transaction currentTransaction, IsisSessionScopeType isisSessionScopeType) {
+ public static IsisTransactionObject of(Transaction currentTransaction, IsisSessionScopeType isisInteractionScopeType) {
val txObject = new IsisTransactionObject();
txObject.setCurrentTransaction(currentTransaction);
- txObject.setIsisSessionScopeType(isisSessionScopeType);
+ txObject.setIsisInteractionScopeType(isisInteractionScopeType);
return txObject;
}
@Getter @Setter Transaction currentTransaction;
- @Getter @Setter IsisSessionScopeType isisSessionScopeType;
+ @Getter @Setter IsisSessionScopeType isisInteractionScopeType;
@Override
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/session/scope/IsisInteractionScope.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/scope/IsisInteractionScope.java
index 129c4bf..f106061 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/session/scope/IsisInteractionScope.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/scope/IsisInteractionScope.java
@@ -40,7 +40,7 @@ import lombok.extern.log4j.Log4j2;
@Log4j2
class IsisInteractionScope implements Scope, IsisInteractionScopeCloseListener {
- @Inject private IsisInteractionTracker isisSessionTracker;
+ @Inject private IsisInteractionTracker isisInteractionTracker;
@Data(staticConstructor = "of")
private static class ScopedObject {
@@ -60,12 +60,12 @@ class IsisInteractionScope implements Scope, IsisInteractionScopeCloseListener {
@Override
public Object get(String name, ObjectFactory<?> objectFactory) {
- if(isisSessionTracker==null) {
+ if(isisInteractionTracker==null) {
throw _Exceptions.illegalState("Creation of bean %s with @IsisSessionScope requires the "
+ "IsisSessionScopeBeanFactoryPostProcessor registered and initialized.", name);
}
- if(!isisSessionTracker.isInSession()) {
+ if(!isisInteractionTracker.isInSession()) {
throw _Exceptions.illegalState("Creation of bean %s with @IsisSessionScope requires the "
+ "calling %s to have an open IsisSession on the thread-local stack. Running into "
+ "this issue might be caused by use of ... @Inject MyScopedBean bean ..., instead of "
@@ -109,7 +109,7 @@ class IsisInteractionScope implements Scope, IsisInteractionScopeCloseListener {
@Override
public String getConversationId() {
// null by convention if not supported
- return isisSessionTracker.getConversationId().orElse(null);
+ return isisInteractionTracker.getConversationId().orElse(null);
}
@Override
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/session/scope/IsisInteractionScopeBeanFactoryPostProcessor.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/scope/IsisInteractionScopeBeanFactoryPostProcessor.java
index 8a0b1b3..76d26ca 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/session/scope/IsisInteractionScopeBeanFactoryPostProcessor.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/scope/IsisInteractionScopeBeanFactoryPostProcessor.java
@@ -35,17 +35,17 @@ public class IsisInteractionScopeBeanFactoryPostProcessor implements BeanFactory
@Override
public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
- val isisSessionScope = new IsisInteractionScope();
+ val isisInteractionScope = new IsisInteractionScope();
// scope name as defined in annotation @IsisSessionScope
- beanFactory.registerScope("isis-session", isisSessionScope);
- _Context.put(IsisInteractionScope.class, isisSessionScope, true);
+ beanFactory.registerScope("isis-session", isisInteractionScope);
+ _Context.put(IsisInteractionScope.class, isisInteractionScope, true);
}
public static IsisInteractionScopeCloseListener initIsisSessionScopeSupport(
@NonNull final ServiceInjector serviceInjector) {
- val isisSessionScope = _Context.getElseFail(IsisInteractionScope.class);
- serviceInjector.injectServicesInto(isisSessionScope);
+ val isisInteractionScope = _Context.getElseFail(IsisInteractionScope.class);
+ serviceInjector.injectServicesInto(isisInteractionScope);
_Context.remove(IsisInteractionScope.class); // cleanup
- return isisSessionScope;
+ return isisInteractionScope;
}
}
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandExecutorServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandExecutorServiceDefault.java
index 8f9b725..499ff39 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandExecutorServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandExecutorServiceDefault.java
@@ -370,8 +370,8 @@ public class CommandExecutorServiceDefault implements CommandExecutorService {
val objectSpec = specificationLoader.loadSpecification(oid.getObjectSpecId());
val loadRequest = ObjectLoader.Request.of(objectSpec, oid.getIdentifier());
- Optional<IsisInteraction> isisSession = isisSessionTracker.currentSession();
- return isisSession
+ Optional<IsisInteraction> isisInteraction = isisInteractionTracker.currentSession();
+ return isisInteraction
.map(x -> x.getObjectManager().loadObject(loadRequest))
.orElse(null);
}
@@ -401,7 +401,7 @@ public class CommandExecutorServiceDefault implements CommandExecutorService {
@Inject TransactionService transactionService;
@Inject SpecificationLoader specificationLoader;
@Inject IsisInteractionFactory isisInteractionFactory;
- @Inject IsisInteractionTracker isisSessionTracker;
+ @Inject IsisInteractionTracker isisInteractionTracker;
@Inject private javax.inject.Provider<InteractionContext> interactionContextProvider;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/IsisInteractionFactoryDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/IsisInteractionFactoryDefault.java
index d2db2aa..a472af1 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/IsisInteractionFactoryDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/IsisInteractionFactoryDefault.java
@@ -97,11 +97,11 @@ public class IsisInteractionFactoryDefault implements IsisInteractionFactory, Is
private IsisLocaleInitializer localeInitializer;
private IsisTimeZoneInitializer timeZoneInitializer;
- private IsisInteractionScopeCloseListener isisSessionScopeCloseListener;
+ private IsisInteractionScopeCloseListener isisInteractionScopeCloseListener;
@PostConstruct
public void initIsisSessionScopeSupport() {
- this.isisSessionScopeCloseListener = IsisInteractionScopeBeanFactoryPostProcessor.initIsisSessionScopeSupport(serviceInjector);
+ this.isisInteractionScopeCloseListener = IsisInteractionScopeBeanFactoryPostProcessor.initIsisSessionScopeSupport(serviceInjector);
}
//@PostConstruct .. too early, needs services to be provisioned first
@@ -148,7 +148,7 @@ public class IsisInteractionFactoryDefault implements IsisInteractionFactory, Is
}
- private final ThreadLocal<Stack<IsisInteraction>> isisSessionStack = ThreadLocal.withInitial(Stack::new);
+ private final ThreadLocal<Stack<IsisInteraction>> isisInteractionStack = ThreadLocal.withInitial(Stack::new);
@Override
public IsisInteraction openSession(@NonNull final AuthenticationSession authenticationSession) {
@@ -157,15 +157,15 @@ public class IsisInteractionFactoryDefault implements IsisInteractionFactory, Is
.orElse(authenticationSession);
val newIsisSession = new IsisInteraction(metaModelContext, authSessionToUse);
- isisSessionStack.get().push(newIsisSession);
- if(isisSessionStack.get().size()==1) {
+ isisInteractionStack.get().push(newIsisSession);
+ if(isisInteractionStack.get().size()==1) {
conversationId.set(UUID.randomUUID());
postTopLevelOpen(newIsisSession);
}
log.debug("new IsisSession created (conversation-id={}, total-sessions-on-stack={}, {})",
conversationId.get(),
- isisSessionStack.get().size(),
+ isisInteractionStack.get().size(),
_Probe.currentThreadId());
return newIsisSession;
@@ -176,28 +176,28 @@ public class IsisInteractionFactoryDefault implements IsisInteractionFactory, Is
public void closeSessionStack() {
log.debug("about to close IsisSession stack (conversation-id={}, total-sessions-on-stack={}, {})",
conversationId.get(),
- isisSessionStack.get().size(),
+ isisInteractionStack.get().size(),
_Probe.currentThreadId());
closeSessionStackDownToStackSize(0);
}
@Override
public Optional<IsisInteraction> currentSession() {
- val stack = isisSessionStack.get();
+ val stack = isisInteractionStack.get();
return stack.isEmpty() ? Optional.empty() : Optional.of(stack.lastElement());
}
@Override
public boolean isInSession() {
- return !isisSessionStack.get().isEmpty();
+ return !isisInteractionStack.get().isEmpty();
}
@Override
public boolean isInTransaction() {
- return currentSession().map(isisSession->{
- if (isisSession.getCurrentTransactionId() != null) {
- if (!isisSession.getCurrentTransactionState().isComplete()) {
+ return currentSession().map(isisInteraction->{
+ if (isisInteraction.getCurrentTransactionId() != null) {
+ if (!isisInteraction.getCurrentTransactionState().isComplete()) {
return true;
}
}
@@ -213,7 +213,7 @@ public class IsisInteractionFactoryDefault implements IsisInteractionFactory, Is
@NonNull final AuthenticationSession authenticationSession,
@NonNull final Callable<R> callable) {
- final int stackSizeWhenEntering = isisSessionStack.get().size();
+ final int stackSizeWhenEntering = isisInteractionStack.get().size();
openSession(authenticationSession);
try {
@@ -238,9 +238,9 @@ public class IsisInteractionFactoryDefault implements IsisInteractionFactory, Is
runtimeEventService.fireSessionOpened(newIsisSession); // only fire on top-level session
}
- private void preTopLevelClose(IsisInteraction isisSession) {
- runtimeEventService.fireSessionClosing(isisSession); // only fire on top-level session
- isisSessionScopeCloseListener.preTopLevelIsisSessionClose(); // cleanup the isis-session scope
+ private void preTopLevelClose(IsisInteraction isisInteraction) {
+ runtimeEventService.fireSessionClosing(isisInteraction); // only fire on top-level session
+ isisInteractionScopeCloseListener.preTopLevelIsisSessionClose(); // cleanup the isis-session scope
}
private void closeSessionStackDownToStackSize(int downToStackSize) {
@@ -248,10 +248,10 @@ public class IsisInteractionFactoryDefault implements IsisInteractionFactory, Is
log.debug("about to close IsisSession stack down to size {} (conversation-id={}, total-sessions-on-stack={}, {})",
downToStackSize,
conversationId.get(),
- isisSessionStack.get().size(),
+ isisInteractionStack.get().size(),
_Probe.currentThreadId());
- val stack = isisSessionStack.get();
+ val stack = isisInteractionStack.get();
while(stack.size()>downToStackSize) {
if(stack.size()==1) {
preTopLevelClose(stack.peek());
@@ -259,7 +259,7 @@ public class IsisInteractionFactoryDefault implements IsisInteractionFactory, Is
stack.pop();
}
if(downToStackSize == 0) {
- isisSessionStack.remove();
+ isisInteractionStack.remove();
conversationId.remove();
}
}
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/user/UserServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/user/UserServiceDefault.java
index 51a7c6c..c168e51 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/user/UserServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/user/UserServiceDefault.java
@@ -52,7 +52,7 @@ import lombok.val;
@Qualifier("Default")
public class UserServiceDefault implements UserService {
- @Inject private IsisInteractionTracker isisSessionTracker;
+ @Inject private IsisInteractionTracker isisInteractionTracker;
@Service
@Named("isisMetaModel.UserServiceDefault.SudoServiceSpi")
@@ -96,7 +96,7 @@ public class UserServiceDefault implements UserService {
return new UserMemento(username, asRoleMementos(roles));
} else {
- return isisSessionTracker.currentAuthenticationSession()
+ return isisInteractionTracker.currentAuthenticationSession()
.map(AuthenticationSession::createUserMemento)
.orElseThrow(()->_Exceptions.illegalState("need an AuthenticationSession to create a UserMemento"));
}
@@ -123,7 +123,7 @@ public class UserServiceDefault implements UserService {
// -- HELPER
private Can<String> currentRoles() {
- return isisSessionTracker.currentAuthenticationSession()
+ return isisInteractionTracker.currentAuthenticationSession()
.map(AuthenticationSession::getRoles)
.orElse(Can.empty());
}
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault.java
index 9f20e28..09cf2eb 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault.java
@@ -126,7 +126,7 @@ public class WrapperFactoryDefault implements WrapperFactory {
@Inject private FactoryService factoryService;
@Inject private MetaModelContext metaModelContext;
@Inject private SpecificationLoader specificationLoader;
- @Inject private IsisInteractionTracker isisSessionTracker;
+ @Inject private IsisInteractionTracker isisInteractionTracker;
@Inject private IsisInteractionFactory isisInteractionFactory;
@Inject private TransactionService transactionService;
@Inject private CommandExecutorService commandExecutorService;
@@ -301,8 +301,8 @@ public class WrapperFactoryDefault implements WrapperFactory {
final AsyncControl<R> asyncControl) {
val executorService = asyncControl.getExecutorService();
- val isisSession = currentIsisSession();
- val asyncAuthSession = authSessionFrom(asyncControl, isisSession.getAuthenticationSession());
+ val isisInteraction = currentIsisSession();
+ val asyncAuthSession = authSessionFrom(asyncControl, isisInteraction.getAuthenticationSession());
val targetAdapter = memberAndTarget.getTarget();
val method = memberAndTarget.getMethod();
@@ -501,7 +501,7 @@ public class WrapperFactoryDefault implements WrapperFactory {
private IsisInteraction currentIsisSession() {
- return isisSessionTracker.currentSession().orElseThrow(() -> new RuntimeException("No IsisSession is open"));
+ return isisInteractionTracker.currentSession().orElseThrow(() -> new RuntimeException("No IsisSession is open"));
}
private ObjectManager currentObjectManager() {
diff --git a/core/webapp/src/main/java/org/apache/isis/core/webapp/context/IsisWebAppCommonContext.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/context/IsisWebAppCommonContext.java
index f271822..13fb169 100644
--- a/core/webapp/src/main/java/org/apache/isis/core/webapp/context/IsisWebAppCommonContext.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/context/IsisWebAppCommonContext.java
@@ -71,7 +71,7 @@ public class IsisWebAppCommonContext implements MetaModelContext.Delegating {
private final MenuBarsService menuBarsService = lookupServiceElseFail(MenuBarsService.class);
@Getter(lazy = true)
- private final IsisInteractionTracker isisSessionTracker = lookupServiceElseFail(IsisInteractionTracker.class);
+ private final IsisInteractionTracker isisInteractionTracker = lookupServiceElseFail(IsisInteractionTracker.class);
@Getter(lazy = true, value = AccessLevel.PRIVATE)
private final ObjectMementoService mementoService = lookupServiceElseFail(ObjectMementoService.class);
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/service/JdoPersistenceLifecycleService.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/service/JdoPersistenceLifecycleService.java
index 9e58ef3..958d245 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/service/JdoPersistenceLifecycleService.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/service/JdoPersistenceLifecycleService.java
@@ -94,10 +94,10 @@ public class JdoPersistenceLifecycleService {
switch (eventType) {
case OPENED:
- openSession(event.getIsisSession());
+ openSession(event.getIsisInteraction());
break;
case CLOSING:
- closeSession(event.getIsisSession());
+ closeSession(event.getIsisInteraction());
break;
// case sessionFlushing:
// flushSession();
@@ -111,7 +111,7 @@ public class JdoPersistenceLifecycleService {
// -- HELPER
- private void openSession(IsisInteraction isisSession) {
+ private void openSession(IsisInteraction isisInteraction) {
val persistenceSession =
persistenceSessionFactory.createPersistenceSession();
@@ -129,7 +129,7 @@ public class JdoPersistenceLifecycleService {
persistenceSession.open();
}
- private void closeSession(IsisInteraction isisSession) {
+ private void closeSession(IsisInteraction isisInteraction) {
PersistenceSession.current(PersistenceSession.class)
.getSingleton()
.ifPresent(PersistenceSession::close);
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPlatformTransactionManagerForJdo.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPlatformTransactionManagerForJdo.java
index 800c0f1..df08bc3 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPlatformTransactionManagerForJdo.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPlatformTransactionManagerForJdo.java
@@ -63,22 +63,22 @@ public class IsisPlatformTransactionManagerForJdo extends AbstractPlatformTransa
private final IsisInteractionFactory isisInteractionFactory;
private final EventBusService eventBusService;
- private final IsisInteractionTracker isisSessionTracker;
+ private final IsisInteractionTracker isisInteractionTracker;
@Inject
public IsisPlatformTransactionManagerForJdo(
final IsisInteractionFactory isisInteractionFactory,
final EventBusService eventBusService,
- final IsisInteractionTracker isisSessionTracker) {
+ final IsisInteractionTracker isisInteractionTracker) {
this.isisInteractionFactory = isisInteractionFactory;
this.eventBusService = eventBusService;
- this.isisSessionTracker = isisSessionTracker;
+ this.isisInteractionTracker = isisInteractionTracker;
}
@Override
protected Object doGetTransaction() throws TransactionException {
- val isInSession = isisSessionTracker.isInSession();
+ val isInSession = isisInteractionTracker.isInSession();
log.debug("doGetTransaction isInSession={}", isInSession);
val transactionBeforeBegin =
@@ -91,7 +91,7 @@ public class IsisPlatformTransactionManagerForJdo extends AbstractPlatformTransa
if(Utils.isJUnitTest()) {
- val authenticationSession = isisSessionTracker.currentAuthenticationSession()
+ val authenticationSession = isisInteractionTracker.currentAuthenticationSession()
.orElseGet(InitialisationSession::new);
log.debug("open new session authenticationSession={}", authenticationSession);
@@ -160,7 +160,7 @@ public class IsisPlatformTransactionManagerForJdo extends AbstractPlatformTransa
private void cleanUp(IsisTransactionObject txObject) {
txObject.getCountDownLatch().countDown();
txObject.setCurrentTransaction(null);
- if(txObject.getIsisSessionScopeType() == IsisSessionScopeType.TEST_SCOPED) {
+ if(txObject.getIsisInteractionScopeType() == IsisSessionScopeType.TEST_SCOPED) {
isisInteractionFactory.closeSessionStack();
}
IsisTransactionAspectSupport.clearTransactionObject();
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainObjectResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainObjectResourceServerside.java
index db2de60..9bf69ca 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainObjectResourceServerside.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainObjectResourceServerside.java
@@ -86,8 +86,8 @@ public class DomainObjectResourceServerside extends ResourceAbstract implements
public DomainObjectResourceServerside(
final MetaModelContext metaModelContext,
final IsisConfiguration isisConfiguration,
- final IsisInteractionTracker isisSessionTracker) {
- super(metaModelContext, isisConfiguration, isisSessionTracker);
+ final IsisInteractionTracker isisInteractionTracker) {
+ super(metaModelContext, isisConfiguration, isisInteractionTracker);
log.debug("<init>");
}
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainServiceResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainServiceResourceServerside.java
index 6caca19..63061f3 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainServiceResourceServerside.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainServiceResourceServerside.java
@@ -78,8 +78,8 @@ public class DomainServiceResourceServerside extends ResourceAbstract implements
public DomainServiceResourceServerside(
final MetaModelContext metaModelContext,
final IsisConfiguration isisConfiguration,
- final IsisInteractionTracker isisSessionTracker) {
- super(metaModelContext, isisConfiguration, isisSessionTracker);
+ final IsisInteractionTracker isisInteractionTracker) {
+ super(metaModelContext, isisConfiguration, isisInteractionTracker);
}
@Override
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainTypeResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainTypeResourceServerside.java
index d8d2197..9b271e9 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainTypeResourceServerside.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainTypeResourceServerside.java
@@ -84,8 +84,8 @@ public class DomainTypeResourceServerside extends ResourceAbstract implements Do
public DomainTypeResourceServerside(
final MetaModelContext metaModelContext,
final IsisConfiguration isisConfiguration,
- final IsisInteractionTracker isisSessionTracker) {
- super(metaModelContext, isisConfiguration, isisSessionTracker);
+ final IsisInteractionTracker isisInteractionTracker) {
+ super(metaModelContext, isisConfiguration, isisInteractionTracker);
}
@Override
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/HomePageResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/HomePageResourceServerside.java
index 14a6856..22b349f 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/HomePageResourceServerside.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/HomePageResourceServerside.java
@@ -51,8 +51,8 @@ public class HomePageResourceServerside extends ResourceAbstract implements Home
public HomePageResourceServerside(
final MetaModelContext metaModelContext,
final IsisConfiguration isisConfiguration,
- final IsisInteractionTracker isisSessionTracker) {
- super(metaModelContext, isisConfiguration, isisSessionTracker);
+ final IsisInteractionTracker isisInteractionTracker) {
+ super(metaModelContext, isisConfiguration, isisInteractionTracker);
}
@Override
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ImageResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ImageResourceServerside.java
index 01a629a..dc8bfe1 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ImageResourceServerside.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ImageResourceServerside.java
@@ -43,8 +43,8 @@ public class ImageResourceServerside extends ResourceAbstract {
public ImageResourceServerside(
final MetaModelContext metaModelContext,
final IsisConfiguration isisConfiguration,
- final IsisInteractionTracker isisSessionTracker) {
- super(metaModelContext, isisConfiguration, isisSessionTracker);
+ final IsisInteractionTracker isisInteractionTracker) {
+ super(metaModelContext, isisConfiguration, isisInteractionTracker);
}
@GET
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 c5b4511..48d1928 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
@@ -54,8 +54,8 @@ public class MenuBarsResourceServerside extends ResourceAbstract implements Menu
public MenuBarsResourceServerside(
final MetaModelContext metaModelContext,
final IsisConfiguration isisConfiguration,
- final IsisInteractionTracker isisSessionTracker) {
- super(metaModelContext, isisConfiguration, isisSessionTracker);
+ final IsisInteractionTracker isisInteractionTracker) {
+ super(metaModelContext, isisConfiguration, isisInteractionTracker);
}
@Override
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ResourceAbstract.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ResourceAbstract.java
index 86a1fa1..fc9132d 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ResourceAbstract.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ResourceAbstract.java
@@ -58,7 +58,7 @@ public abstract class ResourceAbstract {
protected final MetaModelContext metaModelContext;
protected final IsisConfiguration isisConfiguration;
- protected final IsisInteractionTracker isisSessionTracker;
+ protected final IsisInteractionTracker isisInteractionTracker;
@Context HttpHeaders httpHeaders;
@Context UriInfo uriInfo;
@@ -72,11 +72,11 @@ public abstract class ResourceAbstract {
protected ResourceAbstract(
final MetaModelContext metaModelContext,
final IsisConfiguration isisConfiguration,
- final IsisInteractionTracker isisSessionTracker) {
+ final IsisInteractionTracker isisInteractionTracker) {
this.metaModelContext = metaModelContext;
this.isisConfiguration = isisConfiguration;
- this.isisSessionTracker = isisSessionTracker;
+ this.isisInteractionTracker = isisInteractionTracker;
}
// -- FACTORIES
@@ -106,7 +106,7 @@ public abstract class ResourceAbstract {
final ResourceDescriptor resourceDescriptor,
final String urlUnencodedQueryString) {
- if (!isisSessionTracker.isInSession()) {
+ if (!isisInteractionTracker.isInSession()) {
throw RestfulObjectsApplicationException.create(HttpStatusCode.UNAUTHORIZED);
}
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/UserResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/UserResourceServerside.java
index 2d987a2..3dfe3fa 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/UserResourceServerside.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/UserResourceServerside.java
@@ -52,8 +52,8 @@ public class UserResourceServerside extends ResourceAbstract implements UserReso
public UserResourceServerside(
final MetaModelContext metaModelContext,
final IsisConfiguration isisConfiguration,
- final IsisInteractionTracker isisSessionTracker) {
- super(metaModelContext, isisConfiguration, isisSessionTracker);
+ final IsisInteractionTracker isisInteractionTracker) {
+ super(metaModelContext, isisConfiguration, isisInteractionTracker);
}
@Override
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/VersionResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/VersionResourceServerside.java
index 19cfa83..0bef611 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/VersionResourceServerside.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/VersionResourceServerside.java
@@ -61,8 +61,8 @@ public class VersionResourceServerside extends ResourceAbstract implements Versi
public VersionResourceServerside(
final MetaModelContext metaModelContext,
final IsisConfiguration isisConfiguration,
- final IsisInteractionTracker isisSessionTracker) {
- super(metaModelContext, isisConfiguration, isisSessionTracker);
+ final IsisInteractionTracker isisInteractionTracker) {
+ super(metaModelContext, isisConfiguration, isisInteractionTracker);
}
@Override
diff --git a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter_lookupPassThru_Test.java b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter_lookupPassThru_Test.java
index 3486237..2f05f12 100644
--- a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter_lookupPassThru_Test.java
+++ b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter_lookupPassThru_Test.java
@@ -38,14 +38,14 @@ public class IsisRestfulObjectsSessionFilter_lookupPassThru_Test {
@Rule
public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(JUnitRuleMockery2.Mode.INTERFACES_AND_CLASSES);
- IsisRestfulObjectsSessionFilter isisSessionFilter;
+ IsisRestfulObjectsSessionFilter isisInteractionFilter;
@Mock
FilterConfig mockFilterConfig;
@Before
public void setUp() throws Exception {
- isisSessionFilter = new IsisRestfulObjectsSessionFilter();
+ isisInteractionFilter = new IsisRestfulObjectsSessionFilter();
}
@Test
@@ -55,7 +55,7 @@ public class IsisRestfulObjectsSessionFilter_lookupPassThru_Test {
will(returnValue(null));
}});
- final List<String> x = isisSessionFilter.lookupAndParsePassThru(mockFilterConfig);
+ final List<String> x = isisInteractionFilter.lookupAndParsePassThru(mockFilterConfig);
Assert.assertThat(x.size(), is(0));
}
@@ -66,7 +66,7 @@ public class IsisRestfulObjectsSessionFilter_lookupPassThru_Test {
will(returnValue(""));
}});
- final List<String> x = isisSessionFilter.lookupAndParsePassThru(mockFilterConfig);
+ final List<String> x = isisInteractionFilter.lookupAndParsePassThru(mockFilterConfig);
Assert.assertThat(x.size(), is(0));
}
@@ -77,7 +77,7 @@ public class IsisRestfulObjectsSessionFilter_lookupPassThru_Test {
will(returnValue("/abc"));
}});
- final List<String> x = isisSessionFilter.lookupAndParsePassThru(mockFilterConfig);
+ final List<String> x = isisInteractionFilter.lookupAndParsePassThru(mockFilterConfig);
Assert.assertThat(x.size(), is(1));
Assert.assertThat(x.get(0), is("/abc"));
}
@@ -89,7 +89,7 @@ public class IsisRestfulObjectsSessionFilter_lookupPassThru_Test {
will(returnValue("/abc,/def"));
}});
- final List<String> x = isisSessionFilter.lookupAndParsePassThru(mockFilterConfig);
+ final List<String> x = isisInteractionFilter.lookupAndParsePassThru(mockFilterConfig);
Assert.assertThat(x.size(), is(2));
Assert.assertThat(x.get(0), is("/abc"));
Assert.assertThat(x.get(1), is("/def"));
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
index 057b3a5..499b142 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
@@ -51,8 +51,6 @@ import org.apache.isis.core.metamodel.facets.properties.renderunchanged.Unchangi
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
-import org.apache.isis.core.runtime.session.IsisRequestCycle;
-import org.apache.isis.core.runtime.session.IsisInteraction;
import org.apache.isis.core.runtime.session.IsisInteractionFactory;
import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.core.security.authentication.MessageBroker;
@@ -150,7 +148,7 @@ implements FormExecutor {
// flush any queued changes; any concurrency or violation exceptions will actually be thrown here
{
val commonContext = targetEntityModel.getCommonContext();
- if(commonContext.getIsisSessionTracker().isInSession()) {
+ if(commonContext.getIsisInteractionTracker().isInSession()) {
PersistenceSession.current(PersistenceSession.class)
.stream()
.forEach(ps->ps.flush());
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java
index 1590657..a5c8477 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java
@@ -144,7 +144,7 @@ implements BreadcrumbModelProvider, BookmarkedPagesModelProvider, IsisWebAppComm
public synchronized AuthenticationSession getAuthenticationSession() {
- commonContext.getIsisSessionTracker().currentAuthenticationSession()
+ commonContext.getIsisInteractionTracker().currentAuthenticationSession()
.ifPresent(currentAuthenticationSession->{
if (getAuthenticationManager().isSessionValid(currentAuthenticationSession)) {
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/LocalizerForIsis.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/LocalizerForIsis.java
index e737e73..573e752 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/LocalizerForIsis.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/LocalizerForIsis.java
@@ -48,7 +48,7 @@ import lombok.val;
*/
public class LocalizerForIsis extends Localizer {
- @Inject private IsisInteractionTracker isisSessionTracker;
+ @Inject private IsisInteractionTracker isisInteractionTracker;
@Inject private IsisInteractionFactory isisInteractionFactory;
@Inject private TranslationService translationService;
@@ -76,7 +76,7 @@ public class LocalizerForIsis extends Localizer {
protected String translate(final String key, final Component component) {
final Class<?> contextClass = determineContextClassElse(component, IsisWicketApplication.class);
final String context = contextClass.getName();
- if(isisSessionTracker.isInSession()) {
+ if(isisInteractionTracker.isInSession()) {
return translate(key, context);
} else {
return isisInteractionFactory.callAuthenticated(new InitialisationSession(), ()->translate(key, context));
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java
index 3fa7a57..ff807b0 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java
@@ -392,7 +392,7 @@ public class WebRequestCycleForIsis implements IRequestCycleListener {
}
private boolean inIsisSession() {
- return commonContext.getIsisSessionTracker().isInSession();
+ return commonContext.getIsisInteractionTracker().isInSession();
}
private Optional<AuthenticationSession> getAuthenticationSession() {
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java
index d22cac5..2565708 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java
@@ -84,7 +84,7 @@ public class AuthenticatedWebSessionForIsis_Authenticate {
allowing(mockCommonContext).lookupServiceElseFail(IsisInteractionFactory.class);
will(returnValue(mockIsisSessionFactory));
- allowing(mockCommonContext).getIsisSessionTracker();
+ allowing(mockCommonContext).getIsisInteractionTracker();
will(returnValue(mockIsisSessionTracker));
allowing(mockIsisSessionTracker).currentAuthenticationSession();