process nested classes only at first level

bsorrentino · Mar 11, 2018 · 68c2adf · 68c2adf
1 parent 17ddf67
commit 68c2adf
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/processor/src/main/java/org/bsc/processor/TypescriptProcessor.java b/processor/src/main/java/org/bsc/processor/TypescriptProcessor.java
@@ -169,7 +169,7 @@ public boolean process( Context processingContext ) throws Exception {
 
 			types.stream()
 				.filter( tt -> !PREDEFINED_TYPES.contains(tt) )
-				.map( tt -> processClass( tt, declaredTypes))
+				.map( tt -> processClass( 0, tt, declaredTypes))
 				.forEach( wD_append );
 
 			wT.append( "/// <reference path=\"").append(definitionsFile).append("\"/>" ).append( "\n\n");
@@ -353,7 +353,7 @@ public static <T> Predicate<T> distinctByKey(Function<? super T,Object> keyExtra
      * @param type
      * @param declaredTypeMap
      */
-    private void processNestedClasses( StringBuilder sb, TSType tstype, java.util.Map<String, TSType> declaredTypeMap ) {
+    private void processNestedClasses( StringBuilder sb, int level, TSType tstype, java.util.Map<String, TSType> declaredTypeMap ) {
 
         final Class<?> nestedClasses[] = tstype.getValue().getClasses();
 
@@ -367,7 +367,7 @@ private void processNestedClasses( StringBuilder sb, TSType tstype, java.util.Ma
         Stream.of(nestedClasses)
         		.filter( distinctByKey( c -> c.getSimpleName() ) )
         		.map( cl ->  TSType.from(cl) )
-        		.map( t -> processClass(t, declaredTypeMap) )
+        		.map( t -> processClass( level + 1, t, declaredTypeMap) )
         		.forEach( decl -> sb.append(decl) );
 
         sb.append("\n} // end module ")
@@ -482,7 +482,7 @@ private String processStatic( TSType type, java.util.Map<String, TSType> declare
      * @param declaredClassMap
      * @return
      */
-    private String processClass( TSType tstype, java.util.Map<String, TSType> declaredClassMap )   {
+    private String processClass( int level, TSType tstype, java.util.Map<String, TSType> declaredClassMap )   {
 
         final StringBuilder sb = new StringBuilder();
 
@@ -526,7 +526,7 @@ private String processClass( TSType tstype, java.util.Map<String, TSType> declar
         		.append('\n');
 
         // NESTED CLASSES
-        processNestedClasses(sb, tstype, declaredClassMap);
+        if( level == 0 ) processNestedClasses( sb, level, tstype, declaredClassMap);
 
         if( !tstype.getValue().isMemberClass() )
         		sb.append("\n} // end namespace ")