Add support for simple case with basic values

Author: jeffgbutler

src/main/java/org/mybatis/dynamic/sql/SqlBuilder.java

@@ -28,15 +28,15 @@
 import org.mybatis.dynamic.sql.insert.InsertDSL;
 import org.mybatis.dynamic.sql.insert.InsertSelectDSL;
 import org.mybatis.dynamic.sql.insert.MultiRowInsertDSL;
+import org.mybatis.dynamic.sql.select.caseexpression.SearchedCaseDSL;
+import org.mybatis.dynamic.sql.select.caseexpression.SimpleCaseDSL;
 import org.mybatis.dynamic.sql.select.ColumnSortSpecification;
 import org.mybatis.dynamic.sql.select.CountDSL;
 import org.mybatis.dynamic.sql.select.HavingDSL;
 import org.mybatis.dynamic.sql.select.MultiSelectDSL;
 import org.mybatis.dynamic.sql.select.QueryExpressionDSL.FromGatherer;
-import org.mybatis.dynamic.sql.select.SearchedCaseDSL;
 import org.mybatis.dynamic.sql.select.SelectDSL;
 import org.mybatis.dynamic.sql.select.SelectModel;
-import org.mybatis.dynamic.sql.select.SimpleCaseDSL;
 import org.mybatis.dynamic.sql.select.SimpleSortSpecification;
 import org.mybatis.dynamic.sql.select.aggregate.Avg;
 import org.mybatis.dynamic.sql.select.aggregate.Count;

src/main/java/org/mybatis/dynamic/sql/select/caseexpression/BasicWhenCondition.java

