Merge pull request #186 from hazendaz/master

[ci] formatting
mybatis · Feb 11, 2024 · 9c28e60 · 9c28e60
2 parents 98e1d83 + b7f2705
commit 9c28e60
Show file tree

Hide file tree

Showing 33 changed files with 218 additions and 218 deletions.
diff --git a/mybatis-scala-core/src/main/scala/org/mybatis/scala/config/Configuration.scala b/mybatis-scala-core/src/main/scala/org/mybatis/scala/config/Configuration.scala
@@ -249,7 +249,7 @@ object Configuration {
     }
 
     // Pre ====================================================================
-    
+
     def properties(props: (String, String)*) =
       set(0, pre) { _.getVariables.asScala ++= Map(props: _*) }
 
@@ -282,39 +282,39 @@ object Configuration {
     def lazyLoadingSupport(enabled: Boolean) =
       set(10, pre) { _.setLazyLoadingEnabled(enabled) }
 
-    def aggressiveLazyLoading(enabled: Boolean) = 
+    def aggressiveLazyLoading(enabled: Boolean) =
       set(11, pre) { _.setAggressiveLazyLoading(enabled) }
-    
-    def multipleResultSetsSupport(enabled: Boolean) = 
+
+    def multipleResultSetsSupport(enabled: Boolean) =
       set(12, pre) { _.setMultipleResultSetsEnabled(enabled) }
-    
-    def useColumnLabel(enabled: Boolean) = 
+
+    def useColumnLabel(enabled: Boolean) =
       set(13, pre) { _.setUseColumnLabel(enabled) }
-    
-    def useGeneratedKeys(enabled: Boolean) = 
+
+    def useGeneratedKeys(enabled: Boolean) =
       set(14, pre) { _.setUseGeneratedKeys(enabled) }
-    
-    def defaultExecutorType(executorType: ExecutorType) = 
+
+    def defaultExecutorType(executorType: ExecutorType) =
       set(15, pre) { _.setDefaultExecutorType(executorType.unwrap) }
-    
-    def defaultStatementTimeout(timeout: Int) = 
+
+    def defaultStatementTimeout(timeout: Int) =
       set(16, pre) { _.setDefaultStatementTimeout(timeout) }
-    
-    def mapUnderscoreToCamelCase(enabled: Boolean) = 
+
+    def mapUnderscoreToCamelCase(enabled: Boolean) =
       set(17, pre) { _.setMapUnderscoreToCamelCase(enabled) }
-    
-    def safeRowBoundsSupport(enabled: Boolean) = 
+
+    def safeRowBoundsSupport(enabled: Boolean) =
       set(18, pre) { _.setSafeRowBoundsEnabled(enabled) }
-    
-    def localCacheScope(localCacheScope: LocalCacheScope) = 
+
+    def localCacheScope(localCacheScope: LocalCacheScope) =
       set(19, pre) { _.setLocalCacheScope(localCacheScope.unwrap) }
-    
-    def jdbcTypeForNull(jdbcType: JdbcType) = 
+
+    def jdbcTypeForNull(jdbcType: JdbcType) =
       set(20, pre) { _.setJdbcTypeForNull(jdbcType.unwrap) }
-    
-    def lazyLoadTriggerMethods(names: Set[String]) = 
+
+    def lazyLoadTriggerMethods(names: Set[String]) =
       set(21, pre) { _.setLazyLoadTriggerMethods(names.asJava) }
-    
+
     def environment(id: String, transactionFactory: TransactionFactory, dataSource: javax.sql.DataSource) =
       set(24, pre) { _.setEnvironment(new Environment(id, transactionFactory, dataSource)) }
 
@@ -324,38 +324,38 @@ object Configuration {
     def typeHandler(jdbcType: JdbcType, handler: (T[_], TypeHandler[_])) =
       set(26, pre) { _.getTypeHandlerRegistry.register(handler._1.raw, jdbcType.unwrap, handler._2) }
 
-    def typeHandler(handler: (T[_], TypeHandler[_])) = 
+    def typeHandler(handler: (T[_], TypeHandler[_])) =
       set(26, pre) { _.getTypeHandlerRegistry.register(handler._1.raw, handler._2) }
-    
-    def typeHandler(handler: TypeHandler[_]) = 
+
+    def typeHandler(handler: TypeHandler[_]) =
       set(26, pre) { _.getTypeHandlerRegistry.register(handler) }
 
     // Pos ===========================================================
 
     def namespace(name: String)(f: (ConfigurationSpace => Unit)) =
       set(0, pos) { c => f(new ConfigurationSpace(c.configuration, name)) }
 
-    def statements(s: Statement*) = 
+    def statements(s: Statement*) =
       set(1, pos) { _ ++= s }
-    
-    def mappers(mappers: { def bind: Seq[Statement] }*) = 
+
+    def mappers(mappers: { def bind: Seq[Statement] }*) =
       set(1, pos) { c => mappers.foreach(c ++= _) }
-    
-    def cacheRef(that: ConfigurationSpace) = 
+
+    def cacheRef(that: ConfigurationSpace) =
       set(2, pos) { _.cacheRef(that) }
-    
+
     def cache(
       impl: T[_ <: Cache] = DefaultCache,
       eviction: T[_ <: Cache] = Eviction.LRU,
       flushInterval: Long = -1,
       size: Int = -1,
       readWrite: Boolean = true,
       blocking : Boolean = false,
-      props: Properties = null) = 
+      props: Properties = null) =
         set(2, pos) { _.cache(impl, eviction, flushInterval, size, readWrite, blocking, props) }
 
     // PENDING FOR mybatis 3.1.1+ ==================================================
-    
+
     // TODO (3.1.1) def proxyFactory(factory: ProxyFactory) = set( 7, pre) { _.setProxyFactory(factory) }
     // TODO (3.1.1) def safeResultHandlerSupport(enabled : Boolean) = set(22, pre) { _.setSafeResultHandlerEnabled(enabled) }
     // TODO (3.1.1) def defaultScriptingLanguage(driver : T[_]) = set(23, pre) { _.setDefaultScriptingLanguage(driver) }

diff --git a/mybatis-scala-core/src/main/scala/org/mybatis/scala/config/ConfigurationSpace.scala b/mybatis-scala-core/src/main/scala/org/mybatis/scala/config/ConfigurationSpace.scala
@@ -318,22 +318,22 @@ class ConfigurationSpace(configuration : MBConfig, val spaceName : String = "_DE
     val resultTypeClass = generator.resultTypeClass
 
     builderAssistant.addMappedStatement(
-      id, 
-      sqlSource, 
-      statementType, 
+      id,
+      sqlSource,
+      statementType,
       sqlCommandType,
-      fetchSize, 
-      timeout, 
-      parameterMap, 
-      parameterTypeClass, 
-      resultMap, 
+      fetchSize,
+      timeout,
+      parameterMap,
+      parameterTypeClass,
+      resultMap,
       resultTypeClass,
-      resultSetTypeEnum, 
-      flushCache, 
+      resultSetTypeEnum,
+      flushCache,
       useCache,
-      false, // TODO Issue #577 
-      keyGenerator, 
-      keyProperty, 
+      false, // TODO Issue #577
+      keyGenerator,
+      keyProperty,
       keyColumn,
       databaseId,
       DefaultScriptingDriver)

diff --git a/mybatis-scala-core/src/main/scala/org/mybatis/scala/config/Environment.scala b/mybatis-scala-core/src/main/scala/org/mybatis/scala/config/Environment.scala
@@ -17,8 +17,8 @@ package org.mybatis.scala.config
 
 import javax.sql.DataSource
 
-/** 
-  * 
+/**
+  *
   */
 case class Environment(id : String, tf : TransactionFactory, ds : DataSource) {
 

diff --git a/mybatis-scala-core/src/main/scala/org/mybatis/scala/config/ObjectFactory.scala b/mybatis-scala-core/src/main/scala/org/mybatis/scala/config/ObjectFactory.scala
@@ -27,30 +27,30 @@ class DefaultObjectFactory extends ObjectFactory {
   override def setProperties(properties : java.util.Properties) : Unit = {}
 
   private def instantiateClass[T](t : Class[_], constructorArgTypes : java.util.List[Class[_]], constructorArgs : java.util.List[AnyRef]) : T = {
-    
+
     val argTypes = {
-      if (constructorArgTypes != null) 
+      if (constructorArgTypes != null)
         constructorArgTypes.toArray[Class[_]](new Array[Class[_]](constructorArgTypes.size))
       else
         null
     }
-    
+
     val constructor = getConstructor(t, argTypes)
 
     val argValues = {
-      if (constructorArgs != null) 
+      if (constructorArgs != null)
         constructorArgs.toArray[AnyRef](new Array[AnyRef](constructorArgs.size))
-      else 
+      else
         null
     }
-    
+
     try {
       if (argTypes == null || argValues == null) {
         constructor.newInstance().asInstanceOf[T]
       }
       else {
         constructor.newInstance(argValues : _*).asInstanceOf[T]
-      }      
+      }
     }
     catch {
       case e : Exception =>
@@ -90,8 +90,8 @@ class DefaultObjectFactory extends ObjectFactory {
       t
     }
   }
-    
-  def isCollection[T](t : Class[T]) : Boolean = 
+
+  def isCollection[T](t : Class[T]) : Boolean =
     classOf[scala.collection.Seq[_]].isAssignableFrom(t) ||
     classOf[scala.collection.Set[_]].isAssignableFrom(t)
 
@@ -112,9 +112,9 @@ class DefaultObjectFactory extends ObjectFactory {
 
     override def hashCode = _hc
 
-    override def equals(that : Any) = 
-      that != null && 
-        that.getClass == classOf[CacheKey] && 
+    override def equals(that : Any) =
+      that != null &&
+        that.getClass == classOf[CacheKey] &&
           that.asInstanceOf[CacheKey]._hc == this._hc
 
   }
@@ -134,7 +134,7 @@ class DefaultObjectFactory extends ObjectFactory {
             constructor.setAccessible(true)
           }
           constructor
-        }      
+        }
       }
       catch {
         case e : Exception =>
@@ -144,7 +144,7 @@ class DefaultObjectFactory extends ObjectFactory {
           }
           throw new org.apache.ibatis.reflection.ReflectionException(
             "Error instantiating %s with invalid types (%s). Cause: %s".format(t.getSimpleName, args, e.getMessage), e);
-      }      
-  } 
+      }
+  }
 
 }
