rename some classes and methods

.gitignore

@@ -20,7 +20,6 @@ examples/scala2-13/target/
 examples/scala2-11/project/target
 examples/scala2-12/project/target
 examples/scala2-13/project/target
-smt-benchmark/target
 smt-cacheable/target
 smt-cacheable-caffeine/target
 smt-cacheable-redis/target

smt-common/src/main/scala/org/bitlap/common/TransformableSyntax.scala

@@ -1,3 +1,24 @@
+/*
+ * Copyright (c) 2022 bitlap
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
 package org.bitlap.common
 import org.bitlap.common.internal.TransformerMacro
 

smt-csv-derive/src/main/scala/org/bitlap/csv/derive/DeriveCsvConverter.scala

@@ -48,8 +48,8 @@ object DeriveCsvConverter {
       val tree =
         q"""
         new Converter[$typeName] {
-            override def toScala($lineTermName: String): _root_.scala.Option[$typeName] = $packageName.macros.DeriveToCaseClass[$typeName]($lineTermName)($csvFormat)
-            override def toCsvString($tTermName: $typeName): String = $packageName.macros.DeriveToString[$typeName]($tTermName)($csvFormat)
+            override def toScala($lineTermName: String): _root_.scala.Option[$typeName] = $packageName.internal.ToCaseClassMacro[$typeName]($lineTermName)($csvFormat)
+            override def toCsvString($tTermName: $typeName): String = $packageName.internal.ToStringMacro[$typeName]($tTermName)($csvFormat)
         }
        """
       exprPrintTree[CC](force = false, tree)

smt-csv/src/main/scala/org/bitlap/csv/Csvable.scala

@@ -36,7 +36,7 @@ trait Csvable[T] {
    *    case class object
    *  @return
    */
-  def _toCsvString(t: T): String
+  def transform(t: T): String
 
 }
 

smt-csv/src/main/scala/org/bitlap/csv/CsvableBuilder.scala

@@ -21,7 +21,7 @@
 
 package org.bitlap.csv
 
-import org.bitlap.csv.macros.DeriveCsvableBuilder
+import org.bitlap.csv.internal.CsvableBuilderMacro
 import java.io.File
 
 /** Builder to create a custom Csv Encoder.
@@ -43,7 +43,7 @@ class CsvableBuilder[T] {
    *  @return
    */
   def setField[SF](scalaField: T => SF, value: SF => String): CsvableBuilder[T] =
-    macro DeriveCsvableBuilder.setFieldImpl[T, SF]
+    macro CsvableBuilderMacro.setFieldImpl[T, SF]
 
   /** Create a custom builder for converting this scala value to CSV line string.
    *
@@ -54,7 +54,7 @@ class CsvableBuilder[T] {
    *  @return
    *    The string of one CSV line.
    */
-  def convert(t: T)(implicit format: CsvFormat): String = macro DeriveCsvableBuilder.convertOneImpl[T]
+  def convert(t: T)(implicit format: CsvFormat): String = macro CsvableBuilderMacro.convertOneImpl[T]
 
   /** Convert the sequence of Scala case class to CSV string.
    *
@@ -65,7 +65,7 @@ class CsvableBuilder[T] {
    *  @return
    *    The string of all CSV lines.
    */
-  def convert(ts: List[T])(implicit format: CsvFormat): String = macro DeriveCsvableBuilder.convertAllImpl[T]
+  def convert(ts: List[T])(implicit format: CsvFormat): String = macro CsvableBuilderMacro.convertAllImpl[T]
 
   /** Convert the sequence of Scala case class to CSV string and write to file.
    *
@@ -79,12 +79,12 @@ class CsvableBuilder[T] {
    *    The string of all CSV lines.
    */
   def convertTo(ts: List[T], file: File)(implicit format: CsvFormat): Boolean =
-    macro DeriveCsvableBuilder.convertToFileImpl[T]
+    macro CsvableBuilderMacro.convertToFileImpl[T]
 
 }
 
 object CsvableBuilder {
 
-  def apply[T <: Product]: CsvableBuilder[T] = macro DeriveCsvableBuilder.applyImpl[T]
+  def apply[T <: Product]: CsvableBuilder[T] = macro CsvableBuilderMacro.applyImpl[T]
 
 }

smt-csv/src/main/scala/org/bitlap/csv/CsvableImplicits.scala

