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 2016/06/09 07:08:52 UTC

[04/26] isis git commit: ISIS-1427: IsisTransaction constructor simplified. Also, obtain MessageBroker from either AuthenticationSession or from ServicesInjector convenience method.

ISIS-1427: IsisTransaction constructor simplified.  Also, obtain MessageBroker from either AuthenticationSession or from ServicesInjector convenience method.


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/67c33063
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/67c33063
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/67c33063

Branch: refs/heads/ISIS-1427
Commit: 67c3306389f58e0fea5febc7cb3139482b78c9bf
Parents: 848d098
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Jun 7 20:14:56 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Jun 7 20:14:56 2016 +0100

----------------------------------------------------------------------
 ...ersistenceSessionServiceInternalDefault.java |  4 +-
 .../system/transaction/IsisTransaction.java     | 51 +++++++-------------
 .../transaction/IsisTransactionManager.java     |  4 +-
 .../viewer/wicket/model/models/ActionModel.java |  3 +-
 .../actions/ActionParametersFormPanel.java      |  3 +-
 .../property/PropertyEditFormPanel.java         |  3 +-
 .../widgets/breadcrumbs/BreadcrumbPanel.java    |  3 +-
 .../wicket/ui/errors/JGrowlBehaviour.java       |  2 +-
 .../viewer/wicket/ui/pages/PageAbstract.java    |  9 ----
 .../viewer/wicket/ui/panels/PanelAbstract.java  |  4 +-
 10 files changed, 30 insertions(+), 56 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/67c33063/core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/PersistenceSessionServiceInternalDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/PersistenceSessionServiceInternalDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/PersistenceSessionServiceInternalDefault.java
index 0b1b113..09e62cf 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/PersistenceSessionServiceInternalDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/PersistenceSessionServiceInternalDefault.java
@@ -22,6 +22,7 @@ import java.util.List;
 
 import org.apache.isis.applib.annotation.DomainService;
 import org.apache.isis.applib.annotation.NatureOfService;
+import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.query.Query;
 import org.apache.isis.applib.services.bookmark.Bookmark;
 import org.apache.isis.applib.services.bookmark.BookmarkService2;
@@ -176,7 +177,8 @@ public class PersistenceSessionServiceInternalDefault implements PersistenceSess
         return IsisContext.getPersistenceSession();
     }
 