diff --git a/mybatis-scala-core/src/main/scala/org/mybatis/scala/config/ObjectWrapperFactory.scala b/mybatis-scala-core/src/main/scala/org/mybatis/scala/config/ObjectWrapperFactory.scala
@@ -41,7 +41,7 @@ class ArrayBufferWrapper(buffer : scala.collection.mutable.ArrayBuffer[AnyRef])
 
 class HashSetWrapper(set : scala.collection.mutable.HashSet[AnyRef]) extends CollectionObjectWrapper {
   import scala.jdk.CollectionConverters._
-  def add(element : AnyRef) : Unit = set add element  
+  def add(element : AnyRef) : Unit = set add element
   def addAll[E](elements : java.util.List[E]) : Unit = set.addAll(elements.asInstanceOf[java.util.Collection[AnyRef]].asScala)
 }
 
@@ -54,7 +54,7 @@ class DefaultObjectWrapperFactory extends ObjectWrapperFactory {
   def getWrapperFor(metaObject : MetaObject, obj : AnyRef) : org.apache.ibatis.reflection.wrapper.ObjectWrapper = obj match {
     case o : scala.collection.mutable.ArrayBuffer[_] => new ArrayBufferWrapper(o.asInstanceOf[scala.collection.mutable.ArrayBuffer[AnyRef]])
     case o : scala.collection.mutable.HashSet[_] => new HashSetWrapper(o.asInstanceOf[scala.collection.mutable.HashSet[AnyRef]])
-    case _ => 
+    case _ =>
       throw new IllegalArgumentException("Type not supported: " + obj.getClass.getSimpleName)
   }
 }
