Add tests for the improved Spring support

Author: jeffgbutler

src/test/java/examples/generated/always/spring/SpringTest.java

@@ -25,12 +25,16 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mybatis.dynamic.sql.delete.render.DeleteStatementProvider;
+import org.mybatis.dynamic.sql.insert.GeneralInsertModel;
+import org.mybatis.dynamic.sql.insert.InsertModel;
 import org.mybatis.dynamic.sql.insert.render.BatchInsert;
 import org.mybatis.dynamic.sql.insert.render.GeneralInsertStatementProvider;
 import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
 import org.mybatis.dynamic.sql.render.RenderingStrategies;
 import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
 import org.mybatis.dynamic.sql.update.render.UpdateStatementProvider;
+import org.mybatis.dynamic.sql.util.Buildable;
+import org.mybatis.dynamic.sql.util.spring.NamedParameterJdbcTemplateExtensions;
 import org.springframework.jdbc.core.namedparam.BeanPropertySqlParameterSource;
 import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
@@ -145,6 +149,30 @@ void testInsert() {
         assertThat(generatedKey).isEqualTo("Bob Jones");
     }
 
+    @Test
+    void testInsertWithExtensions() {
+        GeneratedAlwaysRecord record = new GeneratedAlwaysRecord();
+        record.setId(100);
+        record.setFirstName("Bob");
+        record.setLastName("Jones");
+        
+        Buildable<InsertModel<GeneratedAlwaysRecord>> insertStatement = insert(record)
+                .into(generatedAlways)
+                .map(id).toProperty("id")
+                .map(firstName).toProperty("firstName")
+                .map(lastName).toProperty("lastName");
+       
+        NamedParameterJdbcTemplateExtensions extensions = new NamedParameterJdbcTemplateExtensions(template);
+        
+        KeyHolder keyHolder = new GeneratedKeyHolder();
+        
+        int rows = extensions.insert(insertStatement, keyHolder);
+        String generatedKey = (String) keyHolder.getKeys().get("FULL_NAME");
+        
+        assertThat(rows).isEqualTo(1);
+        assertThat(generatedKey).isEqualTo("Bob Jones");
+    }
+
     @Test
     void testGeneralInsert() {
         GeneralInsertStatementProvider insertStatement = insertInto(generatedAlways)
@@ -178,6 +206,23 @@ void testGeneralInsertWithGeneratedKey() {
         assertThat(generatedKey).isEqualTo("Bob Jones");
     }
 
+    @Test
+    void testGeneralInsertWithGeneratedKeyAndExtensions() {
+        Buildable<GeneralInsertModel> insertStatement = insertInto(generatedAlways)
+                .set(id).toValue(100)
+                .set(firstName).toValue("Bob")
+                .set(lastName).toValue("Jones");
+
+        NamedParameterJdbcTemplateExtensions extensions = new NamedParameterJdbcTemplateExtensions(template);
+        KeyHolder keyHolder = new GeneratedKeyHolder();
+
+        int rows = extensions.generalInsert(insertStatement, keyHolder);
+        String generatedKey = (String) keyHolder.getKeys().get("FULL_NAME");
+
+        assertThat(rows).isEqualTo(1);
+        assertThat(generatedKey).isEqualTo("Bob Jones");
+    }
+
     @Test
     void testInsertBatch() {
         List<GeneratedAlwaysRecord> records = new ArrayList<>();
@@ -223,6 +268,5 @@ void testUpdate() {
         int rows = template.update(updateStatement.getUpdateStatement(), parameterSource);
 
         assertThat(rows).isEqualTo(2);
-        
     }
 }

src/test/java/examples/spring/AddressDynamicSqlSupport.java

@@ -0,0 +1,40 @@
+/**
+ *    Copyright 2016-2020 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
+ *
+ *       http://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 examples.spring;
+
+import java.sql.JDBCType;
+
+import org.mybatis.dynamic.sql.SqlColumn;
+import org.mybatis.dynamic.sql.SqlTable;
+
+public final class AddressDynamicSqlSupport {
+    public static final Address address = new Address();
+    public static final SqlColumn<Integer> id = address.id;
+    public static final SqlColumn<String> streetAddress = address.streetAddress;
+    public static final SqlColumn<String> city = address.city;
+    public static final SqlColumn<String> state = address.state;
+    
+    public static final class Address extends SqlTable {
+        public final SqlColumn<Integer> id = column("address_id", JDBCType.INTEGER);
+        public final SqlColumn<String> streetAddress = column("street_address", JDBCType.VARCHAR);
+        public final SqlColumn<String> city = column("city", JDBCType.VARCHAR);
+        public final SqlColumn<String> state = column("state", JDBCType.VARCHAR);
+
+        public Address() {
+            super("Address");
+        }
+    }
+}

src/test/java/examples/spring/AddressRecord.java

@@ -0,0 +1,55 @@
+/**
+ *    Copyright 2016-2020 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
+ *
+ *       http://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 examples.spring;
+
+public class AddressRecord {
+    private Integer id;
+    private String streetAddress;
+    private String city;
+    private String state;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getStreetAddress() {
+        return streetAddress;
+    }
+
+    public void setStreetAddress(String streetAddress) {
+        this.streetAddress = streetAddress;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+}

src/test/java/examples/spring/LastName.java

@@ -0,0 +1,59 @@
+/**
+ *    Copyright 2016-2020 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
+ *
+ *       http://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 examples.spring;
+
+public class LastName {
+    private String name;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    
+    public static LastName of(String name) {
+        LastName lastName = new LastName();
+        lastName.setName(name);
+        return lastName;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((name == null) ? 0 : name.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        LastName other = (LastName) obj;
+        if (name == null) {
+            if (other.name != null)
+                return false;
+        } else if (!name.equals(other.name))
+            return false;
+        return true;
+    }
+}

src/test/java/examples/spring/LastNameParameterConverter.java

@@ -0,0 +1,26 @@
+/**
+ *    Copyright 2016-2020 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
+ *
+ *       http://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 examples.spring;
+
+import org.mybatis.dynamic.sql.ParameterTypeConverter;
+import org.springframework.core.convert.converter.Converter;
+
+public class LastNameParameterConverter implements ParameterTypeConverter<LastName>, Converter<LastName, String> {
+    @Override
+    public String convert(LastName source) {
+        return source == null ? null : source.getName();
+    }
+}

src/test/java/examples/spring/PersonDynamicSqlSupport.java

@@ -0,0 +1,49 @@
+/**
+ *    Copyright 2016-2020 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
+ *
+ *       http://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 examples.spring;
+
+import java.sql.JDBCType;
+import java.util.Date;
+
+import org.mybatis.dynamic.sql.SqlColumn;
+import org.mybatis.dynamic.sql.SqlTable;
+
+public final class PersonDynamicSqlSupport {
+    public static final Person person = new Person();
+    public static final SqlColumn<Integer> id = person.id;
+    public static final SqlColumn<String> firstName = person.firstName;
+    public static final SqlColumn<LastName> lastName = person.lastName;
+    public static final SqlColumn<Date> birthDate = person.birthDate;
+    public static final SqlColumn<Boolean> employed = person.employed;
+    public static final SqlColumn<String> occupation = person.occupation;
+    public static final SqlColumn<Integer> addressId = person.addressId;
+    
+    public static final class Person extends SqlTable {
+        public final SqlColumn<Integer> id = column("id", JDBCType.INTEGER);
+        public final SqlColumn<String> firstName = column("first_name", JDBCType.VARCHAR);
+        public final SqlColumn<LastName> lastName = column("last_name", JDBCType.VARCHAR)
+                .withParameterTypeConverter(new LastNameParameterConverter());
+        public final SqlColumn<Date> birthDate = column("birth_date", JDBCType.DATE);
+        public final SqlColumn<Boolean> employed = column("employed", JDBCType.VARCHAR)
+                .withParameterTypeConverter(new YesNoParameterConverter());
+        public final SqlColumn<String> occupation = column("occupation", JDBCType.VARCHAR);
+        public final SqlColumn<Integer> addressId = column("address_id", JDBCType.INTEGER);
+
+        public Person() {
+            super("Person");
+        }
+    }
+}