mirror of https://github.com/iSoron/uhabits.git
Merge pull request #1107 from sgallese/feature/string-utils-remove-jvm
Removes JVM dependencies from StringUtilspull/1113/head
GitHub
commit
1fe3a3d1ca
@ -0,0 +1,30 @@
|
||||
/*
|
||||
* Copyright (C) 2016-2021 Álinson Santos Xavier <git@axavier.org>
|
||||
*
|
||||
* This file is part of Loop Habit Tracker.
|
||||
*
|
||||
* Loop Habit Tracker is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by the
|
||||
* Free Software Foundation, either version 3 of the License, or (at your
|
||||
* option) any later version.
|
||||
*
|
||||
* Loop Habit Tracker is distributed in the hope that it will be useful, but
|
||||
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
||||
* more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package org.isoron.platform.utils
|
||||
|
||||
class StringUtils {
|
||||
|
||||
companion object {
|
||||
|
||||
fun joinLongs(values: LongArray): String = values.joinToString(separator = ",")
|
||||
|
||||
fun splitLongs(str: String): LongArray = str.split(",").map { it.toLong() }.toLongArray()
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,39 @@
|
||||
/*
|
||||
* Copyright (C) 2016-2021 Álinson Santos Xavier <git@axavier.org>
|
||||
*
|
||||
* This file is part of Loop Habit Tracker.
|
||||
*
|
||||
* Loop Habit Tracker is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by the
|
||||
* Free Software Foundation, either version 3 of the License, or (at your
|
||||
* option) any later version.
|
||||
*
|
||||
* Loop Habit Tracker is distributed in the hope that it will be useful, but
|
||||
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
||||
* more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package org.isoron.platform.utils
|
||||
|
||||
import kotlin.test.Test
|
||||
import kotlin.test.assertContentEquals
|
||||
import kotlin.test.assertEquals
|
||||
|
||||
class StringUtilsTest {
|
||||
|
||||
@Test
|
||||
fun testJoinLongs() {
|
||||
val string = StringUtils.joinLongs(longArrayOf(0, 1, 2))
|
||||
assertEquals(string, "0,1,2")
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testSplitLongs() {
|
||||
val longArray = StringUtils.splitLongs("0,1,2")
|
||||
assertContentEquals(longArray, longArrayOf(0, 1, 2))
|
||||
}
|
||||
}
|
||||
@ -1,68 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2016-2021 Álinson Santos Xavier <git@axavier.org>
|
||||
*
|
||||
* This file is part of Loop Habit Tracker.
|
||||
*
|
||||
* Loop Habit Tracker is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by the
|
||||
* Free Software Foundation, either version 3 of the License, or (at your
|
||||
* option) any later version.
|
||||
*
|
||||
* Loop Habit Tracker is distributed in the hope that it will be useful, but
|
||||
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
||||
* more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package org.isoron.uhabits.core.utils
|
||||
|
||||
import org.apache.commons.lang3.builder.StandardToStringStyle
|
||||
import org.apache.commons.lang3.builder.ToStringStyle
|
||||
import java.math.BigInteger
|
||||
import java.util.Random
|
||||
|
||||
class StringUtils {
|
||||
|
||||
companion object {
|
||||
private lateinit var toStringStyle: StandardToStringStyle
|
||||
|
||||
@JvmStatic
|
||||
fun getRandomId(): String {
|
||||
return BigInteger(260, Random()).toString(32).subSequence(0, 32).toString()
|
||||
}
|
||||
|
||||
@JvmStatic
|
||||
fun defaultToStringStyle(): ToStringStyle {
|
||||
toStringStyle = StandardToStringStyle()
|
||||
toStringStyle.apply {
|
||||
fieldSeparator = ", "
|
||||
isUseClassName = false
|
||||
isUseIdentityHashCode = false
|
||||
contentStart = "{"
|
||||
contentEnd = "}"
|
||||
fieldNameValueSeparator = ": "
|
||||
arrayStart = "["
|
||||
arrayEnd = "]"
|
||||
}
|
||||
|
||||
return toStringStyle
|
||||
}
|
||||
|
||||
@JvmStatic
|
||||
fun joinLongs(values: LongArray): String {
|
||||
return org.apache.commons.lang3.StringUtils.join(values, ',')
|
||||
}
|
||||
|
||||
@JvmStatic
|
||||
fun splitLongs(str: String): LongArray {
|
||||
val parts: Array<String> = org.apache.commons.lang3.StringUtils.split(str, ',')
|
||||
return LongArray(parts.size) {
|
||||
i ->
|
||||
parts[i].toLong()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Reference in new issue