Changes to pass the DI TCK

hk2-locator/src/main/java/org/jvnet/hk2/internal/ClazzCreator.java

@@ -50,8 +50,10 @@
 public class ClazzCreator<T> implements Creator<T> {
     private final ServiceLocatorImpl locator;
     private final Class<?> implClass;
-    private final Set<ResolutionInfo> myInitializers = new LinkedHashSet<ResolutionInfo>();
-    private final Set<ResolutionInfo> myFields = new LinkedHashSet<ResolutionInfo>();
+    private final Set<ResolutionInfo> myInitializers = new LinkedHashSet<>();
+    private final Set<ResolutionInfo> superInitializers = new LinkedHashSet<>();
+    private final Set<ResolutionInfo> myFields = new LinkedHashSet<>();
+    private final Set<ResolutionInfo> superFields = new LinkedHashSet<>();
     private ActiveDescriptor<?> selfDescriptor;
 
     private ResolutionInfo myConstructor;
@@ -127,7 +129,11 @@ public class ClazzCreator<T> implements Creator<T> {
 
             baseAllInjectees.addAll(injectees);
 
-            myInitializers.add(new ResolutionInfo(element, injectees));
+            if (initMethod.getDeclaringClass().equals(implClass)) {
+                myInitializers.add(new ResolutionInfo(element, injectees));
+            } else {
+                superInitializers.add(new ResolutionInfo(element, injectees));
+            }
         }
 
         Set<Field> fields = Utilities.getInitFields(implClass, analyzer, collector);
@@ -139,7 +145,11 @@ public class ClazzCreator<T> implements Creator<T> {
 
             baseAllInjectees.addAll(injectees);
 
-            myFields.add(new ResolutionInfo(element, injectees));
+            if (field.getDeclaringClass().equals(implClass)) {
+                myFields.add(new ResolutionInfo(element, injectees));
+            } else {
+                superFields.add(new ResolutionInfo(element, injectees));
+            }
         }
 
         postConstructMethod = Utilities.getPostConstruct(implClass, analyzer, collector);
@@ -204,6 +214,20 @@ private Map<SystemInjecteeImpl, Object> resolveAllDependencies(final ServiceHand
             InjectionResolver<?> resolver = locator.getInjectionResolverForInjectee(injectee);
             resolve(retVal, resolver, injectee, root, errorCollector);
         }
+
+        for (ResolutionInfo fieldRI : superFields) {
+            for (SystemInjecteeImpl injectee : fieldRI.injectees) {
+                InjectionResolver<?> resolver = locator.getInjectionResolverForInjectee(injectee);
+                resolve(retVal, resolver, injectee, root, errorCollector);
+            }
+        }
+
+        for (ResolutionInfo methodRI : superInitializers) {
+            for (SystemInjecteeImpl injectee : methodRI.injectees) {
+                InjectionResolver<?> resolver = locator.getInjectionResolverForInjectee(injectee);
+                resolve(retVal, resolver, injectee, root, errorCollector);
+            }
+        }
 
         for (ResolutionInfo fieldRI : myFields) {
             for (SystemInjecteeImpl injectee : fieldRI.injectees) {
@@ -281,6 +305,22 @@ private void fieldMe(Map<SystemInjecteeImpl, Object> resolved, T t) throws Throw
             ReflectionHelper.setField(field, t, putMeIn);
         }
     }
+
+    private void fieldParents(Map<SystemInjecteeImpl, Object> resolved, T t) throws Throwable {
+        for (ResolutionInfo ri : superFields) {
+            Field field = (Field) ri.baseElement;
+            List<SystemInjecteeImpl> injectees = ri.injectees;  // Should be only one injectee, itself!
+
+            Injectee fieldInjectee = null;
+            for (Injectee candidate : injectees) {
+                fieldInjectee = candidate;
+            }
+
+            Object putMeIn = resolved.get(fieldInjectee);
+
+            ReflectionHelper.setField(field, t, putMeIn);
+        }
+    }
 
     private void methodMe(Map<SystemInjecteeImpl, Object> resolved, T t) throws Throwable {
         for (ResolutionInfo ri : myInitializers) {
@@ -295,6 +335,20 @@ private void methodMe(Map<SystemInjecteeImpl, Object> resolved, T t) throws Thro
             ReflectionHelper.invoke(t, m, args, locator.getNeutralContextClassLoader());
         }
     }
+
+    private void methodParents(Map<SystemInjecteeImpl, Object> resolved, T t) throws Throwable {
+        for (ResolutionInfo ri : superInitializers) {
+            Method m = (Method) ri.baseElement;
+            List<SystemInjecteeImpl> injectees = ri.injectees;
+
+            Object args[] = new Object[injectees.size()];
+            for (Injectee injectee : injectees) {
+                args[injectee.getPosition()] = resolved.get(injectee);
+            }
+
+            ReflectionHelper.invoke(t, m, args, locator.getNeutralContextClassLoader());
+        }
+    }
 
     private void postConstructMe(T t) throws Throwable {
         if (t == null) return;
@@ -340,6 +394,12 @@ public T create(ServiceHandle<?> root, SystemDescriptor<?> eventThrower) {
 
             failureLocation = "create";
             T retVal = (T) createMe(allResolved);
+
+            failureLocation="parent field inject";
+            fieldParents(allResolved, retVal);
+
+            failureLocation = "parent method inject";
+            methodParents(allResolved, retVal);
 
             failureLocation = "field inject";
             fieldMe(allResolved, retVal);

hk2-locator/src/main/java/org/jvnet/hk2/internal/Utilities.java

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2020 Payara Services Ltd.
+ * Copyright (c) 2020, 2021 Payara Services Ltd.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -1419,6 +1419,9 @@ public static Set<Method> findInitializerMethods(
                                 " is static, abstract or has a parameter that is an annotation"));
                 continue;
             }
+            if (Modifier.isStatic(method.getModifiers())) {
+                continue;
+            }
 
             retVal.add(method);
         }
