Adapt to new typescript-generator version

dangmai · Nov 11, 2022 · 4d3a064 · 4d3a064
1 parent 92cfc05
commit 4d3a064
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 11 deletions.
diff --git a/src/main/java/net/dangmai/types/CustomEnumExtension.java b/src/main/java/net/dangmai/types/CustomEnumExtension.java
@@ -4,8 +4,8 @@
 import cz.habarta.typescript.generator.TsProperty;
 import cz.habarta.typescript.generator.TsType;
 import cz.habarta.typescript.generator.compiler.ModelCompiler;
-import cz.habarta.typescript.generator.compiler.ModelTransformer;
 import cz.habarta.typescript.generator.compiler.Symbol;
+import cz.habarta.typescript.generator.compiler.TsModelTransformer;
 import cz.habarta.typescript.generator.emitter.*;
 
 import java.util.Arrays;
@@ -30,7 +30,7 @@ public List<TransformerDefinition> getTransformers() {
         return Arrays.asList(
             new TransformerDefinition(
                 ModelCompiler.TransformationPhase.BeforeEnums,
-                (ModelTransformer) (symbolTable, model) -> transformEnums(model)
+                (TsModelTransformer) (context, model) -> transformEnums(model)
             )
         );
     }

diff --git a/src/main/java/net/dangmai/types/CustomFieldExtension.java b/src/main/java/net/dangmai/types/CustomFieldExtension.java
@@ -3,7 +3,7 @@
 import cz.habarta.typescript.generator.Extension;
 import cz.habarta.typescript.generator.TsType;
 import cz.habarta.typescript.generator.compiler.ModelCompiler;
-import cz.habarta.typescript.generator.compiler.ModelTransformer;
+import cz.habarta.typescript.generator.compiler.TsModelTransformer;
 import cz.habarta.typescript.generator.emitter.EmitterExtensionFeatures;
 import cz.habarta.typescript.generator.emitter.TsBeanModel;
 import cz.habarta.typescript.generator.emitter.TsModifierFlags;
@@ -28,7 +28,7 @@ public List<TransformerDefinition> getTransformers() {
         return Arrays.asList(
             new TransformerDefinition(
                 ModelCompiler.TransformationPhase.BeforeSymbolResolution,
-                (ModelTransformer) (symbolTable, model) -> model.withBeans(
+                (TsModelTransformer) (context, model) -> model.withBeans(
                     model.getBeans().stream()
                         .map(CustomFieldExtension.this::addCustomProperties)
                         .collect(Collectors.toList())

diff --git a/src/main/java/net/dangmai/types/GenericNodeExtension.java b/src/main/java/net/dangmai/types/GenericNodeExtension.java
@@ -3,8 +3,8 @@
 import cz.habarta.typescript.generator.Extension;
 import cz.habarta.typescript.generator.TsType;
 import cz.habarta.typescript.generator.compiler.ModelCompiler;
-import cz.habarta.typescript.generator.compiler.ModelTransformer;
 import cz.habarta.typescript.generator.compiler.Symbol;
+import cz.habarta.typescript.generator.compiler.TsModelTransformer;
 import cz.habarta.typescript.generator.emitter.*;
 
 import java.util.Arrays;
@@ -21,7 +21,7 @@ public List<TransformerDefinition> getTransformers() {
         return Arrays.asList(
             new TransformerDefinition(
                 ModelCompiler.TransformationPhase.BeforeSymbolResolution,
-                (ModelTransformer) (symbolTable, model) -> addGenericNode(model)
+                (TsModelTransformer) (context, model) -> addGenericNode(model)
             )
         );
     }

diff --git a/src/main/java/net/dangmai/types/UnionTypeExtension.java b/src/main/java/net/dangmai/types/UnionTypeExtension.java
@@ -5,7 +5,6 @@
 import cz.habarta.typescript.generator.compiler.ModelTransformer;
 import cz.habarta.typescript.generator.compiler.SymbolTable;
 import cz.habarta.typescript.generator.emitter.EmitterExtensionFeatures;
-import cz.habarta.typescript.generator.emitter.TsModel;
 import cz.habarta.typescript.generator.parser.BeanModel;
 import cz.habarta.typescript.generator.parser.Model;
 import cz.habarta.typescript.generator.util.Utils;
@@ -36,10 +35,6 @@ public List<Extension.TransformerDefinition> getTransformers() {
     }
 
     public static class UnionTypeModelTransformer implements ModelTransformer {
-        @Override
-        public TsModel transformModel(SymbolTable symbolTable, TsModel model) {
-            return model;
-        }
         // This method is copied straight from a private method in
         // typescript-generator
         private Map<Type, List<BeanModel>> createChildrenMap(Model model) {