Cleanup, take advantage of Java 11

Author: vojtechhabarta

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

@@ -151,7 +151,7 @@ public TsModel javaToTypeScript(Model model) {
             }
         }
 
-        // dates
+        // maps
         tsModel = transformMaps(symbolTable, tsModel);
 
         // dates

typescript-generator-core/src/main/java/cz/habarta/typescript/generator/parser/Jackson2Parser.java

@@ -724,7 +724,7 @@ private DeclarationModel parseEnumOrObjectEnum(SourceType<Class<?>> sourceClass,
         final List<EnumMemberModel> enumMembers = new ArrayList<>();
         if (sourceClass.type.isEnum()) {
             @SuppressWarnings("unchecked")
-            final Class<Enum> enumClass = (Class<Enum>) sourceClass.type;
+            final Class<Enum<?>> enumClass = (Class<Enum<?>>) sourceClass.type;
             final List<Field> constants = Arrays.stream(enumClass.getEnumConstants()).map(e -> {
                 try {
                     return enumClass.getDeclaredField(e.name());

typescript-generator-core/src/main/java/cz/habarta/typescript/generator/util/DeprecationUtils.java

@@ -8,9 +8,8 @@ public final class DeprecationUtils {
     public static final String DEPRECATED = "@deprecated";
 
     public static String convertToComment(Deprecated deprecated) {
-        // support for java 9+ syntax
-        String since = Utils.getAnnotationElementValue(deprecated, "since", String.class);
-        Boolean forRemoval = Utils.getAnnotationElementValue(deprecated, "forRemoval", Boolean.class);
+        String since = deprecated.since();
+        Boolean forRemoval = deprecated.forRemoval();
 
         List<String> additional = new ArrayList<>();
         if (since != null && !since.isEmpty()) {
@@ -21,4 +20,5 @@ public static String convertToComment(Deprecated deprecated) {
         }
         return additional.isEmpty() ? DEPRECATED : (DEPRECATED + " " + String.join(", ", additional));
     }
+
 }

typescript-generator-core/src/main/java/cz/habarta/typescript/generator/util/Utils.java

@@ -30,26 +30,20 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Scanner;
-import java.util.Spliterator;
-import java.util.Spliterators;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
-import java.util.function.Predicate;
 import java.util.function.Supplier;
-import java.util.function.UnaryOperator;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collector;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
 
 
 public final class Utils {
@@ -122,7 +116,7 @@ public static List<Field> getAllFields(Class<?> cls) {
     }
 
     public static Stream<Class<?>> getInheritanceChain(Class<?> cls) {
-        return generateStream(cls, c -> c != null, (Class<?> c) -> c.getSuperclass())
+        return Stream.iterate(cls, c -> c != null, (Class<?> c) -> c.getSuperclass())
                 .collect(toReversedCollection())
                 .stream();
     }
@@ -149,27 +143,6 @@ public static Stream<Class<?>> getInheritanceChain(Class<?> cls) {
         );
     }
 
-    // remove on Java 9 and replace with Stream.iterate
-    private static <T> Stream<T> generateStream(T seed, Predicate<? super T> hasNext, UnaryOperator<T> next) {
-        final Spliterator<T> spliterator = Spliterators.spliteratorUnknownSize(new Iterator<T>() {
-            private T last = seed;
-
-            @Override
-            public boolean hasNext() {
-                return hasNext.test(last);
-            }
-
-            @Override
-            public T next() {
-                final T current = last;
-                last = next.apply(last);
-                return current;
-            }
-        }, Spliterator.ORDERED);
-
-        return StreamSupport.stream(spliterator, false);
-    }
-
     public static boolean hasAnyAnnotation(
             Function<Class<? extends Annotation>, Annotation> getAnnotationFunction,
             List<Class<? extends Annotation>> annotations) {

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

@@ -8,35 +8,33 @@
 
 public class DeprecationUtilsTest {
 
-// TODO uncomment on Java 9
-
-//    @Deprecated
-//    private String a;
-//
-//    @Deprecated(since = "2.28")
-//    private String b;
-//
-//    @Deprecated(forRemoval = true)
-//    private String c;
-//
-//    @Deprecated(since = "2.28", forRemoval = true)
-//    private String d;
-//
-//    @Test
-//    public void test() {
-//        Assert.assertEquals("@deprecated", getDeprecationText("a"));
-//        Assert.assertEquals("@deprecated since 2.28", getDeprecationText("b"));
-//        Assert.assertEquals("@deprecated for removal", getDeprecationText("c"));
-//        Assert.assertEquals("@deprecated since 2.28, for removal", getDeprecationText("d"));
-//    }
-//
-//    private static String getDeprecationText(String fieldName) {
-//        try {
-//            final Deprecated deprecated = DeprecationUtilsTest.class.getDeclaredField(fieldName).getAnnotation(Deprecated.class);
-//            return DeprecationUtils.convertToComment(deprecated);
-//        } catch (ReflectiveOperationException e) {
-//            throw new RuntimeException(e);
-//        }
-//    }
+    @Deprecated
+    private String a;
+
+    @Deprecated(since = "2.28")
+    private String b;
+
+    @Deprecated(forRemoval = true)
+    private String c;
+
+    @Deprecated(since = "2.28", forRemoval = true)
+    private String d;
+
+    @Test
+    public void test() {
+        Assertions.assertEquals("@deprecated", getDeprecationText("a"));
+        Assertions.assertEquals("@deprecated since 2.28", getDeprecationText("b"));
+        Assertions.assertEquals("@deprecated for removal", getDeprecationText("c"));
+        Assertions.assertEquals("@deprecated since 2.28, for removal", getDeprecationText("d"));
+    }
+
+    private static String getDeprecationText(String fieldName) {
+        try {
+            final Deprecated deprecated = DeprecationUtilsTest.class.getDeclaredField(fieldName).getAnnotation(Deprecated.class);
+            return DeprecationUtils.convertToComment(deprecated);
+        } catch (ReflectiveOperationException e) {
+            throw new RuntimeException(e);
+        }
+    }
 
 }