fix compile errors

Author: Foxcapades

rest-service/src/main/kotlin/mb/Main.kt

@@ -7,7 +7,6 @@ import org.veupathdb.lib.container.jaxrs.config.Options
 import org.veupathdb.lib.container.jaxrs.health.Dependency
 import org.veupathdb.lib.container.jaxrs.server.ContainerResources
 import org.veupathdb.lib.container.jaxrs.server.Server
-import org.veupathdb.lib.container.jaxrs.server.middleware.PrometheusFilter
 import org.veupathdb.lib.prom.PrometheusJVM
 import java.util.concurrent.Executors
 import java.util.concurrent.ScheduledExecutorService
@@ -22,11 +21,6 @@ object Main : Server() {
     enableAccountDB()
     enableUserDB()
 
-    // Add path transform to exclude job IDs from endpoint metrics.
-    PrometheusFilter.setPathTransform {
-      it.replace(Regex("[0-9A-Fa-f]{32}"), "{id}")
-    }
-
     PrometheusJVM.enable()
 
     bgTasks.scheduleAtFixedRate(JobCleanup, 0, 24, TimeUnit.HOURS)
@@ -35,10 +29,6 @@ object Main : Server() {
   @JvmStatic
   fun main(args: Array<String>) = start(args)
 
-  fun startServer(args: Array<String>) {
-    start(args)
-  }
-
   override fun onShutdown() {
     super.onShutdown()
     bgTasks.shutdown()

rest-service/src/main/kotlin/mb/api/controller/utils.kt

@@ -1,6 +1,5 @@
 package mb.api.controller
 
-import org.veupathdb.lib.container.jaxrs.model.User
 import org.veupathdb.lib.container.jaxrs.providers.UserProvider
 import jakarta.ws.rs.BadRequestException
 import jakarta.ws.rs.InternalServerErrorException
@@ -12,17 +11,16 @@ private const val ErrNoUser = "request reached authenticated endpoint with no us
 
 fun noUserExcept(): RuntimeException = InternalServerErrorException(ErrNoUser)
 
-fun ContainerRequest.requireUser(): User {
-  return UserProvider.lookupUser(this).orElseThrow(::noUserExcept)
-}
+fun ContainerRequest.requireUser() =
+  UserProvider.lookupUser(this).orElseThrow(::noUserExcept)!!
 
 fun ContainerRequest.requireUserID(): Long = requireUser().userId
 
 fun <T> enforceBody(value: T?): T =
   value ?: throw BadRequestException("Request missing one or more input body fields.")
 
 inline fun <R> errorWrap(fn: () -> R): R = try { fn() }
-  catch (e: Throwable) { throw if (e is WebApplicationException) e else InternalServerErrorException(e) }
+  catch (e: Throwable) { throw e as? WebApplicationException ?: InternalServerErrorException(e) }
 
 fun hashIDorThrow(raw: String, fn: () -> Exception): HashID {
   try {