svn commit: r1519880 - /commons/proper/proxy/branches/version-2.0-work/stub/src/main/java/org/apache/commons/proxy2/stub/BaseTrainer.java

[mb...@apache.org]

Author: mbenson
Date: Tue Sep  3 22:55:56 2013
New Revision: 1519880

URL: http://svn.apache.org/r1519880
Log:
open up training API for custom interceptor

Modified:
    commons/proper/proxy/branches/version-2.0-work/stub/src/main/java/org/apache/commons/proxy2/stub/BaseTrainer.java

Modified: commons/proper/proxy/branches/version-2.0-work/stub/src/main/java/org/apache/commons/proxy2/stub/BaseTrainer.java
URL: http://svn.apache.org/viewvc/commons/proper/proxy/branches/version-2.0-work/stub/src/main/java/org/apache/commons/proxy2/stub/BaseTrainer.java?rev=1519880&r1=1519879&r2=1519880&view=diff
==============================================================================
--- commons/proper/proxy/branches/version-2.0-work/stub/src/main/java/org/apache/commons/proxy2/stub/BaseTrainer.java (original)
+++ commons/proper/proxy/branches/version-2.0-work/stub/src/main/java/org/apache/commons/proxy2/stub/BaseTrainer.java Tue Sep  3 22:55:56 2013
@@ -20,8 +20,8 @@ package org.apache.commons.proxy2.stub;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.Validate;
 import org.apache.commons.lang3.reflect.TypeUtils;
+import org.apache.commons.proxy2.Interceptor;
 import org.apache.commons.proxy2.ObjectProvider;
-import org.apache.commons.proxy2.ProxyUtils;
 import org.apache.commons.proxy2.interceptor.InterceptorUtils;
 import org.apache.commons.proxy2.interceptor.matcher.ArgumentMatcher;
 import org.apache.commons.proxy2.interceptor.matcher.argument.ArgumentMatcherUtils;
@@ -178,20 +178,23 @@ public abstract class BaseTrainer<S exte
     {
         public S thenThrow(Exception e)
         {
-            trainingContext().then(InterceptorUtils.throwing(e));
-            return self();
+            return then(InterceptorUtils.throwing(e));
         }
 
         public S thenThrow(ObjectProvider<? extends Exception> provider)
         {
-            trainingContext().then(InterceptorUtils.throwing(provider));
-            return self();
+            return then(InterceptorUtils.throwing(provider));
         }
 
         public S thenAnswer(ObjectProvider<? extends R> provider)
         {
-            trainingContext().then(InterceptorUtils.provider(provider));
-            return self();
+        	return then(InterceptorUtils.provider(provider));
+        }
+
+        public S then(Interceptor interceptor)
+        {
+        	trainingContext().then(interceptor);
+        	return self();
         }
     }