@@ -28,34 +28,34 @@ package org.bitlap.csv
 trait CsvableImplicits {
 
   implicit final val stringCsvable: Csvable[String] = new Csvable[String] {
-    override def _toCsvString(s: String): String = s
+    override def transform(s: String): String = s
   }
 
   implicit final val intCsvable: Csvable[Int] = new Csvable[Int] {
-    override def _toCsvString(column: Int): String = column.toString
+    override def transform(column: Int): String = column.toString
   }
 
   implicit final val charCsvable: Csvable[Char] = new Csvable[Char] {
-    override def _toCsvString(t: Char): String = t.toString
+    override def transform(t: Char): String = t.toString
   }
 
   implicit final val longCsvable: Csvable[Long] = new Csvable[Long] {
-    override def _toCsvString(column: Long): String = column.toString
+    override def transform(column: Long): String = column.toString
   }
 
   implicit final val shortCsvable: Csvable[Short] = new Csvable[Short] {
-    override def _toCsvString(column: Short): String = column.toString
+    override def transform(column: Short): String = column.toString
   }
 
   implicit final val doubleCsvable: Csvable[Double] = new Csvable[Double] {
-    override def _toCsvString(column: Double): String = column.toString
+    override def transform(column: Double): String = column.toString
   }
 
   implicit final val floatCsvable: Csvable[Float] = new Csvable[Float] {
-    override def _toCsvString(column: Float): String = column.toString
+    override def transform(column: Float): String = column.toString
   }
 
   implicit final val booleanCsvable: Csvable[Boolean] = new Csvable[Boolean] {
-    override def _toCsvString(column: Boolean): String = column.toString
+    override def transform(column: Boolean): String = column.toString
   }
 }

smt-csv/src/main/scala/org/bitlap/csv/Scalable.scala

@@ -36,7 +36,7 @@ trait Scalable[T] {
    *    The column value of CSV line data.
    *  @return
    */
-  def _toScala(column: String): Option[T]
+  def transform(column: String): Option[T]
 }
 
 object Scalable extends ScalableImplicits {

smt-csv/src/main/scala/org/bitlap/csv/ScalableBuilder.scala

@@ -21,7 +21,7 @@
 
 package org.bitlap.csv
 
-import org.bitlap.csv.macros.DeriveScalableBuilder
+import org.bitlap.csv.internal.ScalableBuilderMacro
 import java.io.InputStream
 
 /** Builder to create a custom Csv Decoder.
@@ -43,7 +43,7 @@ class ScalableBuilder[T] {
    *  @return
    */
   def setField[SF](scalaField: T => SF, value: String => SF): ScalableBuilder[T] =
-    macro DeriveScalableBuilder.setFieldImpl[T, SF]
+    macro ScalableBuilderMacro.setFieldImpl[T, SF]
 
   /** Create a custom builder for converting this CSV line to scala values.
    *
@@ -53,7 +53,7 @@ class ScalableBuilder[T] {
    *    For processing CSV in the specified format.
    *  @return
    */
-  def convert(line: String)(implicit format: CsvFormat): Option[T] = macro DeriveScalableBuilder.convertOneImpl[T]
+  def convert(line: String)(implicit format: CsvFormat): Option[T] = macro ScalableBuilderMacro.convertOneImpl[T]
 
   /** Convert all CSV lines to the sequence of Scala case class.
    *
@@ -64,7 +64,7 @@ class ScalableBuilder[T] {
    *  @return
    */
   def convert(lines: List[String])(implicit format: CsvFormat): List[Option[T]] =
-    macro DeriveScalableBuilder.convertAllImpl[T]
+    macro ScalableBuilderMacro.convertAllImpl[T]
 
   /** Read all CSV lines of the file and convert them to the sequence of Scala case class.
    *
@@ -75,12 +75,12 @@ class ScalableBuilder[T] {
    *  @return
    */
   def convertFrom(file: InputStream)(implicit format: CsvFormat): List[Option[T]] =
-    macro DeriveScalableBuilder.convertFromFileImpl[T]
+    macro ScalableBuilderMacro.convertFromFileImpl[T]
 
 }
 
 object ScalableBuilder {
 
-  def apply[T <: Product]: ScalableBuilder[T] = macro DeriveScalableBuilder.applyImpl[T]
+  def apply[T <: Product]: ScalableBuilder[T] = macro ScalableBuilderMacro.applyImpl[T]
 
 }

smt-csv/src/main/scala/org/bitlap/csv/ScalableImplicits.scala

@@ -30,34 +30,34 @@ import scala.util.Try
 trait ScalableImplicits {
 
   implicit final val stringScalable: Scalable[String] = new Scalable[String] {
-    override def _toScala(column: String): Option[String] = if (column.isEmpty) None else Some(column)
+    override def transform(column: String): Option[String] = if (column.isEmpty) None else Some(column)
   }
 
   implicit final val intScalable: Scalable[Int] = new Scalable[Int] {
-    override def _toScala(column: String): Option[Int] = Try(column.toInt).toOption
+    override def transform(column: String): Option[Int] = Try(column.toInt).toOption
   }
 
   implicit final val charScalable: Scalable[Char] = new Scalable[Char] {
-    override def _toScala(column: String): Option[Char] = if (column.isEmpty) None else Try(column.charAt(0)).toOption
+    override def transform(column: String): Option[Char] = if (column.isEmpty) None else Try(column.charAt(0)).toOption
   }
 
   implicit final val longScalable: Scalable[Long] = new Scalable[Long] {
-    override def _toScala(column: String): Option[Long] = Try(column.toLong).toOption
+    override def transform(column: String): Option[Long] = Try(column.toLong).toOption
   }
 
   implicit final val shortScalable: Scalable[Short] = new Scalable[Short] {
-    override def _toScala(column: String): Option[Short] = Try(column.toShort).toOption
+    override def transform(column: String): Option[Short] = Try(column.toShort).toOption
   }
 
   implicit final val doubleScalable: Scalable[Double] = new Scalable[Double] {
-    override def _toScala(column: String): Option[Double] = Try(column.toDouble).toOption
+    override def transform(column: String): Option[Double] = Try(column.toDouble).toOption
   }
 
   implicit final val floatScalable: Scalable[Float] = new Scalable[Float] {
-    override def _toScala(column: String): Option[Float] = Try(column.toFloat).toOption
+    override def transform(column: String): Option[Float] = Try(column.toFloat).toOption
   }
 
   implicit final val booleanScalable: Scalable[Boolean] = new Scalable[Boolean] {
-    override def _toScala(column: String): Option[Boolean] = Try(column.toBoolean).toOption
+    override def transform(column: String): Option[Boolean] = Try(column.toBoolean).toOption
   }
 }

