Merge pull request #84 from ndy2/master

use camelCasedObjectMapper in `DocsController` for endpoint `/swagger.json`
jakehschwartz · Dec 20, 2024 · 570adc9 · 570adc9
2 parents 77d7d47 + e113ae9
commit 570adc9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/...es/hello-world/src/main/scala/com/jakehschwartz/finatra/swagger/SampleSwaggerModule.scala b/...es/hello-world/src/main/scala/com/jakehschwartz/finatra/swagger/SampleSwaggerModule.scala
@@ -1,9 +1,9 @@
 package com.jakehschwartz.finatra.swagger
 
 import com.google.inject.Provides
-import io.swagger.v3.oas.models.OpenAPI
+import io.swagger.v3.oas.models.{Components, OpenAPI}
 import io.swagger.v3.oas.models.info.Info
-import io.swagger.v3.oas.models.security.SecurityRequirement
+import io.swagger.v3.oas.models.security.{SecurityRequirement, SecurityScheme}
 
 import javax.inject.Singleton
 
@@ -23,6 +23,11 @@ object SampleSwaggerModule extends SwaggerModule {
     openAPI
       .info(info)
       .addSecurityItem(new SecurityRequirement().addList("sampleBasic", "basic"))
+      .components(
+        new Components().addSecuritySchemes(
+          "sampleBasic", new SecurityScheme().`type`(SecurityScheme.Type.HTTP).scheme("basic")
+        )
+      )
 
     openAPI
   }

diff --git a/src/main/scala/com/jakehschwartz/finatra/swagger/DocsController.scala b/src/main/scala/com/jakehschwartz/finatra/swagger/DocsController.scala
@@ -1,5 +1,7 @@
 package com.jakehschwartz.finatra.swagger
 
+import com.fasterxml.jackson.datatype.joda.JodaModule
+
 import java.io.BufferedInputStream
 import java.util.Date
 import com.twitter.finagle.http.{Message, Request}
@@ -17,10 +19,13 @@ import scala.util.{Failure, Success, Try}
 
 @Singleton
 class DocsController @Inject()(openAPI: OpenAPI,
-                               objectMapper: ScalaObjectMapper,
                                @Flag("swagger.docs.endpoint") endpoint: String)
     extends Controller {
 
+  private val objectMapper = ScalaObjectMapper.builder
+    .camelCaseObjectMapper
+    .registerModule(new JodaModule())
+
   get("/swagger.json") { _: Request =>
     response
       .ok(objectMapper.writeValueAsString(openAPI))