Skip to content

#42 Add support for LocalTime #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 11, 2024
Merged

#42 Add support for LocalTime #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b2f92ce
#42 Add support for LocalTime
jakipatryk Apr 10, 2024
3532b8f
Fix
jakipatryk Apr 10, 2024
77bb608
Merge branch 'main' into feature/42-add-support-for-localtime
jakipatryk Apr 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion library/src/main/scala/za/co/absa/springdocopenapiscala/OpenAPIModelRegistration.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package za.co.absa.springdocopenapiscala
import io.swagger.v3.oas.models.Components
import io.swagger.v3.oas.models.media.{Discriminator, Schema}

import java.time.{Instant, LocalDate, LocalDateTime, ZonedDateTime}
import java.time.{Instant, LocalDate, LocalDateTime, LocalTime, ZonedDateTime}
import java.util.UUID
import scala.annotation.tailrec
import scala.collection.JavaConverters._
Expand Down Expand Up @@ -242,6 +242,7 @@ class OpenAPIModelRegistration(
case t if t =:= typeOf[Instant] => OpenAPISimpleType("string", Some("date-time"))
case t if t =:= typeOf[LocalDateTime] => OpenAPISimpleType("string", Some("date-time"))
case t if t =:= typeOf[LocalDate] => OpenAPISimpleType("string", Some("date"))
case t if t =:= typeOf[LocalTime] => OpenAPISimpleType("string", Some("time"))
}

private def registerAsReference(name: String, schema: Schema[_]): Schema[_] = {
Expand Down
6 changes: 4 additions & 2 deletions library/src/test/scala/za/co/absa/springdocopenapiscala/OpenAPIModelRegistrationSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import io.swagger.v3.oas.models.media.Schema
import org.scalatest
import org.scalatest.flatspec.AnyFlatSpec

import java.time.{Instant, LocalDate, LocalDateTime, ZonedDateTime}
import java.time.{Instant, LocalDate, LocalDateTime, LocalTime, ZonedDateTime}
import java.util.UUID
import scala.collection.JavaConverters._
import scala.reflect.runtime.universe._
Expand All @@ -46,7 +46,8 @@ class OpenAPIModelRegistrationSpec extends AnyFlatSpec {
l: ZonedDateTime,
o: Instant,
p: LocalDateTime,
r: LocalDate
r: LocalDate,
s: LocalTime
)

private case class SimpleTypesMaybeInOption(
Expand Down Expand Up @@ -192,6 +193,7 @@ class OpenAPIModelRegistrationSpec extends AnyFlatSpec {
assertTypeAndFormatAreAsExpected(actualSchemas, "OnlySimpleTypes.o", "string", Some("date-time"))
assertTypeAndFormatAreAsExpected(actualSchemas, "OnlySimpleTypes.p", "string", Some("date-time"))
assertTypeAndFormatAreAsExpected(actualSchemas, "OnlySimpleTypes.r", "string", Some("date"))
assertTypeAndFormatAreAsExpected(actualSchemas, "OnlySimpleTypes.s", "string", Some("time"))
}

it should "mark all non-Option fields of case class as required" in {
Expand Down