Merge pull request #8 from mybatis/master

pull

Author: Dreamroute

src/main/java/org/apache/ibatis/datasource/unpooled/UnpooledDataSource.java

@@ -136,7 +136,7 @@ public void setDriverProperties(Properties driverProperties) {
     this.driverProperties = driverProperties;
   }
 
-  public String getDriver() {
+  public synchronized String getDriver() {
     return driver;
   }
 

src/main/java/org/apache/ibatis/mapping/SqlCommandType.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2015 the original author or authors.
+ *    Copyright 2009-2019 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.

src/site/xdoc/configuration.xml

@@ -151,9 +151,9 @@ SqlSessionFactory factory =
 </properties>]]></source>
 
         <p>
-          <span class="label important">NOTE</span> Also If you are used already the <code>":"</code> as property key(e.g. <code>db:username</code>)
-          or you are used already the ternary operator of OGNL expression(e.g. <code>${tableName != null ? tableName : 'global_constants'}</code>) on your sql definition,
-          you should be change the character that separate key and default value by adding a special property as follow:
+          <span class="label important">NOTE</span> This will conflict with the <code>":"</code> character in property keys (e.g. <code>db:username</code>)
+          or the ternary operator of OGNL expressions (e.g. <code>${tableName != null ? tableName : 'global_constants'}</code>) on a SQL definition.
+          If you use either and want default property values, you must change the default value separator by adding this special property:
         </p>
 
         <source><![CDATA[
@@ -209,7 +209,7 @@ SqlSessionFactory factory =
               </td>
               <td>
                 Globally enables or disables lazy loading. When enabled, all relations will be lazily loaded.
-                This value can be superseded for an specific relation by using the <code>fetchType</code> attribute on it.
+                This value can be superseded for a specific relation by using the <code>fetchType</code> attribute on it.
               </td>
               <td>
                 true | false
@@ -957,7 +957,7 @@ public class Author {
         </p>
         <p>
           <span class="label important">NOTE</span>
-          Since version 3.4.5, The MyBatis has been supported JSR-310(Date and Time API) by default.
+          Since version 3.4.5, MyBatis supports JSR-310 (Date and Time API) by default.
         </p>
         <table>
           <thead>
@@ -1437,7 +1437,7 @@ public class ExampleTypeHandler extends BaseTypeHandler<String> {
           data type until the statement is executed.
         </p>
         <p>
-          MyBatis will know the the Java type that you want to handle with
+          MyBatis will know the Java type that you want to handle with
           this TypeHandler by introspecting its generic type, but
           you can override this behavior by two means:
         </p>
@@ -1450,7 +1450,7 @@ public class ExampleTypeHandler extends BaseTypeHandler<String> {
           </li>
         </ul>
 
-        <p>Associated JDBC type can be specified by two means:</p>
+        <p>The associated JDBC type can be specified by two means:</p>
         <ul>
           <li>
            Adding a <code>jdbcType</code> attribute to the typeHandler element (for example: <code>jdbcType="VARCHAR"</code>).
@@ -1608,15 +1608,22 @@ public class GenericTypeHandler<E extends MyObject> extends BaseTypeHandler<E> {
         </p>
         <source><![CDATA[// ExampleObjectFactory.java
 public class ExampleObjectFactory extends DefaultObjectFactory {
-  public Object create(Class type) {
+  @Override
+  public <T> T create(Class<T> type) {
     return super.create(type);
   }
-  public Object create(Class type, List<Class> constructorArgTypes, List<Object> constructorArgs) {
+
+  @Override
+  public <T> T create(Class<T> type, List<Class<?>> constructorArgTypes, List<Object> constructorArgs) {
     return super.create(type, constructorArgTypes, constructorArgs);
   }
+
+  @Override
   public void setProperties(Properties properties) {
     super.setProperties(properties);
   }
+
+  @Override
   public <T> boolean isCollection(Class<T> type) {
     return Collection.class.isAssignableFrom(type);
   }}
@@ -1690,12 +1697,16 @@ public class ExampleObjectFactory extends DefaultObjectFactory {
   args = {MappedStatement.class,Object.class})})
 public class ExamplePlugin implements Interceptor {
   private Properties properties = new Properties();
+
+  @Override
   public Object intercept(Invocation invocation) throws Throwable {
-    // implement pre processing if need
+    // implement pre-processing if needed
     Object returnObject = invocation.proceed();
-    // implement post processing if need
+    // implement post-processing if needed
     return returnObject;
   }
+
+  @Override
   public void setProperties(Properties properties) {
     this.properties = properties;
   }
@@ -1711,7 +1722,7 @@ public class ExamplePlugin implements Interceptor {
           The plug-in above will intercept all calls to the "update" method
           on
           the Executor instance, which is an internal object responsible for
-          the low level execution of mapped statements.
+          the low-level execution of mapped statements.
         </p>
         <p><span class="label important">NOTE</span>
           <strong>Overriding the Configuration Class
@@ -1720,9 +1731,9 @@ public class ExamplePlugin implements Interceptor {
         <p>
           In addition to modifying core MyBatis behaviour with plugins, you
           can
-          also override the Configuration class entirely. Simply extend it
+          also override the <code>Configuration</code> class entirely. Simply extend it
           and override any methods inside, and pass it into the call to the
-          SqlSessionFactoryBuilder.build(myConfig) method. Again though, this
+          <code>SqlSessionFactoryBuilder.build(myConfig)</code> method. Again though, this
           could have a severe impact on the behaviour of MyBatis, so use
           caution.
         </p>
@@ -1893,13 +1904,12 @@ SqlSessionFactory factory = new SqlSessionFactoryBuilder().build(reader, propert
           The dataSource element configures the source of JDBC Connection
           objects using the standard JDBC DataSource interface.
         </p>
-        <ul>
-          <li>Most MyBatis applications will configure a dataSource as in the
-            example. However, it’s not required. Realize though, that to
-            facilitate Lazy Loading, this dataSource is required.
-          </li>
-        </ul>
-        <p>There are three build-in dataSource types (i.e. type="[UNPOOLED|POOLED|JNDI]"):
+        <p>
+          Most MyBatis applications will configure a dataSource as in the
+          example. However, it’s not required. Realize though, that to
+          facilitate Lazy Loading, this dataSource is required.
+        </p>
+        <p>There are three built-in dataSource types (i.e. type="[UNPOOLED|POOLED|JNDI]"):
         </p>
         <p>
           <strong>UNPOOLED</strong>
@@ -2117,7 +2127,7 @@ public class C3P0DataSourceFactory extends UnpooledDataSourceFactory {
         </p>
 
         <source><![CDATA[public interface DatabaseIdProvider {
-  default void setProperties(Properties p) { // Since 3.5.2, change to default method
+  default void setProperties(Properties p) { // Since 3.5.2, changed to default method
     // NOP
   }
   String getDatabaseId(DataSource dataSource) throws SQLException;