diff options
Diffstat (limited to '')
3 files changed, 13 insertions, 8 deletions
diff --git a/sca-java-2.x/trunk/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java b/sca-java-2.x/trunk/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java index e993cdd382..a289a58091 100644 --- a/sca-java-2.x/trunk/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java +++ b/sca-java-2.x/trunk/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java @@ -25,9 +25,9 @@ package org.apache.tuscany.sca.implementation.java.util; */ public class Bean1 extends SuperBean { - public static final int ALL_BEAN1_FIELDS = 6 + ALL_SUPER_FIELDS; - public static final int ALL_BEAN1_PUBLIC_PROTECTED_FIELDS = 5 + ALL_SUPER_PUBLIC_PROTECTED_FIELDS; - public static final int ALL_BEAN1_METHODS = 4 + ALL_SUPER_METHODS - 1; + public static final int ALL_BEAN1_FIELDS = 6; //TUSCANY-3924 + ALL_SUPER_FIELDS; + public static final int ALL_BEAN1_PUBLIC_PROTECTED_FIELDS = 5; //TUSCANY-3924 + ALL_SUPER_PUBLIC_PROTECTED_FIELDS; + public static final int ALL_BEAN1_METHODS = 4; //TUSCANY-3924 + ALL_SUPER_METHODS - 1; public String field3; protected String field2; private String field1; diff --git a/sca-java-2.x/trunk/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java b/sca-java-2.x/trunk/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java index 9624865dcc..dfb3c77966 100644 --- a/sca-java-2.x/trunk/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java +++ b/sca-java-2.x/trunk/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java @@ -29,6 +29,7 @@ import java.util.Map; import java.util.Set; import org.apache.tuscany.sca.implementation.java.introspect.JavaIntrospectionHelper; +import org.junit.Ignore; import org.junit.Test; /** @@ -46,7 +47,7 @@ public class JavaIntrospectionHelperTestCase { @Test public void testBean1AllPublicProtectedFields() throws Exception { Set<Field> beanFields = JavaIntrospectionHelper.getAllPublicAndProtectedFields(Bean1.class, true); - assertEquals(4, beanFields.size()); //Bean1.ALL_BEAN1_PUBLIC_PROTECTED_FIELDS + assertEquals(2, beanFields.size()); //Bean1.ALL_BEAN1_PUBLIC_PROTECTED_FIELDS } @Test @@ -75,7 +76,8 @@ public class JavaIntrospectionHelperTestCase { throw new Exception("Override never invoked"); } } - + + @Ignore("TUSCANY-3924") @Test public void testNoOverrideMethod() throws Exception { Set<Method> beanFields = JavaIntrospectionHelper.getAllUniquePublicProtectedMethods(Bean1.class, true); diff --git a/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaIntrospectionHelper.java b/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaIntrospectionHelper.java index a04ad3721a..f67ebe793c 100644 --- a/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaIntrospectionHelper.java +++ b/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaIntrospectionHelper.java @@ -83,7 +83,8 @@ public final class JavaIntrospectionHelper { if (clazz == null || clazz.isArray() || Object.class.equals(clazz)) { return fields; } - fields = getAllPublicAndProtectedFields(clazz.getSuperclass(), fields, validating); + // TUSCANY-3924 - don't consider inherited fields + //fields = getAllPublicAndProtectedFields(clazz.getSuperclass(), fields, validating); Field[] declaredFields = null; @@ -136,7 +137,8 @@ public final class JavaIntrospectionHelper { return fields; } - fields = getInjectableFields(clazz.getSuperclass(), fields, validating); + // TUSCANY-3924 - don't consider inherited fields + //fields = getInjectableFields(clazz.getSuperclass(), fields, validating); Field[] declaredFields = null; @@ -235,7 +237,8 @@ public final class JavaIntrospectionHelper { } // evaluate class hierarchy - this is done last to track inherited // methods - methods = getAllUniqueMethods(pClass.getSuperclass(), methods, validating); + // TUSCANY-3924 - don't consider inherited fields + //methods = getAllUniqueMethods(pClass.getSuperclass(), methods, validating); return methods; } |