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 2021/01/07 09:47:13 UTC
[isis] branch 2033-Spring_Data_Integration updated: ISIS-2033:
house-keeping: rename some classes and packages
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch 2033-Spring_Data_Integration
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/2033-Spring_Data_Integration by this push:
new 5fb5d9b ISIS-2033: house-keeping: rename some classes and packages
5fb5d9b is described below
commit 5fb5d9bb5ec141ee98626b25097a39c613392541
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Jan 7 10:47:00 2021 +0100
ISIS-2033: house-keeping: rename some classes and packages
---
.../jdo/integration/IsisModuleJdoIntegration.java | 6 ++--
.../JdoEntityChangeEmitter.java | 3 +-
.../JdoFetchResultHandler.java | 2 +-
.../JdoLifecycleListener.java | 3 +-
.../{session => changetracking}/_Utils.java | 10 +++++--
.../jdo/integration/lifecycles/_Utils.java | 35 ----------------------
.../JdoSchemaService.java} | 14 ++++++---
.../_DnApplication.java} | 6 ++--
.../_DnApplicationComponents.java | 2 +-
.../{session => schema}/_DnStoreManagerType.java | 2 +-
10 files changed, 29 insertions(+), 54 deletions(-)
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/IsisModuleJdoIntegration.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/IsisModuleJdoIntegration.java
index 05cbd51..34c0269 100644
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/IsisModuleJdoIntegration.java
+++ b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/IsisModuleJdoIntegration.java
@@ -32,10 +32,10 @@ import org.apache.isis.core.runtime.IsisModuleCoreRuntime;
import org.apache.isis.persistence.jdo.applib.IsisModulePersistenceJdoApplib;
import org.apache.isis.persistence.jdo.datanucleus.IsisModuleJdoProviderDatanucleus;
import org.apache.isis.persistence.jdo.datanucleus.config.DnSettings;
+import org.apache.isis.persistence.jdo.integration.changetracking.JdoLifecycleListener;
import org.apache.isis.persistence.jdo.integration.jdosupport.IsisJdoSupportDN5;
-import org.apache.isis.persistence.jdo.integration.lifecycles.JdoLifecycleListener;
import org.apache.isis.persistence.jdo.integration.metamodel.JdoIntegrationProgrammingModel;
-import org.apache.isis.persistence.jdo.integration.session.JdoIntegrationService;
+import org.apache.isis.persistence.jdo.integration.schema.JdoSchemaService;
import org.apache.isis.persistence.jdo.metamodel.IsisModuleJdoMetamodel;
import org.apache.isis.persistence.jdo.spring.integration.JdoTransactionManager;
import org.apache.isis.persistence.jdo.spring.integration.LocalPersistenceManagerFactoryBean;
@@ -55,7 +55,7 @@ import lombok.val;
JdoIntegrationProgrammingModel.class,
IsisJdoSupportDN5.class,
- JdoIntegrationService.class,
+ JdoSchemaService.class,
})
public class IsisModuleJdoIntegration {
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/session/JdoEntityChangeEmitter.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/changetracking/JdoEntityChangeEmitter.java
similarity index 96%
rename from persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/session/JdoEntityChangeEmitter.java
rename to persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/changetracking/JdoEntityChangeEmitter.java
index 9baeb4b..1d421be 100644
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/session/JdoEntityChangeEmitter.java
+++ b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/changetracking/JdoEntityChangeEmitter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.persistence.jdo.integration.session;
+package org.apache.isis.persistence.jdo.integration.changetracking;
import org.datanucleus.enhancement.Persistable;
@@ -25,7 +25,6 @@ import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.transaction.changetracking.EntityChangeTracker;
import org.apache.isis.persistence.jdo.datanucleus.entities.DnEntityStateProvider;
-import org.apache.isis.persistence.jdo.integration.lifecycles.JdoLifecycleListener;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/session/JdoFetchResultHandler.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/changetracking/JdoFetchResultHandler.java
similarity index 96%
rename from persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/session/JdoFetchResultHandler.java
rename to persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/changetracking/JdoFetchResultHandler.java
index 6f6a143..a552b9c 100644
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/session/JdoFetchResultHandler.java
+++ b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/changetracking/JdoFetchResultHandler.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.persistence.jdo.integration.session;
+package org.apache.isis.persistence.jdo.integration.changetracking;
import javax.annotation.Nullable;
import javax.jdo.PersistenceManager;
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/lifecycles/JdoLifecycleListener.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/changetracking/JdoLifecycleListener.java
similarity index 98%
rename from persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/lifecycles/JdoLifecycleListener.java
rename to persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/changetracking/JdoLifecycleListener.java
index af0e3f2..47fc0c6 100644
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/lifecycles/JdoLifecycleListener.java
+++ b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/changetracking/JdoLifecycleListener.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.persistence.jdo.integration.lifecycles;
+package org.apache.isis.persistence.jdo.integration.changetracking;
import java.util.Map;
@@ -41,7 +41,6 @@ import org.apache.isis.core.transaction.changetracking.EntityChangeTracker;
import org.apache.isis.core.transaction.changetracking.events.PostStoreEvent;
import org.apache.isis.core.transaction.changetracking.events.PreStoreEvent;
import org.apache.isis.persistence.jdo.integration.metamodel.JdoMetamodelUtil;
-import org.apache.isis.persistence.jdo.integration.session.JdoEntityChangeEmitter;
import lombok.Getter;
import lombok.NonNull;
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/session/_Utils.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/changetracking/_Utils.java
similarity index 93%
rename from persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/session/_Utils.java
rename to persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/changetracking/_Utils.java
index 66ab6ea..59eaff8 100644
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/session/_Utils.java
+++ b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/changetracking/_Utils.java
@@ -16,10 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.persistence.jdo.integration.session;
+package org.apache.isis.persistence.jdo.integration.changetracking;
import javax.annotation.Nullable;
import javax.jdo.PersistenceManager;
+import javax.jdo.listener.InstanceLifecycleEvent;
+
+import org.datanucleus.enhancement.Persistable;
import org.apache.isis.commons.functional.Result;
import org.apache.isis.commons.internal.assertions._Assert;
@@ -37,6 +40,10 @@ import lombok.val;
final class _Utils {
+ static Persistable persistableFor(InstanceLifecycleEvent event) {
+ return (Persistable)event.getSource();
+ }
+
static ManagedObject adaptNullableAndInjectServices(
final @NonNull MetaModelContext mmc,
final @Nullable Object pojo) {
@@ -111,6 +118,5 @@ final class _Utils {
final ManagedObject createdAdapter = ManagedObject.identified(spec, pojo, rootOid);
return injectServices(mmc, createdAdapter);
}
-
}
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/lifecycles/_Utils.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/lifecycles/_Utils.java
deleted file mode 100644
index c0034e2..0000000
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/lifecycles/_Utils.java
+++ /dev/null
@@ -1,35 +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.persistence.jdo.integration.lifecycles;
-
-import javax.jdo.listener.InstanceLifecycleEvent;
-
-import org.datanucleus.enhancement.Persistable;
-
-final class _Utils {
-
- static Persistable persistableFor(InstanceLifecycleEvent event) {
- return (Persistable)event.getSource();
- }
-
- static boolean ensureRootObject(final Persistable pojo) {
- return pojo!=null; // why would a Persistable ever be something different?
- }
-
-}
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/session/JdoIntegrationService.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/schema/JdoSchemaService.java
similarity index 87%
rename from persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/session/JdoIntegrationService.java
rename to persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/schema/JdoSchemaService.java
index 89e91dc..e40d1b1 100644
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/session/JdoIntegrationService.java
+++ b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/schema/JdoSchemaService.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.persistence.jdo.integration.session;
+package org.apache.isis.persistence.jdo.integration.schema;
import javax.annotation.PostConstruct;
import javax.inject.Inject;
@@ -39,13 +39,19 @@ import org.apache.isis.persistence.jdo.spring.integration.TransactionAwarePersis
import lombok.extern.log4j.Log4j2;
+/**
+ * Hooks into the application's lifecycle and runs database schema creation logic
+ * as soon as the meta-model was populated.
+ *
+ * @since 2.0 {@index}
+ */
@Service
-@Named("isisJdoIntegration.JdoIntegrationService")
+@Named("isisJdoIntegration.JdoSchemaService")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
@Log4j2
-public class JdoIntegrationService {
+public class JdoSchemaService {
@Inject MetaModelContext metaModelContext;
@Inject TransactionAwarePersistenceManagerFactoryProxy txAwarePmfProxy;
@@ -73,7 +79,7 @@ public class JdoIntegrationService {
case PRE_METAMODEL:
break;
case POST_METAMODEL:
- new DnApplication(metaModelContext, dnSettings); // creates schema
+ new _DnApplication(metaModelContext, dnSettings); // creates schema
break;
default:
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/session/DnApplication.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/schema/_DnApplication.java
similarity index 96%
rename from persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/session/DnApplication.java
rename to persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/schema/_DnApplication.java
index f502b01..634018a 100644
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/session/DnApplication.java
+++ b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/schema/_DnApplication.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.persistence.jdo.integration.session;
+package org.apache.isis.persistence.jdo.integration.schema;
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.core.config.beans.IsisBeanTypeRegistry;
@@ -28,12 +28,12 @@ import lombok.val;
import lombok.extern.log4j.Log4j2;
@Log4j2
-public class DnApplication {
+public class _DnApplication {
private _DnApplicationComponents dnApplicationComponents;
private final JdoEntityTypeRegistry jdoEntityTypeRegistry = new JdoEntityTypeRegistry();
- public DnApplication(
+ public _DnApplication(
final MetaModelContext metaModelContext,
final DnSettings dnSettings) {
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/session/_DnApplicationComponents.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/schema/_DnApplicationComponents.java
similarity index 99%
rename from persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/session/_DnApplicationComponents.java
rename to persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/schema/_DnApplicationComponents.java
index be82a2e..27ef530 100644
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/session/_DnApplicationComponents.java
+++ b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/schema/_DnApplicationComponents.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.persistence.jdo.integration.session;
+package org.apache.isis.persistence.jdo.integration.schema;
import static org.apache.isis.commons.internal.base._NullSafe.stream;
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/session/_DnStoreManagerType.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/schema/_DnStoreManagerType.java
similarity index 98%
rename from persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/session/_DnStoreManagerType.java
rename to persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/schema/_DnStoreManagerType.java
index 332f71c..f9ea202 100644
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/session/_DnStoreManagerType.java
+++ b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/schema/_DnStoreManagerType.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.persistence.jdo.integration.session;
+package org.apache.isis.persistence.jdo.integration.schema;
import java.util.Map;
import java.util.function.Function;