removed property from generation

bsorrentino · Dec 31, 2017 · 8d71302 · 8d71302
1 parent 627102d
commit 8d71302
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 28 deletions.
diff --git a/processor/src/main/java/org/bsc/processor/TypescriptHelper.java b/processor/src/main/java/org/bsc/processor/TypescriptHelper.java
@@ -135,11 +135,11 @@ static String getName( Class<?> type ) {
      * @return
      * @throws ClassNotFoundException
      */
-    static String getName( Type type, Class<?> declaringClass ) throws ClassNotFoundException {
+    static String getName( Type type, Class<?> declaringClass, boolean packageResolution ) throws ClassNotFoundException {
 
 		final Class<?> clazz = Class.forName(type.getTypeName());
 
-		return getName( clazz, declaringClass );
+		return getName( clazz, declaringClass, packageResolution );
 
     }
 

diff --git a/processor/src/main/java/org/bsc/processor/TypescriptProcessor.java b/processor/src/main/java/org/bsc/processor/TypescriptProcessor.java
@@ -194,7 +194,7 @@ private String getPropertyDecl(	Class<?> declaringClass,
 				final String typeName = pClass.getTypeName();
 
 				try {
-					final String name = getName( pClass, pd.getPropertyType());
+					final String name = getName( pClass, pd.getPropertyType(), true);
 
 					final String r = rType.getTypeName()
 							.replaceAll(typeName, name)
@@ -504,7 +504,20 @@ private String processClass(  BeanInfo bi, java.util.Map<String, Class<?>> decla
 
         final StringBuilder sb = new StringBuilder();
 
-        final PropertyDescriptor[] pds = bi.getPropertyDescriptors();
+        final String namespace = type.getPackage().getName();
+
+        if( !type.isMemberClass() )
+	        sb.append( "declare namespace " )
+	           .append(namespace)
+	           .append(" {\n\n")
+	            ;
+
+        sb.append( getClassDecl(type, declaredClassMap) )
+          .append("\n\n");
+
+        processEnum(sb, type, declaredClassMap);
+
+        //final PropertyDescriptor[] pds = bi.getPropertyDescriptors();
 
         final java.util.Set<Method> methodSet =
     	        getMethods( type )
@@ -513,37 +526,31 @@ private String processClass(  BeanInfo bi, java.util.Map<String, Class<?>> decla
     	        .filter( (md) -> {
 	        		final String name = md.getName();
 	        		return !( 	name.contains("$")		|| // remove unnamed
+        						name.equals("getClass")  ||
+        						name.equals("hashCode")  ||
 	        					name.equals("wait")		||
 	        					name.equals("notify")	||
 	        					name.equals("notifyAll") );
 	        })
-    	        .filter( md ->  // Remove setter and getter
-    	            !Arrays.asList(pds)
+    	        /*
+    	        .filter( md ->  {// Remove setter and getter
+    	        	
+    	            final boolean match = Arrays.asList(pds)
     	            			.stream()
-    	            			.anyMatch( pd -> (md.equals(pd.getReadMethod()) || md.equals(pd.getWriteMethod())) )
-    	        )
-    	        //.peek( (md ) -> System.out.printf( "==> CLASS [%s] - METHOD\t[%s]\n",type.getSimpleName(),md.getName()))
+    	            			.noneMatch( pd -> (md.equals(pd.getReadMethod()) || md.equals(pd.getWriteMethod())) );
+
+    	            return match;
+    	        })
+    	        */
     	        .collect( Collectors.toCollection(() -> new java.util.LinkedHashSet<Method>() ));
 
+        /*
         final java.util.Set<PropertyDescriptor> propertySet =
         		Arrays.stream(pds)
             .filter( TypescriptHelper::isPropertyValid )
             .collect( Collectors.toCollection(() -> new java.util.LinkedHashSet<PropertyDescriptor>(pds.length) ))
             ;
 
-        final String namespace = type.getPackage().getName();
-
-        if( !type.isMemberClass() )
-	        sb.append( "declare namespace " )
-	           .append(namespace)
-	           .append(" {\n\n")
-	            ;
-
-        sb.append( getClassDecl(type, declaredClassMap) )
-          .append("\n\n");
-
-        processEnum(sb, type, declaredClassMap);
-
         propertySet.stream()
 		    .map( pd -> {
 		    		final boolean duplicate = methodSet.stream().anyMatch( m -> m.getName().equals(pd.getName()));
@@ -552,12 +559,12 @@ private String processClass(  BeanInfo bi, java.util.Map<String, Class<?>> decla
 		    })
         		.sorted()
         		.forEach((decl) ->
-
-            sb.append( '\t' )
-              .append(decl)
-              .append(  ENDL ))
-              ;
-
+	            sb.append( '\t' )
+	              .append(decl)
+	              .append(  ENDL ))
+	              ;
+        */
+        
         methodSet.stream()
 	        .map( md -> getMethodDecl(md, type, declaredClassMap) )
 	        .sorted().forEach( (decl) ->