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/12/12 18:18:04 UTC
[isis] 02/03: ISIS-2177: remove SessionScopedComponent
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
commit c8feea88c1589fff882549f3345157275407d1fd
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Dec 12 19:15:11 2019 +0100
ISIS-2177: remove SessionScopedComponent
---
.../java/org/apache/isis/config/beans/IsisBeanTypeRegistry.java | 5 -----
.../jdo/datanucleus5/persistence/IsisPersistenceSessionJdo.java | 3 +--
.../jdo/datanucleus5/persistence/IsisTransactionManagerJdo.java | 3 +--
.../isis/extensions/fixtures/fixturescripts/FixtureScripts.java | 6 +++++-
4 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanTypeRegistry.java b/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanTypeRegistry.java
index be2ceba..2c67eb5 100644
--- a/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanTypeRegistry.java
+++ b/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanTypeRegistry.java
@@ -40,7 +40,6 @@ import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.collections._Sets;
import org.apache.isis.commons.internal.components.ApplicationScopedComponent;
-import org.apache.isis.commons.internal.components.SessionScopedComponent;
import org.apache.isis.commons.internal.components.TransactionScopedComponent;
import org.apache.isis.commons.internal.ioc.BeanSort;
import org.apache.isis.commons.internal.reflection._Reflect;
@@ -242,10 +241,6 @@ public final class IsisBeanTypeRegistry implements IsisComponentScanInterceptor,
return BeanSort.MANAGED_BEAN;
}
- if(SessionScopedComponent.class.isAssignableFrom(type)) {
- return BeanSort.MANAGED_BEAN;
- }
-
if(TransactionScopedComponent.class.isAssignableFrom(type)) {
return BeanSort.MANAGED_BEAN;
}
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdo.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdo.java
index f74cfc3..8f917ef 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdo.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdo.java
@@ -18,7 +18,6 @@
*/
package org.apache.isis.persistence.jdo.datanucleus5.persistence;
-import org.apache.isis.commons.internal.components.SessionScopedComponent;
import org.apache.isis.metamodel.adapter.ObjectAdapterProvider;
import org.apache.isis.runtime.persistence.session.PersistenceSession;
@@ -27,7 +26,7 @@ import org.apache.isis.runtime.persistence.session.PersistenceSession;
* @since 2.0
*/
public interface IsisPersistenceSessionJdo
-extends PersistenceSession, SessionScopedComponent, ObjectAdapterProvider {
+extends PersistenceSession, ObjectAdapterProvider {
/**
* to tell the underlying object store to start a transaction.
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionManagerJdo.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionManagerJdo.java
index 79c24d0..fa5bc61 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionManagerJdo.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionManagerJdo.java
@@ -27,7 +27,6 @@ import org.apache.isis.applib.services.iactn.Interaction;
import org.apache.isis.applib.services.iactn.InteractionContext;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.commons.exceptions.IsisException;
-import org.apache.isis.commons.internal.components.SessionScopedComponent;
import org.apache.isis.runtime.persistence.objectstore.transaction.PersistenceCommand;
import org.apache.isis.runtime.persistence.transaction.IsisTransactionAspectSupport;
import org.apache.isis.runtime.persistence.transaction.IsisTransactionManagerException;
@@ -38,7 +37,7 @@ import lombok.val;
import lombok.extern.log4j.Log4j2;
@Vetoed @Log4j2
-class IsisTransactionManagerJdo implements SessionScopedComponent {
+class IsisTransactionManagerJdo {
// -- constructor, fields
diff --git a/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureScripts.java b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureScripts.java
index ad3489b..ae9e71b 100644
--- a/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureScripts.java
+++ b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureScripts.java
@@ -341,7 +341,11 @@ public class FixtureScripts extends AbstractService {
String parameters = null;
transactionService.executeWithinTransaction(()->{
- runScript(singleScript, parameters);
+ try {
+ runScript(singleScript, parameters);
+ } catch (Exception e) {
+ throw _Exceptions.unrecoverable(e);
+ }
});
}