Commit 60b446e8 authored by mokj's avatar mokj
Browse files

Not changing from 'datetime' to 'datetime-local' any more (html5) - I think it... 

Not changing from 'datetime' to 'datetime-local' any more (html5) - I think it is better that this issue is fixed on the GUI side
parent 41e36143

build.sbt

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
lazy val commonSettings = Seq(

  organization := "com.kjetland",

  organizationName := "mbknor",

  version := "1.0.5-b1-SNAPSHOT",

  version := "1.0.5-b2-SNAPSHOT",

  scalaVersion := "2.11.8",

  publishMavenStyle := true,

  publishArtifact in Test := false,

src/main/scala/com/kjetland/jackson/jsonSchema/JsonSchemaGenerator.scala

+2 −1
Original line number Diff line number Diff line
@@ -90,7 +90,8 @@ class JsonSchemaGenerator 


  val dateFormatMapping = Map[String,String](

    // Java7 dates

    "java.time.OffsetDateTime" -> "datetime-local", // using datetime-local since it is supported in html5

    "java.time.LocalDateTime" -> "datetime-local",

    "java.time.OffsetDateTime" -> "datetime",

    "java.time.LocalDate" -> "date",



    // Joda-dates

src/test/scala/com/kjetland/jackson/jsonSchema/JsonSchemaGeneratorTest.scala

+7 −5
Original line number Diff line number Diff line 
package com.kjetland.jackson.jsonSchema



import java.time.{LocalDate, OffsetDateTime}

import java.time.{LocalDate, LocalDateTime, OffsetDateTime}

import java.util

import java.util.{Optional, TimeZone}
@@ -480,7 +480,7 @@ class JsonSchemaGeneratorTest extends FunSuite with Matchers { 


    assert( schema.at("/properties/dateTime/type").asText() == "string")

    assert( schema.at("/properties/dateTime/format").asText() == "date-time")

    assert( schemaHTML5Date.at("/properties/dateTime/format").asText() == "datetime-local")

    assert( schemaHTML5Date.at("/properties/dateTime/format").asText() == "datetime")





    assert( schema.at("/properties/dateTimeWithAnnotation/type").asText() == "string")
@@ -596,7 +596,8 @@ class JsonSchemaGeneratorTest extends FunSuite with Matchers { 
    val jsonNode = assertToFromJson(jsonSchemaGeneratorScalaHTML5, testData.manyDates)

    val schema = generateAndValidateSchema(jsonSchemaGeneratorScalaHTML5, testData.manyDates.getClass, Some(jsonNode))



    assert(schema.at("/properties/javaOffsetDate/format").asText() == "datetime-local")

    assert(schema.at("/properties/javaLocalDateTime/format").asText() == "datetime-local")

    assert(schema.at("/properties/javaOffsetDateTime/format").asText() == "datetime")

    assert(schema.at("/properties/javaLocalDate/format").asText() == "date")

    assert(schema.at("/properties/jodaLocalDate/format").asText() == "date")
@@ -687,7 +688,7 @@ trait TestData { 
    )



  val pojoUsingFormat = new PojoUsingFormat("test@example.com", true, OffsetDateTime.now(), OffsetDateTime.now())

  val manyDates = ManyDates(OffsetDateTime.now(), LocalDate.now(), org.joda.time.LocalDate.now())

  val manyDates = ManyDates(LocalDateTime.now(), OffsetDateTime.now(), LocalDate.now(), org.joda.time.LocalDate.now())

}
@@ -737,7 +738,8 @@ case class PojoUsingOptionScala( 


case class ManyDates

(

  javaOffsetDate:OffsetDateTime,

  javaLocalDateTime:LocalDateTime,

  javaOffsetDateTime:OffsetDateTime,

  javaLocalDate:LocalDate,

  jodaLocalDate:org.joda.time.LocalDate

)
 
 No newline at end of file