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 2018/03/14 16:16:16 UTC
[isis] branch master updated: ISIS-1910 rename IsisJdoSupport0 to
original IsisJdoSupport
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 f05a596 ISIS-1910 rename IsisJdoSupport0 to original IsisJdoSupport
f05a596 is described below
commit f05a59616972b0555946710a38166aff1bdc6574
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Mar 14 17:16:09 2018 +0100
ISIS-1910 rename IsisJdoSupport0 to original IsisJdoSupport
---
.../teardown/TeardownFixtureAbstract.java | 4 +-
.../teardown/TeardownFixtureAbstract2.java | 4 +-
.../{IsisJdoSupport0.java => IsisJdoSupport.java} | 57 +++-------------------
.../integtestsupport/IntegrationTestAbstract3.java | 4 +-
.../services/jdosupport/IsisJdoSupport_v3_1.java | 2 +-
.../Persistable_downloadJdoMetadata.java | 4 +-
.../services/jdosupport/IsisJdoSupport_v3_2.java | 2 +-
.../Persistable_downloadJdoMetadata.java | 4 +-
.../runtime/headless/IsisSystemBootstrapper.java | 5 +-
.../service/support/TimestampService.java | 4 +-
10 files changed, 23 insertions(+), 67 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/teardown/TeardownFixtureAbstract.java b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/teardown/TeardownFixtureAbstract.java
index cda3734..8c16f2d 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/teardown/TeardownFixtureAbstract.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/teardown/TeardownFixtureAbstract.java
@@ -23,7 +23,7 @@ import javax.jdo.metadata.TypeMetadata;
import org.apache.isis.applib.fixturescripts.FixtureScript;
import org.apache.isis.applib.internal.base._Strings;
-import org.apache.isis.applib.services.jdosupport.IsisJdoSupport0;
+import org.apache.isis.applib.services.jdosupport.IsisJdoSupport;
public abstract class TeardownFixtureAbstract extends FixtureScript {
@@ -62,6 +62,6 @@ public abstract class TeardownFixtureAbstract extends FixtureScript {
protected void postDeleteFrom(final Class<?> cls) {}
@Inject
- private IsisJdoSupport0 isisJdoSupport;
+ private IsisJdoSupport isisJdoSupport;
}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/teardown/TeardownFixtureAbstract2.java b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/teardown/TeardownFixtureAbstract2.java
index 0a771fc..13d5c74 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/teardown/TeardownFixtureAbstract2.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/teardown/TeardownFixtureAbstract2.java
@@ -27,7 +27,7 @@ import javax.jdo.metadata.InheritanceMetadata;
import javax.jdo.metadata.TypeMetadata;
import org.apache.isis.applib.internal.base._Strings;
-import org.apache.isis.applib.services.jdosupport.IsisJdoSupport0;
+import org.apache.isis.applib.services.jdosupport.IsisJdoSupport;
public abstract class TeardownFixtureAbstract2 extends TeardownFixtureAbstract {
@@ -147,5 +147,5 @@ public abstract class TeardownFixtureAbstract2 extends TeardownFixtureAbstract {
}
@Inject
- protected IsisJdoSupport0 isisJdoSupport;
+ protected IsisJdoSupport isisJdoSupport;
}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupport0.java b/core/applib/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupport.java
similarity index 62%
rename from core/applib/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupport0.java
rename to core/applib/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupport.java
index ab89805..af9ed85 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupport0.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupport.java
@@ -31,9 +31,14 @@ import org.apache.isis.applib.annotation.Programmatic;
/**
- * Service that provide a number of workarounds when using JDO/DataNucleus.
+ * Service that provides a number of workarounds when using JDO/DataNucleus.<br/><br/>
+ *
+ * 1.x to 2.x Migration Notes: JDO API version specific query methods have been removed.<br/>
+ * Instead you may want to use IsisJdoSupport_v3_1 or IsisJdoSupport_v3_2 as provided by Isis'
+ * core plugins for JDO.
+ *
*/
-public interface IsisJdoSupport0 {
+public interface IsisJdoSupport {
/**
* Force a reload (corresponding to the JDO <tt>PersistenceManager</tt>'s <tt>refresh()</tt> method)
@@ -83,53 +88,5 @@ public interface IsisJdoSupport0 {
@Programmatic
void deleteAll(Class<?>... pcClasses);
- /**
- * To perform the most common use-case of executing a (type-safe) query against the specified class,
- * filtering using the provided {@link BooleanExpression}, then automatically cloning the returned list
- * and closing the query.
- *
- * <p>
- * Typical usage:
- * <pre>
- * final QToDoItem q = QToDoItem.candidate();
- * return executeQuery(ToDoItem.class,
- * q.atPath.eq(atPath).and(
- * q.description.indexOf(description).gt(0))
- * );
- * </pre>
- * </p>
- */
-// @Programmatic
-// <T> List<T> executeQuery(final Class<T> cls, final BooleanExpression booleanExpression);
-
- /**
- * To perform a common use-case of executing a (type-safe) query against the specified class,
- * filtering a unique match using the provided {@link BooleanExpression}, then returning
- * the result and closing the query.
- *
- * <p>
- * Typical usage:
- * <pre>
- * final QToDoItem q = QToDoItem.candidate();
- * return executeQueryUnique(ToDoItem.class,
- * q.atPath.eq(atPath).and(
- * q.description.eq(description))
- * );
- * </pre>
- * </p>
- */
-// @Programmatic
-// <T> T executeQueryUnique(final Class<T> cls, final BooleanExpression booleanExpression);
- /**
- * To support the execution of type-safe queries using DataNucleus' lower-level APIs
- * (eg for group by and so on).
- *
- * <p>
- * Responsibility for cloning any result sets and closing the query is the responsibility
- * of the caller.
- * </p>
- */
-// @Programmatic
-// <T> JDOQLTypedQuery<T> newTypesafeQuery(Class<T> cls);
}
diff --git a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IntegrationTestAbstract3.java b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IntegrationTestAbstract3.java
index 1caa4a4..ea9c68c 100644
--- a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IntegrationTestAbstract3.java
+++ b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IntegrationTestAbstract3.java
@@ -25,7 +25,7 @@ import org.apache.isis.applib.Module;
import org.apache.isis.applib.NonRecoverableException;
import org.apache.isis.applib.RecoverableException;
import org.apache.isis.applib.internal.exceptions._Exceptions;
-import org.apache.isis.applib.services.jdosupport.IsisJdoSupport0;
+import org.apache.isis.applib.services.jdosupport.IsisJdoSupport;
import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.core.runtime.headless.HeadlessWithBootstrappingAbstract;
import org.apache.isis.core.runtime.headless.IsisSystem;
@@ -84,7 +84,7 @@ public abstract class IntegrationTestAbstract3 extends HeadlessWithBootstrapping
try {
final IsisSystem isft = IsisSystem.get();
isft.getService(TransactionService.class).flushTransaction(); // don't care if npe
- isft.getService(IsisJdoSupport0.class).getJdoPersistenceManager().flush();
+ isft.getService(IsisJdoSupport.class).getJdoPersistenceManager().flush();
} catch (Exception ignore) {
// ignore
}
diff --git a/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupport_v3_1.java b/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupport_v3_1.java
index d7b7f19..bd648a8 100644
--- a/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupport_v3_1.java
+++ b/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupport_v3_1.java
@@ -29,7 +29,7 @@ import org.datanucleus.query.typesafe.TypesafeQuery;
/**
* Service that provide a number of workarounds when using JDO/DataNucleus.
*/
-public interface IsisJdoSupport_v3_1 extends org.apache.isis.applib.services.jdosupport.IsisJdoSupport0 {
+public interface IsisJdoSupport_v3_1 extends org.apache.isis.applib.services.jdosupport.IsisJdoSupport {
/**
* To perform the most common use-case of executing a (type-safe) query against the specified class,
diff --git a/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/core/metamodel/services/jdosupport/Persistable_downloadJdoMetadata.java b/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/core/metamodel/services/jdosupport/Persistable_downloadJdoMetadata.java
index 26da55e..860a91d 100644
--- a/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/core/metamodel/services/jdosupport/Persistable_downloadJdoMetadata.java
+++ b/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/core/metamodel/services/jdosupport/Persistable_downloadJdoMetadata.java
@@ -32,7 +32,7 @@ import org.apache.isis.applib.annotation.Mixin;
import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.applib.annotation.RestrictTo;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.services.jdosupport.IsisJdoSupport0;
+import org.apache.isis.applib.services.jdosupport.IsisJdoSupport;
import org.apache.isis.applib.value.Clob;
import org.datanucleus.enhancement.Persistable;
@@ -80,6 +80,6 @@ public class Persistable_downloadJdoMetadata {
}
@javax.inject.Inject
- IsisJdoSupport0 jdoSupport;
+ IsisJdoSupport jdoSupport;
}
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupport_v3_2.java b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupport_v3_2.java
index 1412927..746e19a 100644
--- a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupport_v3_2.java
+++ b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupport_v3_2.java
@@ -29,7 +29,7 @@ import org.apache.isis.applib.annotation.Programmatic;
/**
* Service that provide a number of workarounds when using JDO/DataNucleus.
*/
-public interface IsisJdoSupport_v3_2 extends org.apache.isis.applib.services.jdosupport.IsisJdoSupport0
+public interface IsisJdoSupport_v3_2 extends org.apache.isis.applib.services.jdosupport.IsisJdoSupport
{
/**
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/metamodel/services/jdosupport/Persistable_downloadJdoMetadata.java b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/metamodel/services/jdosupport/Persistable_downloadJdoMetadata.java
index 26da55e..860a91d 100644
--- a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/metamodel/services/jdosupport/Persistable_downloadJdoMetadata.java
+++ b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/metamodel/services/jdosupport/Persistable_downloadJdoMetadata.java
@@ -32,7 +32,7 @@ import org.apache.isis.applib.annotation.Mixin;
import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.applib.annotation.RestrictTo;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.services.jdosupport.IsisJdoSupport0;
+import org.apache.isis.applib.services.jdosupport.IsisJdoSupport;
import org.apache.isis.applib.value.Clob;
import org.datanucleus.enhancement.Persistable;
@@ -80,6 +80,6 @@ public class Persistable_downloadJdoMetadata {
}
@javax.inject.Inject
- IsisJdoSupport0 jdoSupport;
+ IsisJdoSupport jdoSupport;
}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/headless/IsisSystemBootstrapper.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/headless/IsisSystemBootstrapper.java
index b698b50..b167b51 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/headless/IsisSystemBootstrapper.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/headless/IsisSystemBootstrapper.java
@@ -30,7 +30,7 @@ import org.apache.isis.applib.Module;
import org.apache.isis.applib.fixtures.TickingFixtureClock;
import org.apache.isis.applib.fixturescripts.FixtureScript;
import org.apache.isis.applib.fixturescripts.FixtureScripts;
-import org.apache.isis.applib.services.jdosupport.IsisJdoSupport0;
+import org.apache.isis.applib.services.jdosupport.IsisJdoSupport;
import org.apache.isis.applib.services.metamodel.MetaModelService;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.core.runtime.headless.logging.LogConfig;
@@ -181,8 +181,7 @@ public class IsisSystemBootstrapper {
private static void teardownSystem() {
final IsisSessionFactory isisSessionFactory = lookupService(IsisSessionFactory.class);
- // TODO: this ought to be part of isisSessionFactory's responsibilities
- final IsisJdoSupport0 isisJdoSupport = lookupService(IsisJdoSupport0.class);
+ final IsisJdoSupport isisJdoSupport = lookupService(IsisJdoSupport.class);
final PersistenceManagerFactory pmf =
isisJdoSupport.getJdoPersistenceManager().getPersistenceManagerFactory();
isisSessionFactory.destroyServicesAndShutdown();
diff --git a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/TimestampService.java b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/TimestampService.java
index 615a36a..d6df631 100644
--- a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/TimestampService.java
+++ b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/TimestampService.java
@@ -25,7 +25,7 @@ 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.services.clock.ClockService;
-import org.apache.isis.applib.services.jdosupport.IsisJdoSupport0;
+import org.apache.isis.applib.services.jdosupport.IsisJdoSupport;
import org.apache.isis.applib.services.timestamp.HoldsUpdatedAt;
import org.apache.isis.applib.services.timestamp.HoldsUpdatedBy;
import org.apache.isis.applib.services.user.UserService;
@@ -77,5 +77,5 @@ public class TimestampService implements
ClockService clockService;
@javax.inject.Inject
- IsisJdoSupport0 isisJdoSupport;
+ IsisJdoSupport isisJdoSupport;
}
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
ahuber@apache.org.