revert version and take out Java 8 streams and lombok (PR #192)

Author: Toplak, Jeramy

pom.xml

@@ -5,7 +5,7 @@
     <groupId>cz.habarta.typescript-generator</groupId>
     <artifactId>typescript-generator</artifactId>
     <packaging>pom</packaging>
-    <version>1.30</version>
+    <version>1.29-SNAPSHOT</version>
     <name>typescript-generator</name>
     <description>Generates TypeScript declaration file from specified java classes.</description>
     <url>https://github.com/vojtechhabarta/typescript-generator</url>

typescript-generator-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>cz.habarta.typescript-generator</groupId>
         <artifactId>typescript-generator</artifactId>
-        <version>1.30</version>
+        <version>1.29-SNAPSHOT</version>
     </parent>
 
     <artifactId>typescript-generator-core</artifactId>
@@ -94,28 +94,6 @@
             <version>${jackson2.version}</version>
             <scope>test</scope>
         </dependency>-->
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>1.16.16</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>1.7.22</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <version>1.7.22</version>
-        </dependency>
-        <dependency>
-            <groupId>org.javassist</groupId>
-            <artifactId>javassist</artifactId>
-            <version>3.21.0-GA</version>
-        </dependency>
     </dependencies>
 
     <build>
@@ -166,8 +144,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>1.7</source>
+                    <target>1.7</target>
                 </configuration>
             </plugin>
         </plugins>

typescript-generator-core/src/main/java/cz/habarta/typescript/generator/compiler/ModelCompiler.java

@@ -11,7 +11,6 @@
 import java.lang.reflect.Type;
 import java.lang.reflect.TypeVariable;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * Compiles Java model to TypeScript model.
@@ -100,10 +99,13 @@ public TsModel javaToTypeScript(Model model) {
     }
 
     private TsModel transformClassToEnum(TsModel tsModel) {
-        final List<TsBeanModel> classEnums = tsModel.getBeans()
-                .stream()
-                .filter(tsBeanModel -> tsBeanModel.getName().getSimpleName().contains(settings.classEnumPattern))
-                .collect(Collectors.toList());
+        List<TsBeanModel> beans = tsModel.getBeans();
+
+        List<TsBeanModel> classEnums = new ArrayList<TsBeanModel>();
+        for (TsBeanModel bean : beans) {
+            if (bean.getName().getSimpleName().contains(settings.classEnumPattern))
+                classEnums.add(bean);
+        }
 
         List<TsEnumModel> stringEnums = new ArrayList<>();
         for (TsBeanModel tsBeanModel : classEnums) {

typescript-generator-core/src/test/java/cz/habarta/typescript/generator/DummyClassEnum.java

@@ -2,11 +2,9 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
-import lombok.EqualsAndHashCode;
 
 import java.util.Objects;
 
-@EqualsAndHashCode
 public class DummyClassEnum {
 
     public static final DummyClassEnum ATYPE  = new DummyClassEnum("ATYPE");

typescript-generator-gradle-plugin/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>cz.habarta.typescript-generator</groupId>
         <artifactId>typescript-generator</artifactId>
-        <version>1.30</version>
+        <version>1.29-SNAPSHOT</version>
     </parent>
 
     <artifactId>typescript-generator-gradle-plugin</artifactId>
@@ -42,7 +42,7 @@
         <dependency>
             <groupId>cz.habarta.typescript-generator</groupId>
             <artifactId>typescript-generator-core</artifactId>
-            <version>1.30</version>
+            <version>1.29-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

typescript-generator-maven-plugin/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>cz.habarta.typescript-generator</groupId>
         <artifactId>typescript-generator</artifactId>
-        <version>1.30</version>
+        <version>1.29-SNAPSHOT</version>
     </parent>
 
     <artifactId>typescript-generator-maven-plugin</artifactId>
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>cz.habarta.typescript-generator</groupId>
             <artifactId>typescript-generator-core</artifactId>
-            <version>1.30</version>
+            <version>1.29-SNAPSHOT</version>
         </dependency>
     </dependencies>