Author: rmannibucau
Date: Thu Mar 20 18:24:14 2014
New Revision: 1579700
URL: http://svn.apache.org/r1579700
Log:
OPENEJB-2082 allow to call an observer after another one
Added:
tomee/tomee/trunk/container/openejb-loader/src/test/java/org/apache/openejb/loader/EventTest.java
Removed:
tomee/tomee/trunk/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/AfterServicesDeployed.java
Modified:
tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/observer/ObserverManager.java
tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/observer/Observes.java
tomee/tomee/trunk/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
Modified:
tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/observer/ObserverManager.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/observer/ObserverManager.java?rev=1579700&r1=1579699&r2=1579700&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/observer/ObserverManager.java
(original)
+++
tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/observer/ObserverManager.java
Thu Mar 20 18:24:14 2014
@@ -25,12 +25,18 @@ import java.lang.reflect.InvocationTarge
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.HashMap;
+import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.CopyOnWriteArraySet;
import java.util.logging.Level;
import java.util.logging.Logger;
+import static java.util.Arrays.asList;
+import static java.util.Collections.sort;
+
public class ObserverManager {
private final List<Observer> observers = new ArrayList<Observer>();
@@ -45,36 +51,47 @@ public class ObserverManager {
}
final boolean added = observers.add(obs);
-
- // Observers can observe they have been added and are active
- fireEvent(new ObserverAdded(observer));
-
+ if (added) {
+ // Observers can observe they have been added and are active
+ fireEvent(new ObserverAdded(observer));
+ }
return added;
}
public boolean removeObserver(Object observer) {
if (observer == null) throw new IllegalArgumentException("observer
cannot be null");
- // Observers can observe they are to be removed
- fireEvent(new ObserverRemoved(observer));
-
- return observers.remove(new Observer(observer));
+ final boolean removed = observers.remove(new Observer(observer));
+ if (removed) {
+ // Observers can observe they are to be removed
+ fireEvent(new ObserverRemoved(observer));
+ }
+ return removed;
}
public void fireEvent(Object event) {
if (event == null) throw new IllegalArgumentException("event cannot be
null");
- for (Observer observer : observers) {
+ final List<Invocation> invocations = new LinkedList<Invocation>();
+ for (final Observer observer : observers) {
+ final Invocation i = observer.toInvocation(event);
+ if (i != null) {
+ invocations.add(i);
+ }
+ }
+
+ sort(invocations);
+ for (final Invocation invocation : invocations) {
try {
- observer.invoke(event);
- } catch (Throwable t) {
+ invocation.proceed();
+ } catch (final Throwable t) {
if (!(event instanceof ObserverFailed)) {
- fireEvent(new ObserverFailed(observer, event, t));
+ fireEvent(new ObserverFailed(invocation.observer, event,
t));
}
if (t instanceof InvocationTargetException && t.getCause() !=
null) {
-
Logger.getLogger(ObserverManager.class.getName()).log(Level.SEVERE, "error
invoking " + observer, t.getCause());
+
Logger.getLogger(ObserverManager.class.getName()).log(Level.SEVERE, "error
invoking " + invocation.observer, t.getCause());
} else {
-
Logger.getLogger(ObserverManager.class.getName()).log(Level.SEVERE, "error
invoking " + observer, t);
+
Logger.getLogger(ObserverManager.class.getName()).log(Level.SEVERE, "error
invoking " + invocation.observer, t);
}
}
}
@@ -84,16 +101,21 @@ public class ObserverManager {
* @version $Rev$ $Date$
*/
public static class Observer {
- private final Map<Class, Method> methods = new HashMap<Class,
Method>();
+ private final Map<Class, MetaMethod> methods = new HashMap<Class,
MetaMethod>();
private final Object observer;
- private final Method defaultMethod;
+ private final Class<?> observerClass;
+ private final MetaMethod defaultMethod;
public Observer(Object observer) {
if (observer == null) throw new IllegalArgumentException("observer
cannot be null");
this.observer = observer;
- for (Method method : observer.getClass().getMethods()) {
- if (!isObserver(method)) continue;
+ this.observerClass = observer.getClass();
+ for (final Method method : observer.getClass().getMethods()) {
+ final Observes annotation = isObserver(method);
+ if (annotation == null) {
+ continue;
+ }
if (method.getParameterTypes().length > 1) {
throw new IllegalArgumentException("@Observes method must
have only 1 parameter: " + method.toString());
@@ -129,7 +151,7 @@ public class ObserverManager {
throw new IllegalArgumentException("@Observes method
parameter must be a concrete class (not a primitive): " + method.toString());
}
- methods.put(type, method);
+ methods.put(type, new MetaMethod(method, new
CopyOnWriteArraySet<Class<?>>(asList(annotation.after()))));
}
defaultMethod = methods.get(Object.class);
@@ -139,26 +161,29 @@ public class ObserverManager {
}
}
- public void invoke(Object event) throws InvocationTargetException,
IllegalAccessException {
+ public Invocation toInvocation(final Object event) {
if (event == null) throw new IllegalArgumentException("event
cannot be null");
final Class eventType = event.getClass();
- final Method method = methods.get(eventType);
+ final MetaMethod method = methods.get(eventType);
if (method != null) {
- method.invoke(observer, event);
+ return new Invocation(this, method, event);
} else if (defaultMethod != null) {
- defaultMethod.invoke(observer, event);
+ return new Invocation(this, defaultMethod, event);
}
+ return null;
}
- private boolean isObserver(Method method) {
- for (Annotation[] annotations : method.getParameterAnnotations()) {
- for (Annotation annotation : annotations) {
- if (annotation.annotationType().equals(Observes.class))
return true;
+ private Observes isObserver(Method method) {
+ for (final Annotation[] annotations :
method.getParameterAnnotations()) {
+ for (final Annotation annotation : annotations) {
+ if (annotation.annotationType().equals(Observes.class)) {
+ return Observes.class.cast(annotation);
+ }
}
}
- return false;
+ return null;
}
@Override
@@ -184,6 +209,60 @@ public class ObserverManager {
}
}
+ private static class MetaMethod {
+ private final Method method;
+ private final Collection<Class<?>> after;
+
+ private MetaMethod(final Method method, final Collection<Class<?>>
after) {
+ this.method = method;
+ this.after = after;
+ }
+
+ @Override
+ public String toString() {
+ return "MetaMethod{" +
+ "method=" + method +
+ ", after=" + after +
+ '}';
+ }
+ }
+
+ private static class Invocation implements Comparable<Invocation> {
+ private final Observer observer;
+ private final MetaMethod metaMethod;
+ private final Object event;
+
+ private Invocation(final Observer observer, final MetaMethod method,
final Object event) {
+ this.observer = observer;
+ this.metaMethod = method;
+ this.event = event;
+ }
+
+ private void proceed() throws InvocationTargetException,
IllegalAccessException {
+ metaMethod.method.invoke(observer.observer, event);
+ }
+
+ @Override // only called for a single event so only consider
observer.after
+ public int compareTo(final Invocation o) {
+ if (o == null) {
+ return 0;
+ }
+ if (metaMethod.after.contains(o.observer.observerClass)) {
+ return 1;
+ }
+ return -1;
+ }
+
+ @Override
+ public String toString() {
+ return "Invocation{" +
+ "observer=" + observer +
+ ", metaMethod=" + metaMethod +
+ ", event=" + event +
+ '}';
+ }
+ }
+
private static class NotAnObserverException extends RuntimeException {
public NotAnObserverException(final String s) {
super(s);
Modified:
tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/observer/Observes.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/observer/Observes.java?rev=1579700&r1=1579699&r2=1579700&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/observer/Observes.java
(original)
+++
tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/observer/Observes.java
Thu Mar 20 18:24:14 2014
@@ -30,4 +30,5 @@ import static java.lang.annotation.Reten
@Retention(RUNTIME)
@Documented
public @interface Observes {
+ Class<?>[] after() default {};
}
\ No newline at end of file
Added:
tomee/tomee/trunk/container/openejb-loader/src/test/java/org/apache/openejb/loader/EventTest.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-loader/src/test/java/org/apache/openejb/loader/EventTest.java?rev=1579700&view=auto
==============================================================================
---
tomee/tomee/trunk/container/openejb-loader/src/test/java/org/apache/openejb/loader/EventTest.java
(added)
+++
tomee/tomee/trunk/container/openejb-loader/src/test/java/org/apache/openejb/loader/EventTest.java
Thu Mar 20 18:24:14 2014
@@ -0,0 +1,66 @@
+/**
+ * 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.openejb.loader;
+
+import org.apache.openejb.observer.Observes;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static org.junit.Assert.assertEquals;
+
+public class EventTest {
+ @After
+ @Before
+ public void reset() {
+ SystemInstance.reset();
+ }
+
+ private static final AtomicInteger ID = new AtomicInteger(0);
+
+ @Test
+ public void order() {
+ final SystemInstance s = SystemInstance.get();
+ assertEquals(-1, SimpleObserver.id);
+ assertEquals(-1, OrderedSimpleObserver.id);
+ s.addObserver(new OrderedSimpleObserver());
+ s.addObserver(new SimpleObserver());
+ s.fireEvent(new SimpleEvent());
+ assertEquals(1, SimpleObserver.id);
+ assertEquals(2, OrderedSimpleObserver.id);
+ }
+
+ public static class SimpleEvent {}
+
+ public static class SimpleObserver {
+ private static int id = -1;
+
+ public void observe(final @Observes SimpleEvent event) {
+ id = ID.incrementAndGet();
+ }
+ }
+
+ public static class OrderedSimpleObserver {
+ private static int id = -1;
+
+ public void observe(final @Observes(after = SimpleObserver.class)
SimpleEvent event) {
+ id = ID.incrementAndGet();
+ }
+ }
+}
Modified:
tomee/tomee/trunk/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java?rev=1579700&r1=1579699&r2=1579700&view=diff
==============================================================================
---
tomee/tomee/trunk/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
(original)
+++
tomee/tomee/trunk/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
Thu Mar 20 18:24:14 2014
@@ -619,8 +619,6 @@ public abstract class RESTService implem
}
}
}
-
- SystemInstance.get().fireEvent(new AfterServicesDeployed(appInfo));
}
private void quickCheckIfOldDeploymentShouldBeUsedFromEjbConfig(final
AppInfo appInfo) {
