Skip to content

Replace ini4j with apache-commons-configuration #1387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 20, 2023
Merged

Replace ini4j with apache-commons-configuration #1387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion kotlin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"

implementation "io.github.cdimascio:dotenv-kotlin:6.2.2"
implementation "org.ini4j:ini4j:0.5.4"

implementation "commons-configuration:commons-configuration:1.10"

implementation "com.google.http-client:google-http-client:$googleHttpVersion"
implementation "com.google.http-client:google-http-client-apache-v2:$googleHttpVersion"
Expand Down
24 changes: 15 additions & 9 deletions kotlin/src/main/com/looker/sdk/ApiSettings.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ import com.looker.rtl.DEFAULT_HTTP_TRANSPORT
import com.looker.rtl.DEFAULT_TIMEOUT
import com.looker.rtl.asBoolean
import com.looker.rtl.unQuote
import org.ini4j.Ini
import java.io.ByteArrayInputStream
import org.apache.commons.configuration.HierarchicalINIConfiguration
import java.io.File
import java.io.StringReader

/** Structure read from an .INI file */
typealias ApiSections = Map<String, Map<String, String>>
Expand All @@ -40,14 +40,20 @@ typealias ApiSections = Map<String, Map<String, String>>
* Parse and cleanup something that looks like an .INI file, stripping outermost quotes for values
*/
fun apiConfig(contents: String): ApiSections {
val iniParser = Ini(ByteArrayInputStream(contents.toByteArray()))

val ret = mutableMapOf<String, Map<String, String>>()
iniParser.forEach { (section, values) ->
ret[section] = values.map { it.key to unQuote(it.value) }.toMap()
val iniParser = HierarchicalINIConfiguration()
iniParser.load(StringReader(contents))

return mutableMapOf<String, Map<String, String>>().also { mapToReturn ->
iniParser.sections.forEach { section ->
mapToReturn[section] = mutableMapOf<String, String>().also { sectionMap ->
iniParser.getKeys(section).forEach { key ->
// `key` is fully scoped (e.g. `Looker.<key>`) but we just want the key so
// remove the section prefix before adding to the map.
sectionMap[key.removePrefix("$section.")] = unQuote(iniParser.getString(key))
}
}
}
}

return ret
}

// TODO why no @JvmOverloads here?
Expand Down