Cleanup compiler warnings

pambrose · pambrose · commit 83b1c46b472e · 2018-04-08T13:28:19.000-07:00
diff --git a/src/main/java/io/prometheus/Agent.kt b/src/main/java/io/prometheus/Agent.kt
@@ -288,7 +288,7 @@ class Agent(options: AgentOptions,
                                 valid = true
                                 reason = ""
                                 this.statusCode = statusCode
-                                text = it.body()?.string() ?: ""
+                                text = it.body()?.string().orEmpty()
                                 contentType = it.header(CONTENT_TYPE)
                                 build()
                             }
diff --git a/src/main/java/io/prometheus/agent/AgentOptions.kt b/src/main/java/io/prometheus/agent/AgentOptions.kt
@@ -46,11 +46,11 @@ class AgentOptions(argv: Array<String>, exitOnMissingConfig: Boolean) :
             proxyHostname = PROXY_HOSTNAME.getEnv(if (configHostname.contains(":"))
                                                       configHostname
                                                   else
-                                                      "$configHostname:${configVals.agent.proxy.port}") ?: ""
+                                                      "$configHostname:${configVals.agent.proxy.port}")
         }
 
         if (agentName.isEmpty())
-            agentName = EnvVars.AGENT_NAME.getEnv(configVals.agent.name) ?: ""
+            agentName = EnvVars.AGENT_NAME.getEnv(configVals.agent.name)
 
         assignAdminEnabled(configVals.agent.admin.enabled)
         assignAdminPort(configVals.agent.admin.port)
diff --git a/src/main/java/io/prometheus/common/BaseOptions.kt b/src/main/java/io/prometheus/common/BaseOptions.kt
@@ -119,7 +119,7 @@ abstract class BaseOptions protected constructor(private val progName: String,
     }
 
     private fun readConfig(envConfig: String, exitOnMissingConfig: Boolean) {
-        config = readConfig(if (configName.isNotEmpty()) configName else System.getenv(envConfig) ?: "",
+        config = readConfig(if (configName.isNotEmpty()) configName else System.getenv(envConfig).orEmpty(),
                             envConfig,
                             ConfigParseOptions.defaults().setAllowMissing(false),
                             ConfigFactory.load().resolve(),

Original file line number	Diff line number	Diff line change
`@@ -288,7 +288,7 @@ class Agent(options: AgentOptions,`
`288`	`288`	`valid = true`
`289`	`289`	`reason = ""`
`290`	`290`	`this.statusCode = statusCode`
`291`		`- text = it.body()?.string() ?: ""`
	`291`	`+ text = it.body()?.string().orEmpty()`
`292`	`292`	`contentType = it.header(CONTENT_TYPE)`
`293`	`293`	`build()`
`294`	`294`	`}`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ abstract class BaseOptions protected constructor(private val progName: String,`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`private fun readConfig(envConfig: String, exitOnMissingConfig: Boolean) {`
`122`		`- config = readConfig(if (configName.isNotEmpty()) configName else System.getenv(envConfig) ?: "",`
	`122`	`+ config = readConfig(if (configName.isNotEmpty()) configName else System.getenv(envConfig).orEmpty(),`
`123`	`123`	`envConfig,`
`124`	`124`	`ConfigParseOptions.defaults().setAllowMissing(false),`
`125`	`125`	`ConfigFactory.load().resolve(),`