diff --git a/README.md b/README.md index 93dbb1d..90e10a9 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,7 @@ JSON에 맞춰 자동으로 CSV파일을 생성해주는 라이브러리 입니 image ### 🧑🏼‍🌾개발 일지 +- [[설계/최종본] 클래스다이어그램](https://github.com/hyunolike/json-csv-bridge/wiki/%EA%B0%9C%EB%B0%9C%EA%B8%B0%EB%A1%9D-05.-%ED%81%B4%EB%9E%98%EC%8A%A4-%EB%8B%A4%EC%9D%B4%EC%96%B4%EA%B7%B8%EB%9E%A8-%EC%B5%9C%EC%A2%85%EB%B3%B8) - [[설계] 클래스다이어그램](https://github.com/hyunolike/json-csv-bridge/wiki/%EA%B0%9C%EB%B0%9C%EA%B8%B0%EB%A1%9D-03.-%08%ED%81%B4%EB%9E%98%EC%8A%A4-%EB%8B%A4%EC%9D%B4%EC%96%B4%EA%B7%B8%EB%9E%A8-%EC%84%A4%EA%B3%84) --- diff --git a/build.gradle.kts b/build.gradle.kts index 19529d0..d8b5f6b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,6 +1,9 @@ +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + plugins { id("org.springframework.boot") version "3.3.2" apply false id("io.spring.dependency-management") version "1.1.6" + id("org.jlleitschuh.gradle.ktlint") version "11.0.0" `maven-publish` kotlin("jvm") version "1.9.24" kotlin("plugin.spring") version "1.9.24" @@ -31,7 +34,7 @@ dependencies { testRuntimeOnly("org.junit.platform:junit-platform-launcher") } -tasks.test { +tasks.withType { useJUnitPlatform() } @@ -41,22 +44,19 @@ dependencyManagement { } } -kotlin { - compilerOptions { - freeCompilerArgs.addAll("-Xjsr305=strict") +tasks.withType { + kotlinOptions { + freeCompilerArgs = listOf("-Xjsr305=strict") + jvmTarget = "21" } } -tasks.withType { - useJUnitPlatform() -} - -tasks.register("sourcesJar", Jar::class) { +tasks.register("sourcesJar") { archiveClassifier.set("sources") from(sourceSets.main.get().allSource) } -tasks.register("javadocJar", Jar::class) { +tasks.register("javadocJar") { archiveClassifier.set("javadoc") from(tasks.javadoc) } @@ -100,4 +100,32 @@ publishing { } } } -} \ No newline at end of file +} + +// ktlint configuration +ktlint { + verbose.set(true) + outputToConsole.set(true) + coloredOutput.set(true) + reporters { + reporter(org.jlleitschuh.gradle.ktlint.reporter.ReporterType.CHECKSTYLE) + reporter(org.jlleitschuh.gradle.ktlint.reporter.ReporterType.JSON) + } + filter { + exclude("**/generated/**") + include("**/kotlin/**") + } + + // 와일드카드 임포트 규칙 비활성화 + disabledRules.set(setOf("no-wildcard-imports")) +} + +// Optional: Add ktlint check to check task +tasks.named("check") { + dependsOn("ktlintCheck") +} + +// Optional: Add ktlint format to build task +tasks.named("build") { + dependsOn("ktlintFormat") +} diff --git a/examples/spring-boot-java/.gitignore b/examples/spring-boot-java/.gitignore new file mode 100644 index 0000000..59be535 --- /dev/null +++ b/examples/spring-boot-java/.gitignore @@ -0,0 +1,40 @@ +### intellij ### +.idea + +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/examples/spring-boot-java/build.gradle b/examples/spring-boot-java/build.gradle new file mode 100644 index 0000000..7550fea --- /dev/null +++ b/examples/spring-boot-java/build.gradle @@ -0,0 +1,33 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.3.2' + id 'io.spring.dependency-management' version '1.1.6' +} + +group = 'com.example' +version = '0.0.1-SNAPSHOT' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(22) + } +} + +repositories { + maven { url 'https://jitpack.io' } + mavenCentral() +} + +dependencies { + // 오픈소스 프로젝트 추가 + // Add open-source project + implementation 'com.github.hyunolike:json-csv-bridge:v0.0.6' + + implementation 'org.springframework.boot:spring-boot-starter-web' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/examples/spring-boot-java/csv_output/output_json.csv b/examples/spring-boot-java/csv_output/output_json.csv new file mode 100644 index 0000000..3379912 --- /dev/null +++ b/examples/spring-boot-java/csv_output/output_json.csv @@ -0,0 +1,4 @@ +city,name,age +New York,Hyunho,30 +Los Angeles,Bob,25 +Chicago,Charlie,35 diff --git a/examples/spring-boot-java/gradle/wrapper/gradle-wrapper.jar b/examples/spring-boot-java/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..e644113 Binary files /dev/null and b/examples/spring-boot-java/gradle/wrapper/gradle-wrapper.jar differ diff --git a/examples/spring-boot-java/gradle/wrapper/gradle-wrapper.properties b/examples/spring-boot-java/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..a441313 --- /dev/null +++ b/examples/spring-boot-java/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/examples/spring-boot-java/gradlew b/examples/spring-boot-java/gradlew new file mode 100755 index 0000000..b740cf1 --- /dev/null +++ b/examples/spring-boot-java/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original 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 POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# 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 ;; #( + MSYS* | 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 + if ! command -v java >/dev/null 2>&1 + then + 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 +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# 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"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/examples/spring-boot-java/gradlew.bat b/examples/spring-boot-java/gradlew.bat new file mode 100644 index 0000000..25da30d --- /dev/null +++ b/examples/spring-boot-java/gradlew.bat @@ -0,0 +1,92 @@ +@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=. +@rem This is normally unused +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% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +: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 %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 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! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/examples/spring-boot-java/settings.gradle b/examples/spring-boot-java/settings.gradle new file mode 100644 index 0000000..686137a --- /dev/null +++ b/examples/spring-boot-java/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'spring-boot-java' diff --git a/examples/spring-boot-java/src/main/java/com/example/springbootjava/SpringBootJavaApplication.java b/examples/spring-boot-java/src/main/java/com/example/springbootjava/SpringBootJavaApplication.java new file mode 100644 index 0000000..ad55a01 --- /dev/null +++ b/examples/spring-boot-java/src/main/java/com/example/springbootjava/SpringBootJavaApplication.java @@ -0,0 +1,43 @@ +package com.example.springbootjava; + +import com.jsoncsvbridge.csv.CsvCreator; +import com.jsoncsvbridge.factory.DefaultCsvCreatorFactory; +import org.springframework.boot.CommandLineRunner; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.stereotype.Component; + +import java.io.File; + +@SpringBootApplication +public class SpringBootJavaApplication { + + public static void main(String[] args) { + SpringApplication.run(SpringBootJavaApplication.class, args); + } +} + +@Component +class CsvCreatorRunner implements CommandLineRunner { + @Override + public void run(String... args) throws Exception { + File outputDir = new File("csv_output"); + outputDir.mkdirs(); + + // JSON to CSV + CsvCreator jsonCreator = DefaultCsvCreatorFactory.createCsv("json"); + String jsonOutputPath = new File(outputDir, "output_json.csv").getAbsolutePath(); + + // JSON to CSV + String jsonInput = """ + [ + {"name": "Hyunho", "age": 30, "city": "New York"}, + {"name": "Bob", "age": 25, "city": "Los Angeles"}, + {"name": "Charlie", "age": 35, "city": "Chicago"} + ] + """; + + jsonCreator.createCsv(jsonInput, jsonOutputPath); + System.out.println("JSON to CSV conversion completed. File saved at: " + jsonOutputPath); + } +} \ No newline at end of file diff --git a/examples/spring-boot-java/src/main/resources/application.properties b/examples/spring-boot-java/src/main/resources/application.properties new file mode 100644 index 0000000..7a33855 --- /dev/null +++ b/examples/spring-boot-java/src/main/resources/application.properties @@ -0,0 +1 @@ +spring.application.name=spring-boot-java diff --git a/examples/spring-boot-java/src/test/java/com/example/springbootjava/SpringBootJavaApplicationTests.java b/examples/spring-boot-java/src/test/java/com/example/springbootjava/SpringBootJavaApplicationTests.java new file mode 100644 index 0000000..439e156 --- /dev/null +++ b/examples/spring-boot-java/src/test/java/com/example/springbootjava/SpringBootJavaApplicationTests.java @@ -0,0 +1,13 @@ +package com.example.springbootjava; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class SpringBootJavaApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/examples/spring-boot-kotlin/src/main/kotlin/com/example/SpringBootKotlinApplication.kt b/examples/spring-boot-kotlin/src/main/kotlin/com/example/SpringBootKotlinApplication.kt index e9b84a2..8bbc5b6 100644 --- a/examples/spring-boot-kotlin/src/main/kotlin/com/example/SpringBootKotlinApplication.kt +++ b/examples/spring-boot-kotlin/src/main/kotlin/com/example/SpringBootKotlinApplication.kt @@ -1,6 +1,5 @@ package com.example -import com.jsoncsvbridge.factory.DefaultCsvCreatorFactory import com.jsoncsvbridge.factory.DefaultCsvCreatorFactory.Companion.createCsv import org.springframework.boot.CommandLineRunner import org.springframework.boot.autoconfigure.SpringBootApplication @@ -16,13 +15,13 @@ fun main(args: Array) { } @Component -class CsvCreatorRunner() : CommandLineRunner { +class CsvCreatorRunner : CommandLineRunner { override fun run(vararg args: String) { val outputDir = File("csv_output").apply { mkdirs() } // JSON to CSV // TODO: 라이브러리 호출 지점 수정 generateCsv 24.08.03 - val jsonCreator = createCsv("json"); + val jsonCreator = createCsv("json") val jsonOutputPath = outputDir.resolve("output_json.csv").absolutePath // JSON to CSV @@ -37,4 +36,4 @@ class CsvCreatorRunner() : CommandLineRunner { jsonCreator.createCsv(jsonInput, jsonOutputPath) println("JSON to CSV conversion completed. File saved at: $jsonOutputPath") } -} \ No newline at end of file +} diff --git a/src/main/kotlin/com/jsoncsvbridge/csv/CsvCreator.kt b/src/main/kotlin/com/jsoncsvbridge/csv/CsvCreator.kt index ddbd8c5..de6b4a8 100644 --- a/src/main/kotlin/com/jsoncsvbridge/csv/CsvCreator.kt +++ b/src/main/kotlin/com/jsoncsvbridge/csv/CsvCreator.kt @@ -1,5 +1,8 @@ package com.jsoncsvbridge.csv interface CsvCreator { - fun createCsv(data: String, outputPath: String) -} \ No newline at end of file + fun createCsv( + data: String, + outputPath: String, + ) +} diff --git a/src/main/kotlin/com/jsoncsvbridge/csv/CsvFormatter.kt b/src/main/kotlin/com/jsoncsvbridge/csv/CsvFormatter.kt index 5ebd898..68dab80 100644 --- a/src/main/kotlin/com/jsoncsvbridge/csv/CsvFormatter.kt +++ b/src/main/kotlin/com/jsoncsvbridge/csv/CsvFormatter.kt @@ -2,4 +2,4 @@ package com.jsoncsvbridge.csv interface CsvFormatter { fun format(data: String, options: FormattingOptions): String -} \ No newline at end of file +} diff --git a/src/main/kotlin/com/jsoncsvbridge/csv/CsvRecodes.kt b/src/main/kotlin/com/jsoncsvbridge/csv/CsvRecodes.kt index c19a21a..d87822f 100644 --- a/src/main/kotlin/com/jsoncsvbridge/csv/CsvRecodes.kt +++ b/src/main/kotlin/com/jsoncsvbridge/csv/CsvRecodes.kt @@ -1,5 +1,5 @@ package com.jsoncsvbridge.csv interface CsvRecodes { - fun combine(data: List) :String -} \ No newline at end of file + fun combine(data: List): String +} diff --git a/src/main/kotlin/com/jsoncsvbridge/csv/CsvValidator.kt b/src/main/kotlin/com/jsoncsvbridge/csv/CsvValidator.kt index 065fed2..4f38314 100644 --- a/src/main/kotlin/com/jsoncsvbridge/csv/CsvValidator.kt +++ b/src/main/kotlin/com/jsoncsvbridge/csv/CsvValidator.kt @@ -2,4 +2,4 @@ package com.jsoncsvbridge.csv interface CsvValidator { fun validate(jsonString: String): List> -} \ No newline at end of file +} diff --git a/src/main/kotlin/com/jsoncsvbridge/csv/CsvWriter.kt b/src/main/kotlin/com/jsoncsvbridge/csv/CsvWriter.kt index 753de98..05e3b50 100644 --- a/src/main/kotlin/com/jsoncsvbridge/csv/CsvWriter.kt +++ b/src/main/kotlin/com/jsoncsvbridge/csv/CsvWriter.kt @@ -2,4 +2,4 @@ package com.jsoncsvbridge.csv interface CsvWriter { fun write(data: List>, outputPath: String) -} \ No newline at end of file +} diff --git a/src/main/kotlin/com/jsoncsvbridge/csv/DefaultCsvFormatter.kt b/src/main/kotlin/com/jsoncsvbridge/csv/DefaultCsvFormatter.kt index 41f47e7..845628e 100644 --- a/src/main/kotlin/com/jsoncsvbridge/csv/DefaultCsvFormatter.kt +++ b/src/main/kotlin/com/jsoncsvbridge/csv/DefaultCsvFormatter.kt @@ -1,8 +1,11 @@ package com.jsoncsvbridge.csv class DefaultCsvFormatter : CsvFormatter { - override fun format(data: String, options: FormattingOptions): String { - return data.replace(",", options.delimiter.toString()) + override fun format( + data: String, + options: FormattingOptions, + ): String = + data + .replace(",", options.delimiter.toString()) .replace("\n", options.lineTerminator) - } -} \ No newline at end of file +} diff --git a/src/main/kotlin/com/jsoncsvbridge/csv/FormattingOptions.kt b/src/main/kotlin/com/jsoncsvbridge/csv/FormattingOptions.kt index fa06d76..a3fa108 100644 --- a/src/main/kotlin/com/jsoncsvbridge/csv/FormattingOptions.kt +++ b/src/main/kotlin/com/jsoncsvbridge/csv/FormattingOptions.kt @@ -4,4 +4,4 @@ data class FormattingOptions( val delimiter: Char = ',', val encoding: String = "UTF-8", val lineTerminator: String = "\n" -) \ No newline at end of file +) diff --git a/src/main/kotlin/com/jsoncsvbridge/csv/MergeCsvCreator.kt b/src/main/kotlin/com/jsoncsvbridge/csv/MergeCsvCreator.kt index 1ee17e4..b4498f4 100644 --- a/src/main/kotlin/com/jsoncsvbridge/csv/MergeCsvCreator.kt +++ b/src/main/kotlin/com/jsoncsvbridge/csv/MergeCsvCreator.kt @@ -2,4 +2,4 @@ package com.jsoncsvbridge.csv interface MergeCsvCreator : CsvCreator { fun createMergedCsv(data1: String, data2: String, outputPath: String) -} \ No newline at end of file +} diff --git a/src/main/kotlin/com/jsoncsvbridge/factory/CsvCreatorFactory.kt b/src/main/kotlin/com/jsoncsvbridge/factory/CsvCreatorFactory.kt index a15d902..f1dfe01 100644 --- a/src/main/kotlin/com/jsoncsvbridge/factory/CsvCreatorFactory.kt +++ b/src/main/kotlin/com/jsoncsvbridge/factory/CsvCreatorFactory.kt @@ -4,4 +4,4 @@ import com.jsoncsvbridge.csv.CsvCreator interface CsvCreatorFactory { fun createCsvCreator(type: String): CsvCreator -} \ No newline at end of file +} diff --git a/src/main/kotlin/com/jsoncsvbridge/factory/DefaultCsvCreatorFactory.kt b/src/main/kotlin/com/jsoncsvbridge/factory/DefaultCsvCreatorFactory.kt index 1a908ea..89745da 100644 --- a/src/main/kotlin/com/jsoncsvbridge/factory/DefaultCsvCreatorFactory.kt +++ b/src/main/kotlin/com/jsoncsvbridge/factory/DefaultCsvCreatorFactory.kt @@ -1,3 +1,5 @@ +@file:Suppress("ktlint:standard:no-wildcard-imports") + package com.jsoncsvbridge.factory import com.jsoncsvbridge.csv.CsvCreator @@ -8,33 +10,30 @@ import org.springframework.stereotype.Component @Component class DefaultCsvCreatorFactory : CsvCreatorFactory { - override fun createCsvCreator(type: String): CsvCreator { - return when (type) { - "json" -> JsonToCsvCreator( - DefaultCsvFormatter(), - JsonDataFilter(), - JsonDataValidator(), - JsonToCsvDataWriter() - ) - "mergeJson" -> MergeJsonToCsvCreator( - MergeJsonRecords(), - JsonDataValidator(), - JsonToCsvDataWriter() - ) + override fun createCsvCreator(type: String): CsvCreator = + when (type) { + "json" -> + JsonToCsvCreator( + DefaultCsvFormatter(), + JsonDataFilter(), + JsonDataValidator(), + JsonToCsvDataWriter(), + ) + "mergeJson" -> + MergeJsonToCsvCreator( + MergeJsonRecords(), + JsonDataValidator(), + JsonToCsvDataWriter(), + ) else -> throw IllegalArgumentException("Unknown type") } - } // generateCsv 24.08.03 companion object { @JvmStatic - fun generateCsv(type : String): CsvCreator { - return DefaultCsvCreatorFactory().createCsvCreator(type) - } + fun generateCsv(type: String): CsvCreator = DefaultCsvCreatorFactory().createCsvCreator(type) @JvmStatic - fun generateMergeCsv(): MergeCsvCreator { - return DefaultCsvCreatorFactory().createCsvCreator("mergeJson") as MergeCsvCreator - } + fun generateMergeCsv(): MergeCsvCreator = DefaultCsvCreatorFactory().createCsvCreator("mergeJson") as MergeCsvCreator } -} \ No newline at end of file +} diff --git a/src/main/kotlin/com/jsoncsvbridge/filter/Condition.kt b/src/main/kotlin/com/jsoncsvbridge/filter/Condition.kt index a24e5d2..6b9f71e 100644 --- a/src/main/kotlin/com/jsoncsvbridge/filter/Condition.kt +++ b/src/main/kotlin/com/jsoncsvbridge/filter/Condition.kt @@ -1,3 +1,3 @@ package com.jsoncsvbridge.filter -data class Condition(val field: String, val value: String) \ No newline at end of file +data class Condition(val field: String, val value: String) diff --git a/src/main/kotlin/com/jsoncsvbridge/filter/DataFilter.kt b/src/main/kotlin/com/jsoncsvbridge/filter/DataFilter.kt index 07f8568..bef7b77 100644 --- a/src/main/kotlin/com/jsoncsvbridge/filter/DataFilter.kt +++ b/src/main/kotlin/com/jsoncsvbridge/filter/DataFilter.kt @@ -2,4 +2,4 @@ package com.jsoncsvbridge.filter interface DataFilter { fun filter(data: String, criteria: FilterCriteria): String -} \ No newline at end of file +} diff --git a/src/main/kotlin/com/jsoncsvbridge/filter/FilterCriteria.kt b/src/main/kotlin/com/jsoncsvbridge/filter/FilterCriteria.kt index 919a725..d13069d 100644 --- a/src/main/kotlin/com/jsoncsvbridge/filter/FilterCriteria.kt +++ b/src/main/kotlin/com/jsoncsvbridge/filter/FilterCriteria.kt @@ -2,4 +2,4 @@ package com.jsoncsvbridge.filter data class FilterCriteria( val conditions: List = emptyList() -) \ No newline at end of file +) diff --git a/src/main/kotlin/com/jsoncsvbridge/json/JsonDataFilter.kt b/src/main/kotlin/com/jsoncsvbridge/json/JsonDataFilter.kt index de55739..b138fd7 100644 --- a/src/main/kotlin/com/jsoncsvbridge/json/JsonDataFilter.kt +++ b/src/main/kotlin/com/jsoncsvbridge/json/JsonDataFilter.kt @@ -39,4 +39,4 @@ class JsonDataFilter : DataFilter { } return objectMapper.writeValueAsString(filteredArray) } -} \ No newline at end of file +} diff --git a/src/main/kotlin/com/jsoncsvbridge/json/JsonDataValiator.kt b/src/main/kotlin/com/jsoncsvbridge/json/JsonDataValidator.kt similarity index 66% rename from src/main/kotlin/com/jsoncsvbridge/json/JsonDataValiator.kt rename to src/main/kotlin/com/jsoncsvbridge/json/JsonDataValidator.kt index 40767ac..92133f6 100644 --- a/src/main/kotlin/com/jsoncsvbridge/json/JsonDataValiator.kt +++ b/src/main/kotlin/com/jsoncsvbridge/json/JsonDataValidator.kt @@ -1,3 +1,5 @@ +@file:Suppress("ktlint:standard:filename") + package com.jsoncsvbridge.json import com.jsoncsvbridge.csv.CsvValidator @@ -15,19 +17,19 @@ class JsonDataValidator : CsvValidator { } } - private fun validateAndClean(jsonObject: JSONObject): Map { - return jsonObject.keys().asSequence().associate { key -> - key to when { - jsonObject.isNull(key) -> null - jsonObject.get(key) is JSONObject -> validateAndClean(jsonObject.getJSONObject(key)) - jsonObject.get(key) is JSONArray -> validateJsonArray(jsonObject.getJSONArray(key)) - else -> jsonObject.get(key) - } + private fun validateAndClean(jsonObject: JSONObject): Map = + jsonObject.keys().asSequence().associate { key -> + key to + when { + jsonObject.isNull(key) -> null + jsonObject.get(key) is JSONObject -> validateAndClean(jsonObject.getJSONObject(key)) + jsonObject.get(key) is JSONArray -> validateJsonArray(jsonObject.getJSONArray(key)) + else -> jsonObject.get(key) + } } - } - private fun validateJsonArray(jsonArray: JSONArray): List { - return (0 until jsonArray.length()).map { index -> + private fun validateJsonArray(jsonArray: JSONArray): List = + (0 until jsonArray.length()).map { index -> when { jsonArray.isNull(index) -> null jsonArray.get(index) is JSONObject -> validateAndClean(jsonArray.getJSONObject(index)) @@ -35,5 +37,4 @@ class JsonDataValidator : CsvValidator { else -> jsonArray.get(index) } } - } -} \ No newline at end of file +} diff --git a/src/main/kotlin/com/jsoncsvbridge/json/JsonToCsvCreator.kt b/src/main/kotlin/com/jsoncsvbridge/json/JsonToCsvCreator.kt index 9c4fcf0..2247ba1 100644 --- a/src/main/kotlin/com/jsoncsvbridge/json/JsonToCsvCreator.kt +++ b/src/main/kotlin/com/jsoncsvbridge/json/JsonToCsvCreator.kt @@ -1,16 +1,23 @@ +@file:Suppress("ktlint:standard:no-wildcard-imports") + package com.jsoncsvbridge.json -import com.jsoncsvbridge.csv.* +import com.jsoncsvbridge.csv.CsvCreator +import com.jsoncsvbridge.csv.CsvFormatter +import com.jsoncsvbridge.csv.CsvValidator +import com.jsoncsvbridge.csv.CsvWriter import com.jsoncsvbridge.filter.DataFilter -import com.jsoncsvbridge.filter.FilterCriteria class JsonToCsvCreator( private val formatter: CsvFormatter, private val filter: DataFilter, private val validate: CsvValidator, - private val writer: CsvWriter + private val writer: CsvWriter, ) : CsvCreator { - override fun createCsv(data: String, outputPath: String) { + override fun createCsv( + data: String, + outputPath: String, + ) { try { // val filteredData = filter.filter(data, FilterCriteria()) // val formattedData = formatter.format(filteredData, FormattingOptions()) @@ -20,4 +27,4 @@ class JsonToCsvCreator( throw e } } -} \ No newline at end of file +} diff --git a/src/main/kotlin/com/jsoncsvbridge/json/JsonToCsvDataWriter.kt b/src/main/kotlin/com/jsoncsvbridge/json/JsonToCsvDataWriter.kt index 52e33e3..9889047 100644 --- a/src/main/kotlin/com/jsoncsvbridge/json/JsonToCsvDataWriter.kt +++ b/src/main/kotlin/com/jsoncsvbridge/json/JsonToCsvDataWriter.kt @@ -1,12 +1,13 @@ package com.jsoncsvbridge.json import com.jsoncsvbridge.csv.CsvWriter -import org.json.JSONArray -import org.json.JSONObject import java.io.File class JsonToCsvDataWriter : CsvWriter { - override fun write(data: List>, outputPath: String) { + override fun write( + data: List>, + outputPath: String, + ) { if (data.isEmpty()) { println("데이터가 비어있습니다. CSV 파일이 생성되지 않았습니다.") return @@ -19,20 +20,20 @@ class JsonToCsvDataWriter : CsvWriter { // 데이터 쓰기 data.forEach { row -> - val rowValues = headers.map { header -> - escapeCsvValue(row[header]?.toString() ?: "NULL") - } + val rowValues = + headers.map { header -> + escapeCsvValue(row[header]?.toString() ?: "NULL") + } out.println(rowValues.joinToString(",")) } } println("CSV 파일이 생성되었습니다: $outputPath") } - private fun escapeCsvValue(value: String): String { - return if (value.contains(",") || value.contains("\"") || value.contains("\n")) { + private fun escapeCsvValue(value: String): String = + if (value.contains(",") || value.contains("\"") || value.contains("\n")) { "\"${value.replace("\"", "\"\"")}\"" } else { value } - } -} \ No newline at end of file +} diff --git a/src/main/kotlin/com/jsoncsvbridge/json/MergeJsonRecords.kt b/src/main/kotlin/com/jsoncsvbridge/json/MergeJsonRecords.kt index 16a5e22..1a6b0b3 100644 --- a/src/main/kotlin/com/jsoncsvbridge/json/MergeJsonRecords.kt +++ b/src/main/kotlin/com/jsoncsvbridge/json/MergeJsonRecords.kt @@ -23,4 +23,4 @@ class MergeJsonRecords : CsvRecodes { return mapper.writeValueAsString(allRecords) } -} \ No newline at end of file +} diff --git a/src/main/kotlin/com/jsoncsvbridge/json/MergeJsonToCsvCreator.kt b/src/main/kotlin/com/jsoncsvbridge/json/MergeJsonToCsvCreator.kt index eeda930..8897ae5 100644 --- a/src/main/kotlin/com/jsoncsvbridge/json/MergeJsonToCsvCreator.kt +++ b/src/main/kotlin/com/jsoncsvbridge/json/MergeJsonToCsvCreator.kt @@ -1,6 +1,5 @@ package com.jsoncsvbridge.json -import com.jsoncsvbridge.csv.CsvCreator import com.jsoncsvbridge.csv.MergeCsvCreator class MergeJsonToCsvCreator( @@ -12,7 +11,7 @@ class MergeJsonToCsvCreator( throw UnsupportedOperationException("Use createMergedCsv for merging JSON data") } - override fun createMergedCsv(data1: String, data2: String, outputPath: String) { + override fun createMergedCsv(data1: String, data2: String, outputPath: String) { try { val allRecords = records.combine(listOf(data1, data2)) @@ -21,4 +20,4 @@ class MergeJsonToCsvCreator( throw e } } -} \ No newline at end of file +} diff --git a/src/test/kotlin/com/jsoncsvbridge/factory/DefaultCsvCreatorFactoryTest.kt b/src/test/kotlin/com/jsoncsvbridge/factory/DefaultCsvCreatorFactoryTest.kt index 8733ba1..fe5aceb 100644 --- a/src/test/kotlin/com/jsoncsvbridge/factory/DefaultCsvCreatorFactoryTest.kt +++ b/src/test/kotlin/com/jsoncsvbridge/factory/DefaultCsvCreatorFactoryTest.kt @@ -1,5 +1,6 @@ +@file:Suppress("ktlint:standard:no-wildcard-imports") + import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper -import com.fasterxml.jackson.module.kotlin.readValue import com.jsoncsvbridge.csv.MergeCsvCreator import com.jsoncsvbridge.factory.DefaultCsvCreatorFactory import com.jsoncsvbridge.json.JsonToCsvCreator @@ -12,7 +13,6 @@ import java.io.File import java.nio.file.Path class DefaultCsvCreatorFactoryTest { - private val factory = DefaultCsvCreatorFactory() private val objectMapper = jacksonObjectMapper() @@ -52,7 +52,9 @@ class DefaultCsvCreatorFactoryTest { } @Test - fun `test createCsv and validate contents`(@TempDir tempDir: Path) { + fun `test createCsv and validate contents`( + @TempDir tempDir: Path, + ) { val creator = factory.createCsvCreator("json") val outputPath = tempDir.resolve("test_output.csv").toString() val data = """ @@ -61,7 +63,7 @@ class DefaultCsvCreatorFactoryTest { {"name": "Alice", "age": 25, "city": "London"}, {"name": "Bob", "age": 35, "city": "Paris"} ] - """; + """ creator.createCsv(data, outputPath) @@ -81,7 +83,9 @@ class DefaultCsvCreatorFactoryTest { } @Test - fun `test createMergedCsv and validate contents`(@TempDir tempDir: Path) { + fun `test createMergedCsv and validate contents`( + @TempDir tempDir: Path, + ) { val creator = factory.createCsvCreator("mergeJson") as MergeCsvCreator val outputPath = tempDir.resolve("test_merged_output.csv").toString() val data1 = """ @@ -109,7 +113,9 @@ class DefaultCsvCreatorFactoryTest { } @Test - fun `test createMergedCsv with different key-value pairs and validate contents`(@TempDir tempDir: Path) { + fun `test createMergedCsv with different key-value pairs and validate contents`( + @TempDir tempDir: Path, + ) { val creator = factory.createCsvCreator("mergeJson") as MergeCsvCreator val outputPath = tempDir.resolve("test_merged_output.csv").toString() val data1 = """ @@ -143,4 +149,4 @@ class DefaultCsvCreatorFactoryTest { assertEquals("NULL,London,Alice,25,Engineer,NULL", lines[2]) assertEquals("NULL,Paris,Bob,35,NULL,Photography", lines[3]) } -} \ No newline at end of file +} diff --git a/src/test/kotlin/com/jsoncsvbridge/json/JsonDataValiatorTest.kt b/src/test/kotlin/com/jsoncsvbridge/json/JsonDataValidatorTest.kt similarity index 92% rename from src/test/kotlin/com/jsoncsvbridge/json/JsonDataValiatorTest.kt rename to src/test/kotlin/com/jsoncsvbridge/json/JsonDataValidatorTest.kt index 7e6c570..25e72d3 100644 --- a/src/test/kotlin/com/jsoncsvbridge/json/JsonDataValiatorTest.kt +++ b/src/test/kotlin/com/jsoncsvbridge/json/JsonDataValidatorTest.kt @@ -1,3 +1,5 @@ +@file:Suppress("ktlint:standard:no-wildcard-imports") + package com.jsoncsvbridge.json import org.junit.jupiter.api.Assertions.* @@ -8,14 +10,15 @@ class JsonDataValidatorTest { @Test fun `test validate with various data types`() { - val jsonInput = """ + val jsonInput = + """ [ {"id": 1, "name": "John Doe", "email": "john@example.com", "age": 30}, {"id": 2, "name": "Jane Smith", "email": null, "city": "New York"}, {"id": 3, "name": "Bob Johnson", "age": null, "isStudent": true}, {"id": 4, "name": "Alice Brown", "score": 95, "subjects": ["Math", "Science"]} ] - """.trimIndent() + """.trimIndent() val result = validator.validate(jsonInput) @@ -42,4 +45,4 @@ class JsonDataValidatorTest { validator.validate(jsonInput) } } -} \ No newline at end of file +} diff --git a/src/test/kotlin/com/jsoncsvbridge/json/JsonToCsvDataWriterTest.kt b/src/test/kotlin/com/jsoncsvbridge/json/JsonToCsvDataWriterTest.kt index d2ef854..5b55df8 100644 --- a/src/test/kotlin/com/jsoncsvbridge/json/JsonToCsvDataWriterTest.kt +++ b/src/test/kotlin/com/jsoncsvbridge/json/JsonToCsvDataWriterTest.kt @@ -1,3 +1,5 @@ +@file:Suppress("ktlint:standard:no-wildcard-imports") + package com.jsoncsvbridge.json import org.junit.jupiter.api.Assertions.* @@ -6,17 +8,19 @@ import org.junit.jupiter.api.io.TempDir import java.io.File import java.nio.file.Path - class JsonToCsvDataWriterTest { private val writer = JsonToCsvDataWriter() @Test - fun `write should create CSV file with correct content`(@TempDir tempDir: Path) { - val data = listOf( - mapOf("name" to "John", "age" to 30, "city" to "New York"), - mapOf("name" to "Alice", "age" to 25, "city" to "London"), - mapOf("name" to "Bob", "age" to 35, "city" to "Paris") - ) + fun `write should create CSV file with correct content`( + @TempDir tempDir: Path, + ) { + val data = + listOf( + mapOf("name" to "John", "age" to 30, "city" to "New York"), + mapOf("name" to "Alice", "age" to 25, "city" to "London"), + mapOf("name" to "Bob", "age" to 35, "city" to "Paris"), + ) val outputPath = tempDir.resolve("output.csv").toString() writer.write(data, outputPath) @@ -32,7 +36,9 @@ class JsonToCsvDataWriterTest { } @Test - fun `write should handle empty data`(@TempDir tempDir: Path) { + fun `write should handle empty data`( + @TempDir tempDir: Path, + ) { val data = emptyList>() val outputPath = tempDir.resolve("empty.csv").toString() @@ -41,4 +47,4 @@ class JsonToCsvDataWriterTest { val file = File(outputPath) assertFalse(file.exists()) } -} \ No newline at end of file +}