Remove support for Jackson version 1 (#884)

Author: vojtechhabarta

typescript-generator-core/pom.xml

@@ -13,18 +13,12 @@
     <name>typescript-generator-core</name>
 
     <properties>
-        <jackson1.version>1.9.13</jackson1.version>
         <graalvm.version>22.2.0</graalvm.version>
         <vavr.version>0.10.3</vavr.version>
     </properties>
 
     <dependencies>
         <!--compile dependencies-->
-        <dependency>
-            <groupId>org.codehaus.jackson</groupId>
-            <artifactId>jackson-mapper-asl</artifactId>
-            <version>${jackson1.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>

typescript-generator-core/src/main/java/cz/habarta/typescript/generator/JsonLibrary.java

@@ -1,5 +1,5 @@
 package cz.habarta.typescript.generator;
 
 public enum JsonLibrary {
-    jackson1, jackson2, jaxb, gson, jsonb
+    jackson2, jaxb, gson, jsonb
 }

typescript-generator-core/src/main/java/cz/habarta/typescript/generator/TypeScriptGenerator.java

@@ -8,7 +8,6 @@
 import cz.habarta.typescript.generator.emitter.NpmPackageJsonEmitter;
 import cz.habarta.typescript.generator.emitter.TsModel;
 import cz.habarta.typescript.generator.parser.GsonParser;
-import cz.habarta.typescript.generator.parser.Jackson1Parser;
 import cz.habarta.typescript.generator.parser.Jackson2Parser;
 import cz.habarta.typescript.generator.parser.JsonbParser;
 import cz.habarta.typescript.generator.parser.Model;
@@ -194,8 +193,6 @@ private ModelParser createModelParser() {
 
     private ModelParser.Factory getModelParserFactory() {
         switch (settings.jsonLibrary) {
-            case jackson1:
-                return new Jackson1Parser.Factory();
             case jackson2:
                 return new Jackson2Parser.Jackson2ParserFactory();
             case jaxb:

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

@@ -15,7 +15,7 @@ public class IncludeExcludePropertyTest {
 
     public static Stream<JsonLibrary> data() {
         return Arrays.stream(JsonLibrary.values())
-                .filter(library -> library != JsonLibrary.jackson1 && library != JsonLibrary.jsonb);
+                .filter(library -> library != JsonLibrary.jsonb);
     }
 
     @ParameterizedTest(name = "{index} - {0}")

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

@@ -1,7 +1,7 @@
 package cz.habarta.typescript.generator;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import cz.habarta.typescript.generator.parser.BeanModel;
-import cz.habarta.typescript.generator.parser.Jackson1Parser;
 import cz.habarta.typescript.generator.parser.Jackson2Parser;
 import cz.habarta.typescript.generator.parser.Model;
 import cz.habarta.typescript.generator.parser.ModelParser;
@@ -21,21 +21,6 @@
 
 public class OptionalAnnotationTest {
 
-    @Test
-    public void testJackson1OptionalAnnotation() {
-        Settings settings = new Settings();
-        settings.optionalAnnotations.add(Nullable.class);
-        ModelParser parser = new Jackson1Parser(settings, new DefaultTypeProcessor());
-        testModel(parser.parseModel(Jackson1Bean.class), true);
-    }
-
-    @Test
-    public void testJackson1NoAnnotation() {
-        Settings settings = new Settings();
-        ModelParser parser = new Jackson1Parser(settings, new DefaultTypeProcessor());
-        testModel(parser.parseModel(Jackson1Bean.class), false);
-    }
-
     @Test
     public void testJackson2OptionalAnnotation() {
         Settings settings = new Settings();
@@ -60,11 +45,6 @@ private void testModel(Model model, boolean optional) {
         }
     }
 
-    @Test
-    public void testJavaxNullableWithJackson1() {
-        testJavaxNullableUsingTypeScriptGenerator(JsonLibrary.jackson1);
-    }
-
     @Test
     public void testJavaxNullableWithJackson2() {
         testJavaxNullableUsingTypeScriptGenerator(JsonLibrary.jackson2);
@@ -78,31 +58,18 @@ private void testJavaxNullableUsingTypeScriptGenerator(JsonLibrary jsonLibrary)
         Assertions.assertTrue(output.contains("property1?: string;"));
     }
 
-    @org.codehaus.jackson.annotate.JacksonAnnotation
     @Retention(RetentionPolicy.RUNTIME)
     static @interface Nullable {
         // marker
     }
 
-    static class Jackson1Bean {
-        @Nullable
-        @org.codehaus.jackson.annotate.JsonProperty
-        private String fieldProperty;
-
-        @Nullable
-        @org.codehaus.jackson.annotate.JsonProperty
-        public String getMethodProperty() {
-            return fieldProperty;
-        }
-    }
-
     static class Jackson2Bean {
         @Nullable
-        @com.fasterxml.jackson.annotation.JsonProperty
+        @JsonProperty
         private String fieldProperty;
 
         @Nullable
-        @com.fasterxml.jackson.annotation.JsonProperty
+        @JsonProperty
         public String getMethodProperty() {
             return fieldProperty;
         }

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

@@ -214,7 +214,6 @@ public class GenerateMojo extends AbstractMojo {
      * Library used in JSON classes.
      * Supported values are:
      * <ul>
-     * <li><code>jackson1</code> - annotations from `org.codehaus.jackson.annotate` package</li>
      * <li><code>jackson2</code> - annotations from `com.fasterxml.jackson.annotation` package</li>
      * <li><code>jaxb</code> - annotations from `javax.xml.bind.annotation` package<li>
      * <li><code>gson</code> - annotations from `com.google.gson.annotations` package<li>