Skip to content

Commit b568aeb

Browse files
kezhenxu94wuseal
authored andcommitted
3.2.0 (#159)
* Set theme jekyll-theme-cayman * Add acknowledgement to JetBrains * refactored 'settings' to 'advanced' * Fix typo in README.md * fix JsonArray.onlyHasOneSubArrayAndAllItemsAreObjectElementRecursive logic error * add local.properties to .gitignore * add test * add issue test * Rename test method name in Issue121Test * [Fix] disable gson html escaping to fix format error (#137) * disable html escaping to fix format error * fix typo * add gradle.properties to git ignore * add saveAndReadExceptionInfo unit test and saveAndReadActionInfo unit test * Fix #139 Folder .jsontokotlin in $HOME (#141) Added additional class to provide cache directory. It used directly, because not approach for IoC presented here. * Change Action tip #135 (#145) Changed "Convert Json Into Kotlin Class" to "Kotlin data classes from JSON" * Fix Issue #123 - File Already exists (#157)
1 parent 08a3817 commit b568aeb

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

src/main/kotlin/wu/seal/jsontokotlin/utils/KotlinDataClassFileGenerator.kt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -245,18 +245,20 @@ class KotlinDataClassFileGenerator(private val interceptors: List<IKotlinDataCla
245245
): String {
246246
var newFileName = fileName
247247
val kotlinFileSuffix = ".kt"
248-
val fileNamesWithoutSuffix =
248+
val fileNamesInLowerCaseWithoutSuffix =
249249
directory.files.filter { it.name.endsWith(kotlinFileSuffix) }
250-
.map { it.name.dropLast(kotlinFileSuffix.length) }
251-
while (fileNamesWithoutSuffix.contains(newFileName)) {
250+
.map { it.name.dropLast(kotlinFileSuffix.length).toLowerCase() }
251+
while (fileNamesInLowerCaseWithoutSuffix.contains(newFileName.toLowerCase())) {
252252
newFileName += "X"
253253
}
254254
return newFileName
255255
}
256256

257257
private fun changeClassNameIfCurrentListContains(classesNames: List<String>, className: String): String {
258258
var newClassName = className
259-
while (classesNames.contains(newClassName)) {
259+
260+
var fileNamesInLowerCase = classesNames.map { it.toLowerCase() }
261+
while (fileNamesInLowerCase.contains(newClassName.toLowerCase())) {
260262
newClassName += "X"
261263
}
262264
return newClassName

src/test/kotlin/wu/seal/jsontokotlin/utils/ExtensionsKtTest.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,6 @@ class ExtensionsKtTest {
169169
subArrayString,
170170
JsonArray::class.java
171171
).onlyHasOneSubArrayAndAllItemsAreObjectElementRecursive().should.be.`true`
172-
173172
}
174173

175174
@Test

0 commit comments

Comments
 (0)