add check for functional interface

bsorrentino · May 21, 2018 · 8de3fd2 · 8de3fd2
1 parent 9c89d89
commit 8de3fd2
Showing 1 changed file with 15 additions and 25 deletions.
diff --git a/core/src/main/java/org/bsc/java2typescript/TSType.java b/core/src/main/java/org/bsc/java2typescript/TSType.java
@@ -9,6 +9,8 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import static java.lang.String.format;
+import java.util.Arrays;
+
 /**
  * 
  * @author softphone
@@ -27,25 +29,6 @@ protected TSType() {
         super(3);
     }
 
-    public static TSType from(Class<?> cl, boolean exports) {
-        return new TSType() {
-            {
-                put(VALUE, cl);
-                put(EXPORT, exports);
-            }
-        };
-    }
-
-    public static TSType from(Class<?> cl, String alias, boolean exports) {
-        return new TSType() {
-            {
-                put(VALUE, cl);
-                put(EXPORT, exports);
-                put(ALIAS, alias);
-            }
-        };
-    }
-
     public static TSType from(Class<?> cl) {
         return new TSType() {
             {
@@ -54,7 +37,6 @@ public static TSType from(Class<?> cl) {
         };
     }
 
-
     /**
      * 
      * @return
@@ -97,6 +79,15 @@ public String getAlias() {
         return (String) super.get(ALIAS);
     }
 
+       /**
+     * 
+     * @return
+     */
+    public TSType setAlias( String value ) {
+        super.put(ALIAS,value);
+        return this;
+    }
+
     /**
      * 
      * @return
@@ -107,11 +98,10 @@ public boolean isFunctionalInterface() {
         if( !getValue().isInterface()) return false;
         if( getValue().isAnnotationPresent(FunctionalInterface.class)) return true;
 
-        //return Arrays.stream(c.getDeclaredMethods())
-        //            .filter( m -> Modifier.isAbstract(m.getModifiers()) )
-        //            .count() == 1;
-
-        return (Boolean)super.getOrDefault( FUNCTIONAL, false);
+        return (Boolean)super.getOrDefault( FUNCTIONAL, false) && 
+                Arrays.stream(getValue().getDeclaredMethods())
+                    .filter( m -> Modifier.isAbstract(m.getModifiers()) )
+                    .count() == 1;
     }
 
     /**