Sort constructors in DefaultProjectionSerializer by number of parameters (#572)

* Sort constructors in generated classes based on constructor toString method (#272)

sort constructors based on constructor toString method

Co-authored-by: Lumír Návrat <[email protected]>
(cherry picked from commit 487005f)

* Sort constructors in generated clases based on number of constructor parameters

Signed-off-by: rimuln <[email protected]>

* Sort constructors in generated clases based on number of constructor parameters

- fix formatting

Signed-off-by: rimuln <[email protected]>

---------

Signed-off-by: rimuln <[email protected]>
Co-authored-by: Lumír Návrat <[email protected]>

Author: rimuln

querydsl-tooling/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/model/Constructor.java

@@ -18,7 +18,7 @@
 /**
  * @author tiwe
  */
-public final class Constructor {
+public final class Constructor implements Comparable<Constructor> {
 
   private final Collection<Parameter> parameters;
 
@@ -45,4 +45,9 @@ public Collection<Parameter> getParameters() {
   public int hashCode() {
     return parameters.hashCode();
   }
+
+  @Override
+  public int compareTo(Constructor o) {
+    return parameters.size() - o.parameters.size();
+  }
 }

querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/ConstructorTest.java

@@ -22,4 +22,15 @@ public void test() {
     assertThat(c2).isEqualTo(c1);
     assertThat(c2.hashCode()).isEqualTo(c1.hashCode());
   }
+
+  @Test
+  public void order() {
+    var firstName = new Parameter("firstName", new ClassType(TypeCategory.STRING, String.class));
+    var lastName = new Parameter("lastName", new ClassType(TypeCategory.STRING, String.class));
+    var c1 = new Constructor(Arrays.asList(firstName, lastName));
+    var c2 = new Constructor(Arrays.asList(firstName));
+    assertThat(c1.compareTo(c2)).isEqualTo(1);
+    assertThat(c1.compareTo(c1)).isEqualTo(0);
+    assertThat(c2.compareTo(c1)).isEqualTo(-1);
+  }
 }

querydsl-tooling/querydsl-codegen/src/main/java/com/querydsl/codegen/DefaultProjectionSerializer.java

@@ -30,9 +30,10 @@
 import jakarta.inject.Named;
 import java.io.IOException;
 import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
-import java.util.function.Function;
 
 /**
  * {@code ProjectionSerializer} is a {@link Serializer} implementation for projection types
@@ -85,10 +86,12 @@ protected void intro(EntityType model, CodeWriter writer) throws IOException {
     imports(model, writer);
 
     Set<Integer> sizes = new HashSet<>();
-    for (Constructor c : model.getConstructors()) {
+    var constructors = new ArrayList<>(model.getConstructors());
+    Collections.sort(constructors);
+    for (Constructor c : constructors) {
       sizes.add(c.getParameters().size());
     }
-    if (sizes.size() != model.getConstructors().size()) {
+    if (sizes.size() != constructors.size()) {
       writer.imports(Expression.class);
     }
 
@@ -124,24 +127,23 @@ public void serialize(
     var localName = writer.getRawName(model);
     Set<Integer> sizes = new HashSet<>();
 
-    for (Constructor c : model.getConstructors()) {
+    var constructors = new ArrayList<>(model.getConstructors());
+    Collections.sort(constructors);
+    for (Constructor c : constructors) {
       final var asExpr = sizes.add(c.getParameters().size());
       // begin
       writer.beginConstructor(
           c.getParameters(),
-          new Function<Parameter, Parameter>() {
-            @Override
-            public Parameter apply(Parameter p) {
-              Type type;
-              if (!asExpr) {
-                type = typeMappings.getExprType(p.getType(), model, false, false, true);
-              } else if (p.getType().isFinal()) {
-                type = new ClassType(Expression.class, p.getType());
-              } else {
-                type = new ClassType(Expression.class, new TypeExtends(p.getType()));
-              }
-              return new Parameter(p.getName(), type);
+          (Parameter p) -> {
+            Type type;
+            if (!asExpr) {
+              type = typeMappings.getExprType(p.getType(), model, false, false, true);
+            } else if (p.getType().isFinal()) {
+              type = new ClassType(Expression.class, p.getType());
+            } else {
+              type = new ClassType(Expression.class, new TypeExtends(p.getType()));
             }
+            return new Parameter(p.getName(), type);
           });
 
       // body

querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/ProjectionSerializerTest.java

@@ -48,13 +48,22 @@ public void constructors() throws IOException {
     var lastName = new Parameter("lastName", Types.STRING);
     var age = new Parameter("age", Types.INTEGER);
     type.addConstructor(new Constructor(Arrays.asList(firstName, lastName, age)));
+    type.addConstructor(new Constructor(Arrays.asList(firstName, lastName)));
 
     Writer writer = new StringWriter();
     ProjectionSerializer serializer = new DefaultProjectionSerializer(new JavaTypeMappings());
     serializer.serialize(type, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
-    assertThat(writer.toString()).contains("Expression<String> firstName");
-    assertThat(writer.toString()).contains("Expression<String> lastName");
-    assertThat(writer.toString()).contains("Expression<Integer> age");
+    assertThat(writer.toString())
+        .contains(
+            """
+        public Path(Expression<String> firstName, Expression<String> lastName) {
+            super(com.querydsl.DomainClass.class, new Class<?>[]{String.class, String.class}, firstName, lastName);
+        }
+
+        public Path(Expression<String> firstName, Expression<String> lastName, Expression<Integer> age) {
+            super(com.querydsl.DomainClass.class, new Class<?>[]{String.class, String.class, int.class}, firstName, lastName, age);
+        }
+    """);
   }
 
   @Test