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/04 09:28:57 UTC
[isis] branch master updated: ISIS-1841 remove dependency on DN for
module 'wrapper'
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 27e1199 ISIS-1841 remove dependency on DN for module 'wrapper'
27e1199 is described below
commit 27e1199e89aec2ddb30ef1ae3ffbbeed3a00c3b2
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Mar 4 10:28:52 2018 +0100
ISIS-1841 remove dependency on DN for module 'wrapper'
replaced by plugin
---
.../core/metamodel/IsisJdoMetamodelPlugin.java | 10 +++-
.../plugins/jdo/dn4/IsisJdoSupportPlugin4.java | 7 +++
.../plugins/jdo/dn5/IsisJdoSupportPlugin5.java | 7 +++
.../handlers/DomainObjectInvocationHandler.java | 54 +++++++++++-----------
4 files changed, 50 insertions(+), 28 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/IsisJdoMetamodelPlugin.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/IsisJdoMetamodelPlugin.java
index 0c3bd94..41f2a24 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/IsisJdoMetamodelPlugin.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/IsisJdoMetamodelPlugin.java
@@ -1,5 +1,7 @@
package org.apache.isis.core.metamodel;
+import java.lang.reflect.Method;
+
import javax.annotation.Nullable;
import org.apache.isis.applib.NonRecoverableException;
@@ -16,6 +18,12 @@ public interface IsisJdoMetamodelPlugin {
*/
public boolean isPersistenceEnhanced(@Nullable Class<?> cls);
+ /**
+ * Equivalent to org.datanucleus.enhancement.Persistable.class.getDeclaredMethods().
+ * @return
+ */
+ public Method[] getMethodsProvidedByEnhancement();
+
// -- LOOKUP
public static IsisJdoMetamodelPlugin get() {
@@ -27,7 +35,5 @@ public interface IsisJdoMetamodelPlugin {
throw new NonRecoverableException("No plugin implementing IsisJdoMetamodelPlugin found on class path.");
});
}
-
-
}
diff --git a/core/plugins/jdo-datanucleus-4/src/main/java/org/apacha/isis/plugins/jdo/dn4/IsisJdoSupportPlugin4.java b/core/plugins/jdo-datanucleus-4/src/main/java/org/apacha/isis/plugins/jdo/dn4/IsisJdoSupportPlugin4.java
index 6f3d959..0ef7f30 100644
--- a/core/plugins/jdo-datanucleus-4/src/main/java/org/apacha/isis/plugins/jdo/dn4/IsisJdoSupportPlugin4.java
+++ b/core/plugins/jdo-datanucleus-4/src/main/java/org/apacha/isis/plugins/jdo/dn4/IsisJdoSupportPlugin4.java
@@ -16,6 +16,8 @@
*/
package org.apacha.isis.plugins.jdo.dn4;
+import java.lang.reflect.Method;
+
import javax.annotation.Nullable;
import org.apache.isis.core.metamodel.IsisJdoMetamodelPlugin;
@@ -33,6 +35,11 @@ public class IsisJdoSupportPlugin4 implements IsisJdoMetamodelPlugin, IsisJdoRun
}
return org.datanucleus.enhancement.Persistable.class.isAssignableFrom(cls);
}
+
+ @Override
+ public Method[] getMethodsProvidedByEnhancement() {
+ return org.datanucleus.enhancement.Persistable.class.getDeclaredMethods();
+ }
@Override
public PersistenceSessionFactory getPersistenceSessionFactory(ConfigurationServiceInternal isisConfiguration) {
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apacha/isis/plugins/jdo/dn5/IsisJdoSupportPlugin5.java b/core/plugins/jdo-datanucleus-5/src/main/java/org/apacha/isis/plugins/jdo/dn5/IsisJdoSupportPlugin5.java
index 3eedf3f..515c3d4 100644
--- a/core/plugins/jdo-datanucleus-5/src/main/java/org/apacha/isis/plugins/jdo/dn5/IsisJdoSupportPlugin5.java
+++ b/core/plugins/jdo-datanucleus-5/src/main/java/org/apacha/isis/plugins/jdo/dn5/IsisJdoSupportPlugin5.java
@@ -16,6 +16,8 @@
*/
package org.apacha.isis.plugins.jdo.dn5;
+import java.lang.reflect.Method;
+
import javax.annotation.Nullable;
import org.apache.isis.core.metamodel.IsisJdoMetamodelPlugin;
@@ -33,6 +35,11 @@ public class IsisJdoSupportPlugin5 implements IsisJdoMetamodelPlugin, IsisJdoRun
}
return org.datanucleus.enhancement.Persistable.class.isAssignableFrom(cls);
}
+
+ @Override
+ public Method[] getMethodsProvidedByEnhancement() {
+ return org.datanucleus.enhancement.Persistable.class.getDeclaredMethods();
+ }
@Override
public PersistenceSessionFactory getPersistenceSessionFactory(ConfigurationServiceInternal isisConfiguration) {
diff --git a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/DomainObjectInvocationHandler.java b/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/DomainObjectInvocationHandler.java
index c022ab0..dbea032 100644
--- a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/DomainObjectInvocationHandler.java
+++ b/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/DomainObjectInvocationHandler.java
@@ -21,20 +21,19 @@ package org.apache.isis.core.wrapper.handlers;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import com.google.common.base.Function;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
-
-import org.datanucleus.enhancement.Persistable;
-
import org.apache.isis.applib.annotation.Where;
+import org.apache.isis.applib.internal.base._NullSafe;
+import org.apache.isis.applib.services.wrapper.DisabledException;
+import org.apache.isis.applib.services.wrapper.HiddenException;
+import org.apache.isis.applib.services.wrapper.InteractionException;
+import org.apache.isis.applib.services.wrapper.InvalidException;
+import org.apache.isis.applib.services.wrapper.WrapperFactory.ExecutionMode;
+import org.apache.isis.applib.services.wrapper.WrappingObject;
import org.apache.isis.applib.services.wrapper.events.CollectionAccessEvent;
import org.apache.isis.applib.services.wrapper.events.InteractionEvent;
import org.apache.isis.applib.services.wrapper.events.ObjectTitleEvent;
@@ -42,14 +41,9 @@ import org.apache.isis.applib.services.wrapper.events.PropertyAccessEvent;
import org.apache.isis.applib.services.wrapper.events.UsabilityEvent;
import org.apache.isis.applib.services.wrapper.events.ValidityEvent;
import org.apache.isis.applib.services.wrapper.events.VisibilityEvent;
-import org.apache.isis.applib.services.wrapper.DisabledException;
-import org.apache.isis.applib.services.wrapper.HiddenException;
-import org.apache.isis.applib.services.wrapper.InteractionException;
-import org.apache.isis.applib.services.wrapper.InvalidException;
-import org.apache.isis.applib.services.wrapper.WrapperFactory.ExecutionMode;
-import org.apache.isis.applib.services.wrapper.WrappingObject;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
+import org.apache.isis.core.metamodel.IsisJdoMetamodelPlugin;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
@@ -74,6 +68,9 @@ import org.apache.isis.core.metamodel.specloader.specimpl.ObjectActionMixedIn;
import org.apache.isis.core.metamodel.specloader.specimpl.dflt.ObjectSpecificationDefault;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+
public class DomainObjectInvocationHandler<T> extends DelegatingInvocationHandlerDefault<T> {
private final AuthenticationSessionProvider authenticationSessionProvider;
@@ -104,7 +101,7 @@ public class DomainObjectInvocationHandler<T> extends DelegatingInvocationHandle
*/
protected Method __isis_executionMode;
- protected final Set<String> dnPersistableMethods = Sets.newHashSet();
+ protected final Set<String> jdoMethodsProvidedByEnhancement = Sets.newHashSet();
public DomainObjectInvocationHandler(
final T delegate,
@@ -134,16 +131,21 @@ public class DomainObjectInvocationHandler<T> extends DelegatingInvocationHandle
__isis_wrappedMethod = WrappingObject.class.getMethod("__isis_wrapped", new Class[]{});
__isis_executionMode = WrappingObject.class.getMethod("__isis_executionMode", new Class[]{});
- dnPersistableMethods.addAll(
- Lists.newArrayList(
- Iterables.transform(
- Arrays.asList(Persistable.class.getDeclaredMethods()),
- new Function<Method, String>() {
- @Override
- public String apply(final Method input) {
- return input.getName();
- }
- })));
+ _NullSafe.stream(IsisJdoMetamodelPlugin.get().getMethodsProvidedByEnhancement())
+ .map(Method::getName)
+ .forEach(jdoMethodsProvidedByEnhancement::add);
+
+// legacy of ...
+// dnPersistableMethods.addAll(
+// Lists.newArrayList(
+// Iterables.transform(
+// Arrays.asList(Persistable.class.getDeclaredMethods()),
+// new Function<Method, String>() {
+// @Override
+// public String apply(final Method input) {
+// return input.getName();
+// }
+// })));
} catch (final NoSuchMethodException nsme) {
throw new IllegalStateException(
@@ -344,7 +346,7 @@ public class DomainObjectInvocationHandler<T> extends DelegatingInvocationHandle
}
private boolean isJdoMethod(final Method method) {
- return methodStartsWith(method, "jdo") || dnPersistableMethods.contains(method.getName());
+ return methodStartsWith(method, "jdo") || jdoMethodsProvidedByEnhancement.contains(method.getName());
}
private static boolean isInjectMethod(final Method method) {
--
To stop receiving notification emails like this one, please contact
ahuber@apache.org.