diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 73f69e0..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml -# Editor-based HTTP Client requests -/httpRequests/ diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index 7d83415..0000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml deleted file mode 100644 index b77aaae..0000000 --- a/.idea/codeStyles/codeStyleConfig.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 61a9130..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index a6f8c13..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml deleted file mode 100644 index fdc392f..0000000 --- a/.idea/jarRepositories.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 335d534..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 63ce84d..d3f1391 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,36 +1,9 @@ plugins { - kotlin("jvm") version "1.4.0" + kotlin("jvm") `java-library` - id("de.marcphilipp.nexus-publish") version "0.4.0" -} - -group = "com.cubetiqs.libra" -version = "1.0-SNAPSHOT" - -repositories { - mavenCentral() } dependencies { implementation(kotlin("stdlib")) testImplementation("org.junit.vintage:junit-vintage-engine:5.6.2") -} - -publishing { - publications { - create("mavenJava") { - from(components["java"]) - } - } -} - -nexusPublishing { - repositories { - create("mavenJava") { - nexusUrl.set(uri("https://nexus.osa.cubetiqs.com/repository/local-maven-dev/")) - snapshotRepositoryUrl.set(uri("https://nexus.osa.cubetiqs.com/repository/local-maven-dev/")) - username.set("cubetiq") - password.set("cube17tiq") - } - } } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a4b4429..4d9ca16 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew deleted file mode 100755 index fbd7c51..0000000 --- a/gradlew +++ /dev/null @@ -1,185 +0,0 @@ -#!/usr/bin/env sh - -# -# Copyright 2015 the original author or authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn () { - echo "$*" -} - -die () { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=`expr $i + 1` - done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat deleted file mode 100644 index a9f778a..0000000 --- a/gradlew.bat +++ /dev/null @@ -1,104 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/settings.gradle.kts b/settings.gradle.kts deleted file mode 100644 index f504f9f..0000000 --- a/settings.gradle.kts +++ /dev/null @@ -1,2 +0,0 @@ -rootProject.name = "moneyutils" - diff --git a/src/main/kotlin/com/cubetiqs/libra/moneyutils/Money.kt b/src/main/kotlin/com/cubetiqs/money/Money.kt similarity index 97% rename from src/main/kotlin/com/cubetiqs/libra/moneyutils/Money.kt rename to src/main/kotlin/com/cubetiqs/money/Money.kt index 30dfe34..bee555f 100644 --- a/src/main/kotlin/com/cubetiqs/libra/moneyutils/Money.kt +++ b/src/main/kotlin/com/cubetiqs/money/Money.kt @@ -1,4 +1,4 @@ -package com.cubetiqs.libra.moneyutils +package com.cubetiqs.money open class Money( var value: Double, diff --git a/src/main/kotlin/com/cubetiqs/libra/moneyutils/MoneyArithmetic.kt b/src/main/kotlin/com/cubetiqs/money/MoneyArithmetic.kt similarity index 74% rename from src/main/kotlin/com/cubetiqs/libra/moneyutils/MoneyArithmetic.kt rename to src/main/kotlin/com/cubetiqs/money/MoneyArithmetic.kt index 81c529d..0d410e2 100644 --- a/src/main/kotlin/com/cubetiqs/libra/moneyutils/MoneyArithmetic.kt +++ b/src/main/kotlin/com/cubetiqs/money/MoneyArithmetic.kt @@ -1,4 +1,4 @@ -package com.cubetiqs.libra.moneyutils +package com.cubetiqs.money fun StdMoney.addMoney(value: Double, currency: String): StdMoney { return this + Money.create(value, currency) diff --git a/src/main/kotlin/com/cubetiqs/libra/moneyutils/MoneyConfig.kt b/src/main/kotlin/com/cubetiqs/money/MoneyConfig.kt similarity index 88% rename from src/main/kotlin/com/cubetiqs/libra/moneyutils/MoneyConfig.kt rename to src/main/kotlin/com/cubetiqs/money/MoneyConfig.kt index 28ff0bc..ef919fa 100644 --- a/src/main/kotlin/com/cubetiqs/libra/moneyutils/MoneyConfig.kt +++ b/src/main/kotlin/com/cubetiqs/money/MoneyConfig.kt @@ -1,4 +1,4 @@ -package com.cubetiqs.libra.moneyutils +package com.cubetiqs.money /** * Default money config in static object. @@ -18,7 +18,7 @@ object MoneyConfig { // validate the config, if have it's valid fun isValid(): Boolean { - return this.config.isNotEmpty() + return config.isNotEmpty() } /** @@ -33,7 +33,7 @@ object MoneyConfig { } fun setProperties(properties: MoneyConfigProperties): MoneyConfig { - this.properties = properties + MoneyConfig.properties = properties return MoneyConfig } @@ -44,7 +44,7 @@ object MoneyConfig { */ fun parse(config: String, clearAllStates: Boolean = true) { if (clearAllStates) { - this.config.clear() + MoneyConfig.config.clear() } val rates = config.split(getProperties().deliSplit) rates.map { i -> @@ -52,10 +52,10 @@ object MoneyConfig { if (temp.size == 2) { val currency = temp[0].toUpperCase() val value = temp[1].toDouble() - if (this.config.containsKey(currency)) { - this.config.replace(currency, value) + if (MoneyConfig.config.containsKey(currency)) { + MoneyConfig.config.replace(currency, value) } else { - this.config.put(currency, value) + MoneyConfig.config.put(currency, value) } } else { throw MoneyCurrencyStateException("money config format is not valid!") @@ -64,7 +64,7 @@ object MoneyConfig { } // all currencies with its rate - fun getConfig() = this.config + fun getConfig() = config @Throws(MoneyCurrencyStateException::class) fun getRate(currency: String): Double { diff --git a/src/main/kotlin/com/cubetiqs/libra/moneyutils/MoneyCurrency.kt b/src/main/kotlin/com/cubetiqs/money/MoneyCurrency.kt similarity index 58% rename from src/main/kotlin/com/cubetiqs/libra/moneyutils/MoneyCurrency.kt rename to src/main/kotlin/com/cubetiqs/money/MoneyCurrency.kt index fbe0247..3bdbf45 100644 --- a/src/main/kotlin/com/cubetiqs/libra/moneyutils/MoneyCurrency.kt +++ b/src/main/kotlin/com/cubetiqs/money/MoneyCurrency.kt @@ -1,4 +1,4 @@ -package com.cubetiqs.libra.moneyutils +package com.cubetiqs.money enum class MoneyCurrency { USD, diff --git a/src/main/kotlin/com/cubetiqs/libra/moneyutils/MoneyCurrencyStateException.kt b/src/main/kotlin/com/cubetiqs/money/MoneyCurrencyStateException.kt similarity index 79% rename from src/main/kotlin/com/cubetiqs/libra/moneyutils/MoneyCurrencyStateException.kt rename to src/main/kotlin/com/cubetiqs/money/MoneyCurrencyStateException.kt index ac99f25..5ce140b 100644 --- a/src/main/kotlin/com/cubetiqs/libra/moneyutils/MoneyCurrencyStateException.kt +++ b/src/main/kotlin/com/cubetiqs/money/MoneyCurrencyStateException.kt @@ -1,4 +1,4 @@ -package com.cubetiqs.libra.moneyutils +package com.cubetiqs.money /** * Default money currency state exception diff --git a/src/main/kotlin/com/cubetiqs/libra/moneyutils/MoneyExchangeAdapter.kt b/src/main/kotlin/com/cubetiqs/money/MoneyExchangeAdapter.kt similarity index 66% rename from src/main/kotlin/com/cubetiqs/libra/moneyutils/MoneyExchangeAdapter.kt rename to src/main/kotlin/com/cubetiqs/money/MoneyExchangeAdapter.kt index 00d9b92..d2cbdb9 100644 --- a/src/main/kotlin/com/cubetiqs/libra/moneyutils/MoneyExchangeAdapter.kt +++ b/src/main/kotlin/com/cubetiqs/money/MoneyExchangeAdapter.kt @@ -1,4 +1,4 @@ -package com.cubetiqs.libra.moneyutils +package com.cubetiqs.money interface MoneyExchangeAdapter { fun getRate(currency: String): Double diff --git a/src/main/kotlin/com/cubetiqs/libra/moneyutils/MoneyExchangeUtils.kt b/src/main/kotlin/com/cubetiqs/money/MoneyExchangeUtils.kt similarity index 93% rename from src/main/kotlin/com/cubetiqs/libra/moneyutils/MoneyExchangeUtils.kt rename to src/main/kotlin/com/cubetiqs/money/MoneyExchangeUtils.kt index f6575bd..0b2f01d 100644 --- a/src/main/kotlin/com/cubetiqs/libra/moneyutils/MoneyExchangeUtils.kt +++ b/src/main/kotlin/com/cubetiqs/money/MoneyExchangeUtils.kt @@ -1,4 +1,4 @@ -package com.cubetiqs.libra.moneyutils +package com.cubetiqs.money object MoneyExchangeUtils { fun exchange(exchangeFrom: StdMoney, exchangeToCurrency: String): StdMoney { diff --git a/src/main/kotlin/com/cubetiqs/libra/moneyutils/MoneyExtension.kt b/src/main/kotlin/com/cubetiqs/money/MoneyExtension.kt similarity index 67% rename from src/main/kotlin/com/cubetiqs/libra/moneyutils/MoneyExtension.kt rename to src/main/kotlin/com/cubetiqs/money/MoneyExtension.kt index 12defd7..e4d2783 100644 --- a/src/main/kotlin/com/cubetiqs/libra/moneyutils/MoneyExtension.kt +++ b/src/main/kotlin/com/cubetiqs/money/MoneyExtension.kt @@ -1,4 +1,4 @@ -package com.cubetiqs.libra.moneyutils +package com.cubetiqs.money fun StdMoney.exchangeTo(currency: String): StdMoney { return MoneyExchangeUtils.exchange(this, currency) diff --git a/src/main/kotlin/com/cubetiqs/libra/moneyutils/MoneyOperator.kt b/src/main/kotlin/com/cubetiqs/money/MoneyOperator.kt similarity index 93% rename from src/main/kotlin/com/cubetiqs/libra/moneyutils/MoneyOperator.kt rename to src/main/kotlin/com/cubetiqs/money/MoneyOperator.kt index f9a15df..193b67c 100644 --- a/src/main/kotlin/com/cubetiqs/libra/moneyutils/MoneyOperator.kt +++ b/src/main/kotlin/com/cubetiqs/money/MoneyOperator.kt @@ -1,4 +1,4 @@ -package com.cubetiqs.libra.moneyutils +package com.cubetiqs.money operator fun StdMoney.unaryMinus() = (-getMoneyValue()) operator fun StdMoney.unaryPlus() = (+getMoneyValue()) diff --git a/src/main/kotlin/com/cubetiqs/libra/moneyutils/SpecialString.kt b/src/main/kotlin/com/cubetiqs/money/SpecialString.kt similarity index 61% rename from src/main/kotlin/com/cubetiqs/libra/moneyutils/SpecialString.kt rename to src/main/kotlin/com/cubetiqs/money/SpecialString.kt index 3b4b644..0637f57 100644 --- a/src/main/kotlin/com/cubetiqs/libra/moneyutils/SpecialString.kt +++ b/src/main/kotlin/com/cubetiqs/money/SpecialString.kt @@ -1,4 +1,4 @@ -package com.cubetiqs.libra.moneyutils +package com.cubetiqs.money @Target(AnnotationTarget.FIELD) @Retention(AnnotationRetention.RUNTIME) diff --git a/src/main/kotlin/com/cubetiqs/libra/moneyutils/SpecialStringProcessor.kt b/src/main/kotlin/com/cubetiqs/money/SpecialStringProcessor.kt similarity index 96% rename from src/main/kotlin/com/cubetiqs/libra/moneyutils/SpecialStringProcessor.kt rename to src/main/kotlin/com/cubetiqs/money/SpecialStringProcessor.kt index b33652b..71e7cf9 100644 --- a/src/main/kotlin/com/cubetiqs/libra/moneyutils/SpecialStringProcessor.kt +++ b/src/main/kotlin/com/cubetiqs/money/SpecialStringProcessor.kt @@ -1,4 +1,4 @@ -package com.cubetiqs.libra.moneyutils +package com.cubetiqs.money import java.lang.reflect.Field diff --git a/src/main/kotlin/com/cubetiqs/libra/moneyutils/StdMoney.kt b/src/main/kotlin/com/cubetiqs/money/StdMoney.kt similarity index 91% rename from src/main/kotlin/com/cubetiqs/libra/moneyutils/StdMoney.kt rename to src/main/kotlin/com/cubetiqs/money/StdMoney.kt index e000a4e..29d20cc 100644 --- a/src/main/kotlin/com/cubetiqs/libra/moneyutils/StdMoney.kt +++ b/src/main/kotlin/com/cubetiqs/money/StdMoney.kt @@ -1,4 +1,4 @@ -package com.cubetiqs.libra.moneyutils +package com.cubetiqs.money /** * Default standard money style diff --git a/src/main/kotlin/com/cubetiqs/libra/moneyutils/StdMoneyFormation.kt b/src/main/kotlin/com/cubetiqs/money/StdMoneyFormation.kt similarity index 74% rename from src/main/kotlin/com/cubetiqs/libra/moneyutils/StdMoneyFormation.kt rename to src/main/kotlin/com/cubetiqs/money/StdMoneyFormation.kt index 2293f6c..711cc2f 100644 --- a/src/main/kotlin/com/cubetiqs/libra/moneyutils/StdMoneyFormation.kt +++ b/src/main/kotlin/com/cubetiqs/money/StdMoneyFormation.kt @@ -1,4 +1,4 @@ -package com.cubetiqs.libra.moneyutils +package com.cubetiqs.money interface StdMoneyFormation { fun format(): String diff --git a/src/test/kotlin/MoneyTests.kt b/src/test/kotlin/MoneyTests.kt index 475c150..56fda11 100644 --- a/src/test/kotlin/MoneyTests.kt +++ b/src/test/kotlin/MoneyTests.kt @@ -1,8 +1,8 @@ -import com.cubetiqs.libra.moneyutils.Money -import com.cubetiqs.libra.moneyutils.MoneyConfig -import com.cubetiqs.libra.moneyutils.MoneyCurrency -import com.cubetiqs.libra.moneyutils.MoneyExchangeUtils -import com.cubetiqs.libra.moneyutils.SpecialStringProcessor +import com.cubetiqs.money.Money +import com.cubetiqs.money.MoneyConfig +import com.cubetiqs.money.MoneyCurrency +import com.cubetiqs.money.MoneyExchangeUtils +import com.cubetiqs.money.SpecialStringProcessor import org.junit.Assert import org.junit.Test diff --git a/src/test/kotlin/ObjectTests.kt b/src/test/kotlin/ObjectTests.kt deleted file mode 100644 index 6ea44db..0000000 --- a/src/test/kotlin/ObjectTests.kt +++ /dev/null @@ -1,37 +0,0 @@ -import org.junit.Test - -class ObjectTests { - - @Test - fun builder_object_test() { - val person = Person - .builder() - .name("Sambo Chea") - .id(10) - .build() - - println(person) - } -} - -data class Person(val id: Long? = null, val name: String? = null) { - companion object { - fun builder(): PersonBuilder { - return PersonBuilder() - } - } -} - -class PersonBuilder { - private var id: Long? = null - private var name: String? = null - - fun id(id: Long?) = apply { this.id = id } - fun name(name: String?) = apply { this.name = name } - - fun build(): Person { - return Person(id, name) - } - - -} \ No newline at end of file