@@ -0,0 +1,38 @@
+/*
+ *    Copyright 2016-2024 the original author or authors.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *       https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package org.mybatis.dynamic.sql.select.caseexpression;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Stream;
+
+public class BasicWhenCondition<T> extends SimpleCaseWhenCondition<T> {
+    private final List<T> conditions = new ArrayList<>();
+
+    public BasicWhenCondition(List<T> conditions, Object thenValue) {
+        super(thenValue);
+        this.conditions.addAll(conditions);
+    }
+
+    public Stream<T> conditions() {
+        return conditions.stream();
+    }
+
+    @Override
+    public <R> R accept(SimpleCaseWhenConditionVisitor<T, R> visitor) {
+        return visitor.visit(this);
+    }
+}

src/main/java/org/mybatis/dynamic/sql/select/caseexpression/ConditionBasedWhenCondition.java

@@ -0,0 +1,40 @@
+/*
+ *    Copyright 2016-2024 the original author or authors.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *       https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package org.mybatis.dynamic.sql.select.caseexpression;
+
+import org.mybatis.dynamic.sql.VisitableCondition;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Stream;
+
+public class ConditionBasedWhenCondition<T> extends SimpleCaseWhenCondition<T> {
+    private final List<VisitableCondition<T>> conditions = new ArrayList<>();
+
+    public ConditionBasedWhenCondition(List<VisitableCondition<T>> conditions, Object thenValue) {
+        super(thenValue);
+        this.conditions.addAll(conditions);
+    }
+
+    public Stream<VisitableCondition<T>> conditions() {
+        return conditions.stream();
+    }
+
+    @Override
+    public <R> R accept(SimpleCaseWhenConditionVisitor<T, R> visitor) {
+        return visitor.visit(this);
+    }
+}

src/main/java/org/mybatis/dynamic/sql/select/SearchedCaseDSL.java renamed to src/main/java/org/mybatis/dynamic/sql/select/caseexpression/SearchedCaseDSL.java

@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package org.mybatis.dynamic.sql.select;
+package org.mybatis.dynamic.sql.select.caseexpression;
 
 import static org.mybatis.dynamic.sql.util.StringUtilities.quoteStringForSQL;
 

src/main/java/org/mybatis/dynamic/sql/select/SearchedCaseModel.java renamed to src/main/java/org/mybatis/dynamic/sql/select/caseexpression/SearchedCaseModel.java

@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package org.mybatis.dynamic.sql.select;
+package org.mybatis.dynamic.sql.select.caseexpression;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/org/mybatis/dynamic/sql/select/SimpleCaseDSL.java renamed to src/main/java/org/mybatis/dynamic/sql/select/caseexpression/SimpleCaseDSL.java

@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package org.mybatis.dynamic.sql.select;
+package org.mybatis.dynamic.sql.select.caseexpression;
 
 import static org.mybatis.dynamic.sql.util.StringUtilities.quoteStringForSQL;
 
@@ -28,22 +28,31 @@
 
 public class SimpleCaseDSL<T> {
     private final BindableColumn<T> column;
-    private final List<SimpleCaseModel.SimpleWhenCondition<T>> whenConditions = new ArrayList<>();
+    private final List<SimpleCaseWhenCondition<T>> whenConditions = new ArrayList<>();
     private Object elseValue;
 
     private SimpleCaseDSL(BindableColumn<T> column) {
         this.column = Objects.requireNonNull(column);
     }
 
     @SafeVarargs
-    public final WhenFinisher when(VisitableCondition<T> condition,
-                                   VisitableCondition<T>... subsequentConditions) {
+    public final ConditionBasedWhenFinisher when(VisitableCondition<T> condition,
+                                                 VisitableCondition<T>... subsequentConditions) {
         return when(condition, Arrays.asList(subsequentConditions));
     }
 
-    public WhenFinisher when(VisitableCondition<T> condition,
-                             List<VisitableCondition<T>> subsequentConditions) {
-        return new WhenFinisher(condition, subsequentConditions);
+    public ConditionBasedWhenFinisher when(VisitableCondition<T> condition,
+                                           List<VisitableCondition<T>> subsequentConditions) {
+        return new ConditionBasedWhenFinisher(condition, subsequentConditions);
+    }
+
+    @SafeVarargs
+    public final BasicWhenFinisher when(T condition, T... subsequentConditions) {
+        return when(condition, Arrays.asList(subsequentConditions));
+    }
+
+    public BasicWhenFinisher when(T condition, List<T> subsequentConditions) {
+        return new BasicWhenFinisher(condition, subsequentConditions);
     }
 
     @SuppressWarnings("java:S100")
@@ -66,21 +75,40 @@ public BasicColumn end() {
                 .build();
     }
 
-    public class WhenFinisher {
+    public class ConditionBasedWhenFinisher {
         private final List<VisitableCondition<T>> conditions = new ArrayList<>();
 
-        private WhenFinisher(VisitableCondition<T> condition, List<VisitableCondition<T>> subsequentConditions) {
+        private ConditionBasedWhenFinisher(VisitableCondition<T> condition, List<VisitableCondition<T>> subsequentConditions) {
             conditions.add(condition);
             conditions.addAll(subsequentConditions);
         }
 
         public SimpleCaseDSL<T> then(String value) {
-            whenConditions.add(new SimpleCaseModel.SimpleWhenCondition<>(conditions, quoteStringForSQL(value)));
+            whenConditions.add(new ConditionBasedWhenCondition<>(conditions, quoteStringForSQL(value)));
+            return SimpleCaseDSL.this;
+        }
+
+        public SimpleCaseDSL<T> then(Object value) {
+            whenConditions.add(new ConditionBasedWhenCondition<>(conditions, value));
+            return SimpleCaseDSL.this;
+        }
+    }
+
+    public class BasicWhenFinisher {
+        private final List<T> values = new ArrayList<>();
+
+        private BasicWhenFinisher(T value, List<T> subsequentValues) {
+            values.add(value);
+            values.addAll(subsequentValues);
+        }
+
+        public SimpleCaseDSL<T> then(String value) {
+            whenConditions.add(new BasicWhenCondition<>(values, quoteStringForSQL(value)));
             return SimpleCaseDSL.this;
         }
 
         public SimpleCaseDSL<T> then(Object value) {
-            whenConditions.add(new SimpleCaseModel.SimpleWhenCondition<>(conditions, value));
+            whenConditions.add(new BasicWhenCondition<>(values, value));
             return SimpleCaseDSL.this;
         }
     }

src/main/java/org/mybatis/dynamic/sql/select/SimpleCaseModel.java renamed to src/main/java/org/mybatis/dynamic/sql/select/caseexpression/SimpleCaseModel.java

@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package org.mybatis.dynamic.sql.select;
+package org.mybatis.dynamic.sql.select.caseexpression;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -23,15 +23,14 @@
 
 import org.mybatis.dynamic.sql.BasicColumn;
 import org.mybatis.dynamic.sql.BindableColumn;
-import org.mybatis.dynamic.sql.VisitableCondition;
 import org.mybatis.dynamic.sql.render.RenderingContext;
 import org.mybatis.dynamic.sql.select.render.SimpleCaseRenderer;
 import org.mybatis.dynamic.sql.util.FragmentAndParameters;
 import org.mybatis.dynamic.sql.util.Validator;
 
 public class SimpleCaseModel<T> implements BasicColumn {
     private final BindableColumn<T> column;
-    private final List<SimpleWhenCondition<T>> whenConditions;
+    private final List<SimpleCaseWhenCondition<T>> whenConditions;
     private final Object elseValue;
     private final String alias;
 
@@ -47,7 +46,7 @@ public BindableColumn<T> column() {
         return column;
     }
 
-    public Stream<SimpleWhenCondition<T>> whenConditions() {
+    public Stream<SimpleCaseWhenCondition<T>> whenConditions() {
         return whenConditions.stream();
     }
 
@@ -75,27 +74,9 @@ public FragmentAndParameters render(RenderingContext renderingContext) {
         return new SimpleCaseRenderer<>(this, renderingContext).render();
     }
 
-    public static class SimpleWhenCondition<T> {
-        private final List<VisitableCondition<T>> conditions = new ArrayList<>();
-        private final Object thenValue;
-
-        public Stream<VisitableCondition<T>> conditions() {
-            return conditions.stream();
-        }
-
-        public Object thenValue() {
-            return thenValue;
-        }
-
-        public SimpleWhenCondition(List<VisitableCondition<T>> conditions, Object thenValue) {
-            this.conditions.addAll(conditions);
-            this.thenValue = Objects.requireNonNull(thenValue);
-        }
-    }
-
     public static class Builder<T> {
         private BindableColumn<T> column;
-        private final List<SimpleWhenCondition<T>> whenConditions = new ArrayList<>();
+        private final List<SimpleCaseWhenCondition<T>> whenConditions = new ArrayList<>();
         private Object elseValue;
         private String alias;
 
@@ -104,7 +85,7 @@ public Builder<T> withColumn(BindableColumn<T> column) {
             return this;
         }
 
-        public Builder<T> withWhenConditions(List<SimpleWhenCondition<T>> whenConditions) {
+        public Builder<T> withWhenConditions(List<SimpleCaseWhenCondition<T>> whenConditions) {
             this.whenConditions.addAll(whenConditions);
             return this;
         }

src/main/java/org/mybatis/dynamic/sql/select/caseexpression/SimpleCaseWhenCondition.java

@@ -0,0 +1,32 @@
+/*
+ *    Copyright 2016-2024 the original author or authors.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *       https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package org.mybatis.dynamic.sql.select.caseexpression;
+
+import java.util.Objects;
+
+public abstract class SimpleCaseWhenCondition<T> {
+    private final Object thenValue;
+
+    protected SimpleCaseWhenCondition(Object thenValue) {
+        this.thenValue = Objects.requireNonNull(thenValue);
+    }
+
+    public Object thenValue() {
+        return thenValue;
+    }
+
+    public abstract <R> R accept(SimpleCaseWhenConditionVisitor<T, R> visitor);
+}

src/main/java/org/mybatis/dynamic/sql/select/caseexpression/SimpleCaseWhenConditionVisitor.java

@@ -0,0 +1,22 @@
+/*
+ *    Copyright 2016-2024 the original author or authors.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *       https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package org.mybatis.dynamic.sql.select.caseexpression;
+
+public interface SimpleCaseWhenConditionVisitor<T, R> {
+    R visit(ConditionBasedWhenCondition<T> whenCondition);
+
+    R visit(BasicWhenCondition<T> whenCondition);
+}

src/main/java/org/mybatis/dynamic/sql/select/render/SearchedCaseRenderer.java

@@ -22,7 +22,7 @@
 
 import org.mybatis.dynamic.sql.exception.InvalidSqlException;
 import org.mybatis.dynamic.sql.render.RenderingContext;
-import org.mybatis.dynamic.sql.select.SearchedCaseModel;
+import org.mybatis.dynamic.sql.select.caseexpression.SearchedCaseModel;
 import org.mybatis.dynamic.sql.util.FragmentAndParameters;
 import org.mybatis.dynamic.sql.util.FragmentCollector;
 import org.mybatis.dynamic.sql.util.Messages;