Merge branch 'master' into schema-provider

Author: jeffgbutler

README.md

@@ -254,9 +254,8 @@ an example from `examples.simple.SimpleTableAnnotatedMapperTest`:
 ```java
     @Test
     public void testSelectByExample() {
-        SqlSession session = sqlSessionFactory.openSession();
-        try {
-            SimpleTableXmlMapper mapper = session.getMapper(SimpleTableXmlMapper.class);
+        try (SqlSession session = sqlSessionFactory.openSession()) {
+            SimpleTableAnnotatedMapper mapper = session.getMapper(SimpleTableAnnotatedMapper.class);
 
             SelectStatementProvider selectStatement = select(id.as("A_ID"), firstName, lastName, birthDate, employed, occupation)
                     .from(simpleTable)
@@ -268,8 +267,6 @@ an example from `examples.simple.SimpleTableAnnotatedMapperTest`:
             List<SimpleTableRecord> rows = mapper.selectMany(selectStatement);
 
             assertThat(rows.size()).isEqualTo(3);
-        } finally {
-            session.close();
         }
     }
 ```

src/site/markdown/docs/quickStart.md

@@ -138,9 +138,8 @@ an example from `examples.simple.SimpleTableAnnotatedMapperTest`:
 ```java
     @Test
     public void testSelectByExample() {
-        SqlSession session = sqlSessionFactory.openSession();
-        try {
-            SimpleTableXmlMapper mapper = session.getMapper(SimpleTableXmlMapper.class);
+        try (SqlSession session = sqlSessionFactory.openSession()) {
+            SimpleTableAnnotatedMapper mapper = session.getMapper(SimpleTableAnnotatedMapper.class);
 
             SelectStatementProvider selectStatement = select(id.as("A_ID"), firstName, lastName, birthDate, employed, occupation)
                     .from(simpleTable)
@@ -152,8 +151,6 @@ an example from `examples.simple.SimpleTableAnnotatedMapperTest`:
             List<SimpleTableRecord> rows = mapper.selectMany(selectStatement);
 
             assertThat(rows.size()).isEqualTo(3);
-        } finally {
-            session.close();
         }
     }
 ```

src/site/markdown/docs/springBatch.md

@@ -14,7 +14,7 @@ The `ItemReader` implementations need special care. Those classes assume that al
 The solution involves these steps:
 
 1. The SQL must be rendered such that the parameter markers are aware of the enclosing parameter Map in the `ItemReader`
-1. The `SelectStatamentProvider` must be placed in the `ItemReader` parameter Map with a known key.
+1. The `SelectStatementProvider` must be placed in the `ItemReader` parameter Map with a known key.
 1. The `@SelectProvider` must be configured to be aware of the enclosing parameter Map
 
 MyBatis Dynamic SQL provides utilities for each of these requirements. Each utility uses a shared Map key for consistency.