You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by da...@apache.org on 2023/12/11 10:37:32 UTC
(causeway) 14/25: CAUSEWAY-3654: removes IATBH
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch CAUSEWAY-3654-isis
in repository https://gitbox.apache.org/repos/asf/causeway.git
commit 7c2e3342240c9de40165d562d0bee850425f8d0c
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Dec 10 08:59:16 2023 +0000
CAUSEWAY-3654: removes IATBH
---
.../interaction/IsisModuleCoreInteraction.java | 2 -
...teractionAwareTransactionalBoundaryHandler.java | 78 ----------------------
.../session/InteractionServiceDefault.java | 4 --
.../transaction/TransactionServiceSpring.java | 2 -
4 files changed, 86 deletions(-)
diff --git a/core/interaction/src/main/java/org/apache/isis/core/interaction/IsisModuleCoreInteraction.java b/core/interaction/src/main/java/org/apache/isis/core/interaction/IsisModuleCoreInteraction.java
index 1496de0f43..98748f3563 100644
--- a/core/interaction/src/main/java/org/apache/isis/core/interaction/IsisModuleCoreInteraction.java
+++ b/core/interaction/src/main/java/org/apache/isis/core/interaction/IsisModuleCoreInteraction.java
@@ -21,14 +21,12 @@ package org.apache.isis.core.interaction;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.core.interaction.integration.InteractionAwareTransactionalBoundaryHandler;
import org.apache.isis.core.interaction.scope.InteractionScopeBeanFactoryPostProcessor;
@Configuration
@Import({
InteractionScopeBeanFactoryPostProcessor.class,
- InteractionAwareTransactionalBoundaryHandler.class
})
public class IsisModuleCoreInteraction {
diff --git a/core/interaction/src/main/java/org/apache/isis/core/interaction/integration/InteractionAwareTransactionalBoundaryHandler.java b/core/interaction/src/main/java/org/apache/isis/core/interaction/integration/InteractionAwareTransactionalBoundaryHandler.java
deleted file mode 100644
index 8cae856b83..0000000000
--- a/core/interaction/src/main/java/org/apache/isis/core/interaction/integration/InteractionAwareTransactionalBoundaryHandler.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.isis.core.interaction.integration;
-
-import java.util.List;
-import java.util.Optional;
-import java.util.function.Consumer;
-
-import javax.annotation.Priority;
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import org.apache.isis.core.interaction.IsisModuleCoreInteraction;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.TransactionDefinition;
-import org.springframework.transaction.TransactionStatus;
-import org.springframework.transaction.support.TransactionTemplate;
-
-import org.apache.isis.applib.annotation.PriorityPrecedence;
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.functional.ThrowingRunnable;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.debug._Probe;
-import org.apache.isis.core.interaction.session.IsisInteraction;
-
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-import lombok.Value;
-import lombok.val;
-import lombok.extern.log4j.Log4j2;
-
-@Service
-@Named(InteractionAwareTransactionalBoundaryHandler.LOGICAL_TYPE_NAME)
-@Priority(PriorityPrecedence.MIDPOINT)
-@Qualifier("Default")
-@Log4j2
-public class InteractionAwareTransactionalBoundaryHandler {
-
- public static final String LOGICAL_TYPE_NAME = IsisModuleCoreInteraction.NAMESPACE + ".InteractionAwareTransactionalBoundaryHandler";
-
- private final Can<PlatformTransactionManager> txManagers;
-
- @Inject
- public InteractionAwareTransactionalBoundaryHandler(final List<PlatformTransactionManager> txManagers) {
- this.txManagers = Can.ofCollection(txManagers);
- }
-
- // -- OPEN
-
-
- // -- CLOSE
-
-
-
- // -- HELPER
-
-
-
-
-}
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/InteractionServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/InteractionServiceDefault.java
index 1b9306a0ee..82c24be801 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/InteractionServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/InteractionServiceDefault.java
@@ -61,7 +61,6 @@ import org.apache.isis.commons.internal.concurrent._ConcurrentTaskList;
import org.apache.isis.commons.internal.debug._Probe;
import org.apache.isis.commons.internal.debug.xray.XrayUi;
import org.apache.isis.commons.internal.exceptions._Exceptions;
-import org.apache.isis.core.interaction.integration.InteractionAwareTransactionalBoundaryHandler;
import org.apache.isis.core.interaction.scope.InteractionScopeBeanFactoryPostProcessor;
import org.apache.isis.core.interaction.scope.InteractionScopeLifecycleHandler;
import org.apache.isis.core.interaction.scope.TransactionBoundaryAware;
@@ -98,7 +97,6 @@ implements
final SpecificationLoader specificationLoader;
final ServiceInjector serviceInjector;
- final InteractionAwareTransactionalBoundaryHandler txBoundaryHandler;
final ClockService clockService;
final Provider<CommandPublisher> commandPublisherProvider;
final Provider<TransactionService> transactionServiceProvider;
@@ -117,7 +115,6 @@ implements
final MetamodelEventService runtimeEventService,
final SpecificationLoader specificationLoader,
final ServiceInjector serviceInjector,
- final InteractionAwareTransactionalBoundaryHandler txBoundaryHandler,
final TransactionServiceSpring transactionServiceSpring,
final ClockService clockService,
final Provider<CommandPublisher> commandPublisherProvider,
@@ -127,7 +124,6 @@ implements
this.runtimeEventService = runtimeEventService;
this.specificationLoader = specificationLoader;
this.serviceInjector = serviceInjector;
- this.txBoundaryHandler = txBoundaryHandler;
this.transactionServiceSpring = transactionServiceSpring;
this.clockService = clockService;
this.commandPublisherProvider = commandPublisherProvider;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/transaction/TransactionServiceSpring.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/transaction/TransactionServiceSpring.java
index 1a2e393165..d05f5a9896 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/transaction/TransactionServiceSpring.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/transaction/TransactionServiceSpring.java
@@ -31,7 +31,6 @@ import javax.inject.Named;
import org.apache.isis.commons.functional.ThrowingRunnable;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.debug._Probe;
-import org.apache.isis.core.interaction.integration.InteractionAwareTransactionalBoundaryHandler;
import org.apache.isis.core.interaction.session.IsisInteraction;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -54,7 +53,6 @@ import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.functional.Try;
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.commons.internal.exceptions._Exceptions;
-import org.apache.isis.core.interaction.scope.TransactionBoundaryAware;
import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
import org.apache.isis.core.transaction.events.TransactionAfterCompletionEvent;