@@ -1485,6 +1488,9 @@ public static Set<Field> findInitializerFields(Class<?> annotatedType,
                         Pretty.field(field) + " may not be static, final or have an Annotation type"));
                 continue;
             }
+            if (Modifier.isStatic(field.getModifiers())) {
+                continue;
+            }
 
             retVal.add(field);
         }
@@ -1518,7 +1524,7 @@ static AnnotatedElementAnnotationInfo computeAEAI(AnnotatedElement annotatedElem
     }
 
   private static boolean isProperMethod(Method member) {
-        if (ReflectionHelper.isStatic(member)) return false;
+        //if (ReflectionHelper.isStatic(member)) return false;
         if (isAbstract(member)) return false;
         for (Class<?> paramClazz : member.getParameterTypes()) {
             if (paramClazz.isAnnotation()) {
@@ -1530,7 +1536,7 @@ private static boolean isProperMethod(Method member) {
     }
 
     private static boolean isProperField(Field field) {
-        if (ReflectionHelper.isStatic(field)) return false;
+        //if (ReflectionHelper.isStatic(field)) return false;
         if (isFinal(field)) return false;
         Class<?> type = field.getType();
         return !type.isAnnotation();

hk2-locator/src/test/java/org/glassfish/hk2/tests/locator/negative/field/NegativeFieldTest.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021 Payara Services Ltd.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -36,14 +37,10 @@ public class NegativeFieldTest {
      */
     @Test
     public void testStaticField() {
-        try {
             locator.reifyDescriptor(locator.getBestDescriptor(BuilderHelper.createContractFilter(
                     StaticFieldService.class.getName())));
-            Assert.fail("static field should cause failure");
-        }
-        catch (MultiException me) {
-            Assert.assertTrue(me.getMessage().contains(" may not be static, final or have an Annotation type"));
-        }
+            StaticFieldService fieldService = locator.getService(StaticFieldService.class);
+            Assert.assertNull(fieldService.locator);
     }
 
     /**

hk2-locator/src/test/java/org/glassfish/hk2/tests/locator/negative/field/StaticFieldService.java

@@ -27,6 +27,6 @@
  */
 public class StaticFieldService {
     @Inject
-    static ServiceLocator locator;
+    public static ServiceLocator locator;
 
 }

hk2-locator/src/test/java/org/glassfish/hk2/tests/locator/negative/method/NegativeMethodTest.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021 Payara Services Ltd.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,6 +17,7 @@
 
 package org.glassfish.hk2.tests.locator.negative.method;
 
+import org.glassfish.hk2.api.ActiveDescriptor;
 import org.glassfish.hk2.api.MultiException;
 import org.glassfish.hk2.api.ServiceLocator;
 import org.glassfish.hk2.tests.locator.utilities.LocatorHelper;
@@ -37,12 +39,14 @@ public class NegativeMethodTest {
     @Test
     public void testStaticMethod() {
         try {
-            locator.reifyDescriptor(locator.getBestDescriptor(BuilderHelper.createContractFilter(
+            ActiveDescriptor descriptor = locator.reifyDescriptor(locator.getBestDescriptor(BuilderHelper.createContractFilter(
                     StaticMethodService.class.getName())));
-            Assert.fail("static method should cause failure");
+            StaticMethodService methodService = locator.getService(StaticMethodService.class);
         }
         catch (MultiException me) {
-            Assert.assertTrue(me.getMessage().contains("is static, abstract or has a parameter that is an annotation"));
+            me.printStackTrace();
+            Assert.fail(me.getMessage());
+           // Assert.assertTrue(me.getMessage(), me.getMessage().contains("is static, abstract or has a parameter that is an annotation"));
         }
     }
 

hk2-testing/di-tck/pom.xml

@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2021 Payara Services Ltd. and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.glassfish.hk2</groupId>
+        <artifactId>hk2-testing</artifactId>
+        <version>3.0.2-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>hk2-di-tck-runner</artifactId>
+    <name>DI TCK Runner</name>
+    <description>Runner for the Jakarta DI TCK</description>
+
+    <properties>
+        <ditck.version>2.0.1</ditck.version>
+    </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.1.1</version>
+                <executions>
+                    <execution>
+                        <id>unpack</id>
+                        <phase>process-test-classes</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <artifactItems>
+                        <artifactItem>
+                            <groupId>jakarta.inject</groupId>
+                            <artifactId>jakarta.inject-api</artifactId>
+                            <version>2.0.0</version>
+                            <overWrite>false</overWrite>
+                            <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
+                        </artifactItem>
+                        <artifactItem>
+                            <groupId>jakarta.inject</groupId>
+                            <artifactId>jakarta.inject-tck</artifactId>
+                            <version>${ditck.version}</version>
+                            <overWrite>false</overWrite>
+                            <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
+                        </artifactItem>
+                    </artifactItems>
+                    <overWriteReleases>false</overWriteReleases>
+                    <overWriteSnapshots>true</overWriteSnapshots>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>3.0.0-M3</version>
+                <configuration>
+                    <includes>
+                        <include>${runSuite}</include>
+                    </includes>
+                    <trimStackTrace>false</trimStackTrace>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>default-jar</id>
+                        <phase>none</phase>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-install-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>default-install</id>
+                        <phase>none</phase>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-tck</artifactId>
+            <version>${ditck.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.hk2</groupId>
+            <artifactId>hk2-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.hk2</groupId>
+            <artifactId>hk2-locator</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+</project>