Format application/network interceptor names for WebActionMetadata (#853

)
cashapp · Mar 14, 2019 · a08a4ae · a08a4ae
1 parent 75725af
commit a08a4ae
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/misk/src/main/kotlin/misk/web/actions/WebActionMetadataAction.kt b/misk/src/main/kotlin/misk/web/actions/WebActionMetadataAction.kt
@@ -7,6 +7,7 @@ import misk.web.NetworkInterceptor
 import misk.web.PathPattern
 import misk.web.RequestContentType
 import misk.web.ResponseContentType
+import misk.web.formatter.ClassNameFormatter
 import misk.web.jetty.WebActionsServlet
 import misk.web.mediatype.MediaRange
 import misk.web.mediatype.MediaTypes
@@ -72,8 +73,8 @@ internal fun WebActionMetadata(
       parameterTypes = parameterTypes.map { it.toString() },
       returnType = returnType.toString(),
       pathPattern = pathPattern.toString(),
-      applicationInterceptors = applicationInterceptors.map { it::class.qualifiedName.toString() },
-      networkInterceptors = networkInterceptors.map { it::class.qualifiedName.toString() },
+      applicationInterceptors = applicationInterceptors.map { ClassNameFormatter.format(it::class) },
+      networkInterceptors = networkInterceptors.map { ClassNameFormatter.format(it::class) },
       dispatchMechanism = dispatchMechanism,
       allowedServices = allowedServices,
       allowedRoles = allowedRoles

diff --git a/misk/src/main/kotlin/misk/web/formatter/ClassNameFormatter.kt b/misk/src/main/kotlin/misk/web/formatter/ClassNameFormatter.kt
@@ -4,10 +4,12 @@ import javax.inject.Inject
 import kotlin.reflect.KClass
 
 class ClassNameFormatter @Inject constructor() {
-  fun <T : Any> format(kclass: KClass<T>): String {
-    return when (kclass.qualifiedName) {
-      null -> kclass.toString().split("class ").last()
-      else -> kclass.qualifiedName.toString()
+  companion object {
+    fun <T : Any> format(kclass: KClass<T>): String {
+      return when (kclass.qualifiedName) {
+        null -> kclass.toString().split("class ").last()
+        else -> kclass.qualifiedName.toString()
+      }
     }
   }
 }
diff --git a/misk/src/test/kotlin/misk/web/formatter/ClassNameFormatterTest.kt b/misk/src/test/kotlin/misk/web/formatter/ClassNameFormatterTest.kt
@@ -21,7 +21,7 @@ class ClassNameFormatterTest {
   }
 
   @Test fun validQualifiedName() {
-    val formatted = ClassNameFormatter().format(ValidQualifiedNameClass::class)
+    val formatted = ClassNameFormatter.format(ValidQualifiedNameClass::class)
     isValid(formatted)
     assertEquals(formatted, ValidQualifiedNameClass::class.qualifiedName.toString())
   }
@@ -30,7 +30,7 @@ class ClassNameFormatterTest {
     val noQualifiedNameClass = NoQualifiedNameFactory().create()
     assertNull(noQualifiedNameClass::class.qualifiedName)
 
-    val formatted = ClassNameFormatter().format(noQualifiedNameClass::class)
+    val formatted = ClassNameFormatter.format(noQualifiedNameClass::class)
     isValid(formatted)
     assertEquals(formatted, noQualifiedNameClass::class.toString().split("class ").last())
   }