From 99aeed69a817871eb04bbc744bb9605098332aea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=A6=E5=A2=83=E8=BF=B7=E7=A6=BB?= Date: Tue, 3 May 2022 18:29:02 +0800 Subject: [PATCH] add doc, rename directory --- README_CN.md | 4 +- build.sbt | 36 +++++------ .../README.md | 0 .../benchmark/BenchmarkRuntime.scala | 0 .../benchmark/CacheableBenchmarks.scala | 0 .../src/main/resources/reference.conf | 0 .../bitlap/cacheable/caffeine/Implicits.scala | 0 .../bitlap/cacheable/caffeine/ZCaffeine.scala | 0 .../src/test/resources/application.conf | 0 .../cacheable/caffeine/CacheEvictTest.scala | 0 .../cacheable/caffeine/CacheValue.scala | 0 .../cacheable/caffeine/CacheableTest.scala | 0 .../caffeine/CustomCacheableTest.scala | 0 .../org/bitlap/cacheable/core/Cache.scala | 0 .../org/bitlap/cacheable/core/Utils.scala | 0 .../org/bitlap/cacheable/core/ZIOCache.scala | 0 .../cacheable/core/ZIOUpdateCache.scala | 0 .../bitlap/cacheable/core/ZStreamCache.scala | 0 .../cacheable/core/ZStreamUpdateCache.scala | 0 .../bitlap/cacheable/core/cacheEvict.scala | 0 .../org/bitlap/cacheable/core/cacheable.scala | 0 .../core/macros/AbstractMacroProcessor.scala | 0 .../core/macros/CacheEvictMacro.scala | 0 .../core/macros/CacheableMacro.scala | 0 .../src/main/resources/reference.conf | 0 .../bitlap/cacheable/redis/Implicits.scala | 0 .../cacheable/redis/ZRedisConfiguration.scala | 0 .../bitlap/cacheable/redis/ZRedisLive.scala | 0 .../cacheable/redis/ZRedisService.scala | 0 .../org/bitlap/cacheable/redis/redis.scala | 0 .../src/test/resources/application.conf | 0 .../cacheable/redis/CacheEvictTest.scala | 0 .../bitlap/cacheable/redis/CacheValue.scala | 0 .../cacheable/redis/CacheableTest.scala | 0 .../cacheable/redis/CustomCacheableTest.scala | 0 .../org/bitlap/csv/core/ScalableHelper.scala | 2 + .../scala/org/bitlap/csv/core/Converter.scala | 0 .../scala/org/bitlap/csv/core/Csvable.scala | 11 ++++ .../org/bitlap/csv/core/CsvableBuilder.scala | 0 .../bitlap/csv/core/CsvableImplicits.scala | 0 .../org/bitlap/csv/core/InternalApi.scala | 0 .../scala/org/bitlap/csv/core/Scalable.scala | 11 ++++ .../org/bitlap/csv/core/ScalableBuilder.scala | 0 .../bitlap/csv/core/ScalableImplicits.scala | 0 .../org/bitlap/csv/core/StringUtils.scala | 0 .../core/macros/AbstractMacroProcessor.scala | 59 ++++++++++++++++--- .../core/macros/DeriveCsvableBuilder.scala | 2 +- .../core/macros/DeriveScalableBuilder.scala | 2 +- .../csv/core/macros/DeriveToCaseClass.scala | 2 +- .../csv/core/macros/DeriveToString.scala | 2 +- .../bitlap/csv/core/macros/MacroCache.scala | 0 .../src/test/resources/simple_data.csv | 0 .../csv/core/test/CsvConverterTest.scala | 0 .../core/test/CsvableAndScalableTest.scala | 0 .../test/CustomConverterBuilderTest.scala | 0 .../org/bitlap/csv/core/test/Dimension.scala | 0 .../csv/core/test/StringUtilsTest.scala | 0 .../csv/derive/DeriveCsvConverter.scala | 0 .../derive/test/DeriveCsvConverterTest.scala | 0 .../bitlap/csv/derive/test/Dimension.scala | 0 .../bitlap/csv/derive/test/Dimension2.scala | 0 .../scala/org/bitlap/tools/LogLevel.scala | 0 .../main/scala/org/bitlap/tools/apply.scala | 0 .../main/scala/org/bitlap/tools/builder.scala | 0 .../scala/org/bitlap/tools/constructor.scala | 0 .../main/scala/org/bitlap/tools/elapsed.scala | 0 .../org/bitlap/tools/equalsAndHashCode.scala | 0 .../scala/org/bitlap/tools/jacksonEnum.scala | 0 .../org/bitlap/tools/javaCompatible.scala | 0 .../main/scala/org/bitlap/tools/json.scala | 0 .../src/main/scala/org/bitlap/tools/log.scala | 0 .../scala/org/bitlap/tools/logs/LogType.scala | 0 .../logs/extension/ScalaLazyLogging.scala | 0 .../logs/extension/ScalaLoggingLazyImpl.scala | 0 .../extension/ScalaLoggingStrictImpl.scala | 0 .../logs/extension/ScalaStrictLogging.scala | 0 .../org/bitlap/tools/logs/impl/JLogImpl.scala | 0 .../bitlap/tools/logs/impl/Log4J2Impl.scala | 0 .../bitlap/tools/logs/impl/Slf4jImpl.scala | 0 .../scala/org/bitlap/tools/logs/package.scala | 0 .../tools/macros/AbstractMacroProcessor.scala | 0 .../org/bitlap/tools/macros/applyMacro.scala | 0 .../bitlap/tools/macros/builderMacro.scala | 0 .../tools/macros/constructorMacro.scala | 0 .../bitlap/tools/macros/elapsedMacro.scala | 0 .../tools/macros/equalsAndHashCodeMacro.scala | 0 .../tools/macros/jacksonEnumMacro.scala | 0 .../tools/macros/javaCompatibleMacro.scala | 0 .../org/bitlap/tools/macros/jsonMacro.scala | 0 .../org/bitlap/tools/macros/logMacro.scala | 0 .../org/bitlap/tools/macros/macros.scala | 0 .../bitlap/tools/macros/toStringMacro.scala | 0 .../tools/methods/ProcessorCreator.scala | 0 .../tools/methods/impl/MacroCache.scala | 0 .../methods/impl/ProcessorCreatorMacro.scala | 0 .../main/scala/org/bitlap/tools/package.scala | 0 .../scala/org/bitlap/tools/toString.scala | 0 .../tools/utils/ScalaReflectionUtils.scala | 0 .../src/test/proto/schema.proto | 0 .../src/test/resources/log4j2.xml | 0 .../scala/org/bitlap/tools/ApplyTest.scala | 0 .../scala/org/bitlap/tools/BuilderTest.scala | 0 .../org/bitlap/tools/ConstructorTest.scala | 0 .../scala/org/bitlap/tools/ElapsedTest.scala | 0 .../org/bitlap/tools/EmployeeTests.scala | 0 .../bitlap/tools/EqualsAndHashCodeTest.scala | 0 .../org/bitlap/tools/JacksonEnumTest.scala | 0 .../org/bitlap/tools/JavaCompatibleTest.scala | 0 .../scala/org/bitlap/tools/JsonTest.scala | 0 .../test/scala/org/bitlap/tools/LogMain.scala | 0 .../test/scala/org/bitlap/tools/LogTest.scala | 0 .../scala/org/bitlap/tools/NetService.scala | 0 .../scala/org/bitlap/tools/OthersTest.scala | 0 .../bitlap/tools/ProcessorCreatorTest.scala | 0 .../tools/ScalaReflectionUtilsTest.scala | 0 .../scala/org/bitlap/tools/ToStringTest.scala | 0 .../bitlap/tools/test/proto/BOpenSession.java | 0 .../test/proto/BOpenSessionOrBuilder.java | 0 .../tools/test/proto/DriverService.java | 0 119 files changed, 99 insertions(+), 32 deletions(-) rename {cacheable-benchmark => smt-cacheable-benchmark}/README.md (100%) rename {cacheable-benchmark => smt-cacheable-benchmark}/src/main/scala/org/bitlap/cacheable/benchmark/BenchmarkRuntime.scala (100%) rename {cacheable-benchmark => smt-cacheable-benchmark}/src/main/scala/org/bitlap/cacheable/benchmark/CacheableBenchmarks.scala (100%) rename {cacheable-caffeine => smt-cacheable-caffeine}/src/main/resources/reference.conf (100%) rename {cacheable-caffeine => smt-cacheable-caffeine}/src/main/scala/org/bitlap/cacheable/caffeine/Implicits.scala (100%) rename {cacheable-caffeine => smt-cacheable-caffeine}/src/main/scala/org/bitlap/cacheable/caffeine/ZCaffeine.scala (100%) rename {cacheable-caffeine => smt-cacheable-caffeine}/src/test/resources/application.conf (100%) rename {cacheable-caffeine => smt-cacheable-caffeine}/src/test/scala/org/bitlap/cacheable/caffeine/CacheEvictTest.scala (100%) rename {cacheable-caffeine => smt-cacheable-caffeine}/src/test/scala/org/bitlap/cacheable/caffeine/CacheValue.scala (100%) rename {cacheable-caffeine => smt-cacheable-caffeine}/src/test/scala/org/bitlap/cacheable/caffeine/CacheableTest.scala (100%) rename {cacheable-caffeine => smt-cacheable-caffeine}/src/test/scala/org/bitlap/cacheable/caffeine/CustomCacheableTest.scala (100%) rename {cacheable-core => smt-cacheable-core}/src/main/scala/org/bitlap/cacheable/core/Cache.scala (100%) rename {cacheable-core => smt-cacheable-core}/src/main/scala/org/bitlap/cacheable/core/Utils.scala (100%) rename {cacheable-core => smt-cacheable-core}/src/main/scala/org/bitlap/cacheable/core/ZIOCache.scala (100%) rename {cacheable-core => smt-cacheable-core}/src/main/scala/org/bitlap/cacheable/core/ZIOUpdateCache.scala (100%) rename {cacheable-core => smt-cacheable-core}/src/main/scala/org/bitlap/cacheable/core/ZStreamCache.scala (100%) rename {cacheable-core => smt-cacheable-core}/src/main/scala/org/bitlap/cacheable/core/ZStreamUpdateCache.scala (100%) rename {cacheable-core => smt-cacheable-core}/src/main/scala/org/bitlap/cacheable/core/cacheEvict.scala (100%) rename {cacheable-core => smt-cacheable-core}/src/main/scala/org/bitlap/cacheable/core/cacheable.scala (100%) rename {cacheable-core => smt-cacheable-core}/src/main/scala/org/bitlap/cacheable/core/macros/AbstractMacroProcessor.scala (100%) rename {cacheable-core => smt-cacheable-core}/src/main/scala/org/bitlap/cacheable/core/macros/CacheEvictMacro.scala (100%) rename {cacheable-core => smt-cacheable-core}/src/main/scala/org/bitlap/cacheable/core/macros/CacheableMacro.scala (100%) rename {cacheable-redis => smt-cacheable-redis}/src/main/resources/reference.conf (100%) rename {cacheable-redis => smt-cacheable-redis}/src/main/scala/org/bitlap/cacheable/redis/Implicits.scala (100%) rename {cacheable-redis => smt-cacheable-redis}/src/main/scala/org/bitlap/cacheable/redis/ZRedisConfiguration.scala (100%) rename {cacheable-redis => smt-cacheable-redis}/src/main/scala/org/bitlap/cacheable/redis/ZRedisLive.scala (100%) rename {cacheable-redis => smt-cacheable-redis}/src/main/scala/org/bitlap/cacheable/redis/ZRedisService.scala (100%) rename {cacheable-redis => smt-cacheable-redis}/src/main/scala/org/bitlap/cacheable/redis/redis.scala (100%) rename {cacheable-redis => smt-cacheable-redis}/src/test/resources/application.conf (100%) rename {cacheable-redis => smt-cacheable-redis}/src/test/scala/org/bitlap/cacheable/redis/CacheEvictTest.scala (100%) rename {cacheable-redis => smt-cacheable-redis}/src/test/scala/org/bitlap/cacheable/redis/CacheValue.scala (100%) rename {cacheable-redis => smt-cacheable-redis}/src/test/scala/org/bitlap/cacheable/redis/CacheableTest.scala (100%) rename {cacheable-redis => smt-cacheable-redis}/src/test/scala/org/bitlap/cacheable/redis/CustomCacheableTest.scala (100%) rename {csv-core => smt-csv-core}/src/main/scala-2.13/org/bitlap/csv/core/ScalableHelper.scala (97%) rename {csv-core => smt-csv-core}/src/main/scala/org/bitlap/csv/core/Converter.scala (100%) rename {csv-core => smt-csv-core}/src/main/scala/org/bitlap/csv/core/Csvable.scala (87%) rename {csv-core => smt-csv-core}/src/main/scala/org/bitlap/csv/core/CsvableBuilder.scala (100%) rename {csv-core => smt-csv-core}/src/main/scala/org/bitlap/csv/core/CsvableImplicits.scala (100%) rename {csv-core => smt-csv-core}/src/main/scala/org/bitlap/csv/core/InternalApi.scala (100%) rename {csv-core => smt-csv-core}/src/main/scala/org/bitlap/csv/core/Scalable.scala (85%) rename {csv-core => smt-csv-core}/src/main/scala/org/bitlap/csv/core/ScalableBuilder.scala (100%) rename {csv-core => smt-csv-core}/src/main/scala/org/bitlap/csv/core/ScalableImplicits.scala (100%) rename {csv-core => smt-csv-core}/src/main/scala/org/bitlap/csv/core/StringUtils.scala (100%) rename {csv-core => smt-csv-core}/src/main/scala/org/bitlap/csv/core/macros/AbstractMacroProcessor.scala (67%) rename {csv-core => smt-csv-core}/src/main/scala/org/bitlap/csv/core/macros/DeriveCsvableBuilder.scala (99%) rename {csv-core => smt-csv-core}/src/main/scala/org/bitlap/csv/core/macros/DeriveScalableBuilder.scala (99%) rename {csv-core => smt-csv-core}/src/main/scala/org/bitlap/csv/core/macros/DeriveToCaseClass.scala (98%) rename {csv-core => smt-csv-core}/src/main/scala/org/bitlap/csv/core/macros/DeriveToString.scala (97%) rename {csv-core => smt-csv-core}/src/main/scala/org/bitlap/csv/core/macros/MacroCache.scala (100%) rename {csv-core => smt-csv-core}/src/test/resources/simple_data.csv (100%) rename {csv-core => smt-csv-core}/src/test/scala/org/bitlap/csv/core/test/CsvConverterTest.scala (100%) rename {csv-core => smt-csv-core}/src/test/scala/org/bitlap/csv/core/test/CsvableAndScalableTest.scala (100%) rename {csv-core => smt-csv-core}/src/test/scala/org/bitlap/csv/core/test/CustomConverterBuilderTest.scala (100%) rename {csv-core => smt-csv-core}/src/test/scala/org/bitlap/csv/core/test/Dimension.scala (100%) rename {csv-core => smt-csv-core}/src/test/scala/org/bitlap/csv/core/test/StringUtilsTest.scala (100%) rename {csv-derive => smt-csv-derive}/src/main/scala/org/bitlap/csv/derive/DeriveCsvConverter.scala (100%) rename {csv-derive => smt-csv-derive}/src/test/scala/org/bitlap/csv/derive/test/DeriveCsvConverterTest.scala (100%) rename {csv-derive => smt-csv-derive}/src/test/scala/org/bitlap/csv/derive/test/Dimension.scala (100%) rename {csv-derive => smt-csv-derive}/src/test/scala/org/bitlap/csv/derive/test/Dimension2.scala (100%) rename {tools => smt-tools}/src/main/scala/org/bitlap/tools/LogLevel.scala (100%) rename {tools => smt-tools}/src/main/scala/org/bitlap/tools/apply.scala (100%) rename {tools => smt-tools}/src/main/scala/org/bitlap/tools/builder.scala (100%) rename {tools => smt-tools}/src/main/scala/org/bitlap/tools/constructor.scala (100%) rename {tools => smt-tools}/src/main/scala/org/bitlap/tools/elapsed.scala (100%) rename {tools => smt-tools}/src/main/scala/org/bitlap/tools/equalsAndHashCode.scala (100%) rename {tools => smt-tools}/src/main/scala/org/bitlap/tools/jacksonEnum.scala (100%) rename {tools => smt-tools}/src/main/scala/org/bitlap/tools/javaCompatible.scala (100%) rename {tools => smt-tools}/src/main/scala/org/bitlap/tools/json.scala (100%) rename {tools => smt-tools}/src/main/scala/org/bitlap/tools/log.scala (100%) rename {tools => smt-tools}/src/main/scala/org/bitlap/tools/logs/LogType.scala (100%) rename {tools => smt-tools}/src/main/scala/org/bitlap/tools/logs/extension/ScalaLazyLogging.scala (100%) rename {tools => smt-tools}/src/main/scala/org/bitlap/tools/logs/extension/ScalaLoggingLazyImpl.scala (100%) rename {tools => smt-tools}/src/main/scala/org/bitlap/tools/logs/extension/ScalaLoggingStrictImpl.scala (100%) rename {tools => smt-tools}/src/main/scala/org/bitlap/tools/logs/extension/ScalaStrictLogging.scala (100%) rename {tools => smt-tools}/src/main/scala/org/bitlap/tools/logs/impl/JLogImpl.scala (100%) rename {tools => smt-tools}/src/main/scala/org/bitlap/tools/logs/impl/Log4J2Impl.scala (100%) rename {tools => smt-tools}/src/main/scala/org/bitlap/tools/logs/impl/Slf4jImpl.scala (100%) rename {tools => smt-tools}/src/main/scala/org/bitlap/tools/logs/package.scala (100%) rename {tools => smt-tools}/src/main/scala/org/bitlap/tools/macros/AbstractMacroProcessor.scala (100%) rename {tools => smt-tools}/src/main/scala/org/bitlap/tools/macros/applyMacro.scala (100%) rename {tools => smt-tools}/src/main/scala/org/bitlap/tools/macros/builderMacro.scala (100%) rename {tools => smt-tools}/src/main/scala/org/bitlap/tools/macros/constructorMacro.scala (100%) rename {tools => smt-tools}/src/main/scala/org/bitlap/tools/macros/elapsedMacro.scala (100%) rename {tools => smt-tools}/src/main/scala/org/bitlap/tools/macros/equalsAndHashCodeMacro.scala (100%) rename {tools => smt-tools}/src/main/scala/org/bitlap/tools/macros/jacksonEnumMacro.scala (100%) rename {tools => smt-tools}/src/main/scala/org/bitlap/tools/macros/javaCompatibleMacro.scala (100%) rename {tools => smt-tools}/src/main/scala/org/bitlap/tools/macros/jsonMacro.scala (100%) rename {tools => smt-tools}/src/main/scala/org/bitlap/tools/macros/logMacro.scala (100%) rename {tools => smt-tools}/src/main/scala/org/bitlap/tools/macros/macros.scala (100%) rename {tools => smt-tools}/src/main/scala/org/bitlap/tools/macros/toStringMacro.scala (100%) rename {tools => smt-tools}/src/main/scala/org/bitlap/tools/methods/ProcessorCreator.scala (100%) rename {tools => smt-tools}/src/main/scala/org/bitlap/tools/methods/impl/MacroCache.scala (100%) rename {tools => smt-tools}/src/main/scala/org/bitlap/tools/methods/impl/ProcessorCreatorMacro.scala (100%) rename {tools => smt-tools}/src/main/scala/org/bitlap/tools/package.scala (100%) rename {tools => smt-tools}/src/main/scala/org/bitlap/tools/toString.scala (100%) rename {tools => smt-tools}/src/main/scala/org/bitlap/tools/utils/ScalaReflectionUtils.scala (100%) rename {tools => smt-tools}/src/test/proto/schema.proto (100%) rename {tools => smt-tools}/src/test/resources/log4j2.xml (100%) rename {tools => smt-tools}/src/test/scala/org/bitlap/tools/ApplyTest.scala (100%) rename {tools => smt-tools}/src/test/scala/org/bitlap/tools/BuilderTest.scala (100%) rename {tools => smt-tools}/src/test/scala/org/bitlap/tools/ConstructorTest.scala (100%) rename {tools => smt-tools}/src/test/scala/org/bitlap/tools/ElapsedTest.scala (100%) rename {tools => smt-tools}/src/test/scala/org/bitlap/tools/EmployeeTests.scala (100%) rename {tools => smt-tools}/src/test/scala/org/bitlap/tools/EqualsAndHashCodeTest.scala (100%) rename {tools => smt-tools}/src/test/scala/org/bitlap/tools/JacksonEnumTest.scala (100%) rename {tools => smt-tools}/src/test/scala/org/bitlap/tools/JavaCompatibleTest.scala (100%) rename {tools => smt-tools}/src/test/scala/org/bitlap/tools/JsonTest.scala (100%) rename {tools => smt-tools}/src/test/scala/org/bitlap/tools/LogMain.scala (100%) rename {tools => smt-tools}/src/test/scala/org/bitlap/tools/LogTest.scala (100%) rename {tools => smt-tools}/src/test/scala/org/bitlap/tools/NetService.scala (100%) rename {tools => smt-tools}/src/test/scala/org/bitlap/tools/OthersTest.scala (100%) rename {tools => smt-tools}/src/test/scala/org/bitlap/tools/ProcessorCreatorTest.scala (100%) rename {tools => smt-tools}/src/test/scala/org/bitlap/tools/ScalaReflectionUtilsTest.scala (100%) rename {tools => smt-tools}/src/test/scala/org/bitlap/tools/ToStringTest.scala (100%) rename {tools => smt-tools}/src/test/scala/org/bitlap/tools/test/proto/BOpenSession.java (100%) rename {tools => smt-tools}/src/test/scala/org/bitlap/tools/test/proto/BOpenSessionOrBuilder.java (100%) rename {tools => smt-tools}/src/test/scala/org/bitlap/tools/test/proto/DriverService.java (100%) diff --git a/README_CN.md b/README_CN.md index 221fe7b..bf5d4c9 100644 --- a/README_CN.md +++ b/README_CN.md @@ -42,7 +42,7 @@ - 零依赖，类型安全 ```scala -"org.bitlap" %% "smt-csv-core" % "" // 从0.5.1开始 +"org.bitlap" %% "smt-csv-core" % "" // 从0.5.2开始 ``` ## csv-derive @@ -50,7 +50,7 @@ - `DeriveCsvConverter` 为Scala`case class`自动派生`Converter`实例 ```scala -"org.bitlap" %% "smt-csv-derive" % "" // 从0.5.1开始 +"org.bitlap" %% "smt-csv-derive" % "" // 从0.5.2开始 ``` ## tools diff --git a/build.sbt b/build.sbt index 759e53d..8367ff2 100644 --- a/build.sbt +++ b/build.sbt @@ -53,7 +53,7 @@ lazy val commonSettings = publishLocalConfiguration := publishLocalConfiguration.value.withOverwrite(true) ) -lazy val `cacheable-core` = (project in file("cacheable-core")) +lazy val `smt-cacheable-core` = (project in file("smt-cacheable-core")) .settings(commonSettings) .settings(Publishing.publishSettings) .settings( @@ -68,7 +68,7 @@ lazy val `cacheable-core` = (project in file("cacheable-core")) .settings(paradise()) .enablePlugins(HeaderPlugin) -lazy val `cacheable-caffeine` = (project in file("cacheable-caffeine")) +lazy val `smt-cacheable-caffeine` = (project in file("smt-cacheable-caffeine")) .settings(commonSettings) .settings(Publishing.publishSettings) .settings( @@ -79,11 +79,11 @@ lazy val `cacheable-caffeine` = (project in file("cacheable-caffeine")) "com.github.ben-manes.caffeine" % "caffeine" % caffeineVersion ) ) - .dependsOn(`cacheable-core` % "compile->compile;test->test") + .dependsOn(`smt-cacheable-core` % "compile->compile;test->test") .settings(paradise()) .enablePlugins(HeaderPlugin) -lazy val `cacheable-redis` = (project in file("cacheable-redis")) +lazy val `smt-cacheable-redis` = (project in file("smt-cacheable-redis")) .settings(commonSettings) .settings(Publishing.publishSettings) .settings( @@ -97,21 +97,21 @@ lazy val `cacheable-redis` = (project in file("cacheable-redis")) "dev.zio" %% "zio-schema-derivation" % zioSchemaVersion % Test ) ) - .dependsOn(`cacheable-core` % "compile->compile;test->test") + .dependsOn(`smt-cacheable-core` % "compile->compile;test->test") .settings(paradise()) .enablePlugins(HeaderPlugin) -lazy val `cacheable-benchmark` = (project in file("cacheable-benchmark")) +lazy val `smt-cacheable-benchmark` = (project in file("smt-cacheable-benchmark")) .settings(commonSettings) .settings( name := "smt-cacheable-benchmark", publish / skip := true ) - .dependsOn(`cacheable-core`, `cacheable-redis`, `cacheable-caffeine`) + .dependsOn(`smt-cacheable-core`, `smt-cacheable-redis`, `smt-cacheable-caffeine`) .settings(paradise()) .enablePlugins(HeaderPlugin, JmhPlugin) -lazy val `csv-core` = (project in file("csv-core")) +lazy val `smt-csv-core` = (project in file("smt-csv-core")) .settings(commonSettings) .settings( name := "smt-csv-core", @@ -121,7 +121,7 @@ lazy val `csv-core` = (project in file("csv-core")) .settings(paradise()) .enablePlugins(HeaderPlugin) -lazy val `csv-derive` = (project in file("csv-derive")) +lazy val `smt-csv-derive` = (project in file("smt-csv-derive")) .settings(commonSettings) .settings( name := "smt-csv-derive", @@ -130,9 +130,9 @@ lazy val `csv-derive` = (project in file("csv-derive")) .settings(Publishing.publishSettings) .settings(paradise()) .enablePlugins(HeaderPlugin) - .dependsOn(`csv-core` % "compile->compile;test->test") + .dependsOn(`smt-csv-core` % "compile->compile;test->test") -lazy val tools = (project in file("tools")) +lazy val `smt-tools` = (project in file("smt-tools")) .settings(commonSettings) .settings( name := "smt-tools", @@ -154,13 +154,13 @@ lazy val tools = (project in file("tools")) lazy val root = (project in file(".")) .aggregate( - tools, - `cacheable-core`, - `cacheable-redis`, - `cacheable-caffeine`, - `cacheable-benchmark`, - `csv-core`, - `csv-derive` + `smt-tools`, + `smt-cacheable-core`, + `smt-cacheable-redis`, + `smt-cacheable-caffeine`, + `smt-cacheable-benchmark`, + `smt-csv-core`, + `smt-csv-derive` ) .settings( commands ++= Commands.value, diff --git a/cacheable-benchmark/README.md b/smt-cacheable-benchmark/README.md similarity index 100% rename from cacheable-benchmark/README.md rename to smt-cacheable-benchmark/README.md diff --git a/cacheable-benchmark/src/main/scala/org/bitlap/cacheable/benchmark/BenchmarkRuntime.scala b/smt-cacheable-benchmark/src/main/scala/org/bitlap/cacheable/benchmark/BenchmarkRuntime.scala similarity index 100% rename from cacheable-benchmark/src/main/scala/org/bitlap/cacheable/benchmark/BenchmarkRuntime.scala rename to smt-cacheable-benchmark/src/main/scala/org/bitlap/cacheable/benchmark/BenchmarkRuntime.scala diff --git a/cacheable-benchmark/src/main/scala/org/bitlap/cacheable/benchmark/CacheableBenchmarks.scala b/smt-cacheable-benchmark/src/main/scala/org/bitlap/cacheable/benchmark/CacheableBenchmarks.scala similarity index 100% rename from cacheable-benchmark/src/main/scala/org/bitlap/cacheable/benchmark/CacheableBenchmarks.scala rename to smt-cacheable-benchmark/src/main/scala/org/bitlap/cacheable/benchmark/CacheableBenchmarks.scala diff --git a/cacheable-caffeine/src/main/resources/reference.conf b/smt-cacheable-caffeine/src/main/resources/reference.conf similarity index 100% rename from cacheable-caffeine/src/main/resources/reference.conf rename to smt-cacheable-caffeine/src/main/resources/reference.conf diff --git a/cacheable-caffeine/src/main/scala/org/bitlap/cacheable/caffeine/Implicits.scala b/smt-cacheable-caffeine/src/main/scala/org/bitlap/cacheable/caffeine/Implicits.scala similarity index 100% rename from cacheable-caffeine/src/main/scala/org/bitlap/cacheable/caffeine/Implicits.scala rename to smt-cacheable-caffeine/src/main/scala/org/bitlap/cacheable/caffeine/Implicits.scala diff --git a/cacheable-caffeine/src/main/scala/org/bitlap/cacheable/caffeine/ZCaffeine.scala b/smt-cacheable-caffeine/src/main/scala/org/bitlap/cacheable/caffeine/ZCaffeine.scala similarity index 100% rename from cacheable-caffeine/src/main/scala/org/bitlap/cacheable/caffeine/ZCaffeine.scala rename to smt-cacheable-caffeine/src/main/scala/org/bitlap/cacheable/caffeine/ZCaffeine.scala diff --git a/cacheable-caffeine/src/test/resources/application.conf b/smt-cacheable-caffeine/src/test/resources/application.conf similarity index 100% rename from cacheable-caffeine/src/test/resources/application.conf rename to smt-cacheable-caffeine/src/test/resources/application.conf diff --git a/cacheable-caffeine/src/test/scala/org/bitlap/cacheable/caffeine/CacheEvictTest.scala b/smt-cacheable-caffeine/src/test/scala/org/bitlap/cacheable/caffeine/CacheEvictTest.scala similarity index 100% rename from cacheable-caffeine/src/test/scala/org/bitlap/cacheable/caffeine/CacheEvictTest.scala rename to smt-cacheable-caffeine/src/test/scala/org/bitlap/cacheable/caffeine/CacheEvictTest.scala diff --git a/cacheable-caffeine/src/test/scala/org/bitlap/cacheable/caffeine/CacheValue.scala b/smt-cacheable-caffeine/src/test/scala/org/bitlap/cacheable/caffeine/CacheValue.scala similarity index 100% rename from cacheable-caffeine/src/test/scala/org/bitlap/cacheable/caffeine/CacheValue.scala rename to smt-cacheable-caffeine/src/test/scala/org/bitlap/cacheable/caffeine/CacheValue.scala diff --git a/cacheable-caffeine/src/test/scala/org/bitlap/cacheable/caffeine/CacheableTest.scala b/smt-cacheable-caffeine/src/test/scala/org/bitlap/cacheable/caffeine/CacheableTest.scala similarity index 100% rename from cacheable-caffeine/src/test/scala/org/bitlap/cacheable/caffeine/CacheableTest.scala rename to smt-cacheable-caffeine/src/test/scala/org/bitlap/cacheable/caffeine/CacheableTest.scala diff --git a/cacheable-caffeine/src/test/scala/org/bitlap/cacheable/caffeine/CustomCacheableTest.scala b/smt-cacheable-caffeine/src/test/scala/org/bitlap/cacheable/caffeine/CustomCacheableTest.scala similarity index 100% rename from cacheable-caffeine/src/test/scala/org/bitlap/cacheable/caffeine/CustomCacheableTest.scala rename to smt-cacheable-caffeine/src/test/scala/org/bitlap/cacheable/caffeine/CustomCacheableTest.scala diff --git a/cacheable-core/src/main/scala/org/bitlap/cacheable/core/Cache.scala b/smt-cacheable-core/src/main/scala/org/bitlap/cacheable/core/Cache.scala similarity index 100% rename from cacheable-core/src/main/scala/org/bitlap/cacheable/core/Cache.scala rename to smt-cacheable-core/src/main/scala/org/bitlap/cacheable/core/Cache.scala diff --git a/cacheable-core/src/main/scala/org/bitlap/cacheable/core/Utils.scala b/smt-cacheable-core/src/main/scala/org/bitlap/cacheable/core/Utils.scala similarity index 100% rename from cacheable-core/src/main/scala/org/bitlap/cacheable/core/Utils.scala rename to smt-cacheable-core/src/main/scala/org/bitlap/cacheable/core/Utils.scala diff --git a/cacheable-core/src/main/scala/org/bitlap/cacheable/core/ZIOCache.scala b/smt-cacheable-core/src/main/scala/org/bitlap/cacheable/core/ZIOCache.scala similarity index 100% rename from cacheable-core/src/main/scala/org/bitlap/cacheable/core/ZIOCache.scala rename to smt-cacheable-core/src/main/scala/org/bitlap/cacheable/core/ZIOCache.scala diff --git a/cacheable-core/src/main/scala/org/bitlap/cacheable/core/ZIOUpdateCache.scala b/smt-cacheable-core/src/main/scala/org/bitlap/cacheable/core/ZIOUpdateCache.scala similarity index 100% rename from cacheable-core/src/main/scala/org/bitlap/cacheable/core/ZIOUpdateCache.scala rename to smt-cacheable-core/src/main/scala/org/bitlap/cacheable/core/ZIOUpdateCache.scala diff --git a/cacheable-core/src/main/scala/org/bitlap/cacheable/core/ZStreamCache.scala b/smt-cacheable-core/src/main/scala/org/bitlap/cacheable/core/ZStreamCache.scala similarity index 100% rename from cacheable-core/src/main/scala/org/bitlap/cacheable/core/ZStreamCache.scala rename to smt-cacheable-core/src/main/scala/org/bitlap/cacheable/core/ZStreamCache.scala diff --git a/cacheable-core/src/main/scala/org/bitlap/cacheable/core/ZStreamUpdateCache.scala b/smt-cacheable-core/src/main/scala/org/bitlap/cacheable/core/ZStreamUpdateCache.scala similarity index 100% rename from cacheable-core/src/main/scala/org/bitlap/cacheable/core/ZStreamUpdateCache.scala rename to smt-cacheable-core/src/main/scala/org/bitlap/cacheable/core/ZStreamUpdateCache.scala diff --git a/cacheable-core/src/main/scala/org/bitlap/cacheable/core/cacheEvict.scala b/smt-cacheable-core/src/main/scala/org/bitlap/cacheable/core/cacheEvict.scala similarity index 100% rename from cacheable-core/src/main/scala/org/bitlap/cacheable/core/cacheEvict.scala rename to smt-cacheable-core/src/main/scala/org/bitlap/cacheable/core/cacheEvict.scala diff --git a/cacheable-core/src/main/scala/org/bitlap/cacheable/core/cacheable.scala b/smt-cacheable-core/src/main/scala/org/bitlap/cacheable/core/cacheable.scala similarity index 100% rename from cacheable-core/src/main/scala/org/bitlap/cacheable/core/cacheable.scala rename to smt-cacheable-core/src/main/scala/org/bitlap/cacheable/core/cacheable.scala diff --git a/cacheable-core/src/main/scala/org/bitlap/cacheable/core/macros/AbstractMacroProcessor.scala b/smt-cacheable-core/src/main/scala/org/bitlap/cacheable/core/macros/AbstractMacroProcessor.scala similarity index 100% rename from cacheable-core/src/main/scala/org/bitlap/cacheable/core/macros/AbstractMacroProcessor.scala rename to smt-cacheable-core/src/main/scala/org/bitlap/cacheable/core/macros/AbstractMacroProcessor.scala diff --git a/cacheable-core/src/main/scala/org/bitlap/cacheable/core/macros/CacheEvictMacro.scala b/smt-cacheable-core/src/main/scala/org/bitlap/cacheable/core/macros/CacheEvictMacro.scala similarity index 100% rename from cacheable-core/src/main/scala/org/bitlap/cacheable/core/macros/CacheEvictMacro.scala rename to smt-cacheable-core/src/main/scala/org/bitlap/cacheable/core/macros/CacheEvictMacro.scala diff --git a/cacheable-core/src/main/scala/org/bitlap/cacheable/core/macros/CacheableMacro.scala b/smt-cacheable-core/src/main/scala/org/bitlap/cacheable/core/macros/CacheableMacro.scala similarity index 100% rename from cacheable-core/src/main/scala/org/bitlap/cacheable/core/macros/CacheableMacro.scala rename to smt-cacheable-core/src/main/scala/org/bitlap/cacheable/core/macros/CacheableMacro.scala diff --git a/cacheable-redis/src/main/resources/reference.conf b/smt-cacheable-redis/src/main/resources/reference.conf similarity index 100% rename from cacheable-redis/src/main/resources/reference.conf rename to smt-cacheable-redis/src/main/resources/reference.conf diff --git a/cacheable-redis/src/main/scala/org/bitlap/cacheable/redis/Implicits.scala b/smt-cacheable-redis/src/main/scala/org/bitlap/cacheable/redis/Implicits.scala similarity index 100% rename from cacheable-redis/src/main/scala/org/bitlap/cacheable/redis/Implicits.scala rename to smt-cacheable-redis/src/main/scala/org/bitlap/cacheable/redis/Implicits.scala diff --git a/cacheable-redis/src/main/scala/org/bitlap/cacheable/redis/ZRedisConfiguration.scala b/smt-cacheable-redis/src/main/scala/org/bitlap/cacheable/redis/ZRedisConfiguration.scala similarity index 100% rename from cacheable-redis/src/main/scala/org/bitlap/cacheable/redis/ZRedisConfiguration.scala rename to smt-cacheable-redis/src/main/scala/org/bitlap/cacheable/redis/ZRedisConfiguration.scala diff --git a/cacheable-redis/src/main/scala/org/bitlap/cacheable/redis/ZRedisLive.scala b/smt-cacheable-redis/src/main/scala/org/bitlap/cacheable/redis/ZRedisLive.scala similarity index 100% rename from cacheable-redis/src/main/scala/org/bitlap/cacheable/redis/ZRedisLive.scala rename to smt-cacheable-redis/src/main/scala/org/bitlap/cacheable/redis/ZRedisLive.scala diff --git a/cacheable-redis/src/main/scala/org/bitlap/cacheable/redis/ZRedisService.scala b/smt-cacheable-redis/src/main/scala/org/bitlap/cacheable/redis/ZRedisService.scala similarity index 100% rename from cacheable-redis/src/main/scala/org/bitlap/cacheable/redis/ZRedisService.scala rename to smt-cacheable-redis/src/main/scala/org/bitlap/cacheable/redis/ZRedisService.scala diff --git a/cacheable-redis/src/main/scala/org/bitlap/cacheable/redis/redis.scala b/smt-cacheable-redis/src/main/scala/org/bitlap/cacheable/redis/redis.scala similarity index 100% rename from cacheable-redis/src/main/scala/org/bitlap/cacheable/redis/redis.scala rename to smt-cacheable-redis/src/main/scala/org/bitlap/cacheable/redis/redis.scala diff --git a/cacheable-redis/src/test/resources/application.conf b/smt-cacheable-redis/src/test/resources/application.conf similarity index 100% rename from cacheable-redis/src/test/resources/application.conf rename to smt-cacheable-redis/src/test/resources/application.conf diff --git a/cacheable-redis/src/test/scala/org/bitlap/cacheable/redis/CacheEvictTest.scala b/smt-cacheable-redis/src/test/scala/org/bitlap/cacheable/redis/CacheEvictTest.scala similarity index 100% rename from cacheable-redis/src/test/scala/org/bitlap/cacheable/redis/CacheEvictTest.scala rename to smt-cacheable-redis/src/test/scala/org/bitlap/cacheable/redis/CacheEvictTest.scala diff --git a/cacheable-redis/src/test/scala/org/bitlap/cacheable/redis/CacheValue.scala b/smt-cacheable-redis/src/test/scala/org/bitlap/cacheable/redis/CacheValue.scala similarity index 100% rename from cacheable-redis/src/test/scala/org/bitlap/cacheable/redis/CacheValue.scala rename to smt-cacheable-redis/src/test/scala/org/bitlap/cacheable/redis/CacheValue.scala diff --git a/cacheable-redis/src/test/scala/org/bitlap/cacheable/redis/CacheableTest.scala b/smt-cacheable-redis/src/test/scala/org/bitlap/cacheable/redis/CacheableTest.scala similarity index 100% rename from cacheable-redis/src/test/scala/org/bitlap/cacheable/redis/CacheableTest.scala rename to smt-cacheable-redis/src/test/scala/org/bitlap/cacheable/redis/CacheableTest.scala diff --git a/cacheable-redis/src/test/scala/org/bitlap/cacheable/redis/CustomCacheableTest.scala b/smt-cacheable-redis/src/test/scala/org/bitlap/cacheable/redis/CustomCacheableTest.scala similarity index 100% rename from cacheable-redis/src/test/scala/org/bitlap/cacheable/redis/CustomCacheableTest.scala rename to smt-cacheable-redis/src/test/scala/org/bitlap/cacheable/redis/CustomCacheableTest.scala diff --git a/csv-core/src/main/scala-2.13/org/bitlap/csv/core/ScalableHelper.scala b/smt-csv-core/src/main/scala-2.13/org/bitlap/csv/core/ScalableHelper.scala similarity index 97% rename from csv-core/src/main/scala-2.13/org/bitlap/csv/core/ScalableHelper.scala rename to smt-csv-core/src/main/scala-2.13/org/bitlap/csv/core/ScalableHelper.scala index eeaf31f..12993bd 100644 --- a/csv-core/src/main/scala-2.13/org/bitlap/csv/core/ScalableHelper.scala +++ b/smt-csv-core/src/main/scala-2.13/org/bitlap/csv/core/ScalableHelper.scala @@ -26,6 +26,8 @@ import scala.collection.mutable.ListBuffer import scala.util.Using /** + * Tool class for parsing CSV files. + * * @author 梦境迷离 * @version 1.0,2022/5/2 */ diff --git a/csv-core/src/main/scala/org/bitlap/csv/core/Converter.scala b/smt-csv-core/src/main/scala/org/bitlap/csv/core/Converter.scala similarity index 100% rename from csv-core/src/main/scala/org/bitlap/csv/core/Converter.scala rename to smt-csv-core/src/main/scala/org/bitlap/csv/core/Converter.scala diff --git a/csv-core/src/main/scala/org/bitlap/csv/core/Csvable.scala b/smt-csv-core/src/main/scala/org/bitlap/csv/core/Csvable.scala similarity index 87% rename from csv-core/src/main/scala/org/bitlap/csv/core/Csvable.scala rename to smt-csv-core/src/main/scala/org/bitlap/csv/core/Csvable.scala index 5d9be1a..8c7415a 100644 --- a/csv-core/src/main/scala/org/bitlap/csv/core/Csvable.scala +++ b/smt-csv-core/src/main/scala/org/bitlap/csv/core/Csvable.scala @@ -30,9 +30,20 @@ package org.bitlap.csv.core */ trait Csvable[T] { + /** + * Internal API for processing a specific field of case class object. + * + * @param t case class object + * @return + */ @InternalApi def _toCsvString(t: T): String = "" + /** + * Public API, finally get CSV line string. + * + * @return + */ def toCsvString: String = "" } diff --git a/csv-core/src/main/scala/org/bitlap/csv/core/CsvableBuilder.scala b/smt-csv-core/src/main/scala/org/bitlap/csv/core/CsvableBuilder.scala similarity index 100% rename from csv-core/src/main/scala/org/bitlap/csv/core/CsvableBuilder.scala rename to smt-csv-core/src/main/scala/org/bitlap/csv/core/CsvableBuilder.scala diff --git a/csv-core/src/main/scala/org/bitlap/csv/core/CsvableImplicits.scala b/smt-csv-core/src/main/scala/org/bitlap/csv/core/CsvableImplicits.scala similarity index 100% rename from csv-core/src/main/scala/org/bitlap/csv/core/CsvableImplicits.scala rename to smt-csv-core/src/main/scala/org/bitlap/csv/core/CsvableImplicits.scala diff --git a/csv-core/src/main/scala/org/bitlap/csv/core/InternalApi.scala b/smt-csv-core/src/main/scala/org/bitlap/csv/core/InternalApi.scala similarity index 100% rename from csv-core/src/main/scala/org/bitlap/csv/core/InternalApi.scala rename to smt-csv-core/src/main/scala/org/bitlap/csv/core/InternalApi.scala diff --git a/csv-core/src/main/scala/org/bitlap/csv/core/Scalable.scala b/smt-csv-core/src/main/scala/org/bitlap/csv/core/Scalable.scala similarity index 85% rename from csv-core/src/main/scala/org/bitlap/csv/core/Scalable.scala rename to smt-csv-core/src/main/scala/org/bitlap/csv/core/Scalable.scala index ecb5dbf..a8d762e 100644 --- a/csv-core/src/main/scala/org/bitlap/csv/core/Scalable.scala +++ b/smt-csv-core/src/main/scala/org/bitlap/csv/core/Scalable.scala @@ -30,9 +30,20 @@ package org.bitlap.csv.core */ trait Scalable[T] { + /** + * Internal API for processing a specific column value of CSV line data. + * + * @param column The column value of CSV line data. + * @return + */ @InternalApi def _toScala(column: String): Option[T] = None + /** + * Public API, finally get scala case class object. + * + * @return + */ def toScala: Option[T] = None } diff --git a/csv-core/src/main/scala/org/bitlap/csv/core/ScalableBuilder.scala b/smt-csv-core/src/main/scala/org/bitlap/csv/core/ScalableBuilder.scala similarity index 100% rename from csv-core/src/main/scala/org/bitlap/csv/core/ScalableBuilder.scala rename to smt-csv-core/src/main/scala/org/bitlap/csv/core/ScalableBuilder.scala diff --git a/csv-core/src/main/scala/org/bitlap/csv/core/ScalableImplicits.scala b/smt-csv-core/src/main/scala/org/bitlap/csv/core/ScalableImplicits.scala similarity index 100% rename from csv-core/src/main/scala/org/bitlap/csv/core/ScalableImplicits.scala rename to smt-csv-core/src/main/scala/org/bitlap/csv/core/ScalableImplicits.scala diff --git a/csv-core/src/main/scala/org/bitlap/csv/core/StringUtils.scala b/smt-csv-core/src/main/scala/org/bitlap/csv/core/StringUtils.scala similarity index 100% rename from csv-core/src/main/scala/org/bitlap/csv/core/StringUtils.scala rename to smt-csv-core/src/main/scala/org/bitlap/csv/core/StringUtils.scala diff --git a/csv-core/src/main/scala/org/bitlap/csv/core/macros/AbstractMacroProcessor.scala b/smt-csv-core/src/main/scala/org/bitlap/csv/core/macros/AbstractMacroProcessor.scala similarity index 67% rename from csv-core/src/main/scala/org/bitlap/csv/core/macros/AbstractMacroProcessor.scala rename to smt-csv-core/src/main/scala/org/bitlap/csv/core/macros/AbstractMacroProcessor.scala index d86aecc..ead4d4a 100644 --- a/csv-core/src/main/scala/org/bitlap/csv/core/macros/AbstractMacroProcessor.scala +++ b/smt-csv-core/src/main/scala/org/bitlap/csv/core/macros/AbstractMacroProcessor.scala @@ -26,6 +26,8 @@ import java.time.format.DateTimeFormatter import scala.reflect.macros.blackbox /** + * This is a generic implementation of macro handling, and subclasses need to inherit it to reduce redundant code. + * * @author 梦境迷离 * @since 2021/7/24 * @version 1.0 @@ -34,10 +36,17 @@ abstract class AbstractMacroProcessor(val c: blackbox.Context) { import c.universe._ - private[macros] def checkCaseClassZipParams[T: c.WeakTypeTag]( + /** + * Get the list of case class constructor parameters and return the column index, column name, and parameter type that zip as a `List[((Int, Tree), Type)]`. + * + * @param columns CSV row data temporary identifier, also known as a line. + * @tparam T Type of the case class. + * @return + */ + private[macros] def checkCaseClassZipAll[T: c.WeakTypeTag]( columns: TermName ): List[((Int, Tree), Type)] = { - val idxColumn = (i: Int) => q"${columns}(${i})" + val idxColumn = (i: Int) => q"$columns($i)" val params = getCaseClassParams[T]() val paramsSize = params.size val types = params.map(f => c.typecheck(tq"$f", c.TYPEmode).tpe) @@ -49,6 +58,12 @@ abstract class AbstractMacroProcessor(val c: blackbox.Context) { indexColumns zip types } + /** + * Get only the symbol of the case class constructor parameters. + * + * @tparam T Type of the case class. + * @return + */ private[macros] def getCaseClassParams[T: c.WeakTypeTag](): List[Symbol] = { val parameters = resolveParameters[T] if (parameters.size > 1) { @@ -57,6 +72,14 @@ abstract class AbstractMacroProcessor(val c: blackbox.Context) { parameters.flatten } + /** + * Print the expanded code of macro. + * + * @param force + * @param resTree + * @tparam T + * @return + */ def printTree[T: c.WeakTypeTag](force: Boolean, resTree: c.Tree): c.Expr[T] = { c.info( c.enclosingPosition, @@ -67,23 +90,43 @@ abstract class AbstractMacroProcessor(val c: blackbox.Context) { c.Expr[T](resTree) } + /** + * Get the constructor symbol of the case class. + * + * @tparam T Type of the case class. + * @return The parameters may be currying, so it's a two-level list. + */ private[macros] def resolveParameters[T: c.WeakTypeTag]: List[List[Symbol]] = c.weakTypeOf[T].resultType.member(TermName("")).typeSignature.paramLists + /** + * Get the `TypeName` of the class. + * + * @tparam T Type of the case class. + * @return + */ private[macros] def resolveClazzTypeName[T: c.WeakTypeTag]: c.universe.TypeName = TypeName(c.weakTypeOf[T].typeSymbol.name.decodedName.toString) - private[macros] def zipAllCaseClassParams[T: c.WeakTypeTag]: (List[String], List[(Int, Type)]) = { - val parameters = resolveParameters[T] - if (parameters.size > 1) { - c.abort(c.enclosingPosition, "The constructor of case class has currying!") - } - val params = parameters.flatten + /** + * Get the list of case class constructor parameters and return the column index and parameter type that zip as a `List[(Int, Type)])`. + * + * @tparam T Type of the case class. + * @return + */ + private[macros] def checkCaseClassZip[T: c.WeakTypeTag]: (List[String], List[(Int, Type)]) = { + val params = getCaseClassParams[T]() val paramsSize = params.size val names = params.map(p => p.name.decodedName.toString) names -> params.zip(0 until paramsSize).map(f => f._2 -> c.typecheck(tq"${f._1}", c.TYPEmode).tpe) } + /** + * Get the builderId of the current class which generated by *Builder,apply macro. + * + * @param annoBuilderPrefix + * @return + */ private[macros] def getBuilderId(annoBuilderPrefix: String): Int = c.prefix.actualType.toString.replace(annoBuilderPrefix, "").toInt } diff --git a/csv-core/src/main/scala/org/bitlap/csv/core/macros/DeriveCsvableBuilder.scala b/smt-csv-core/src/main/scala/org/bitlap/csv/core/macros/DeriveCsvableBuilder.scala similarity index 99% rename from csv-core/src/main/scala/org/bitlap/csv/core/macros/DeriveCsvableBuilder.scala rename to smt-csv-core/src/main/scala/org/bitlap/csv/core/macros/DeriveCsvableBuilder.scala index 6762e68..5f951a7 100644 --- a/csv-core/src/main/scala/org/bitlap/csv/core/macros/DeriveCsvableBuilder.scala +++ b/smt-csv-core/src/main/scala/org/bitlap/csv/core/macros/DeriveCsvableBuilder.scala @@ -99,7 +99,7 @@ class DeriveCsvableBuilder(override val c: whitebox.Context) extends AbstractMac customTrees: mutable.Map[String, Any] ): c.Expr[Csvable[T]] = { val clazzName = resolveClazzTypeName[T] - val (fieldNames, indexTypes) = zipAllCaseClassParams + val (fieldNames, indexTypes) = checkCaseClassZip val indexByName = (i: Int) => TermName(fieldNames(i)) val fieldsToString = indexTypes.map { idxType => val customFunction = () => diff --git a/csv-core/src/main/scala/org/bitlap/csv/core/macros/DeriveScalableBuilder.scala b/smt-csv-core/src/main/scala/org/bitlap/csv/core/macros/DeriveScalableBuilder.scala similarity index 99% rename from csv-core/src/main/scala/org/bitlap/csv/core/macros/DeriveScalableBuilder.scala rename to smt-csv-core/src/main/scala/org/bitlap/csv/core/macros/DeriveScalableBuilder.scala index 27f394a..ecdf75b 100644 --- a/csv-core/src/main/scala/org/bitlap/csv/core/macros/DeriveScalableBuilder.scala +++ b/smt-csv-core/src/main/scala/org/bitlap/csv/core/macros/DeriveScalableBuilder.scala @@ -104,7 +104,7 @@ class DeriveScalableBuilder(override val c: whitebox.Context) extends AbstractMa val customTrees = MacroCache.builderFunctionTrees.getOrElse(getBuilderId(annoBuilderPrefix), mutable.Map.empty) val params = getCaseClassParams[T]() val fieldNames = params.map(_.name.decodedName.toString) - val fields = checkCaseClassZipParams[T](innerVarTermName).map { idxType => + val fields = checkCaseClassZipAll[T](innerVarTermName).map { idxType => val idx = idxType._1._1 val columnValues = idxType._1._2 val fieldTypeName = TypeName(idxType._2.typeSymbol.name.decodedName.toString) diff --git a/csv-core/src/main/scala/org/bitlap/csv/core/macros/DeriveToCaseClass.scala b/smt-csv-core/src/main/scala/org/bitlap/csv/core/macros/DeriveToCaseClass.scala similarity index 98% rename from csv-core/src/main/scala/org/bitlap/csv/core/macros/DeriveToCaseClass.scala rename to smt-csv-core/src/main/scala/org/bitlap/csv/core/macros/DeriveToCaseClass.scala index ba6e9d9..098408c 100644 --- a/csv-core/src/main/scala/org/bitlap/csv/core/macros/DeriveToCaseClass.scala +++ b/smt-csv-core/src/main/scala/org/bitlap/csv/core/macros/DeriveToCaseClass.scala @@ -43,7 +43,7 @@ object DeriveToCaseClass { val clazzName = c.weakTypeOf[T].typeSymbol.name val innerVarTermName = TermName("_columns") val fields = (columns: TermName) => - checkCaseClassZipParams[T](columns).map { idxType => + checkCaseClassZipAll[T](columns).map { idxType => val columnValues = idxType._1._2 if (idxType._2 <:< typeOf[Option[_]]) { val genericType = c.typecheck(q"${idxType._2}", c.TYPEmode).tpe.typeArgs.head diff --git a/csv-core/src/main/scala/org/bitlap/csv/core/macros/DeriveToString.scala b/smt-csv-core/src/main/scala/org/bitlap/csv/core/macros/DeriveToString.scala similarity index 97% rename from csv-core/src/main/scala/org/bitlap/csv/core/macros/DeriveToString.scala rename to smt-csv-core/src/main/scala/org/bitlap/csv/core/macros/DeriveToString.scala index 035e3fd..ebb56f7 100644 --- a/csv-core/src/main/scala/org/bitlap/csv/core/macros/DeriveToString.scala +++ b/smt-csv-core/src/main/scala/org/bitlap/csv/core/macros/DeriveToString.scala @@ -38,7 +38,7 @@ object DeriveToString { private val packageName = q"_root_.org.bitlap.csv.core" def macroImpl[T: c.WeakTypeTag](t: c.Expr[T], columnSeparator: c.Expr[Char]): c.Expr[String] = { - val (names, indexTypes) = super.zipAllCaseClassParams[T] + val (names, indexTypes) = super.checkCaseClassZip[T] val clazzName = c.weakTypeOf[T].typeSymbol.name val innerVarTermName = TermName("_t") val indexByName = (i: Int) => TermName(names(i)) diff --git a/csv-core/src/main/scala/org/bitlap/csv/core/macros/MacroCache.scala b/smt-csv-core/src/main/scala/org/bitlap/csv/core/macros/MacroCache.scala similarity index 100% rename from csv-core/src/main/scala/org/bitlap/csv/core/macros/MacroCache.scala rename to smt-csv-core/src/main/scala/org/bitlap/csv/core/macros/MacroCache.scala diff --git a/csv-core/src/test/resources/simple_data.csv b/smt-csv-core/src/test/resources/simple_data.csv similarity index 100% rename from csv-core/src/test/resources/simple_data.csv rename to smt-csv-core/src/test/resources/simple_data.csv diff --git a/csv-core/src/test/scala/org/bitlap/csv/core/test/CsvConverterTest.scala b/smt-csv-core/src/test/scala/org/bitlap/csv/core/test/CsvConverterTest.scala similarity index 100% rename from csv-core/src/test/scala/org/bitlap/csv/core/test/CsvConverterTest.scala rename to smt-csv-core/src/test/scala/org/bitlap/csv/core/test/CsvConverterTest.scala diff --git a/csv-core/src/test/scala/org/bitlap/csv/core/test/CsvableAndScalableTest.scala b/smt-csv-core/src/test/scala/org/bitlap/csv/core/test/CsvableAndScalableTest.scala similarity index 100% rename from csv-core/src/test/scala/org/bitlap/csv/core/test/CsvableAndScalableTest.scala rename to smt-csv-core/src/test/scala/org/bitlap/csv/core/test/CsvableAndScalableTest.scala diff --git a/csv-core/src/test/scala/org/bitlap/csv/core/test/CustomConverterBuilderTest.scala b/smt-csv-core/src/test/scala/org/bitlap/csv/core/test/CustomConverterBuilderTest.scala similarity index 100% rename from csv-core/src/test/scala/org/bitlap/csv/core/test/CustomConverterBuilderTest.scala rename to smt-csv-core/src/test/scala/org/bitlap/csv/core/test/CustomConverterBuilderTest.scala diff --git a/csv-core/src/test/scala/org/bitlap/csv/core/test/Dimension.scala b/smt-csv-core/src/test/scala/org/bitlap/csv/core/test/Dimension.scala similarity index 100% rename from csv-core/src/test/scala/org/bitlap/csv/core/test/Dimension.scala rename to smt-csv-core/src/test/scala/org/bitlap/csv/core/test/Dimension.scala diff --git a/csv-core/src/test/scala/org/bitlap/csv/core/test/StringUtilsTest.scala b/smt-csv-core/src/test/scala/org/bitlap/csv/core/test/StringUtilsTest.scala similarity index 100% rename from csv-core/src/test/scala/org/bitlap/csv/core/test/StringUtilsTest.scala rename to smt-csv-core/src/test/scala/org/bitlap/csv/core/test/StringUtilsTest.scala diff --git a/csv-derive/src/main/scala/org/bitlap/csv/derive/DeriveCsvConverter.scala b/smt-csv-derive/src/main/scala/org/bitlap/csv/derive/DeriveCsvConverter.scala similarity index 100% rename from csv-derive/src/main/scala/org/bitlap/csv/derive/DeriveCsvConverter.scala rename to smt-csv-derive/src/main/scala/org/bitlap/csv/derive/DeriveCsvConverter.scala diff --git a/csv-derive/src/test/scala/org/bitlap/csv/derive/test/DeriveCsvConverterTest.scala b/smt-csv-derive/src/test/scala/org/bitlap/csv/derive/test/DeriveCsvConverterTest.scala similarity index 100% rename from csv-derive/src/test/scala/org/bitlap/csv/derive/test/DeriveCsvConverterTest.scala rename to smt-csv-derive/src/test/scala/org/bitlap/csv/derive/test/DeriveCsvConverterTest.scala diff --git a/csv-derive/src/test/scala/org/bitlap/csv/derive/test/Dimension.scala b/smt-csv-derive/src/test/scala/org/bitlap/csv/derive/test/Dimension.scala similarity index 100% rename from csv-derive/src/test/scala/org/bitlap/csv/derive/test/Dimension.scala rename to smt-csv-derive/src/test/scala/org/bitlap/csv/derive/test/Dimension.scala diff --git a/csv-derive/src/test/scala/org/bitlap/csv/derive/test/Dimension2.scala b/smt-csv-derive/src/test/scala/org/bitlap/csv/derive/test/Dimension2.scala similarity index 100% rename from csv-derive/src/test/scala/org/bitlap/csv/derive/test/Dimension2.scala rename to smt-csv-derive/src/test/scala/org/bitlap/csv/derive/test/Dimension2.scala diff --git a/tools/src/main/scala/org/bitlap/tools/LogLevel.scala b/smt-tools/src/main/scala/org/bitlap/tools/LogLevel.scala similarity index 100% rename from tools/src/main/scala/org/bitlap/tools/LogLevel.scala rename to smt-tools/src/main/scala/org/bitlap/tools/LogLevel.scala diff --git a/tools/src/main/scala/org/bitlap/tools/apply.scala b/smt-tools/src/main/scala/org/bitlap/tools/apply.scala similarity index 100% rename from tools/src/main/scala/org/bitlap/tools/apply.scala rename to smt-tools/src/main/scala/org/bitlap/tools/apply.scala diff --git a/tools/src/main/scala/org/bitlap/tools/builder.scala b/smt-tools/src/main/scala/org/bitlap/tools/builder.scala similarity index 100% rename from tools/src/main/scala/org/bitlap/tools/builder.scala rename to smt-tools/src/main/scala/org/bitlap/tools/builder.scala diff --git a/tools/src/main/scala/org/bitlap/tools/constructor.scala b/smt-tools/src/main/scala/org/bitlap/tools/constructor.scala similarity index 100% rename from tools/src/main/scala/org/bitlap/tools/constructor.scala rename to smt-tools/src/main/scala/org/bitlap/tools/constructor.scala diff --git a/tools/src/main/scala/org/bitlap/tools/elapsed.scala b/smt-tools/src/main/scala/org/bitlap/tools/elapsed.scala similarity index 100% rename from tools/src/main/scala/org/bitlap/tools/elapsed.scala rename to smt-tools/src/main/scala/org/bitlap/tools/elapsed.scala diff --git a/tools/src/main/scala/org/bitlap/tools/equalsAndHashCode.scala b/smt-tools/src/main/scala/org/bitlap/tools/equalsAndHashCode.scala similarity index 100% rename from tools/src/main/scala/org/bitlap/tools/equalsAndHashCode.scala rename to smt-tools/src/main/scala/org/bitlap/tools/equalsAndHashCode.scala diff --git a/tools/src/main/scala/org/bitlap/tools/jacksonEnum.scala b/smt-tools/src/main/scala/org/bitlap/tools/jacksonEnum.scala similarity index 100% rename from tools/src/main/scala/org/bitlap/tools/jacksonEnum.scala rename to smt-tools/src/main/scala/org/bitlap/tools/jacksonEnum.scala diff --git a/tools/src/main/scala/org/bitlap/tools/javaCompatible.scala b/smt-tools/src/main/scala/org/bitlap/tools/javaCompatible.scala similarity index 100% rename from tools/src/main/scala/org/bitlap/tools/javaCompatible.scala rename to smt-tools/src/main/scala/org/bitlap/tools/javaCompatible.scala diff --git a/tools/src/main/scala/org/bitlap/tools/json.scala b/smt-tools/src/main/scala/org/bitlap/tools/json.scala similarity index 100% rename from tools/src/main/scala/org/bitlap/tools/json.scala rename to smt-tools/src/main/scala/org/bitlap/tools/json.scala diff --git a/tools/src/main/scala/org/bitlap/tools/log.scala b/smt-tools/src/main/scala/org/bitlap/tools/log.scala similarity index 100% rename from tools/src/main/scala/org/bitlap/tools/log.scala rename to smt-tools/src/main/scala/org/bitlap/tools/log.scala diff --git a/tools/src/main/scala/org/bitlap/tools/logs/LogType.scala b/smt-tools/src/main/scala/org/bitlap/tools/logs/LogType.scala similarity index 100% rename from tools/src/main/scala/org/bitlap/tools/logs/LogType.scala rename to smt-tools/src/main/scala/org/bitlap/tools/logs/LogType.scala diff --git a/tools/src/main/scala/org/bitlap/tools/logs/extension/ScalaLazyLogging.scala b/smt-tools/src/main/scala/org/bitlap/tools/logs/extension/ScalaLazyLogging.scala similarity index 100% rename from tools/src/main/scala/org/bitlap/tools/logs/extension/ScalaLazyLogging.scala rename to smt-tools/src/main/scala/org/bitlap/tools/logs/extension/ScalaLazyLogging.scala diff --git a/tools/src/main/scala/org/bitlap/tools/logs/extension/ScalaLoggingLazyImpl.scala b/smt-tools/src/main/scala/org/bitlap/tools/logs/extension/ScalaLoggingLazyImpl.scala similarity index 100% rename from tools/src/main/scala/org/bitlap/tools/logs/extension/ScalaLoggingLazyImpl.scala rename to smt-tools/src/main/scala/org/bitlap/tools/logs/extension/ScalaLoggingLazyImpl.scala diff --git a/tools/src/main/scala/org/bitlap/tools/logs/extension/ScalaLoggingStrictImpl.scala b/smt-tools/src/main/scala/org/bitlap/tools/logs/extension/ScalaLoggingStrictImpl.scala similarity index 100% rename from tools/src/main/scala/org/bitlap/tools/logs/extension/ScalaLoggingStrictImpl.scala rename to smt-tools/src/main/scala/org/bitlap/tools/logs/extension/ScalaLoggingStrictImpl.scala diff --git a/tools/src/main/scala/org/bitlap/tools/logs/extension/ScalaStrictLogging.scala b/smt-tools/src/main/scala/org/bitlap/tools/logs/extension/ScalaStrictLogging.scala similarity index 100% rename from tools/src/main/scala/org/bitlap/tools/logs/extension/ScalaStrictLogging.scala rename to smt-tools/src/main/scala/org/bitlap/tools/logs/extension/ScalaStrictLogging.scala diff --git a/tools/src/main/scala/org/bitlap/tools/logs/impl/JLogImpl.scala b/smt-tools/src/main/scala/org/bitlap/tools/logs/impl/JLogImpl.scala similarity index 100% rename from tools/src/main/scala/org/bitlap/tools/logs/impl/JLogImpl.scala rename to smt-tools/src/main/scala/org/bitlap/tools/logs/impl/JLogImpl.scala diff --git a/tools/src/main/scala/org/bitlap/tools/logs/impl/Log4J2Impl.scala b/smt-tools/src/main/scala/org/bitlap/tools/logs/impl/Log4J2Impl.scala similarity index 100% rename from tools/src/main/scala/org/bitlap/tools/logs/impl/Log4J2Impl.scala rename to smt-tools/src/main/scala/org/bitlap/tools/logs/impl/Log4J2Impl.scala diff --git a/tools/src/main/scala/org/bitlap/tools/logs/impl/Slf4jImpl.scala b/smt-tools/src/main/scala/org/bitlap/tools/logs/impl/Slf4jImpl.scala similarity index 100% rename from tools/src/main/scala/org/bitlap/tools/logs/impl/Slf4jImpl.scala rename to smt-tools/src/main/scala/org/bitlap/tools/logs/impl/Slf4jImpl.scala diff --git a/tools/src/main/scala/org/bitlap/tools/logs/package.scala b/smt-tools/src/main/scala/org/bitlap/tools/logs/package.scala similarity index 100% rename from tools/src/main/scala/org/bitlap/tools/logs/package.scala rename to smt-tools/src/main/scala/org/bitlap/tools/logs/package.scala diff --git a/tools/src/main/scala/org/bitlap/tools/macros/AbstractMacroProcessor.scala b/smt-tools/src/main/scala/org/bitlap/tools/macros/AbstractMacroProcessor.scala similarity index 100% rename from tools/src/main/scala/org/bitlap/tools/macros/AbstractMacroProcessor.scala rename to smt-tools/src/main/scala/org/bitlap/tools/macros/AbstractMacroProcessor.scala diff --git a/tools/src/main/scala/org/bitlap/tools/macros/applyMacro.scala b/smt-tools/src/main/scala/org/bitlap/tools/macros/applyMacro.scala similarity index 100% rename from tools/src/main/scala/org/bitlap/tools/macros/applyMacro.scala rename to smt-tools/src/main/scala/org/bitlap/tools/macros/applyMacro.scala diff --git a/tools/src/main/scala/org/bitlap/tools/macros/builderMacro.scala b/smt-tools/src/main/scala/org/bitlap/tools/macros/builderMacro.scala similarity index 100% rename from tools/src/main/scala/org/bitlap/tools/macros/builderMacro.scala rename to smt-tools/src/main/scala/org/bitlap/tools/macros/builderMacro.scala diff --git a/tools/src/main/scala/org/bitlap/tools/macros/constructorMacro.scala b/smt-tools/src/main/scala/org/bitlap/tools/macros/constructorMacro.scala similarity index 100% rename from tools/src/main/scala/org/bitlap/tools/macros/constructorMacro.scala rename to smt-tools/src/main/scala/org/bitlap/tools/macros/constructorMacro.scala diff --git a/tools/src/main/scala/org/bitlap/tools/macros/elapsedMacro.scala b/smt-tools/src/main/scala/org/bitlap/tools/macros/elapsedMacro.scala similarity index 100% rename from tools/src/main/scala/org/bitlap/tools/macros/elapsedMacro.scala rename to smt-tools/src/main/scala/org/bitlap/tools/macros/elapsedMacro.scala diff --git a/tools/src/main/scala/org/bitlap/tools/macros/equalsAndHashCodeMacro.scala b/smt-tools/src/main/scala/org/bitlap/tools/macros/equalsAndHashCodeMacro.scala similarity index 100% rename from tools/src/main/scala/org/bitlap/tools/macros/equalsAndHashCodeMacro.scala rename to smt-tools/src/main/scala/org/bitlap/tools/macros/equalsAndHashCodeMacro.scala diff --git a/tools/src/main/scala/org/bitlap/tools/macros/jacksonEnumMacro.scala b/smt-tools/src/main/scala/org/bitlap/tools/macros/jacksonEnumMacro.scala similarity index 100% rename from tools/src/main/scala/org/bitlap/tools/macros/jacksonEnumMacro.scala rename to smt-tools/src/main/scala/org/bitlap/tools/macros/jacksonEnumMacro.scala diff --git a/tools/src/main/scala/org/bitlap/tools/macros/javaCompatibleMacro.scala b/smt-tools/src/main/scala/org/bitlap/tools/macros/javaCompatibleMacro.scala similarity index 100% rename from tools/src/main/scala/org/bitlap/tools/macros/javaCompatibleMacro.scala rename to smt-tools/src/main/scala/org/bitlap/tools/macros/javaCompatibleMacro.scala diff --git a/tools/src/main/scala/org/bitlap/tools/macros/jsonMacro.scala b/smt-tools/src/main/scala/org/bitlap/tools/macros/jsonMacro.scala similarity index 100% rename from tools/src/main/scala/org/bitlap/tools/macros/jsonMacro.scala rename to smt-tools/src/main/scala/org/bitlap/tools/macros/jsonMacro.scala diff --git a/tools/src/main/scala/org/bitlap/tools/macros/logMacro.scala b/smt-tools/src/main/scala/org/bitlap/tools/macros/logMacro.scala similarity index 100% rename from tools/src/main/scala/org/bitlap/tools/macros/logMacro.scala rename to smt-tools/src/main/scala/org/bitlap/tools/macros/logMacro.scala diff --git a/tools/src/main/scala/org/bitlap/tools/macros/macros.scala b/smt-tools/src/main/scala/org/bitlap/tools/macros/macros.scala similarity index 100% rename from tools/src/main/scala/org/bitlap/tools/macros/macros.scala rename to smt-tools/src/main/scala/org/bitlap/tools/macros/macros.scala diff --git a/tools/src/main/scala/org/bitlap/tools/macros/toStringMacro.scala b/smt-tools/src/main/scala/org/bitlap/tools/macros/toStringMacro.scala similarity index 100% rename from tools/src/main/scala/org/bitlap/tools/macros/toStringMacro.scala rename to smt-tools/src/main/scala/org/bitlap/tools/macros/toStringMacro.scala diff --git a/tools/src/main/scala/org/bitlap/tools/methods/ProcessorCreator.scala b/smt-tools/src/main/scala/org/bitlap/tools/methods/ProcessorCreator.scala similarity index 100% rename from tools/src/main/scala/org/bitlap/tools/methods/ProcessorCreator.scala rename to smt-tools/src/main/scala/org/bitlap/tools/methods/ProcessorCreator.scala diff --git a/tools/src/main/scala/org/bitlap/tools/methods/impl/MacroCache.scala b/smt-tools/src/main/scala/org/bitlap/tools/methods/impl/MacroCache.scala similarity index 100% rename from tools/src/main/scala/org/bitlap/tools/methods/impl/MacroCache.scala rename to smt-tools/src/main/scala/org/bitlap/tools/methods/impl/MacroCache.scala diff --git a/tools/src/main/scala/org/bitlap/tools/methods/impl/ProcessorCreatorMacro.scala b/smt-tools/src/main/scala/org/bitlap/tools/methods/impl/ProcessorCreatorMacro.scala similarity index 100% rename from tools/src/main/scala/org/bitlap/tools/methods/impl/ProcessorCreatorMacro.scala rename to smt-tools/src/main/scala/org/bitlap/tools/methods/impl/ProcessorCreatorMacro.scala diff --git a/tools/src/main/scala/org/bitlap/tools/package.scala b/smt-tools/src/main/scala/org/bitlap/tools/package.scala similarity index 100% rename from tools/src/main/scala/org/bitlap/tools/package.scala rename to smt-tools/src/main/scala/org/bitlap/tools/package.scala diff --git a/tools/src/main/scala/org/bitlap/tools/toString.scala b/smt-tools/src/main/scala/org/bitlap/tools/toString.scala similarity index 100% rename from tools/src/main/scala/org/bitlap/tools/toString.scala rename to smt-tools/src/main/scala/org/bitlap/tools/toString.scala diff --git a/tools/src/main/scala/org/bitlap/tools/utils/ScalaReflectionUtils.scala b/smt-tools/src/main/scala/org/bitlap/tools/utils/ScalaReflectionUtils.scala similarity index 100% rename from tools/src/main/scala/org/bitlap/tools/utils/ScalaReflectionUtils.scala rename to smt-tools/src/main/scala/org/bitlap/tools/utils/ScalaReflectionUtils.scala diff --git a/tools/src/test/proto/schema.proto b/smt-tools/src/test/proto/schema.proto similarity index 100% rename from tools/src/test/proto/schema.proto rename to smt-tools/src/test/proto/schema.proto diff --git a/tools/src/test/resources/log4j2.xml b/smt-tools/src/test/resources/log4j2.xml similarity index 100% rename from tools/src/test/resources/log4j2.xml rename to smt-tools/src/test/resources/log4j2.xml diff --git a/tools/src/test/scala/org/bitlap/tools/ApplyTest.scala b/smt-tools/src/test/scala/org/bitlap/tools/ApplyTest.scala similarity index 100% rename from tools/src/test/scala/org/bitlap/tools/ApplyTest.scala rename to smt-tools/src/test/scala/org/bitlap/tools/ApplyTest.scala diff --git a/tools/src/test/scala/org/bitlap/tools/BuilderTest.scala b/smt-tools/src/test/scala/org/bitlap/tools/BuilderTest.scala similarity index 100% rename from tools/src/test/scala/org/bitlap/tools/BuilderTest.scala rename to smt-tools/src/test/scala/org/bitlap/tools/BuilderTest.scala diff --git a/tools/src/test/scala/org/bitlap/tools/ConstructorTest.scala b/smt-tools/src/test/scala/org/bitlap/tools/ConstructorTest.scala similarity index 100% rename from tools/src/test/scala/org/bitlap/tools/ConstructorTest.scala rename to smt-tools/src/test/scala/org/bitlap/tools/ConstructorTest.scala diff --git a/tools/src/test/scala/org/bitlap/tools/ElapsedTest.scala b/smt-tools/src/test/scala/org/bitlap/tools/ElapsedTest.scala similarity index 100% rename from tools/src/test/scala/org/bitlap/tools/ElapsedTest.scala rename to smt-tools/src/test/scala/org/bitlap/tools/ElapsedTest.scala diff --git a/tools/src/test/scala/org/bitlap/tools/EmployeeTests.scala b/smt-tools/src/test/scala/org/bitlap/tools/EmployeeTests.scala similarity index 100% rename from tools/src/test/scala/org/bitlap/tools/EmployeeTests.scala rename to smt-tools/src/test/scala/org/bitlap/tools/EmployeeTests.scala diff --git a/tools/src/test/scala/org/bitlap/tools/EqualsAndHashCodeTest.scala b/smt-tools/src/test/scala/org/bitlap/tools/EqualsAndHashCodeTest.scala similarity index 100% rename from tools/src/test/scala/org/bitlap/tools/EqualsAndHashCodeTest.scala rename to smt-tools/src/test/scala/org/bitlap/tools/EqualsAndHashCodeTest.scala diff --git a/tools/src/test/scala/org/bitlap/tools/JacksonEnumTest.scala b/smt-tools/src/test/scala/org/bitlap/tools/JacksonEnumTest.scala similarity index 100% rename from tools/src/test/scala/org/bitlap/tools/JacksonEnumTest.scala rename to smt-tools/src/test/scala/org/bitlap/tools/JacksonEnumTest.scala diff --git a/tools/src/test/scala/org/bitlap/tools/JavaCompatibleTest.scala b/smt-tools/src/test/scala/org/bitlap/tools/JavaCompatibleTest.scala similarity index 100% rename from tools/src/test/scala/org/bitlap/tools/JavaCompatibleTest.scala rename to smt-tools/src/test/scala/org/bitlap/tools/JavaCompatibleTest.scala diff --git a/tools/src/test/scala/org/bitlap/tools/JsonTest.scala b/smt-tools/src/test/scala/org/bitlap/tools/JsonTest.scala similarity index 100% rename from tools/src/test/scala/org/bitlap/tools/JsonTest.scala rename to smt-tools/src/test/scala/org/bitlap/tools/JsonTest.scala diff --git a/tools/src/test/scala/org/bitlap/tools/LogMain.scala b/smt-tools/src/test/scala/org/bitlap/tools/LogMain.scala similarity index 100% rename from tools/src/test/scala/org/bitlap/tools/LogMain.scala rename to smt-tools/src/test/scala/org/bitlap/tools/LogMain.scala diff --git a/tools/src/test/scala/org/bitlap/tools/LogTest.scala b/smt-tools/src/test/scala/org/bitlap/tools/LogTest.scala similarity index 100% rename from tools/src/test/scala/org/bitlap/tools/LogTest.scala rename to smt-tools/src/test/scala/org/bitlap/tools/LogTest.scala diff --git a/tools/src/test/scala/org/bitlap/tools/NetService.scala b/smt-tools/src/test/scala/org/bitlap/tools/NetService.scala similarity index 100% rename from tools/src/test/scala/org/bitlap/tools/NetService.scala rename to smt-tools/src/test/scala/org/bitlap/tools/NetService.scala diff --git a/tools/src/test/scala/org/bitlap/tools/OthersTest.scala b/smt-tools/src/test/scala/org/bitlap/tools/OthersTest.scala similarity index 100% rename from tools/src/test/scala/org/bitlap/tools/OthersTest.scala rename to smt-tools/src/test/scala/org/bitlap/tools/OthersTest.scala diff --git a/tools/src/test/scala/org/bitlap/tools/ProcessorCreatorTest.scala b/smt-tools/src/test/scala/org/bitlap/tools/ProcessorCreatorTest.scala similarity index 100% rename from tools/src/test/scala/org/bitlap/tools/ProcessorCreatorTest.scala rename to smt-tools/src/test/scala/org/bitlap/tools/ProcessorCreatorTest.scala diff --git a/tools/src/test/scala/org/bitlap/tools/ScalaReflectionUtilsTest.scala b/smt-tools/src/test/scala/org/bitlap/tools/ScalaReflectionUtilsTest.scala similarity index 100% rename from tools/src/test/scala/org/bitlap/tools/ScalaReflectionUtilsTest.scala rename to smt-tools/src/test/scala/org/bitlap/tools/ScalaReflectionUtilsTest.scala diff --git a/tools/src/test/scala/org/bitlap/tools/ToStringTest.scala b/smt-tools/src/test/scala/org/bitlap/tools/ToStringTest.scala similarity index 100% rename from tools/src/test/scala/org/bitlap/tools/ToStringTest.scala rename to smt-tools/src/test/scala/org/bitlap/tools/ToStringTest.scala diff --git a/tools/src/test/scala/org/bitlap/tools/test/proto/BOpenSession.java b/smt-tools/src/test/scala/org/bitlap/tools/test/proto/BOpenSession.java similarity index 100% rename from tools/src/test/scala/org/bitlap/tools/test/proto/BOpenSession.java rename to smt-tools/src/test/scala/org/bitlap/tools/test/proto/BOpenSession.java diff --git a/tools/src/test/scala/org/bitlap/tools/test/proto/BOpenSessionOrBuilder.java b/smt-tools/src/test/scala/org/bitlap/tools/test/proto/BOpenSessionOrBuilder.java similarity index 100% rename from tools/src/test/scala/org/bitlap/tools/test/proto/BOpenSessionOrBuilder.java rename to smt-tools/src/test/scala/org/bitlap/tools/test/proto/BOpenSessionOrBuilder.java diff --git a/tools/src/test/scala/org/bitlap/tools/test/proto/DriverService.java b/smt-tools/src/test/scala/org/bitlap/tools/test/proto/DriverService.java similarity index 100% rename from tools/src/test/scala/org/bitlap/tools/test/proto/DriverService.java rename to smt-tools/src/test/scala/org/bitlap/tools/test/proto/DriverService.java -- GitLab