You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by jb...@apache.org on 2020/05/20 08:41:22 UTC
[aries] branch trunk updated (b9611fb -> 09e60c6)
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/aries.git.
from b9611fb [ARIES-1981] Upgrade to ASM 8.0.1
new aa225e1 Update proxy-itest
new 09e60c6 [ARIES-1787] Add around functionnality on object proxy
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
proxy/proxy-api/pom.xml | 2 +-
.../java/org/apache/aries/proxy/InvocationListener.java | 6 ++++++
proxy/proxy-impl/pom.xml | 2 +-
.../java/org/apache/aries/proxy/impl/ProxyHandler.java | 2 +-
proxy/proxy-itests/pom.xml | 16 +++++++++++-----
.../org/apache/aries/proxy/itests/AbstractProxyTest.java | 3 ++-
6 files changed, 22 insertions(+), 9 deletions(-)
[aries] 01/02: Update proxy-itest
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/aries.git
commit aa225e18fc76752136b3776d2962f3acaa4c6698
Author: jbonofre <jb...@apache.org>
AuthorDate: Wed May 20 10:09:32 2020 +0200
Update proxy-itest
---
proxy/proxy-itests/pom.xml | 16 +++++++++++-----
.../org/apache/aries/proxy/itests/AbstractProxyTest.java | 3 ++-
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/proxy/proxy-itests/pom.xml b/proxy/proxy-itests/pom.xml
index 81781b7..319ef4d 100644
--- a/proxy/proxy-itests/pom.xml
+++ b/proxy/proxy-itests/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.0.0</version>
+ <version>2.1.0</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
@@ -43,7 +43,7 @@
</scm>
<properties>
- <exam.version>3.4.0</exam.version>
+ <exam.version>4.13.3</exam.version>
<url.version>1.6.0</url.version>
</properties>
@@ -63,7 +63,7 @@
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy.api</artifactId>
<scope>test</scope>
- <version>1.1.0</version>
+ <version>1.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.proxy</groupId>
@@ -133,8 +133,14 @@
<dependency>
<groupId>org.ow2.asm</groupId>
- <artifactId>asm-debug-all</artifactId>
- <version>5.0.3</version>
+ <artifactId>asm</artifactId>
+ <version>8.0.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-commons</artifactId>
+ <version>8.0.1</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/AbstractProxyTest.java b/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/AbstractProxyTest.java
index 8dc6d7d..7196a7a 100644
--- a/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/AbstractProxyTest.java
+++ b/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/AbstractProxyTest.java
@@ -297,7 +297,8 @@ public abstract class AbstractProxyTest {
CoreOptions.junitBundles(),
systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"),
when(localRepo != null).useOptions(CoreOptions.vmOption("-Dorg.ops4j.pax.url.mvn.localRepository=" + localRepo)),
- mavenBundle("org.ow2.asm", "asm-debug-all").versionAsInProject(),
+ mavenBundle("org.ow2.asm", "asm-commons").versionAsInProject(),
+ mavenBundle("org.ow2.asm", "asm").versionAsInProject(),
mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(),
mavenBundle("org.ops4j.pax.logging", "pax-logging-service").versionAsInProject(),
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy").versionAsInProject()
[aries] 02/02: [ARIES-1787] Add around functionnality on object
proxy
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/aries.git
commit 09e60c68ed874439c8a82eac92720df23ba1ad15
Author: jbonofre <jb...@apache.org>
AuthorDate: Wed May 20 10:09:46 2020 +0200
[ARIES-1787] Add around functionnality on object proxy
---
proxy/proxy-api/pom.xml | 2 +-
.../src/main/java/org/apache/aries/proxy/InvocationListener.java | 6 ++++++
proxy/proxy-impl/pom.xml | 2 +-
.../src/main/java/org/apache/aries/proxy/impl/ProxyHandler.java | 2 +-
4 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/proxy/proxy-api/pom.xml b/proxy/proxy-api/pom.xml
index 2e058f6..d071fb4 100644
--- a/proxy/proxy-api/pom.xml
+++ b/proxy/proxy-api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.0.0</version>
+ <version>2.1.0</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
diff --git a/proxy/proxy-api/src/main/java/org/apache/aries/proxy/InvocationListener.java b/proxy/proxy-api/src/main/java/org/apache/aries/proxy/InvocationListener.java
index b319273..bf1447b 100644
--- a/proxy/proxy-api/src/main/java/org/apache/aries/proxy/InvocationListener.java
+++ b/proxy/proxy-api/src/main/java/org/apache/aries/proxy/InvocationListener.java
@@ -19,6 +19,7 @@
package org.apache.aries.proxy;
import java.lang.reflect.Method;
+import java.util.concurrent.Callable;
/**
* An {@link InvocationListener} is used in conjunction with the {@link ProxyManager}
@@ -31,4 +32,9 @@ public interface InvocationListener
public void postInvoke(Object token, Object proxy, Method m, Object returnValue) throws Throwable;
public void postInvokeExceptionalReturn(Object token, Object proxy, Method m, Throwable exception) throws Throwable;
+
+ default Object aroundInvoke(Object token, Object proxy, Callable<Object> dispatcher, Method method, Object[] args) throws Throwable {
+ return method.invoke(dispatcher.call(), args);
+ }
+
}
\ No newline at end of file
diff --git a/proxy/proxy-impl/pom.xml b/proxy/proxy-impl/pom.xml
index 06f0da1..6d0bbfa 100644
--- a/proxy/proxy-impl/pom.xml
+++ b/proxy/proxy-impl/pom.xml
@@ -70,7 +70,7 @@
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy.api</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/ProxyHandler.java b/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/ProxyHandler.java
index f4f89df..0241ff2 100644
--- a/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/ProxyHandler.java
+++ b/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/ProxyHandler.java
@@ -51,7 +51,7 @@ public final class ProxyHandler implements InvocationHandler {
try {
token = nonNullListener.preInvoke(proxy, method, args);
inInvoke = true;
- result = method.invoke(target.call(), args);
+ result = nonNullListener.aroundInvoke(token, proxy, target, method, args);
inInvoke = false;
nonNullListener.postInvoke(token, proxy, method, result);