Merge branch 'release/0.2.0' into develop

bsorrentino · Mar 27, 2018 · 2a01923 · 2a01923
2 parents fe1e7d6 + 14318ac
commit 2a01923
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 40 deletions.
diff --git a/README.md b/README.md
@@ -123,5 +123,5 @@ The easier way to start your **Typescript on JVM** project is using the provided
 >mvn archetype:generate \
 >-DarchetypeGroupId=org.bsc.processor \
 >-DarchetypeArtifactId=java2ts-processor-archetype \
->-DarchetypeVersion=0.1.0
+>-DarchetypeVersion=0.2.0
 >```
diff --git a/archetype/pom.xml b/archetype/pom.xml
@@ -5,7 +5,7 @@
   <parent>
       <groupId>org.bsc.processor</groupId>
     <artifactId>java2ts-processor-parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>0.2.0</version>
   </parent>
   <artifactId>java2ts-processor-archetype</artifactId>
   <name>java2ts-processor::archetype - ${project.version}</name>

diff --git a/core/pom.xml b/core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.bsc.processor</groupId>
     <artifactId>java2ts-processor-parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>0.2.0</version>
   </parent>
   <artifactId>java2ts-processor-core</artifactId>
   <name>java2ts-processor::core - ${project.version}</name>

diff --git a/core/src/main/java/org/bsc/java2typescript/TypescriptConverter.java b/core/src/main/java/org/bsc/java2typescript/TypescriptConverter.java
@@ -2,6 +2,8 @@
 
 import static java.lang.String.format;
 
+import java.io.Closeable;
+import java.io.Serializable;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Executable;
 import java.lang.reflect.GenericArrayType;
@@ -14,22 +16,48 @@
 import java.lang.reflect.TypeVariable;
 import java.lang.reflect.WildcardType;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.RandomAccess;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
 import java.util.function.BiPredicate;
+import java.util.function.BinaryOperator;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Predicate;
+import java.util.function.Supplier;
+import java.util.function.UnaryOperator;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 public class TypescriptConverter {
 
     final static String ENDL = ";\n";
 
+    public static final List<TSType> PREDEFINED_TYPES = Arrays.asList(
+            TSType.from(Class.class),
+            TSType.from(Serializable.class),
+            TSType.from(Closeable.class),
+            TSType.from(AutoCloseable.class),
+            TSType.from(Comparable.class),
+            TSType.from(Cloneable.class),
+            TSType.from(RandomAccess.class),
+            TSType.from(Function.class, "Func", false),
+            TSType.from(BiFunction.class, "BiFunc", false),
+            TSType.from(Consumer.class),
+            TSType.from(BiConsumer.class),
+            TSType.from(UnaryOperator.class),
+            TSType.from(BinaryOperator.class),
+            TSType.from(Supplier.class),
+            TSType.from(Predicate.class),
+            TSType.from(BiPredicate.class),
+            TSType.from(Runnable.class)
+        );
+
 
         /**
          *

diff --git a/processor/src/main/resources/headerD.ts → core/src/main/resources/headerD.ts b/processor/src/main/resources/headerD.ts → core/src/main/resources/headerD.ts
diff --git a/processor/src/main/resources/headerT.ts → core/src/main/resources/headerT.ts b/processor/src/main/resources/headerT.ts → core/src/main/resources/headerT.ts
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.bsc.processor</groupId>
     <artifactId>java2ts-processor-parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>0.2.0</version>
     <packaging>pom</packaging>
 
     <name>java2ts-processor::parent - ${project.version}</name>

diff --git a/processor/pom.xml b/processor/pom.xml
@@ -7,7 +7,7 @@
     <parent>
 	    <groupId>org.bsc.processor</groupId>
 	    <artifactId>java2ts-processor-parent</artifactId>
-	    <version>1.0.0-SNAPSHOT</version>    
+	    <version>0.2.0</version>    
     </parent>
 
     <build>

diff --git a/processor/src/main/java/org/bsc/processor/TypescriptProcessor.java b/processor/src/main/java/org/bsc/processor/TypescriptProcessor.java
@@ -1,24 +1,15 @@
 package org.bsc.processor;
 
-import java.io.Closeable;
+import static org.bsc.java2typescript.TypescriptConverter.PREDEFINED_TYPES;
+
 import java.io.IOException;
-import java.io.Serializable;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
-import java.util.RandomAccess;
 import java.util.Set;
-import java.util.function.BiConsumer;
-import java.util.function.BiFunction;
-import java.util.function.BiPredicate;
-import java.util.function.BinaryOperator;
 import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.function.Predicate;
-import java.util.function.Supplier;
-import java.util.function.UnaryOperator;
 import java.util.stream.Collectors;
 
 import javax.annotation.processing.SupportedAnnotationTypes;
@@ -32,7 +23,7 @@
 import javax.tools.FileObject;
 
 import org.bsc.java2typescript.TSType;
-import org.bsc.java2typescript.TypescriptConverter;
+import org.bsc.java2typescript.TypescriptConverter;;
 
 /**
  *
@@ -46,26 +37,6 @@ public class TypescriptProcessor extends AbstractProcessorEx {
 
     final static String ENDL = ";\n";
 
-    static final List<TSType> PREDEFINED_TYPES = Arrays.asList(
-    		TSType.from(Class.class),
-    		TSType.from(Serializable.class),
-    		TSType.from(Closeable.class),
-    		TSType.from(AutoCloseable.class),
-    		TSType.from(Comparable.class),
-    		TSType.from(Cloneable.class),
-    		TSType.from(RandomAccess.class),
-    		TSType.from(Function.class, "Func", false),
-    		TSType.from(BiFunction.class, "BiFunc", false),
-    		TSType.from(Consumer.class),
-    		TSType.from(BiConsumer.class),
-    		TSType.from(UnaryOperator.class),
-    		TSType.from(BinaryOperator.class),
-    		TSType.from(Supplier.class),
-    		TSType.from(Predicate.class),
-    		TSType.from(BiPredicate.class),
-    		TSType.from(Runnable.class)
-    	);
-
     static final List<TSType> REQUIRED_TYPES = Arrays.asList(
     		TSType.from(java.lang.String.class,true),
     		TSType.from(java.lang.Iterable.class,true),

diff --git a/sample/pom.xml b/sample/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.bsc.processor</groupId>
     <artifactId>java2ts-processor-parent</artifactId>
-    <version>0.1.0</version>
+    <version>0.2.0</version>
   </parent>
 
   <build>
@@ -36,7 +36,7 @@
 		    		<skipSource>true</skipSource>
 		    </configuration>
 		</plugin>
-      
+
 
       <plugin>
         <groupId>org.bsc.maven</groupId>
@@ -60,7 +60,7 @@
       </plugin>
 
       <plugin>
-      
+
          <groupId>org.codehaus.mojo</groupId>
          <artifactId>exec-maven-plugin</artifactId>
          <version>1.6.0</version>