Remove deprecations

Author: vojtechhabarta

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

@@ -25,12 +25,18 @@ public static class TransformerDefinition {
         public final TsModelTransformer tsTransformer;
 
         public TransformerDefinition(ModelCompiler.TransformationPhase phase, ModelTransformer transformer) {
+            if (phase != ModelCompiler.TransformationPhase.BeforeTsModel) {
+                throw new IllegalArgumentException("ModelTransformer can only be applied in phase 'BeforeTsModel'");
+            }
             this.phase = phase;
             this.transformer = transformer;
-            this.tsTransformer = (context, model) -> transformer.transformModel(context.getSymbolTable(), model);
+            this.tsTransformer = null;
         }
 
         public TransformerDefinition(ModelCompiler.TransformationPhase phase, TsModelTransformer transformer) {
+            if (phase == ModelCompiler.TransformationPhase.BeforeTsModel) {
+                throw new IllegalArgumentException("TsModelTransformer cannot be applied in phase 'BeforeTsModel'");
+            }
             this.phase = phase;
             this.transformer = null;
             this.tsTransformer = transformer;

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

@@ -39,35 +39,6 @@ public static Input from(Type... types) {
         return new Input(sourceTypes);
     }
 
-    @Deprecated
-    public static Input fromClassNamesAndJaxrsApplication(List<String> classNames, List<String> classNamePatterns, String jaxrsApplicationClassName,
-            boolean automaticJaxrsApplication, Predicate<String> isClassNameExcluded, URLClassLoader classLoader, boolean debug) {
-        return fromClassNamesAndJaxrsApplication(classNames, classNamePatterns, null, null, null,
-                jaxrsApplicationClassName, automaticJaxrsApplication, isClassNameExcluded, classLoader,
-                debug);
-    }
-
-    @Deprecated
-    public static Input fromClassNamesAndJaxrsApplication(List<String> classNames,
-            List<String> classNamePatterns, List<String> classesWithAnnotations,
-            List<String> classesImplementingInterfaces, List<String> classesExtendingClasses,
-            String jaxrsApplicationClassName,
-            boolean automaticJaxrsApplication, Predicate<String> isClassNameExcluded,
-            URLClassLoader classLoader, boolean debug) {
-        final Parameters parameters = new Parameters();
-        parameters.classNames = classNames;
-        parameters.classNamePatterns = classNamePatterns;
-        parameters.classesWithAnnotations = classesWithAnnotations;
-        parameters.classesImplementingInterfaces = classesImplementingInterfaces;
-        parameters.classesExtendingClasses = classesExtendingClasses;
-        parameters.jaxrsApplicationClassName = jaxrsApplicationClassName;
-        parameters.automaticJaxrsApplication = automaticJaxrsApplication;
-        parameters.isClassNameExcluded = isClassNameExcluded;
-        parameters.classLoader = classLoader;
-        parameters.debug = debug;
-        return from(parameters);
-    }
-
     public static class Parameters {
         public List<String> classNames;
         public List<String> classNamePatterns;

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

@@ -62,7 +62,6 @@ public class Settings {
     public List<String> additionalDataLibraries = new ArrayList<>();
     private LoadedDataLibraries loadedDataLibrariesClasses = null;
     private Predicate<String> excludeFilter = null;
-    @Deprecated public boolean declarePropertiesAsOptional = false;
     public OptionalProperties optionalProperties; // default is OptionalProperties.useSpecifiedAnnotations
     public OptionalPropertiesDeclaration optionalPropertiesDeclaration; // default is OptionalPropertiesDeclaration.questionMark
     public NullabilityDefinition nullabilityDefinition; // default is NullabilityDefinition.nullInlineUnion
@@ -100,9 +99,6 @@ public class Settings {
     public boolean generateSpringApplicationInterface = false;
     public boolean generateSpringApplicationClient = false;
     public boolean scanSpringApplication;
-    @Deprecated public RestNamespacing jaxrsNamespacing;
-    @Deprecated public Class<? extends Annotation> jaxrsNamespacingAnnotation = null;
-    @Deprecated public String jaxrsNamespacingAnnotationElement;  // default is "value"
     public RestNamespacing restNamespacing;
     public Class<? extends Annotation> restNamespacingAnnotation = null;
     public String restNamespacingAnnotationElement;  // default is "value"
@@ -135,9 +131,6 @@ public class Settings {
     public String typescriptVersion = "^2.4";
     public String npmTypescriptVersion = null;
     public String npmBuildScript = null;
-    @Deprecated public boolean displaySerializerWarning;
-    @Deprecated public boolean debug;
-    @Deprecated public boolean disableJackson2ModuleDiscovery = false;
     public boolean jackson2ModuleDiscovery = false;
     public List<Class<? extends Module>> jackson2Modules = new ArrayList<>();
     public ClassLoader classLoader = null;
@@ -415,18 +408,6 @@ public void validate() {
         if (generateSpringApplicationClient && outputFileType != TypeScriptFileType.implementationFile) {
             throw new RuntimeException("'generateSpringApplicationClient' can only be used when generating implementation file ('outputFileType' parameter is 'implementationFile').");
         }
-        if (jaxrsNamespacing != null) {
-            TypeScriptGenerator.getLogger().warning("Parameter 'jaxrsNamespacing' is deprecated. Use 'restNamespacing' parameter.");
-            if (restNamespacing == null) {
-                restNamespacing = jaxrsNamespacing;
-            }
-        }
-        if (jaxrsNamespacingAnnotation != null) {
-            TypeScriptGenerator.getLogger().warning("Parameter 'jaxrsNamespacingAnnotation' is deprecated. Use 'restNamespacingAnnotation' parameter.");
-            if (restNamespacingAnnotation == null) {
-                restNamespacingAnnotation = jaxrsNamespacingAnnotation;
-            }
-        }
         if (restNamespacing != null && !isGenerateRest()) {
             throw new RuntimeException("'restNamespacing' parameter can only be used when generating REST client or interface.");
         }
@@ -472,21 +453,6 @@ public void validate() {
         }
         getModuleDependencies();
         getLoadedDataLibraries();
-        if (declarePropertiesAsOptional) {
-            TypeScriptGenerator.getLogger().warning("Parameter 'declarePropertiesAsOptional' is deprecated. Use 'optionalProperties' parameter.");
-            if (optionalProperties == null) {
-                optionalProperties = OptionalProperties.all;
-            }
-        }
-        if (disableJackson2ModuleDiscovery) {
-            TypeScriptGenerator.getLogger().warning("Parameter 'disableJackson2ModuleDiscovery' was removed. See 'jackson2ModuleDiscovery' and 'jackson2Modules' parameters.");
-        }
-        if (displaySerializerWarning) {
-            TypeScriptGenerator.getLogger().warning("Parameter 'displaySerializerWarning' was removed.");
-        }
-        if (debug) {
-            TypeScriptGenerator.getLogger().warning("Parameter 'debug' was removed. Please set 'loggingLevel' parameter to 'Debug'.");
-        }
     }
 
     public NullabilityDefinition getNullabilityDefinition() {
@@ -720,15 +686,6 @@ public boolean test(String className) {
         return mapClassesAsClassesFilter;
     }
 
-    @Deprecated
-    public void setJaxrsNamespacingAnnotation(ClassLoader classLoader, String jaxrsNamespacingAnnotation) {
-        final Pair<Class<? extends Annotation>, String> pair = resolveRestNamespacingAnnotation(classLoader, jaxrsNamespacingAnnotation);
-        if (pair != null) {
-            this.jaxrsNamespacingAnnotation = pair.getValue1();
-            this.jaxrsNamespacingAnnotationElement = pair.getValue2();
-        }
-    }
-
     public void setRestNamespacingAnnotation(ClassLoader classLoader, String restNamespacingAnnotation) {
         final Pair<Class<? extends Annotation>, String> pair = resolveRestNamespacingAnnotation(classLoader, restNamespacingAnnotation);
         if (pair != null) {

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

@@ -70,24 +70,15 @@ public String generateTypeScript(Input input) {
     }
 
     public void generateTypeScript(Input input, Output output) {
-        generateTypeScript(input, output, false, 0);
-    }
-
-    @Deprecated
-    public void generateEmbeddableTypeScript(Input input, Output output, boolean addExportKeyword, int initialIndentationLevel) {
-        generateTypeScript(input, output, addExportKeyword, initialIndentationLevel);
-    }
-
-    private void generateTypeScript(Input input, Output output, boolean forceExportKeyword, int initialIndentationLevel) {
         final Model model = getModelParser().parseModel(input.getSourceTypes());
         final TsModel tsModel = getModelCompiler().javaToTypeScript(model);
-        generateTypeScript(tsModel, output, forceExportKeyword, initialIndentationLevel);
+        generateTypeScript(tsModel, output);
         generateInfoJson(tsModel, output);
         generateNpmPackageJson(output);
     }
 
-    private void generateTypeScript(TsModel tsModel, Output output, boolean forceExportKeyword, int initialIndentationLevel) {
-        getEmitter().emit(tsModel, output.getWriter(), output.getName(), output.shouldCloseWriter(), forceExportKeyword, initialIndentationLevel);
+    private void generateTypeScript(TsModel tsModel, Output output) {
+        getEmitter().emit(tsModel, output.getWriter(), output.getName(), output.shouldCloseWriter());
     }
 
     private void generateInfoJson(TsModel tsModel, Output output) {

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

@@ -1,17 +1,11 @@
 
 package cz.habarta.typescript.generator.compiler;
 
-import cz.habarta.typescript.generator.emitter.TsModel;
 import cz.habarta.typescript.generator.parser.Model;
 
 
 public interface ModelTransformer {
 
-    @Deprecated
-    public TsModel transformModel(SymbolTable symbolTable, TsModel model);
-
-    default Model transformModel(SymbolTable symbolTable, Model model) {
-        return model;
-    }
+    public Model transformModel(SymbolTable symbolTable, Model model);
 
 }

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

@@ -24,17 +24,15 @@ public class Emitter implements EmitterExtension.Writer {
 
     private final Settings settings;
     private Writer writer;
-    private boolean forceExportKeyword;
     private int indent;
 
     public Emitter(Settings settings) {
         this.settings = settings;
     }
 
-    public void emit(TsModel model, Writer output, String outputName, boolean closeOutput, boolean forceExportKeyword, int initialIndentationLevel) {
+    public void emit(TsModel model, Writer output, String outputName, boolean closeOutput) {
         this.writer = output;
-        this.forceExportKeyword = forceExportKeyword;
-        this.indent = initialIndentationLevel;
+        this.indent = 0;
         if (outputName != null) {
             TypeScriptGenerator.getLogger().info("Writing declarations to: " + outputName);
         }
@@ -129,7 +127,6 @@ private void emitNamespace(TsModel model) {
     }
 
     private void emitElements(TsModel model, boolean exportKeyword, boolean declareKeyword) {
-        exportKeyword = exportKeyword || forceExportKeyword;
         emitBeans(model, exportKeyword, declareKeyword);
         emitTypeAliases(model, exportKeyword, declareKeyword);
         emitLiteralEnums(model, exportKeyword, declareKeyword);

typescript-generator-core/src/main/java/cz/habarta/typescript/generator/emitter/Emitter.java

@@ -5,8 +5,7 @@
 import cz.habarta.typescript.generator.compiler.EnumKind;
 import cz.habarta.typescript.generator.compiler.EnumMemberModel;
 import cz.habarta.typescript.generator.compiler.ModelCompiler;
-import cz.habarta.typescript.generator.compiler.ModelTransformer;
-import cz.habarta.typescript.generator.compiler.SymbolTable;
+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.TsEnumModel;
@@ -38,9 +37,9 @@ public void setConfiguration(Map<String, String> configuration) throws RuntimeEx
 
     @Override
     public List<TransformerDefinition> getTransformers() {
-        return Arrays.asList(new TransformerDefinition(ModelCompiler.TransformationPhase.BeforeEnums, new ModelTransformer() {
+        return Arrays.asList(new TransformerDefinition(ModelCompiler.TransformationPhase.BeforeEnums, new TsModelTransformer() {
             @Override
-            public TsModel transformModel(SymbolTable symbolTable, TsModel model) {
+            public TsModel transformModel(Context context, TsModel model) {
                 List<TsBeanModel> beans = model.getBeans();
                 List<TsBeanModel> classEnums = new ArrayList<>();
                 for (TsBeanModel bean : beans) {

typescript-generator-core/src/main/java/cz/habarta/typescript/generator/ext/ClassEnumExtension.java

@@ -5,9 +5,9 @@
 import cz.habarta.typescript.generator.TsParameter;
 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.SymbolTable;
+import cz.habarta.typescript.generator.compiler.TsModelTransformer;
 import cz.habarta.typescript.generator.emitter.EmitterExtensionFeatures;
 import cz.habarta.typescript.generator.emitter.TsArrowFunction;
 import cz.habarta.typescript.generator.emitter.TsAssignmentExpression;
@@ -79,12 +79,12 @@ public void setConfiguration(Map<String, String> configuration) throws RuntimeEx
 
     @Override
     public List<TransformerDefinition> getTransformers() {
-        return Arrays.asList(new TransformerDefinition(ModelCompiler.TransformationPhase.BeforeSymbolResolution, new ModelTransformer() {
+        return Arrays.asList(new TransformerDefinition(ModelCompiler.TransformationPhase.BeforeSymbolResolution, new TsModelTransformer() {
             @Override
-            public TsModel transformModel(SymbolTable symbolTable, TsModel model) {
-                model = createDeserializationMethods(symbolTable, model);
+            public TsModel transformModel(Context context, TsModel model) {
+                model = createDeserializationMethods(context.getSymbolTable(), model);
                 if (useJsonDeserializationInJaxrsApplicationClient) {
-                    model = useDeserializationMethodsInJaxrs(symbolTable, model);
+                    model = useDeserializationMethodsInJaxrs(context.getSymbolTable(), model);
                 }
                 return model;
             }