ClassCastException during Graal native image and ReST Client (helidon…

…-io#2917) * Addresses helidon-io#2913 * Adding primitive PathParam
aseovic · Apr 26, 2021 · 6c7cce8 · 6c7cce8
1 parent 2a5a09e
commit 6c7cce8
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 13 deletions.
diff --git a/...in/java/io/helidon/integrations/graal/nativeimage/extension/HelidonReflectionFeature.java b/...in/java/io/helidon/integrations/graal/nativeimage/extension/HelidonReflectionFeature.java
@@ -272,18 +272,17 @@ private Class<?> getSimpleType(BeforeAnalysisContext context,
             TypeSignature typeDescriptor = typeDescriptorSupplier.get();
             return getSimpleType(context, typeDescriptor);
         }
-        ClassRefTypeSignature refType = (ClassRefTypeSignature) typeSignature;
-        List<TypeArgument> typeArguments = refType.getTypeArguments();
-        if (typeArguments.size() != 1) {
-            return getSimpleType(context, typeSignature);
-        }
 
-        TypeArgument typeArgument = typeArguments.get(0);
-        ReferenceTypeSignature ref = typeArgument.getTypeSignature();
-        if (ref == null) {
-            return Object.class;
+        if (typeSignature instanceof ClassRefTypeSignature) {
+            ClassRefTypeSignature refType = (ClassRefTypeSignature) typeSignature;
+            List<TypeArgument> typeArguments = refType.getTypeArguments();
+            if (typeArguments.size() == 1) {
+                TypeArgument typeArgument = typeArguments.get(0);
+                ReferenceTypeSignature ref = typeArgument.getTypeSignature();
+                return getSimpleType(context, ref);
+            }
         }
-        return getSimpleType(context, ref);
+        return getSimpleType(context, typeSignature);
     }
 
     private Class<?> getSimpleType(BeforeAnalysisContext context, TypeSignature typeSignature) {

diff --git a/...-image/mp-1/src/main/java/io/helidon/tests/integration/nativeimage/mp1/JaxRsResource.java b/...-image/mp-1/src/main/java/io/helidon/tests/integration/nativeimage/mp1/JaxRsResource.java
@@ -174,4 +174,10 @@ public String queryParam(@QueryParam("long") Long longParam) {
     public String queryParam(@QueryParam("boolean") Boolean booleanParam) {
         return String.valueOf(booleanParam);
     }
+
+    @GET
+    @Path("/queryparam3")
+    public String queryParam(@QueryParam("int") int intParam) {
+        return String.valueOf(intParam);
+    }
 }
diff --git a/...native-image/mp-1/src/main/java/io/helidon/tests/integration/nativeimage/mp1/Mp1Main.java b/...native-image/mp-1/src/main/java/io/helidon/tests/integration/nativeimage/mp1/Mp1Main.java
@@ -191,8 +191,9 @@ private static void testBean(int port, String jwtToken) {
         // + JSON-B
         invoke(collector, "Rest client JSON-B", "json-b", aBean::restClientJsonB);
         // + query params
-        invoke(collector, "Rest client Query param long", "1020", () -> aBean.restClientQuery(1020L));
-        invoke(collector, "Rest client Query param boolean", "true", () -> aBean.restClientQuery(true));
+        invoke(collector, "Rest client Query param Long", "1020", () -> aBean.restClientQuery(1020L));
+        invoke(collector, "Rest client Query param Boolean", "true", () -> aBean.restClientQuery(true));
+        invoke(collector, "Rest client Query param int", "123", () -> aBean.restClientQuery(123));
 
         // Message from rest client, originating in BeanClass.BeanType
         invoke(collector, "Rest client bean type", "Properties message", aBean::restClientBeanType);

diff --git a/...mage/mp-1/src/main/java/io/helidon/tests/integration/nativeimage/mp1/RestClientIface.java b/...mage/mp-1/src/main/java/io/helidon/tests/integration/nativeimage/mp1/RestClientIface.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020 Oracle and/or its affiliates.
+ * Copyright (c) 2019, 2021 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,4 +54,8 @@ public interface RestClientIface {
     @GET
     @Path("/queryparam2")
     String queryParam(@QueryParam("boolean") Boolean booleanParam);
+
+    @GET
+    @Path("/queryparam3")
+    String queryParam(@QueryParam("int") int intParam);
 }
diff --git a/...ative-image/mp-1/src/main/java/io/helidon/tests/integration/nativeimage/mp1/TestBean.java b/...ative-image/mp-1/src/main/java/io/helidon/tests/integration/nativeimage/mp1/TestBean.java
@@ -111,6 +111,11 @@ public String restClientQuery(Boolean param) {
                 .queryParam(param);
     }
 
+    public String restClientQuery(int param) {
+        return restClient()
+                .queryParam(param);
+    }
+
     @Fallback(fallbackMethod = "fallbackTo")
     public String fallback() {
         throw new RuntimeException("intentional failure");