You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2015/09/15 08:03:17 UTC
[12/50] [abbrv] isis git commit: ISIS-1194: inlining runnable impls
in IsisLifecycleListener2
ISIS-1194: inlining runnable impls in IsisLifecycleListener2
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/38c46aa9
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/38c46aa9
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/38c46aa9
Branch: refs/heads/master
Commit: 38c46aa9c0304c7446f8ac8f7f4ae5b41f5e4df8
Parents: e0363f6
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Sep 11 18:56:01 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Sep 14 07:36:07 2015 +0100
----------------------------------------------------------------------
.../persistence/IsisLifecycleListener2.java | 115 ++++---------------
1 file changed, 20 insertions(+), 95 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/38c46aa9/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/IsisLifecycleListener2.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/IsisLifecycleListener2.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/IsisLifecycleListener2.java
index 73cbd0d..c9a2d76 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/IsisLifecycleListener2.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/IsisLifecycleListener2.java
@@ -35,7 +35,6 @@ import com.google.common.collect.Maps;
import org.datanucleus.enhancement.Persistable;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.objectstore.jdo.datanucleus.persistence.IsisLifecycleListener;
public class IsisLifecycleListener2
implements AttachLifecycleListener, ClearLifecycleListener, CreateLifecycleListener, DeleteLifecycleListener,
@@ -56,73 +55,43 @@ public class IsisLifecycleListener2
@Override
public void postCreate(final InstanceLifecycleEvent event) {
- final InstanceLifecycleEvent event1 = event;
- new RunnableAbstract(event1) {
- protected void doRun() {}
- }.run();
+ // no-op
}
@Override
public void preAttach(final InstanceLifecycleEvent event) {
- final InstanceLifecycleEvent event1 = event;
- new RunnableAbstract(event1) {
- protected void doRun() {
- final Persistable pojo = Utils.persistenceCapableFor(event);
- persistenceSession.ensureRootObject(pojo);
- }
- }.run();
+ final Persistable pojo = Utils.persistenceCapableFor(event);
+ persistenceSession.ensureRootObject(pojo);
}
@Override
public void postAttach(final InstanceLifecycleEvent event) {
- final InstanceLifecycleEvent event1 = event;
- new RunnableAbstract(event1) {
- protected void doRun() {
- final Persistable pojo = Utils.persistenceCapableFor(event);
- persistenceSession.ensureRootObject(pojo);
- }
- }.run();
+ final Persistable pojo = Utils.persistenceCapableFor(event);
+ persistenceSession.ensureRootObject(pojo);
}
@Override
public void postLoad(final InstanceLifecycleEvent event) {
- new RunnableAbstract(event){
- @Override
- protected void doRun() {
- final Persistable pojo = Utils.persistenceCapableFor(event);
- persistenceSession.initializeMapAndCheckConcurrency(pojo);
- }}.run();
+ final Persistable pojo = Utils.persistenceCapableFor(event);
+ persistenceSession.initializeMapAndCheckConcurrency(pojo);
}
@Override
public void preStore(InstanceLifecycleEvent event) {
- new RunnableAbstract(event){
- @Override
- protected void doRun() {
- final Persistable pojo = Utils.persistenceCapableFor(event);
- persistenceSession.invokeIsisPersistingCallback(pojo);
-
- }}.run();
+ final Persistable pojo = Utils.persistenceCapableFor(event);
+ persistenceSession.invokeIsisPersistingCallback(pojo);
}
@Override
public void postStore(InstanceLifecycleEvent event) {
- new RunnableAbstract(event){
- @Override
- protected void doRun() {
- final Persistable pojo = Utils.persistenceCapableFor(event);
- persistenceSession.postStoreProcessingFor(pojo);
- }}.run();
+ final Persistable pojo = Utils.persistenceCapableFor(event);
+ persistenceSession.postStoreProcessingFor(pojo);
}
@Override
public void preDirty(InstanceLifecycleEvent event) {
- new RunnableAbstract(event){
- @Override
- protected void doRun() {
- final Persistable pojo = Utils.persistenceCapableFor(event);
- persistenceSession.preDirtyProcessingFor(pojo);
- }}.run();
+ final Persistable pojo = Utils.persistenceCapableFor(event);
+ persistenceSession.preDirtyProcessingFor(pojo);
}
@Override
@@ -133,22 +102,13 @@ public class IsisLifecycleListener2
//
// 1<->m bidirectional, persistence-by-reachability
- final InstanceLifecycleEvent event1 = event;
- new RunnableAbstract(event1) {
- protected void doRun() {}
- }.run();
+ // no-op
}
@Override
public void preDelete(InstanceLifecycleEvent event) {
-
- new RunnableAbstract(event){
- @Override
- protected void doRun() {
- final Persistable pojo = Utils.persistenceCapableFor(event);
- persistenceSession.invokeIsisRemovingCallback(pojo);
- }
- }.run();
+ final Persistable pojo = Utils.persistenceCapableFor(event);
+ persistenceSession.invokeIsisRemovingCallback(pojo);
}
@Override
@@ -180,57 +140,23 @@ public class IsisLifecycleListener2
@Override
public void preDetach(InstanceLifecycleEvent event) {
- final InstanceLifecycleEvent event1 = event;
- new RunnableAbstract(event1) {
- protected void doRun() {
- final Persistable pojo = Utils.persistenceCapableFor(event);
- persistenceSession.ensureRootObject(pojo);
- }
- }.run();
+ final Persistable pojo = Utils.persistenceCapableFor(event);
+ persistenceSession.ensureRootObject(pojo);
}
@Override
public void postDetach(InstanceLifecycleEvent event) {
- final InstanceLifecycleEvent event1 = event;
- new RunnableAbstract(event1) {
- protected void doRun() {
- final Persistable pojo = Utils.persistenceCapableFor(event);
- persistenceSession.ensureRootObject(pojo);
- }
- }.run();
+ final Persistable pojo = Utils.persistenceCapableFor(event);
+ persistenceSession.ensureRootObject(pojo);
}
- /////////////////////////////////////////////////////////////////////////
- // withLogging
- /////////////////////////////////////////////////////////////////////////
-
- private abstract class RunnableAbstract implements Runnable {
- final InstanceLifecycleEvent event;
- public RunnableAbstract(final InstanceLifecycleEvent event) {
- this.event = event;
- }
- @Override
- public void run() {
- if (isSuspended()) {
- if (IsisLifecycleListener.LOG.isDebugEnabled()) {
- IsisLifecycleListener.LOG.debug(" [currently suspended - ignoring]");
- }
- return;
- }
- doRun();
- }
-
- protected abstract void doRun();
- }
-
// /////////////////////////////////////////////////////////
// SuspendListener
// /////////////////////////////////////////////////////////
private boolean suspended;
-
@Override
public boolean isSuspended() {
return suspended;
@@ -269,5 +195,4 @@ public class IsisLifecycleListener2
return phase + " " + location.prefix + " " + LifecycleEventType.lookup(event.getEventType()) + ": oid=" + (adapter !=null? adapter.getOid(): "(null)") + " ,pojo " + pojo;
}
-
}