smt-csv/src/main/scala/org/bitlap/csv/macros/DeriveCsvableBuilder.scala → smt-csv/src/main/scala/org/bitlap/csv/internal/CsvableBuilderMacro.scala

@@ -19,7 +19,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package org.bitlap.csv.macros
+package org.bitlap.csv.internal
 
 import org.bitlap.common.MacroCache
 import org.bitlap.common.internal.AbstractMacroProcessor
@@ -33,7 +33,7 @@ import scala.reflect.macros.whitebox
  *    梦境迷离
  *  @version 1.0,2022/4/29
  */
-class DeriveCsvableBuilder(override val c: whitebox.Context) extends AbstractMacroProcessor(c) {
+class CsvableBuilderMacro(override val c: whitebox.Context) extends AbstractMacroProcessor(c) {
 
   import c.universe._
 
@@ -103,7 +103,7 @@ class DeriveCsvableBuilder(override val c: whitebox.Context) extends AbstractMac
          ..${getAnnoClassObject[T](customTrees, format)}
          $packageName.FileUtils.writer($file, $ts.map { ($innerTName: $clazzName) =>
                $csvableInstanceTermName.$innerTmpTermName = $innerTName
-               $csvableInstanceTermName._toCsvString($innerTName)
+               $csvableInstanceTermName.transform($innerTName)
            }, $format
          )
       """
@@ -120,7 +120,7 @@ class DeriveCsvableBuilder(override val c: whitebox.Context) extends AbstractMac
          ..${getAnnoClassObject[T](customTrees, format)}
          lazy val lines = $ts.map { ($innerTName: $clazzName) =>
              $csvableInstanceTermName.$innerTmpTermName = $innerTName
-             $csvableInstanceTermName._toCsvString($innerTName)
+             $csvableInstanceTermName.transform($innerTName)
          }
          $packageName.StringUtils.combineRows(lines, $format)
       """
@@ -139,7 +139,7 @@ class DeriveCsvableBuilder(override val c: whitebox.Context) extends AbstractMac
                 val values = if (null == fields) _root_.scala.List.empty else ${fieldsToString[T](funcArgsTempTermName, customTrees)}
                 $packageName.StringUtils.combineColumns(values, $format)
            }
-           override def _toCsvString(t: $clazzName): String = _toCsv($annoClassName.$innerTmpTermName)
+           override def transform(t: $clazzName): String = _toCsv($annoClassName.$innerTmpTermName)
        }
 
        final lazy private val $csvableInstanceTermName = $annoClassName
@@ -156,13 +156,13 @@ class DeriveCsvableBuilder(override val c: whitebox.Context) extends AbstractMac
          object $annoClassName extends $packageName.Csvable[$clazzName] {
             final private val $innerTmpTermName = $t
 
-            override def _toCsvString(t: $clazzName): String = {
+            override def transform(t: $clazzName): String = {
                 val fields = ${clazzName.toTermName}.unapply($innerTmpTermName).orNull
                 val values = if (null == fields) _root_.scala.List.empty else ${fieldsToString[T](innerTmpTermName, customTrees)}
                 $packageName.StringUtils.combineColumns(values, $format)
             }
          }
-         $annoClassName._toCsvString($t)
+         $annoClassName.transform($t)
       """
     exprPrintTree[String](force = false, tree)
   }
@@ -210,15 +210,15 @@ class DeriveCsvableBuilder(override val c: whitebox.Context) extends AbstractMac
         case t if t <:< typeOf[Option[_]] && !customTrees.contains(fieldNames(indexType._1)) =>
           val genericType = c.typecheck(q"${indexType._2}", c.TYPEmode).tpe.dealias.typeArgs.head
           q"""
-              $packageName.Csvable[$genericType]._toCsvString {
+              $packageName.Csvable[$genericType].transform {
                 if ($innerVarTermName.${indexByName(indexType._1)}.isEmpty) "" 
                 else $innerVarTermName.${indexByName(indexType._1)}.get
               }
             """
         case _ if customTrees.contains(fieldNames(indexType._1)) =>
           customFunction()
         case _ =>
-          q"$packageName.Csvable[${indexType._2}]._toCsvString($innerVarTermName.${indexByName(indexType._1)})"
+          q"$packageName.Csvable[${indexType._2}].transform($innerVarTermName.${indexByName(indexType._1)})"
       }
     }
   }