Import types referenced in lambdas

1 files changed, 11 insertions, 8 deletions

diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/Analyze.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/Analyze.java
index 054e820b1a4..7c34539921b 100644
--- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/Analyze.java
+++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/Analyze.java
@@ -13,7 +13,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.Optional;
 
-
 /**
  * Main entry point for class analysis
  *
@@ -21,6 +20,7 @@ import java.util.Optional;
  * @author ollivir
  */
 public class Analyze {
+
     public static ClassFileMetaData analyzeClass(File classFile) {
         return analyzeClass(classFile, null);
     }
@@ -44,7 +44,7 @@ public class Analyze {
     }
 
     static Optional<String> internalNameToClassName(String internalClassName) {
-        if(internalClassName == null) {
+        if (internalClassName == null) {
             return Optional.empty();
         } else {
             return getClassName(Type.getObjectType(internalClassName));
@@ -53,12 +53,14 @@ public class Analyze {
 
     static Optional<String> getClassName(Type aType) {
         switch (aType.getSort()) {
-        case Type.ARRAY:
-            return getClassName(aType.getElementType());
-        case Type.OBJECT:
-            return Optional.of(aType.getClassName());
-        default:
-            return Optional.empty();
+            case Type.ARRAY:
+                return getClassName(aType.getElementType());
+            case Type.OBJECT:
+                return Optional.of(aType.getClassName());
+            case Type.METHOD:
+                return getClassName(aType.getReturnType());
+            default:
+                return Optional.empty();
         }
     }
 
@@ -89,4 +91,5 @@ public class Analyze {
             }
         };
     }
+
 }