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/12/22 11:38:17 UTC
[isis] branch master updated: ISIS-2033: separation of concerns,
move packages from 'runtime' closer to where they belong
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 63d15e2 ISIS-2033: separation of concerns, move packages from 'runtime' closer to where they belong
63d15e2 is described below
commit 63d15e2c9b56e919cd9e37caf505a60136c5531b
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Dec 22 12:38:03 2020 +0100
ISIS-2033: separation of concerns, move packages from 'runtime' closer
to where they belong
---
.../core/interaction/IsisModuleCoreInteraction.java | 17 +++++++++++++++++
.../IsisInteractionScopeBeanFactoryPostProcessor.java | 2 ++
.../apache/isis/core/runtime/IsisModuleCoreRuntime.java | 14 ++++----------
.../isis/core/runtime/events/RuntimeEventService.java | 4 ++--
.../runtimeservices/IsisModuleCoreRuntimeServices.java | 2 --
.../core/transaction/IsisModuleCoreTransaction.java | 10 ++--------
.../changetracking/events}/PostStoreEvent.java | 2 +-
.../changetracking/events}/PreStoreEvent.java | 2 +-
.../changetracking/events}/TimestampService.java | 4 ++--
9 files changed, 31 insertions(+), 26 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
new file mode 100644
index 0000000..b99c8c7
--- /dev/null
+++ b/core/interaction/src/main/java/org/apache/isis/core/interaction/IsisModuleCoreInteraction.java
@@ -0,0 +1,17 @@
+package org.apache.isis.core.interaction;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+import org.apache.isis.core.interaction.scope.IsisInteractionScopeBeanFactoryPostProcessor;
+
+@Configuration
+@Import({
+
+ IsisInteractionScopeBeanFactoryPostProcessor.class
+
+})
+public class IsisModuleCoreInteraction {
+
+
+}
diff --git a/core/interaction/src/main/java/org/apache/isis/core/interaction/scope/IsisInteractionScopeBeanFactoryPostProcessor.java b/core/interaction/src/main/java/org/apache/isis/core/interaction/scope/IsisInteractionScopeBeanFactoryPostProcessor.java
index aa21ea6..6f0695e 100644
--- a/core/interaction/src/main/java/org/apache/isis/core/interaction/scope/IsisInteractionScopeBeanFactoryPostProcessor.java
+++ b/core/interaction/src/main/java/org/apache/isis/core/interaction/scope/IsisInteractionScopeBeanFactoryPostProcessor.java
@@ -21,6 +21,7 @@ package org.apache.isis.core.interaction.scope;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
+import org.springframework.stereotype.Component;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.commons.internal.context._Context;
@@ -31,6 +32,7 @@ import lombok.val;
/**
* @since 2.0
*/
+@Component
public class IsisInteractionScopeBeanFactoryPostProcessor implements BeanFactoryPostProcessor {
@Override
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/IsisModuleCoreRuntime.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/IsisModuleCoreRuntime.java
index e1bc51c..5e9834a 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/IsisModuleCoreRuntime.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/IsisModuleCoreRuntime.java
@@ -18,33 +18,27 @@
*/
package org.apache.isis.core.runtime;
-import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
-import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.core.interaction.scope.IsisInteractionScopeBeanFactoryPostProcessor;
+import org.apache.isis.core.interaction.IsisModuleCoreInteraction;
import org.apache.isis.core.metamodel.IsisModuleCoreMetamodel;
import org.apache.isis.core.runtime.events.RuntimeEventService;
-import org.apache.isis.core.runtime.events.persistence.TimestampService;
+import org.apache.isis.core.transaction.IsisModuleCoreTransaction;
@Configuration
@Import({
// modules
IsisModuleCoreMetamodel.class,
+ IsisModuleCoreInteraction.class,
+ IsisModuleCoreTransaction.class,
// @Service's
RuntimeEventService.class,
- TimestampService.class,
// @Configuration's
})
public class IsisModuleCoreRuntime {
-
- @Bean
- public static BeanFactoryPostProcessor beanFactoryPostProcessor() {
- return new IsisInteractionScopeBeanFactoryPostProcessor();
- }
}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/events/RuntimeEventService.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/events/RuntimeEventService.java
index 29810c8..5a75561 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/events/RuntimeEventService.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/events/RuntimeEventService.java
@@ -27,8 +27,8 @@ import org.apache.isis.core.interaction.session.InteractionSession;
import org.apache.isis.core.interaction.session.InteractionTracker;
import org.apache.isis.core.runtime.events.app.AppLifecycleEvent;
import org.apache.isis.core.runtime.events.iactn.IsisInteractionLifecycleEvent;
-import org.apache.isis.core.runtime.events.persistence.PostStoreEvent;
-import org.apache.isis.core.runtime.events.persistence.PreStoreEvent;
+import org.apache.isis.core.transaction.changetracking.events.PostStoreEvent;
+import org.apache.isis.core.transaction.changetracking.events.PreStoreEvent;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Primary;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/IsisModuleCoreRuntimeServices.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/IsisModuleCoreRuntimeServices.java
index 7ed6583..256915d 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/IsisModuleCoreRuntimeServices.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/IsisModuleCoreRuntimeServices.java
@@ -64,13 +64,11 @@ import org.apache.isis.core.runtimeservices.wrapper.WrapperFactoryDefault;
import org.apache.isis.core.runtimeservices.xactn.TransactionServiceSpring;
import org.apache.isis.core.runtimeservices.xml.XmlServiceDefault;
import org.apache.isis.core.runtimeservices.xmlsnapshot.XmlSnapshotServiceDefault;
-import org.apache.isis.core.transaction.IsisModuleCoreTransaction;
@Configuration
@Import({
// modules
IsisModuleCoreRuntime.class,
- IsisModuleCoreTransaction.class,
IsisModuleCoreCodegenByteBuddy.class,
// @Service's
diff --git a/core/transaction/src/main/java/org/apache/isis/core/transaction/IsisModuleCoreTransaction.java b/core/transaction/src/main/java/org/apache/isis/core/transaction/IsisModuleCoreTransaction.java
index e35af74..d19577d 100644
--- a/core/transaction/src/main/java/org/apache/isis/core/transaction/IsisModuleCoreTransaction.java
+++ b/core/transaction/src/main/java/org/apache/isis/core/transaction/IsisModuleCoreTransaction.java
@@ -22,19 +22,13 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.apache.isis.core.transaction.changetracking.EntityChangeTrackerDefault;
+import org.apache.isis.core.transaction.changetracking.events.TimestampService;
@Configuration
@Import({
- // modules
-// IsisModuleCoreMetamodel.class,
-
// @Service's
-// RuntimeEventService.class,
-// TimestampService.class,
+ TimestampService.class,
EntityChangeTrackerDefault.class,
-
- // @Configuration's
-
})
public class IsisModuleCoreTransaction {
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/events/persistence/PostStoreEvent.java b/core/transaction/src/main/java/org/apache/isis/core/transaction/changetracking/events/PostStoreEvent.java
similarity index 93%
rename from core/runtime/src/main/java/org/apache/isis/core/runtime/events/persistence/PostStoreEvent.java
rename to core/transaction/src/main/java/org/apache/isis/core/transaction/changetracking/events/PostStoreEvent.java
index 46ef604..4b415fa 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/events/persistence/PostStoreEvent.java
+++ b/core/transaction/src/main/java/org/apache/isis/core/transaction/changetracking/events/PostStoreEvent.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.runtime.events.persistence;
+package org.apache.isis.core.transaction.changetracking.events;
import lombok.Value;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/events/persistence/PreStoreEvent.java b/core/transaction/src/main/java/org/apache/isis/core/transaction/changetracking/events/PreStoreEvent.java
similarity index 93%
rename from core/runtime/src/main/java/org/apache/isis/core/runtime/events/persistence/PreStoreEvent.java
rename to core/transaction/src/main/java/org/apache/isis/core/transaction/changetracking/events/PreStoreEvent.java
index 216735a..7d944a0 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/events/persistence/PreStoreEvent.java
+++ b/core/transaction/src/main/java/org/apache/isis/core/transaction/changetracking/events/PreStoreEvent.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.runtime.events.persistence;
+package org.apache.isis.core.transaction.changetracking.events;
import lombok.Value;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/events/persistence/TimestampService.java b/core/transaction/src/main/java/org/apache/isis/core/transaction/changetracking/events/TimestampService.java
similarity index 95%
rename from core/runtime/src/main/java/org/apache/isis/core/runtime/events/persistence/TimestampService.java
rename to core/transaction/src/main/java/org/apache/isis/core/transaction/changetracking/events/TimestampService.java
index 6915ecf..722d9ef 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/events/persistence/TimestampService.java
+++ b/core/transaction/src/main/java/org/apache/isis/core/transaction/changetracking/events/TimestampService.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.runtime.events.persistence;
+package org.apache.isis.core.transaction.changetracking.events;
import javax.inject.Inject;
import javax.inject.Named;
@@ -36,7 +36,7 @@ import org.apache.isis.applib.services.user.UserService;
import lombok.val;
@Service
-@Named("isisRuntime.TimestampService")
+@Named("isisTransaction.TimestampService")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")