[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openejb-cvs
Subject:    tomee git commit: TOMEE-2174 ensure nested parameters don't break interceptors resolution
From:       rmannibucau () apache ! org
Date:       2018-02-25 15:23:53
Message-ID: 6241984f05d149309191c768801d8194 () git ! apache ! org
[Download RAW message or body]

Repository: tomee
Updated Branches:
  refs/heads/fb_tomee8 32c8164ad -> 27639abc7


TOMEE-2174 ensure nested parameters don't break interceptors resolution


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/27639abc
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/27639abc
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/27639abc

Branch: refs/heads/fb_tomee8
Commit: 27639abc74cd60ae945a29fcae61abbca50df3db
Parents: 32c8164
Author: Romain Manni-Bucau <rmannibucau@apache.org>
Authored: Sun Feb 25 16:23:25 2018 +0100
Committer: Romain Manni-Bucau <rmannibucau@apache.org>
Committed: Sun Feb 25 16:23:25 2018 +0100

----------------------------------------------------------------------
 .../assembler/classic/MethodInfoUtil.java       |  2 +-
 .../NestedParamInterceptorTest.java             | 60 ++++++++++++++++++++
 2 files changed, 61 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/27639abc/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodInfoUtil.java
                
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodInfoUtil.java \
b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodInfoUtil.java
 index c284644..998e18d 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodInfoUtil.java
                
+++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodInfoUtil.java
 @@ -550,7 +550,7 @@ public class MethodInfoUtil {
         for (int i = 0; i < parameterTypes.length; i++) {
             final Class<?> parameterType = parameterTypes[i];
             final String methodParam = methodParams.get(i);
-            if (!methodParam.equals(getName(parameterType)) && \
!methodParam.equals(parameterType.getName())) { +            if \
(!methodParam.equals(getName(parameterType).replace('$', '.')) && \
!methodParam.equals(parameterType.getName())) {  return false;
             }
         }

http://git-wip-us.apache.org/repos/asf/tomee/blob/27639abc/container/openejb-core/src/test/java/org/apache/openejb/interceptors/NestedParamInterceptorTest.java
                
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/interceptors/NestedParamInterceptorTest.java \
b/container/openejb-core/src/test/java/org/apache/openejb/interceptors/NestedParamInterceptorTest.java
 new file mode 100644
index 0000000..1b0cbbb
--- /dev/null
+++ b/container/openejb-core/src/test/java/org/apache/openejb/interceptors/NestedParamInterceptorTest.java
 @@ -0,0 +1,60 @@
+/**
+ * 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.interceptors;
+
+import static org.junit.Assert.assertEquals;
+
+import javax.ejb.EJB;
+import javax.ejb.Stateless;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptors;
+import javax.interceptor.InvocationContext;
+
+import org.apache.openejb.junit.ApplicationComposer;
+import org.apache.openejb.testing.Classes;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(ApplicationComposer.class)
+@Classes(NestedParamInterceptorTest.Intercepted.class)
+public class NestedParamInterceptorTest {
+    @EJB
+    private Intercepted bean;
+
+    @Test
+    public void run() {
+        assertEquals("success", bean.value(null));
+    }
+
+    @Stateless
+    public static class Intercepted {
+        @Interceptors(InterceptorImpl.class)
+        public String value(final Nested param) {
+            return "failed";
+        }
+    }
+
+    public static class InterceptorImpl {
+        @AroundInvoke
+        public Object invoke(final InvocationContext ctx) throws Exception {
+            return "success";
+        }
+    }
+
+    public static class Nested {
+    }
+}


[prev in list] [next in list] [prev in thread] [next in thread]