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:52:29 UTC
[isis] branch master updated: ISIS-2033: more 'runtime' cleaning up
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 988fd90 ISIS-2033: more 'runtime' cleaning up
988fd90 is described below
commit 988fd909c67df9ea89cabfd58d96b71214c15ec5
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Dec 22 12:51:45 2020 +0100
ISIS-2033: more 'runtime' cleaning up
---
.../interaction/events}/IsisInteractionLifecycleEvent.java | 2 +-
.../core/runtime/events/{app => }/AppLifecycleEvent.java | 2 +-
.../isis/core/runtime/events/RuntimeEventService.java | 13 ++++++-------
.../java/demoapp/dom/_infra/seed/SeedServiceAbstract.java | 5 +++--
.../jdo/JavaTimeOffsetDateTimeJdoSeedService.java | 2 +-
.../jdo/JavaTimeOffsetTimeJdoSeedService.java | 2 +-
.../jdo/JavaTimeZonedDateTimeJdoSeedService.java | 2 +-
.../viewmodels/jaxbrefentity/seed/ChildJdoSeedService.java | 6 ------
.../secman/jdo/seed/SeedSecurityModuleService.java | 7 ++++---
.../isis/incubator/viewer/javafx/ui/main/UiBuilderFx.java | 2 +-
.../lifecycles/JdoPersistenceLifecycleService.java | 4 ++--
.../apache/isis/testdomain/conf/Configuration_headless.java | 2 +-
.../fixtures/applib/services/FixturesLifecycleService.java | 2 +-
13 files changed, 23 insertions(+), 28 deletions(-)
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/events/iactn/IsisInteractionLifecycleEvent.java b/core/interaction/src/main/java/org/apache/isis/core/interaction/events/IsisInteractionLifecycleEvent.java
similarity index 96%
rename from core/runtime/src/main/java/org/apache/isis/core/runtime/events/iactn/IsisInteractionLifecycleEvent.java
rename to core/interaction/src/main/java/org/apache/isis/core/interaction/events/IsisInteractionLifecycleEvent.java
index cbd1649..03e6332 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/events/iactn/IsisInteractionLifecycleEvent.java
+++ b/core/interaction/src/main/java/org/apache/isis/core/interaction/events/IsisInteractionLifecycleEvent.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.runtime.events.iactn;
+package org.apache.isis.core.interaction.events;
import org.apache.isis.core.interaction.session.InteractionSession;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/events/app/AppLifecycleEvent.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/events/AppLifecycleEvent.java
similarity index 95%
rename from core/runtime/src/main/java/org/apache/isis/core/runtime/events/app/AppLifecycleEvent.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/events/AppLifecycleEvent.java
index 8aad981..e2f1add 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/events/app/AppLifecycleEvent.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/events/AppLifecycleEvent.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.runtime.events.app;
+package org.apache.isis.core.runtime.events;
public enum AppLifecycleEvent {
PRE_METAMODEL,
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 5a75561..ef0408a 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
@@ -21,20 +21,19 @@ package org.apache.isis.core.runtime.events;
import javax.inject.Inject;
import javax.inject.Named;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Primary;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Service;
+
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.eventbus.EventBusService;
+import org.apache.isis.core.interaction.events.IsisInteractionLifecycleEvent;
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.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;
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Service;
-
import lombok.val;
/**
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/_infra/seed/SeedServiceAbstract.java b/examples/demo/domain/src/main/java/demoapp/dom/_infra/seed/SeedServiceAbstract.java
index b219ac6..982c3bf 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/_infra/seed/SeedServiceAbstract.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/_infra/seed/SeedServiceAbstract.java
@@ -22,10 +22,11 @@ import java.util.function.Supplier;
import javax.inject.Inject;
-import org.apache.isis.core.runtime.events.app.AppLifecycleEvent;
+import org.springframework.context.event.EventListener;
+
+import org.apache.isis.core.runtime.events.AppLifecycleEvent;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
-import org.springframework.context.event.EventListener;
public abstract class SeedServiceAbstract implements SeedService {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/jdo/JavaTimeOffsetDateTimeJdoSeedService.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/jdo/JavaTimeOffsetDateTimeJdoSeedService.java
index bcd358e..754c828 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/jdo/JavaTimeOffsetDateTimeJdoSeedService.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/jdo/JavaTimeOffsetDateTimeJdoSeedService.java
@@ -26,7 +26,7 @@ import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Service;
import org.apache.isis.applib.services.repository.RepositoryService;
-import org.apache.isis.core.runtime.events.app.AppLifecycleEvent;
+import org.apache.isis.core.runtime.events.AppLifecycleEvent;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/jdo/JavaTimeOffsetTimeJdoSeedService.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/jdo/JavaTimeOffsetTimeJdoSeedService.java
index 46495e8..896dbfd 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/jdo/JavaTimeOffsetTimeJdoSeedService.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/jdo/JavaTimeOffsetTimeJdoSeedService.java
@@ -26,7 +26,7 @@ import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Service;
import org.apache.isis.applib.services.repository.RepositoryService;
-import org.apache.isis.core.runtime.events.app.AppLifecycleEvent;
+import org.apache.isis.core.runtime.events.AppLifecycleEvent;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/jdo/JavaTimeZonedDateTimeJdoSeedService.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/jdo/JavaTimeZonedDateTimeJdoSeedService.java
index f6d1615..bbdb56d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/jdo/JavaTimeZonedDateTimeJdoSeedService.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/jdo/JavaTimeZonedDateTimeJdoSeedService.java
@@ -26,7 +26,7 @@ import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Service;
import org.apache.isis.applib.services.repository.RepositoryService;
-import org.apache.isis.core.runtime.events.app.AppLifecycleEvent;
+import org.apache.isis.core.runtime.events.AppLifecycleEvent;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/viewmodels/jaxbrefentity/seed/ChildJdoSeedService.java b/examples/demo/domain/src/main/java/demoapp/dom/viewmodels/jaxbrefentity/seed/ChildJdoSeedService.java
index 94ddc1d..992d9fe 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/viewmodels/jaxbrefentity/seed/ChildJdoSeedService.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/viewmodels/jaxbrefentity/seed/ChildJdoSeedService.java
@@ -18,18 +18,12 @@
*/
package demoapp.dom.viewmodels.jaxbrefentity.seed;
-import java.util.function.Supplier;
-import java.util.stream.Stream;
-
import javax.inject.Inject;
-import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Service;
import org.apache.isis.applib.services.repository.RepositoryService;
-import org.apache.isis.core.runtime.events.app.AppLifecycleEvent;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
-import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import demoapp.dom._infra.samples.NameSamples;
import demoapp.dom._infra.seed.SeedServiceAbstract;
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedSecurityModuleService.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedSecurityModuleService.java
index e69a8f3..44eeafd 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedSecurityModuleService.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedSecurityModuleService.java
@@ -21,14 +21,15 @@ package org.apache.isis.extensions.secman.jdo.seed;
import javax.inject.Inject;
import javax.inject.Named;
-import org.apache.isis.applib.annotation.OrderPrecedence;
-import org.apache.isis.core.runtime.events.app.AppLifecycleEvent;
-import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.event.EventListener;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
+import org.apache.isis.applib.annotation.OrderPrecedence;
+import org.apache.isis.core.runtime.events.AppLifecycleEvent;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
+
import lombok.extern.log4j.Log4j2;
@Service
diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/main/UiBuilderFx.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/main/UiBuilderFx.java
index cbc8c11..a883037 100644
--- a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/main/UiBuilderFx.java
+++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/main/UiBuilderFx.java
@@ -27,7 +27,7 @@ import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Component;
import org.apache.isis.commons.internal.debug._Probe;
-import org.apache.isis.core.runtime.events.iactn.IsisInteractionLifecycleEvent;
+import org.apache.isis.core.interaction.events.IsisInteractionLifecycleEvent;
import org.apache.isis.incubator.viewer.javafx.model.events.JavaFxViewerConfig;
import org.apache.isis.incubator.viewer.javafx.model.events.PrimaryStageReadyEvent;
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/lifecycles/JdoPersistenceLifecycleService.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/lifecycles/JdoPersistenceLifecycleService.java
index 528cb63..dd6b0f9 100644
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/lifecycles/JdoPersistenceLifecycleService.java
+++ b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/lifecycles/JdoPersistenceLifecycleService.java
@@ -33,10 +33,10 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.config.beans.IsisBeanTypeRegistry;
+import org.apache.isis.core.interaction.events.IsisInteractionLifecycleEvent;
import org.apache.isis.core.interaction.session.InteractionSession;
import org.apache.isis.core.metamodel.context.MetaModelContext;
-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.AppLifecycleEvent;
import org.apache.isis.persistence.jdo.integration.persistence.IsisPersistenceSessionJdo;
import org.apache.isis.persistence.jdo.integration.persistence.PersistenceSession;
import org.apache.isis.persistence.jdo.integration.persistence.PersistenceSessionFactory;
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/conf/Configuration_headless.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/conf/Configuration_headless.java
index ce8146a..d74981a 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/conf/Configuration_headless.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/conf/Configuration_headless.java
@@ -38,7 +38,7 @@ import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.metrics.MetricsService;
import org.apache.isis.commons.internal.debug._Probe;
import org.apache.isis.core.config.presets.IsisPresets;
-import org.apache.isis.core.runtime.events.iactn.IsisInteractionLifecycleEvent;
+import org.apache.isis.core.interaction.events.IsisInteractionLifecycleEvent;
import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
import org.apache.isis.extensions.modelannotation.metamodel.IsisModuleExtModelAnnotation;
import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
diff --git a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/services/FixturesLifecycleService.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/services/FixturesLifecycleService.java
index e2626d8..c4ea30d 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/services/FixturesLifecycleService.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/services/FixturesLifecycleService.java
@@ -34,7 +34,7 @@ import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.config.environment.IsisSystemEnvironment;
import org.apache.isis.core.interaction.session.InteractionFactory;
-import org.apache.isis.core.runtime.events.app.AppLifecycleEvent;
+import org.apache.isis.core.runtime.events.AppLifecycleEvent;
import org.apache.isis.testing.fixtures.applib.clock.Clock;
import org.apache.isis.testing.fixtures.applib.clock.FixtureClock;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;