diff --git a/mybatis-scala-core/src/main/scala/org/mybatis/scala/config/package.scala b/mybatis-scala-core/src/main/scala/org/mybatis/scala/config/package.scala
@@ -30,13 +30,13 @@ package org.mybatis.scala
   * }
   * val persistenceContext = config.createPersistenceContext
   * }}}
-  * 
+  *
   * == Another example without external XML file and with default namespace ==
   * {{{
   * val config = Configuration(
   *  Environment(
-  *    "default", 
-  *    new JdbcTransactionFactory(), 
+  *    "default",
+  *    new JdbcTransactionFactory(),
   *    new PooledDataSource(
   *      "org.hsqldb.jdbcDriver",
   *      "jdbc:hsqldb:mem:scala",
@@ -46,7 +46,7 @@ package org.mybatis.scala
   *  )
   * )
   * config ++= MyDAO
-  * 
+  *
   * val persistenceContext = config.createPersistenceContext
   * }}}
   */
@@ -55,27 +55,27 @@ package object config {
   type TransactionFactory = org.apache.ibatis.transaction.TransactionFactory
   type JdbcTransactionFactory = org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory
   type ManagedTransactionFactory = org.apache.ibatis.transaction.managed.ManagedTransactionFactory
-  
+
   type PooledDataSource = org.apache.ibatis.datasource.pooled.PooledDataSource
   type UnpooledDataSource = org.apache.ibatis.datasource.unpooled.UnpooledDataSource
   type JndiDataSourceFactory = org.apache.ibatis.datasource.jndi.JndiDataSourceFactory
-  
+
   type ObjectFactory = org.apache.ibatis.reflection.factory.ObjectFactory
   type ObjectWrapperFactory = org.apache.ibatis.reflection.wrapper.ObjectWrapperFactory
   type DatabaseIdProvider = org.apache.ibatis.mapping.DatabaseIdProvider
   type LanguageDriver = org.apache.ibatis.scripting.LanguageDriver
-  
+
   sealed abstract class LocalCacheScope {
     val unwrap : org.apache.ibatis.session.LocalCacheScope
     case object SESSION extends LocalCacheScope { val unwrap = org.apache.ibatis.session.LocalCacheScope.SESSION }
     case object STATEMENT extends LocalCacheScope { val unwrap = org.apache.ibatis.session.LocalCacheScope.STATEMENT }
   }
-  
+
   sealed abstract class AutoMappingBehavior {
     val unwrap : org.apache.ibatis.session.AutoMappingBehavior
     case object FULL extends AutoMappingBehavior { val unwrap = org.apache.ibatis.session.AutoMappingBehavior.FULL }
     case object NONE extends AutoMappingBehavior { val unwrap = org.apache.ibatis.session.AutoMappingBehavior.NONE }
     case object PARTIAL extends AutoMappingBehavior { val unwrap = org.apache.ibatis.session.AutoMappingBehavior.PARTIAL }
   }
-  
+
 }
diff --git a/mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/Binding.scala b/mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/Binding.scala
@@ -62,7 +62,7 @@ case object ModeINOUT extends ParamModeEnum("INOUT")
   * }}}
   *
   */
