style: re-arrange class

Signed-off-by: Andreas Reichel <andreas@manticore-projects.com>

Author: manticore-projects

src/main/java/net/sf/jsqlparser/expression/Function.java

@@ -23,57 +23,6 @@
  * A function as MAX,COUNT...
  */
 public class Function extends ASTNodeAccessImpl implements Expression {
-    public enum NullHandling {
-        IGNORE_NULLS, RESPECT_NULLS;
-    }
-
-    public static class HavingClause extends ASTNodeAccessImpl implements Expression {
-        enum HavingType {
-            MAX, MIN;
-        }
-
-        HavingType havingType;
-        Expression expression;
-
-        public HavingClause(HavingType havingType, Expression expression) {
-            this.havingType = havingType;
-            this.expression = expression;
-        }
-
-        public HavingType getHavingType() {
-            return havingType;
-        }
-
-        public HavingClause setHavingType(HavingType havingType) {
-            this.havingType = havingType;
-            return this;
-        }
-
-        public Expression getExpression() {
-            return expression;
-        }
-
-        public HavingClause setExpression(Expression expression) {
-            this.expression = expression;
-            return this;
-        }
-
-        @Override
-        public void accept(ExpressionVisitor expressionVisitor) {
-            expression.accept(expressionVisitor);
-        }
-
-        public StringBuilder appendTo(StringBuilder builder) {
-            builder.append(" HAVING ").append(havingType.name()).append(" ").append(expression);
-            return builder;
-        }
-
-        @Override
-        public String toString() {
-            return appendTo(new StringBuilder()).toString();
-        }
-    }
-
     private List<String> nameparts;
     private ExpressionList<?> parameters;
     private NamedExpressionList<?> namedParameters;
@@ -88,10 +37,8 @@ public String toString() {
     private NullHandling nullHandling = null;
     private boolean ignoreNullsOutside = false; // IGNORE NULLS outside function parameters
     private Limit limit = null;
-
     private KeepExpression keep = null;
 
-
     public Function() {}
 
     public Function(String name, Expression... parameters) {
@@ -110,14 +57,18 @@ public String getName() {
                         nameparts);
     }
 
-    public List<String> getMultipartName() {
-        return nameparts;
-    }
-
     public void setName(String string) {
         nameparts = Arrays.asList(string);
     }
 
+    public void setName(List<String> string) {
+        nameparts = string;
+    }
+
+    public List<String> getMultipartName() {
+        return nameparts;
+    }
+
     public Function withName(String name) {
         this.setName(name);
         return this;
@@ -128,10 +79,6 @@ public Function withName(List<String> nameparts) {
         return this;
     }
 
-    public void setName(List<String> string) {
-        nameparts = string;
-    }
-
     public boolean isAllColumns() {
         return allColumns;
     }
@@ -277,6 +224,11 @@ public void setAttribute(Expression attributeExpression) {
         this.attributeExpression = attributeExpression;
     }
 
+    public void setAttribute(Column attributeColumn) {
+        attributeExpression = null;
+        this.attributeColumn = attributeColumn;
+    }
+
     @Deprecated
     public String getAttributeName() {
         return attributeColumn.toString();
@@ -290,11 +242,6 @@ public Column getAttributeColumn() {
         return attributeColumn;
     }
 
-    public void setAttribute(Column attributeColumn) {
-        attributeExpression = null;
-        this.attributeColumn = attributeColumn;
-    }
-
     public Function withAttribute(Column attributeColumn) {
         setAttribute(attributeColumn);
         return this;
@@ -456,4 +403,55 @@ public void setOrderByElements(List<OrderByElement> orderByElements) {
     public <E extends Expression> E getAttribute(Class<E> type) {
         return type.cast(getAttribute());
     }
+
+    public enum NullHandling {
+        IGNORE_NULLS, RESPECT_NULLS;
+    }
+
+    public static class HavingClause extends ASTNodeAccessImpl implements Expression {
+        HavingType havingType;
+        Expression expression;
+
+        public HavingClause(HavingType havingType, Expression expression) {
+            this.havingType = havingType;
+            this.expression = expression;
+        }
+
+        public HavingType getHavingType() {
+            return havingType;
+        }
+
+        public HavingClause setHavingType(HavingType havingType) {
+            this.havingType = havingType;
+            return this;
+        }
+
+        public Expression getExpression() {
+            return expression;
+        }
+
+        public HavingClause setExpression(Expression expression) {
+            this.expression = expression;
+            return this;
+        }
+
+        @Override
+        public void accept(ExpressionVisitor expressionVisitor) {
+            expression.accept(expressionVisitor);
+        }
+
+        public StringBuilder appendTo(StringBuilder builder) {
+            builder.append(" HAVING ").append(havingType.name()).append(" ").append(expression);
+            return builder;
+        }
+
+        @Override
+        public String toString() {
+            return appendTo(new StringBuilder()).toString();
+        }
+
+        enum HavingType {
+            MAX, MIN;
+        }
+    }
 }