refactor

wttech · Sep 24, 2023 · 10cc3b8 · 10cc3b8
1 parent baf922f
commit 10cc3b8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/.../core/src/main/kotlin/com/cognifide/apm/core/endpoints/params/RequestParameterInjector.kt b/.../core/src/main/kotlin/com/cognifide/apm/core/endpoints/params/RequestParameterInjector.kt
@@ -21,7 +21,6 @@
 package com.cognifide.apm.core.endpoints.params
 
 import com.cognifide.apm.core.Property
-import com.google.common.primitives.Ints
 import org.apache.commons.lang3.StringUtils
 import org.apache.sling.api.SlingHttpServletRequest
 import org.apache.sling.models.spi.DisposalCallbackRegistry
@@ -69,7 +68,7 @@ class RequestParameterInjector : Injector, StaticInjectAnnotationProcessorFactor
         val parameterValue = request.getRequestParameter(fieldName) ?: return null
         return when {
             annotatedElement.isAnnotationPresent(FileName::class.java) -> parameterValue.fileName
-            fieldClass.name in listOf("java.lang.Integer", "int") -> Ints.tryParse(parameterValue.string)
+            fieldClass.name in listOf("java.lang.Integer", "int") -> parameterValue.string.toIntOrNull()
             fieldClass.name in listOf("java.lang.Boolean", "boolean") -> "true" == parameterValue.string
             fieldClass == InputStream::class.java -> parameterValue.inputStream
             fieldClass == LocalDateTime::class.java -> toLocalDateTime(annotatedElement, parameterValue)
@@ -106,6 +105,7 @@ class RequestParameterInjector : Injector, StaticInjectAnnotationProcessorFactor
             return annotation.value
         }
 
+        @Deprecated("")
         override fun isOptional(): Boolean {
             return annotation.optional
         }

diff --git a/app/aem/core/src/main/kotlin/com/cognifide/apm/core/grammar/argument/ArgumentResolver.kt b/app/aem/core/src/main/kotlin/com/cognifide/apm/core/grammar/argument/ArgumentResolver.kt
@@ -26,7 +26,6 @@ import com.cognifide.apm.core.grammar.common.getIdentifier
 import com.cognifide.apm.core.grammar.common.getKey
 import com.cognifide.apm.core.grammar.common.getPath
 import com.cognifide.apm.core.grammar.executioncontext.VariableHolder
-import com.google.common.primitives.Ints
 import org.apache.commons.lang.text.StrSubstitutor
 import org.apache.commons.lang3.StringUtils
 
@@ -147,15 +146,15 @@ class ArgumentResolver(private val variableHolder: VariableHolder) {
 
         override fun visitNumberValue(ctx: NumberValueContext): ApmType {
             val value = ctx.NUMBER_LITERAL().toString()
-            val number = Ints.tryParse(value)
+            val number = value.toIntOrNull()
                 ?: throw ArgumentResolverException("Found invalid number value $value")
             return ApmInteger(number)
         }
 
         private fun determineStringValue(value: String): ApmString {
             val tokens = StringUtils.substringsBetween(value, "\${", "}")
                 .orEmpty()
-                .associateWith { variableHolder[it]!!.string }
+                .associateWith { variableHolder[it].string }
             val strSubstitutor = StrSubstitutor(tokens, "\${", "}")
             return ApmString(if (tokens.isEmpty()) value else strSubstitutor.replace(value))
         }