Merge pull request #154 from vojtechhabarta/revert-150-glen/sort-discriminant-types

Revert "Add option to sort discriminant types"

Author: vojtechhabarta

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

@@ -56,7 +56,6 @@ public class Settings {
     public boolean restOptionsTypeIsGeneric;
     public TypeProcessor customTypeProcessor = null;
     public boolean sortDeclarations = false;
-    public boolean sortDiscriminantTypes = false;
     public boolean sortTypeDeclarations = false;
     public boolean noFileComment = false;
     public List<File> javadocXmlFiles = null;

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

@@ -166,26 +166,16 @@ public String format(Settings settings) {
     public static class UnionType extends TsType {
 
         public final List<TsType> types;
-        public final boolean sort;
 
         public UnionType(List<? extends TsType> types) {
-            this(types, false);
-        }
-
-        public UnionType(List<? extends TsType> types, boolean sort) {
             this.types = new ArrayList<TsType>(new LinkedHashSet<TsType>(types));
-            this.sort = sort;
         }
 
         @Override
         public String format(Settings settings) {
-            List<String> formattedTypes = format(this.types, settings);
-            if (this.sort) {
-                Collections.sort(formattedTypes);
-            }
-            return formattedTypes.isEmpty()
+            return types.isEmpty()
                     ? "never"
-                    : Utils.join(formattedTypes, " | ");
+                    : Utils.join(format(types, settings), " | ");
         }
 
     }

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

@@ -150,7 +150,7 @@ private <T> TsBeanModel processBean(SymbolTable symbolTable, Model model, Map<Ty
             }
             final TsType discriminantType = literals.isEmpty()
                     ? TsType.String
-                    : new TsType.UnionType(literals, settings.sortDiscriminantTypes);
+                    : new TsType.UnionType(literals);
             properties.add(0, new TsPropertyModel(bean.getDiscriminantProperty(), discriminantType, settings.declarePropertiesAsReadOnly, null));
         }
 

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

@@ -51,7 +51,6 @@ public class GenerateTask extends DefaultTask {
     public String restOptionsType;
     public String customTypeProcessor;
     public boolean sortDeclarations;
-    public boolean sortDiscriminantTypes;
     public boolean sortTypeDeclarations;
     public boolean noFileComment;
     public List<File> javadocXmlFiles;
@@ -124,7 +123,6 @@ public void generate() throws Exception {
         settings.setRestOptionsType(restOptionsType);
         settings.loadCustomTypeProcessor(classLoader, customTypeProcessor);
         settings.sortDeclarations = sortDeclarations;
-        settings.sortDiscriminantTypes = sortDiscriminantTypes;
         settings.sortTypeDeclarations = sortTypeDeclarations;
         settings.noFileComment = noFileComment;
         settings.javadocXmlFiles = javadocXmlFiles;

typescript-generator-gradle-plugin/src/main/java/cz/habarta/typescript/generator/gradle/GenerateTask.java

@@ -317,12 +317,6 @@ public class GenerateMojo extends AbstractMojo {
     @Parameter
     private boolean sortDeclarations;
 
-    /**
-     * If true discriminant types will be sorted alphabetically.
-     */
-    @Parameter
-    private boolean sortDiscriminantTypes;
-
     /**
      * If true TypeScript type declarations (interfaces) will be sorted alphabetically.
      */
@@ -468,7 +462,6 @@ public void execute() {
             settings.setRestOptionsType(restOptionsType);
             settings.loadCustomTypeProcessor(classLoader, customTypeProcessor);
             settings.sortDeclarations = sortDeclarations;
-            settings.sortDiscriminantTypes = sortDiscriminantTypes;
             settings.sortTypeDeclarations = sortTypeDeclarations;
             settings.noFileComment = noFileComment;
             settings.javadocXmlFiles = javadocXmlFiles;