-object Binding {  
+object Binding {
 
   /** Custom Aliased Types */
   private val valueTypes = Set("byte", "long", "short", "int", "double", "float", "boolean",
@@ -83,7 +83,7 @@ object Binding {
     mode : ParamModeEnum = ModeIN,
     typeHandler : T[_ <: TypeHandler[_]] = null,
     resultMap : ResultMap[_] = null
-  ) : String = {  
+  ) : String = {
     Seq[Option[String]](
       Some(property)
       ,if (jdbcType != null) Some("jdbcType=" + jdbcType.toString) else None

diff --git a/mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/Delete.scala b/mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/Delete.scala
@@ -22,8 +22,8 @@ import org.mybatis.scala.session.Session
   * @tparam Param Input parameter type of the apply method.
   * @version \$Revision$
   */
-abstract class Delete [Param : Manifest] 
-  extends Statement 
+abstract class Delete [Param : Manifest]
+  extends Statement
      with SQLFunction1[Param,Int] {
 
   def parameterTypeClass = manifest[Param].runtimeClass

diff --git a/mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/Insert.scala b/mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/Insert.scala
@@ -22,7 +22,7 @@ import org.mybatis.scala.session.Session
   * @tparam Param Input parameter type of the apply method.
   * @version \$Revision$
   */
-abstract class Insert[Param : Manifest] 
+abstract class Insert[Param : Manifest]
   extends Statement
      with SQLFunction1[Param,Int] {
 

diff --git a/mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/OptionTypeHandler.scala b/mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/OptionTypeHandler.scala
@@ -29,7 +29,7 @@ import java.sql.ResultSet
   */
 class OptionTypeHandler[T](delegate : TypeHandler[T]) extends TypeHandler[Option[T]] {
 
-  def setParameter(ps : PreparedStatement, i : Int, parameter : Option[T], jdbcType : JdbcTypeEnum) : Unit = 
+  def setParameter(ps : PreparedStatement, i : Int, parameter : Option[T], jdbcType : JdbcTypeEnum) : Unit =
     parameter match {
       case None => delegate.setParameter(ps, i, null.asInstanceOf[T], jdbcType)
       case Some(v) => delegate.setParameter(ps, i, v, jdbcType)
@@ -41,16 +41,16 @@ class OptionTypeHandler[T](delegate : TypeHandler[T]) extends TypeHandler[Option
   def getResult(rs : ResultSet, columnIndex : Int) : Option[T]  =
     Option{ delegate.getResult(rs, columnIndex) }
 
-  def getResult(cs : CallableStatement, columnIndex : Int) : Option[T] = 
+  def getResult(cs : CallableStatement, columnIndex : Int) : Option[T] =
     Option{ delegate.getResult(cs, columnIndex) }
 
 }
 
 /** Builtin Option TypeHandlers */
 object TypeHandlers {
-  
+
   import org.apache.ibatis.`type`._
-  
+
   class OptBooleanTypeHandler     extends OptionTypeHandler(new BooleanTypeHandler())
   class OptByteTypeHandler        extends OptionTypeHandler(new ByteTypeHandler())
   class OptShortTypeHandler       extends OptionTypeHandler(new ShortTypeHandler())