Merge pull request #20 from jGauravGupta/FISH-1282

FISH-1282 Jakarta EE9: Fixes HK2 OSGI issues on starting the Payara Server
payara · Apr 16, 2021 · 84cd5da · 84cd5da
2 parents 960ac1f + ec0e91d
commit 84cd5da
Show file tree

Hide file tree

Showing 80 changed files with 127 additions and 76 deletions.
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -28,7 +28,7 @@
     </parent>
     <groupId>org.glassfish.hk2</groupId>
     <artifactId>hk2-bom</artifactId>
-    <version>3.0.1</version>
+    <version>3.0.1.payara-p1</version>
     <packaging>pom</packaging>
 
     <name>HK2 Bom Pom</name>

diff --git a/class-model/pom.xml b/class-model/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
 
     <groupId>org.glassfish.hk2</groupId>

diff --git a/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/MethodModel.java b/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/MethodModel.java
@@ -47,6 +47,12 @@ public interface MethodModel extends Member, AnnotatedElement {
      */
     String[] getArgumentTypes();
 
+    /**
+     * @return the checked exception types, or an empty array if the method doesn't
+     *         declare any thrown exceptions
+     */
+    String[] getExceptionTypes();
+
     /**
      * Returns the list of parameter
      *

diff --git a/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/MethodModelImpl.java b/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/MethodModelImpl.java
@@ -26,6 +26,7 @@
 public class MethodModelImpl extends AnnotatedElementImpl implements MethodModel {
 
     private List<Parameter> parameters;
+    private List<ParameterizedType> exceptionTypes;
     private ParameterizedType returnType;
     final ExtensibleType<?> owner;
     private final String signature;
@@ -74,6 +75,24 @@ public String[] getArgumentTypes() {
         return stringTypes;
     }
 
+    @Override
+    public String[] getExceptionTypes() {
+        String[] stringTypes;
+        if (exceptionTypes != null) {
+            stringTypes = new String[exceptionTypes.size()];
+            for (int i = 0; i < exceptionTypes.size(); i++) {
+                stringTypes[i] = exceptionTypes.get(i).getTypeName();
+            }
+        } else {
+            stringTypes = new String[0];
+        }
+        return stringTypes;
+    }
+
+    public void setExceptionTypes(List<ParameterizedType> exceptionTypes) {
+        this.exceptionTypes = exceptionTypes;
+    }
+
     @Override
     public List<Parameter> getParameters() {
         return parameters;

diff --git a/...l/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/MethodSignatureVisitorImpl.java b/...l/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/MethodSignatureVisitorImpl.java
@@ -35,6 +35,7 @@ public class MethodSignatureVisitorImpl extends SignatureVisitor {
     private final MethodModel methodModel;
 
     private final List<Parameter> parameters = new ArrayList<>();
+    private final List<ParameterizedType> exceptionTypes = new ArrayList<>();
     private final ParameterizedType returnType = new ParameterizedTypeImpl();
     private final ArrayDeque<ParameterizedType> parentType = new ArrayDeque<>();
 
@@ -49,6 +50,10 @@ public List<Parameter> getParameters() {
         return parameters;
     }
 
+    public List<ParameterizedType> getExceptionTypes() {
+        return exceptionTypes;
+    }
+
     public ParameterizedType getReturnType() {
         return returnType;
     }
@@ -61,6 +66,11 @@ public SignatureVisitor visitParameterType() {
         return this;
     }
 
+    @Override
+    public SignatureVisitor visitExceptionType() {
+        return this;
+    }
+
     @Override
     public SignatureVisitor visitReturnType() {
         parentType.add(returnType);

diff --git a/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/ModelClassVisitor.java b/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/ModelClassVisitor.java
@@ -280,6 +280,17 @@ public MethodVisitor visitMethod(int access, String name, String desc, String si
         org.objectweb.asm.Type type = org.objectweb.asm.Type.getReturnType(desc);
         returnType.setType(type);
 
+        final List<ParameterizedType> exceptionTypes = new ArrayList<>();
+        if (exceptions != null) {
+            for (int i = 0; i < exceptions.length; i++) {
+                final String exception = exceptions[i];
+                final ParameterizedTypeImpl exceptionType = new ParameterizedTypeImpl(exception);
+                exceptionType.setType(org.objectweb.asm.Type.getObjectType(exception));
+                exceptionTypes.add(exceptionType);
+            }
+        }
+        methodModel.setExceptionTypes(exceptionTypes);
+
         org.objectweb.asm.Type[] types = org.objectweb.asm.Type.getArgumentTypes(desc);
         for (int i = 0; i < methodModel.getParameters().size(); i++) {
             ParameterImpl parameter = (ParameterImpl) methodModel.getParameter(i);

diff --git a/class-model/src/test/java/org/glassfish/hk2/classmodel/reflect/test/method/MethodTest.java b/class-model/src/test/java/org/glassfish/hk2/classmodel/reflect/test/method/MethodTest.java
@@ -82,6 +82,11 @@ public void simpleTest() throws IOException, InterruptedException {
                         Assert.assertEquals("yellow", gradientColor2.get(0).getValues().get("name"));
                         Assert.assertEquals("orange", gradientColor2.get(1).getValues().get("name"));
 
+                        // Exception types
+                        final String[] exceptionTypes = mm.getExceptionTypes();
+                        Assert.assertEquals(1, exceptionTypes.length);
+                        Assert.assertEquals(IllegalArgumentException.class.getName(), exceptionTypes[0]);
+
                         // Parameter annotations, type and generic types check
                         Assert.assertEquals(5, mm.getParameters().size());
 

diff --git a/...src/test/java/org/glassfish/hk2/classmodel/reflect/test/method/SimpleAnnotatedMethod.java b/...src/test/java/org/glassfish/hk2/classmodel/reflect/test/method/SimpleAnnotatedMethod.java
@@ -44,7 +44,7 @@ public SampleType<Integer, Character, Boolean> setFoo(
             List<String> input,
             SampleType<Double, String, SampleType<Short, Float, Long>> sampleType,
             int count,
-            Object value) {
+            Object value) throws IllegalArgumentException {
         return null;
     }
 }

diff --git a/examples/caching/pom.xml b/examples/caching/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>examples</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/examples/caching/runner/pom.xml b/examples/caching/runner/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>caching-aop-example</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
 
     <artifactId>caching-aop-example-runner</artifactId>

diff --git a/examples/caching/system/pom.xml b/examples/caching/system/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>caching-aop-example</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
 
     <artifactId>caching-aop-example-system</artifactId>

diff --git a/examples/configuration/pom.xml b/examples/configuration/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>examples</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/examples/configuration/webserver/pom.xml b/examples/configuration/webserver/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>configuration-examples</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
 
     <artifactId>webserver-configuration-example</artifactId>

diff --git a/examples/configuration/xml/pom.xml b/examples/configuration/xml/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>configuration-examples</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
 
     <artifactId>xml-configuration-example</artifactId>

diff --git a/examples/custom-resolver/pom.xml b/examples/custom-resolver/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>examples</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <artifactId>custom-resolver-example</artifactId>
     <name>Custom Resolver Example</name>

diff --git a/examples/events/pom.xml b/examples/events/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>examples</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/examples/events/threaded/pom.xml b/examples/events/threaded/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>event-examples</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
 
     <artifactId>threading-event-example</artifactId>

diff --git a/examples/operations/pom.xml b/examples/operations/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>examples</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <artifactId>operations-example</artifactId>
     <name>Operations Example</name>

diff --git a/examples/pom.xml b/examples/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/examples/security-lockdown/alice/pom.xml b/examples/security-lockdown/alice/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>security-lockdown-example</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
 
     <artifactId>security-lockdown-example-alice</artifactId>

diff --git a/examples/security-lockdown/mallory/pom.xml b/examples/security-lockdown/mallory/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>security-lockdown-example</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
 
     <artifactId>security-lockdown-example-mallory</artifactId>

diff --git a/examples/security-lockdown/pom.xml b/examples/security-lockdown/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>examples</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/examples/security-lockdown/runner/pom.xml b/examples/security-lockdown/runner/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>security-lockdown-example</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
 
     <artifactId>security-lockdown-example-runner</artifactId>

diff --git a/examples/security-lockdown/system/pom.xml b/examples/security-lockdown/system/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>security-lockdown-example</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
 
     <artifactId>security-lockdown-example-system</artifactId>

diff --git a/external/aopalliance/pom.xml b/external/aopalliance/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>external</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <groupId>org.glassfish.hk2.external</groupId>
     <artifactId>aopalliance-repackaged</artifactId>

diff --git a/external/pom.xml b/external/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/guice-bridge/pom.xml b/guice-bridge/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <groupId>org.glassfish.hk2</groupId>
     <artifactId>guice-bridge</artifactId>

diff --git a/hk2-api/pom.xml b/hk2-api/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <groupId>org.glassfish.hk2</groupId>
     <artifactId>hk2-api</artifactId>

diff --git a/hk2-configuration/hk2-integration/pom.xml b/hk2-configuration/hk2-integration/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-configuration</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
 
     <artifactId>hk2-configuration-integration</artifactId>

diff --git a/hk2-configuration/manager/pom.xml b/hk2-configuration/manager/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-configuration</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
 
     <artifactId>hk2-configuration-hub</artifactId>

diff --git a/hk2-configuration/persistence/hk2-xml/hk2-json/pom.xml b/hk2-configuration/persistence/hk2-xml/hk2-json/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-xml-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <artifactId>hk2-json</artifactId>
 

diff --git a/hk2-configuration/persistence/hk2-xml/hk2-pbuf/pom.xml b/hk2-configuration/persistence/hk2-xml/hk2-pbuf/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-xml-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <artifactId>hk2-pbuf</artifactId>
 

diff --git a/hk2-configuration/persistence/hk2-xml/integration-test/pom.xml b/hk2-configuration/persistence/hk2-xml/integration-test/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-xml-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <artifactId>hk2-xml-integration-test</artifactId>
 

diff --git a/hk2-configuration/persistence/hk2-xml/main/pom.xml b/hk2-configuration/persistence/hk2-xml/main/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-xml-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <artifactId>hk2-xml</artifactId>
 

diff --git a/hk2-configuration/persistence/hk2-xml/pom.xml b/hk2-configuration/persistence/hk2-xml/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-configuration-persistence</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/hk2-configuration/persistence/hk2-xml/schema/pom.xml b/hk2-configuration/persistence/hk2-xml/schema/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-xml-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <artifactId>hk2-xml-schema</artifactId>
 

diff --git a/hk2-configuration/persistence/hk2-xml/test1/pom.xml b/hk2-configuration/persistence/hk2-xml/test1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-xml-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.1.payara-p1</version>
     </parent>
     <artifactId>hk2-xml-test</artifactId>