-    protected IsisTransactionManager getTransactionManager() {
+    @Programmatic
+    public IsisTransactionManager getTransactionManager() {
         return getPersistenceSession().getTransactionManager();
     }
 

http://git-wip-us.apache.org/repos/asf/isis/blob/67c33063/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
index 2a88fc1..6c6262a 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
@@ -32,6 +32,7 @@ import org.apache.isis.applib.services.HasTransactionId;
 import org.apache.isis.applib.services.WithTransactionScope;
 import org.apache.isis.applib.services.xactn.Transaction;
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
 import org.apache.isis.core.commons.authentication.MessageBroker;
 import org.apache.isis.core.commons.components.TransactionScopedComponent;
 import org.apache.isis.core.commons.exceptions.IsisException;
@@ -44,6 +45,7 @@ import org.apache.isis.core.runtime.persistence.objectstore.transaction.CreateOb
 import org.apache.isis.core.runtime.persistence.objectstore.transaction.DestroyObjectCommand;
 import org.apache.isis.core.runtime.persistence.objectstore.transaction.PersistenceCommand;
 import org.apache.isis.core.runtime.services.auditing.AuditingServiceInternal;
+import org.apache.isis.core.runtime.services.persistsession.PersistenceSessionServiceInternalDefault;
 
 /**
  * Used by the {@link IsisTransactionManager} to captures a set of changes to be
@@ -161,37 +163,35 @@ public class IsisTransaction implements TransactionScopedComponent, Transaction
 
     //region > constructor, fields
 
+    private final UUID interactionId;
+    private final int sequence;
+
     private final List<PersistenceCommand> persistenceCommands = Lists.newArrayList();
     private final IsisTransactionManager transactionManager;
     private final MessageBroker messageBroker;
-
-    private final ServicesInjector servicesInjector;
-
     private final PublishingServiceInternal publishingServiceInternal;
     private final AuditingServiceInternal auditingServiceInternal;
 
-    private final UUID interactionId;
-    private final int sequence;
+    private final List<WithTransactionScope> withTransactionScopes;
 
     private IsisException abortCause;
 
     public IsisTransaction(
-            final IsisTransactionManager transactionManager,
-            final MessageBroker messageBroker,
-            final ServicesInjector servicesInjector,
-            final UUID interactionId,
-            final int sequence) {
-        
-        this.transactionManager = transactionManager;
-        this.messageBroker = messageBroker;
-        this.servicesInjector = servicesInjector;
-        
-        this.publishingServiceInternal = lookupService(PublishingServiceInternal.class);
-        this.auditingServiceInternal = lookupService(AuditingServiceInternal.class);
+            final UUID interactionId, final int sequence, final ServicesInjector servicesInjector) {
 
         this.interactionId = interactionId;
         this.sequence = sequence;
 
+        final PersistenceSessionServiceInternalDefault persistenceSessionService = servicesInjector
+                .lookupServiceElseFail(PersistenceSessionServiceInternalDefault.class);
+        this.transactionManager = persistenceSessionService.getTransactionManager();
+
+        this.messageBroker = servicesInjector.getMessageBroker();
+        this.publishingServiceInternal = servicesInjector.lookupServiceElseFail(PublishingServiceInternal.class);
+        this.auditingServiceInternal = servicesInjector.lookupServiceElseFail(AuditingServiceInternal.class);
+
+        withTransactionScopes = servicesInjector.lookupServices(WithTransactionScope.class);
+
         this.state = State.IN_PROGRESS;
 
         if (LOG.isDebugEnabled()) {
@@ -418,8 +418,6 @@ public class IsisTransaction implements TransactionScopedComponent, Transaction
             setAbortCause(new IsisTransactionManagerException(ex));
             throw ex;
         } finally {
-            List<WithTransactionScope> withTransactionScopes = servicesInjector
-                    .lookupServices(WithTransactionScope.class);
             for (WithTransactionScope withTransactionScope : withTransactionScopes) {
                 withTransactionScope.resetForNextTransaction();
             }
@@ -524,21 +522,6 @@ public class IsisTransaction implements TransactionScopedComponent, Transaction
 
     //endregion
 
-    //region > helpers: lookupService etc
-    private <T> T lookupService(Class<T> serviceType) {
-        T service = lookupServiceIfAny(serviceType);
-        if(service == null) {
-            throw new IllegalStateException("Could not locate service of type '" + serviceType + "'");
-        }
-        return service;
-    }
-
-    private <T> T lookupServiceIfAny(final Class<T> serviceType) {
-        return servicesInjector.lookupService(serviceType);
-    }
-
-    //endregion
-
 }
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/67c33063/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManager.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManager.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManager.java
index 3035ad0..36e6e0d 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManager.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManager.java
@@ -255,8 +255,8 @@ public class IsisTransactionManager implements SessionScopedComponent {
             command = commandContext.getCommand();
             final UUID transactionId = command.getTransactionId();
 
-            final MessageBroker messageBroker = getAuthenticationSession().getMessageBroker();
-            this.transaction = new IsisTransaction(this, messageBroker, servicesInjector, transactionId, interaction.next(Interaction.Sequence.TRANSACTION.id()));
+            this.transaction = new IsisTransaction(transactionId,
+                    interaction.next(Interaction.Sequence.TRANSACTION.id()), servicesInjector);
             transactionLevel = 0;
 
             persistenceSession.startTransaction();

http://git-wip-us.apache.org/repos/asf/isis/blob/67c33063/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
index dcd2626..8ebf435 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
@@ -52,6 +52,7 @@ import org.apache.isis.applib.services.routing.RoutingService;
 import org.apache.isis.applib.value.Blob;
 import org.apache.isis.applib.value.Clob;
 import org.apache.isis.applib.value.NamedWithMimeType;
+import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager.ConcurrencyChecking;
 import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
@@ -560,7 +561,7 @@ public class ActionModel extends BookmarkableModel<ObjectAdapter> {
             // equivalent to calling DomainObjectContainer#raiseError(...)
             final RecoverableException appEx = getApplicationExceptionIfAny(ex);
             if (appEx != null) {
-                IsisContext.getMessageBroker().setApplicationError(appEx.getMessage());
+                getServicesInjector().getMessageBroker().setApplicationError(appEx.getMessage());
 
                 // there's no need to set the abort cause on the transaction, it will have already been done
                 // (in IsisTransactionManager#executeWithinTransaction(...)).

http://git-wip-us.apache.org/repos/asf/isis/blob/67c33063/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java
index 4fec53b..35b1e57 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java
@@ -37,7 +37,6 @@ import org.apache.isis.core.commons.ensure.Ensure;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.version.ConcurrencyException;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.core.runtime.system.context.IsisContext;
 import org.apache.isis.viewer.wicket.model.hints.IsisActionCompletedEvent;
 import org.apache.isis.viewer.wicket.model.mementos.ActionParameterMemento;
 import org.apache.isis.viewer.wicket.model.models.ActionModel;
@@ -163,7 +162,7 @@ public class ActionParametersFormPanel extends PanelAbstract<ActionModel> {
 
                             // ensure any jGrowl errors are shown
                             // (normally would be flushed when traverse to next page).
-                            String errorMessagesIfAny = JGrowlUtil.asJGrowlCalls(IsisContext.getMessageBroker());
+                            String errorMessagesIfAny = JGrowlUtil.asJGrowlCalls(getAuthenticationSession().getMessageBroker());
                             builder.append(errorMessagesIfAny);
 
                             // append the JS to the response. 

http://git-wip-us.apache.org/repos/asf/isis/blob/67c33063/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanel.java
index 2ca51ca..99842ae 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanel.java
@@ -29,7 +29,6 @@ import org.apache.wicket.model.ResourceModel;
 
 import org.apache.isis.core.commons.ensure.Ensure;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.runtime.system.context.IsisContext;
 import org.apache.isis.viewer.wicket.model.hints.IsisPropertyEditCompletedEvent;
 import org.apache.isis.viewer.wicket.model.models.ActionPrompt;
 import org.apache.isis.viewer.wicket.model.models.ActionPromptProvider;
@@ -141,7 +140,7 @@ public class PropertyEditFormPanel extends PanelAbstract<ScalarModel> {
 
                         // ensure any jGrowl errors are shown
                         // (normally would be flushed when traverse to next page).
-                        String errorMessagesIfAny = JGrowlUtil.asJGrowlCalls(IsisContext.getMessageBroker());
+                        String errorMessagesIfAny = JGrowlUtil.asJGrowlCalls(getServicesInjector().getMessageBroker());
                         builder.append(errorMessagesIfAny);
 
                         // append the JS to the response.

http://git-wip-us.apache.org/repos/asf/isis/blob/67c33063/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
index 50c7367..d831804 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
@@ -33,7 +33,6 @@ import org.wicketstuff.select2.Settings;
 import org.wicketstuff.select2.TextChoiceProvider;
 
 import org.apache.isis.core.commons.authentication.MessageBroker;
-import org.apache.isis.core.runtime.system.context.IsisContext;
 import org.apache.isis.viewer.wicket.model.models.EntityModel;
 import org.apache.isis.viewer.wicket.ui.errors.JGrowlUtil;
 import org.apache.isis.viewer.wicket.ui.pages.entity.EntityPage;
@@ -104,7 +103,7 @@ public class BreadcrumbPanel extends PanelAbstract<IModel<Void>> {
                     final String oidStr = breadcrumbChoice.getInput();
                     final EntityModel selectedModel = breadcrumbModel.lookup(oidStr);
                     if(selectedModel == null) {
-                        final MessageBroker messageBroker = IsisContext.getAuthenticationSession().getMessageBroker();
+                        final MessageBroker messageBroker = getServicesInjector().getMessageBroker();
                         messageBroker.addWarning("Cannot find object");
                         String feedbackMsg = JGrowlUtil.asJGrowlCalls(messageBroker);
                         target.appendJavaScript(feedbackMsg);

http://git-wip-us.apache.org/repos/asf/isis/blob/67c33063/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java
index 90084e6..45965f6 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java
@@ -75,7 +75,7 @@ public class JGrowlBehaviour extends AbstractDefaultAjaxBehavior {
 
 
     protected MessageBroker getMessageBroker() {
-        return IsisContext.getMessageBroker();
+        return IsisContext.getAuthenticationSession().getMessageBroker();
     }
     
 }

http://git-wip-us.apache.org/repos/asf/isis/blob/67c33063/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
----------------------------------------------------------------------
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 a2d6bfa..1de0f9c 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
@@ -61,7 +61,6 @@ import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.commons.authentication.MessageBroker;
 import org.apache.isis.core.commons.config.IsisConfiguration;
 import org.apache.isis.core.metamodel.services.ServicesInjector;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.core.runtime.system.context.IsisContext;
 import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
 import org.apache.isis.viewer.wicket.model.common.PageParametersUtils;
@@ -443,18 +442,10 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
         return IsisContext.getPersistenceSession();
     }
 
-    protected SpecificationLoader getSpecificationLoader() {
-        return IsisContext.getSpecificationLoader();
-    }
-    
     protected AuthenticationSession getAuthenticationSession() {
         return IsisContext.getAuthenticationSession();
     }
     
-    protected MessageBroker getMessageBroker() {
-        return IsisContext.getMessageBroker();
-    }
-    
     protected IsisConfiguration getConfiguration() {
         return IsisContext.getConfiguration();
     }

http://git-wip-us.apache.org/repos/asf/isis/blob/67c33063/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
----------------------------------------------------------------------
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 a3c4235..d88c50a 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
@@ -133,11 +133,11 @@ public abstract class PanelAbstract<T extends IModel<?>> extends Panel
      * @return
      */
     public AuthenticationSession getAuthenticationSession() {
-        return IsisContext.getAuthenticationSession();
+        return getServicesInjector().getAuthenticationSession();
     }
 
     public DeploymentCategory getDeploymentCategory() {
-        return IsisContext.getDeploymentType().getDeploymentCategory();
+        return getServicesInjector().getDeploymentCategory();
     }