From fe4dfcd12e137f0927dada6387d3b465300a4dc4 Mon Sep 17 00:00:00 2001 From: Elizabeth Paige Harper Date: Tue, 24 Oct 2023 13:58:08 -0400 Subject: [PATCH] update date format in an attempt to work around Raml2JaxRS date handling --- .gitignore | 0 build.gradle.kts | 14 +++++++------- docs/dokka/1.0.0/images/anchor-copy-button.svg | 0 docs/dokka/1.0.0/images/arrow_down.svg | 0 docs/dokka/1.0.0/images/copy-icon.svg | 0 docs/dokka/1.0.0/images/copy-successful-icon.svg | 0 docs/dokka/1.0.0/images/footer-go-to-link.svg | 0 docs/dokka/1.0.0/images/go-to-top-icon.svg | 0 docs/dokka/1.0.0/images/logo-icon.svg | 0 .../images/nav-icons/abstract-class-kotlin.svg | 0 .../1.0.0/images/nav-icons/abstract-class.svg | 0 .../1.0.0/images/nav-icons/annotation-kotlin.svg | 0 docs/dokka/1.0.0/images/nav-icons/annotation.svg | 0 .../dokka/1.0.0/images/nav-icons/class-kotlin.svg | 0 docs/dokka/1.0.0/images/nav-icons/class.svg | 0 docs/dokka/1.0.0/images/nav-icons/enum-kotlin.svg | 0 docs/dokka/1.0.0/images/nav-icons/enum.svg | 0 .../1.0.0/images/nav-icons/exception-class.svg | 0 docs/dokka/1.0.0/images/nav-icons/field-value.svg | 0 .../1.0.0/images/nav-icons/field-variable.svg | 0 docs/dokka/1.0.0/images/nav-icons/function.svg | 0 .../1.0.0/images/nav-icons/interface-kotlin.svg | 0 docs/dokka/1.0.0/images/nav-icons/interface.svg | 0 docs/dokka/1.0.0/images/nav-icons/object.svg | 0 docs/dokka/1.0.0/images/theme-toggle.svg | 0 docs/dokka/1.0.0/index.html | 0 docs/dokka/1.0.0/navigation.html | 0 docs/dokka/1.0.0/scripts/clipboard.js | 0 docs/dokka/1.0.0/scripts/main.js | 0 docs/dokka/1.0.0/scripts/navigation-loader.js | 0 docs/dokka/1.0.0/scripts/pages.json | 0 .../1.0.0/scripts/platform-content-handler.js | 0 docs/dokka/1.0.0/scripts/prism.js | 0 .../dokka/1.0.0/scripts/sourceset_dependencies.js | 0 .../scripts/symbol-parameters-wrapper_deferred.js | 0 docs/dokka/1.0.0/styles/jetbrains-mono.css | 0 docs/dokka/1.0.0/styles/logo-styles.css | 0 docs/dokka/1.0.0/styles/main.css | 0 docs/dokka/1.0.0/styles/prism.css | 0 docs/dokka/1.0.0/styles/style.css | 0 .../org.veupathdb.vdi.lib.json/-j-s-o-n.html | 0 .../org.veupathdb.vdi.lib.json/index.html | 0 .../to-j-s-o-n-string.html | 0 docs/dokka/1.0.0/vdi-component-json/package-list | 0 gradle.properties | 0 gradle/wrapper/gradle-wrapper.jar | Bin gradle/wrapper/gradle-wrapper.properties | 0 gradlew.bat | 0 license | 0 readme.adoc | 0 settings.gradle.kts | 0 .../kotlin/org/veupathdb/vdi/lib/json/JSON.kt | 6 ++++++ 52 files changed, 13 insertions(+), 7 deletions(-) mode change 100644 => 100755 .gitignore mode change 100644 => 100755 build.gradle.kts mode change 100644 => 100755 docs/dokka/1.0.0/images/anchor-copy-button.svg mode change 100644 => 100755 docs/dokka/1.0.0/images/arrow_down.svg mode change 100644 => 100755 docs/dokka/1.0.0/images/copy-icon.svg mode change 100644 => 100755 docs/dokka/1.0.0/images/copy-successful-icon.svg mode change 100644 => 100755 docs/dokka/1.0.0/images/footer-go-to-link.svg mode change 100644 => 100755 docs/dokka/1.0.0/images/go-to-top-icon.svg mode change 100644 => 100755 docs/dokka/1.0.0/images/logo-icon.svg mode change 100644 => 100755 docs/dokka/1.0.0/images/nav-icons/abstract-class-kotlin.svg mode change 100644 => 100755 docs/dokka/1.0.0/images/nav-icons/abstract-class.svg mode change 100644 => 100755 docs/dokka/1.0.0/images/nav-icons/annotation-kotlin.svg mode change 100644 => 100755 docs/dokka/1.0.0/images/nav-icons/annotation.svg mode change 100644 => 100755 docs/dokka/1.0.0/images/nav-icons/class-kotlin.svg mode change 100644 => 100755 docs/dokka/1.0.0/images/nav-icons/class.svg mode change 100644 => 100755 docs/dokka/1.0.0/images/nav-icons/enum-kotlin.svg mode change 100644 => 100755 docs/dokka/1.0.0/images/nav-icons/enum.svg mode change 100644 => 100755 docs/dokka/1.0.0/images/nav-icons/exception-class.svg mode change 100644 => 100755 docs/dokka/1.0.0/images/nav-icons/field-value.svg mode change 100644 => 100755 docs/dokka/1.0.0/images/nav-icons/field-variable.svg mode change 100644 => 100755 docs/dokka/1.0.0/images/nav-icons/function.svg mode change 100644 => 100755 docs/dokka/1.0.0/images/nav-icons/interface-kotlin.svg mode change 100644 => 100755 docs/dokka/1.0.0/images/nav-icons/interface.svg mode change 100644 => 100755 docs/dokka/1.0.0/images/nav-icons/object.svg mode change 100644 => 100755 docs/dokka/1.0.0/images/theme-toggle.svg mode change 100644 => 100755 docs/dokka/1.0.0/index.html mode change 100644 => 100755 docs/dokka/1.0.0/navigation.html mode change 100644 => 100755 docs/dokka/1.0.0/scripts/clipboard.js mode change 100644 => 100755 docs/dokka/1.0.0/scripts/main.js mode change 100644 => 100755 docs/dokka/1.0.0/scripts/navigation-loader.js mode change 100644 => 100755 docs/dokka/1.0.0/scripts/pages.json mode change 100644 => 100755 docs/dokka/1.0.0/scripts/platform-content-handler.js mode change 100644 => 100755 docs/dokka/1.0.0/scripts/prism.js mode change 100644 => 100755 docs/dokka/1.0.0/scripts/sourceset_dependencies.js mode change 100644 => 100755 docs/dokka/1.0.0/scripts/symbol-parameters-wrapper_deferred.js mode change 100644 => 100755 docs/dokka/1.0.0/styles/jetbrains-mono.css mode change 100644 => 100755 docs/dokka/1.0.0/styles/logo-styles.css mode change 100644 => 100755 docs/dokka/1.0.0/styles/main.css mode change 100644 => 100755 docs/dokka/1.0.0/styles/prism.css mode change 100644 => 100755 docs/dokka/1.0.0/styles/style.css mode change 100644 => 100755 docs/dokka/1.0.0/vdi-component-json/org.veupathdb.vdi.lib.json/-j-s-o-n.html mode change 100644 => 100755 docs/dokka/1.0.0/vdi-component-json/org.veupathdb.vdi.lib.json/index.html mode change 100644 => 100755 docs/dokka/1.0.0/vdi-component-json/org.veupathdb.vdi.lib.json/to-j-s-o-n-string.html mode change 100644 => 100755 docs/dokka/1.0.0/vdi-component-json/package-list mode change 100644 => 100755 gradle.properties mode change 100644 => 100755 gradle/wrapper/gradle-wrapper.jar mode change 100644 => 100755 gradle/wrapper/gradle-wrapper.properties mode change 100644 => 100755 gradlew.bat mode change 100644 => 100755 license mode change 100644 => 100755 readme.adoc mode change 100644 => 100755 settings.gradle.kts mode change 100644 => 100755 src/main/kotlin/org/veupathdb/vdi/lib/json/JSON.kt diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/build.gradle.kts b/build.gradle.kts old mode 100644 new mode 100755 index 52dde11..28269e2 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,13 +13,13 @@ repositories { } dependencies { - api("com.fasterxml.jackson.core:jackson-core:2.14.2") - api("com.fasterxml.jackson.core:jackson-databind:2.14.2") - api("com.fasterxml.jackson.core:jackson-annotations:2.14.2") - api("com.fasterxml.jackson.module:jackson-module-kotlin:2.14.2") - api("com.fasterxml.jackson.module:jackson-module-parameter-names:2.14.2") - api("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.14.2") - api("com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.14.2")} + api("com.fasterxml.jackson.core:jackson-core:2.15.3") + api("com.fasterxml.jackson.core:jackson-databind:2.15.3") + api("com.fasterxml.jackson.core:jackson-annotations:2.15.3") + api("com.fasterxml.jackson.module:jackson-module-kotlin:2.15.3") + api("com.fasterxml.jackson.module:jackson-module-parameter-names:2.15.3") + api("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.3") + api("com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.15.3")} kotlin { jvmToolchain(18) diff --git a/docs/dokka/1.0.0/images/anchor-copy-button.svg b/docs/dokka/1.0.0/images/anchor-copy-button.svg old mode 100644 new mode 100755 diff --git a/docs/dokka/1.0.0/images/arrow_down.svg b/docs/dokka/1.0.0/images/arrow_down.svg old mode 100644 new mode 100755 diff --git a/docs/dokka/1.0.0/images/copy-icon.svg b/docs/dokka/1.0.0/images/copy-icon.svg old mode 100644 new mode 100755 diff --git a/docs/dokka/1.0.0/images/copy-successful-icon.svg b/docs/dokka/1.0.0/images/copy-successful-icon.svg old mode 100644 new mode 100755 diff --git a/docs/dokka/1.0.0/images/footer-go-to-link.svg b/docs/dokka/1.0.0/images/footer-go-to-link.svg old mode 100644 new mode 100755 diff --git a/docs/dokka/1.0.0/images/go-to-top-icon.svg b/docs/dokka/1.0.0/images/go-to-top-icon.svg old mode 100644 new mode 100755 diff --git a/docs/dokka/1.0.0/images/logo-icon.svg b/docs/dokka/1.0.0/images/logo-icon.svg old mode 100644 new mode 100755 diff --git a/docs/dokka/1.0.0/images/nav-icons/abstract-class-kotlin.svg b/docs/dokka/1.0.0/images/nav-icons/abstract-class-kotlin.svg old mode 100644 new mode 100755 diff --git a/docs/dokka/1.0.0/images/nav-icons/abstract-class.svg b/docs/dokka/1.0.0/images/nav-icons/abstract-class.svg old mode 100644 new mode 100755 diff --git a/docs/dokka/1.0.0/images/nav-icons/annotation-kotlin.svg b/docs/dokka/1.0.0/images/nav-icons/annotation-kotlin.svg old mode 100644 new mode 100755 diff --git a/docs/dokka/1.0.0/images/nav-icons/annotation.svg b/docs/dokka/1.0.0/images/nav-icons/annotation.svg old mode 100644 new mode 100755 diff --git a/docs/dokka/1.0.0/images/nav-icons/class-kotlin.svg b/docs/dokka/1.0.0/images/nav-icons/class-kotlin.svg old mode 100644 new mode 100755 diff --git a/docs/dokka/1.0.0/images/nav-icons/class.svg b/docs/dokka/1.0.0/images/nav-icons/class.svg old mode 100644 new mode 100755 diff --git a/docs/dokka/1.0.0/images/nav-icons/enum-kotlin.svg b/docs/dokka/1.0.0/images/nav-icons/enum-kotlin.svg old mode 100644 new mode 100755 diff --git a/docs/dokka/1.0.0/images/nav-icons/enum.svg b/docs/dokka/1.0.0/images/nav-icons/enum.svg old mode 100644 new mode 100755 diff --git a/docs/dokka/1.0.0/images/nav-icons/exception-class.svg b/docs/dokka/1.0.0/images/nav-icons/exception-class.svg old mode 100644 new mode 100755 diff --git a/docs/dokka/1.0.0/images/nav-icons/field-value.svg b/docs/dokka/1.0.0/images/nav-icons/field-value.svg old mode 100644 new mode 100755 diff --git a/docs/dokka/1.0.0/images/nav-icons/field-variable.svg b/docs/dokka/1.0.0/images/nav-icons/field-variable.svg old mode 100644 new mode 100755 diff --git a/docs/dokka/1.0.0/images/nav-icons/function.svg b/docs/dokka/1.0.0/images/nav-icons/function.svg old mode 100644 new mode 100755 diff --git a/docs/dokka/1.0.0/images/nav-icons/interface-kotlin.svg b/docs/dokka/1.0.0/images/nav-icons/interface-kotlin.svg old mode 100644 new mode 100755 diff --git a/docs/dokka/1.0.0/images/nav-icons/interface.svg b/docs/dokka/1.0.0/images/nav-icons/interface.svg old mode 100644 new mode 100755 diff --git a/docs/dokka/1.0.0/images/nav-icons/object.svg b/docs/dokka/1.0.0/images/nav-icons/object.svg old mode 100644 new mode 100755 diff --git a/docs/dokka/1.0.0/images/theme-toggle.svg b/docs/dokka/1.0.0/images/theme-toggle.svg old mode 100644 new mode 100755 diff --git a/docs/dokka/1.0.0/index.html b/docs/dokka/1.0.0/index.html old mode 100644 new mode 100755 diff --git a/docs/dokka/1.0.0/navigation.html b/docs/dokka/1.0.0/navigation.html old mode 100644 new mode 100755 diff --git a/docs/dokka/1.0.0/scripts/clipboard.js b/docs/dokka/1.0.0/scripts/clipboard.js old mode 100644 new mode 100755 diff --git a/docs/dokka/1.0.0/scripts/main.js b/docs/dokka/1.0.0/scripts/main.js old mode 100644 new mode 100755 diff --git a/docs/dokka/1.0.0/scripts/navigation-loader.js b/docs/dokka/1.0.0/scripts/navigation-loader.js old mode 100644 new mode 100755 diff --git a/docs/dokka/1.0.0/scripts/pages.json b/docs/dokka/1.0.0/scripts/pages.json old mode 100644 new mode 100755 diff --git a/docs/dokka/1.0.0/scripts/platform-content-handler.js b/docs/dokka/1.0.0/scripts/platform-content-handler.js old mode 100644 new mode 100755 diff --git a/docs/dokka/1.0.0/scripts/prism.js b/docs/dokka/1.0.0/scripts/prism.js old mode 100644 new mode 100755 diff --git a/docs/dokka/1.0.0/scripts/sourceset_dependencies.js b/docs/dokka/1.0.0/scripts/sourceset_dependencies.js old mode 100644 new mode 100755 diff --git a/docs/dokka/1.0.0/scripts/symbol-parameters-wrapper_deferred.js b/docs/dokka/1.0.0/scripts/symbol-parameters-wrapper_deferred.js old mode 100644 new mode 100755 diff --git a/docs/dokka/1.0.0/styles/jetbrains-mono.css b/docs/dokka/1.0.0/styles/jetbrains-mono.css old mode 100644 new mode 100755 diff --git a/docs/dokka/1.0.0/styles/logo-styles.css b/docs/dokka/1.0.0/styles/logo-styles.css old mode 100644 new mode 100755 diff --git a/docs/dokka/1.0.0/styles/main.css b/docs/dokka/1.0.0/styles/main.css old mode 100644 new mode 100755 diff --git a/docs/dokka/1.0.0/styles/prism.css b/docs/dokka/1.0.0/styles/prism.css old mode 100644 new mode 100755 diff --git a/docs/dokka/1.0.0/styles/style.css b/docs/dokka/1.0.0/styles/style.css old mode 100644 new mode 100755 diff --git a/docs/dokka/1.0.0/vdi-component-json/org.veupathdb.vdi.lib.json/-j-s-o-n.html b/docs/dokka/1.0.0/vdi-component-json/org.veupathdb.vdi.lib.json/-j-s-o-n.html old mode 100644 new mode 100755 diff --git a/docs/dokka/1.0.0/vdi-component-json/org.veupathdb.vdi.lib.json/index.html b/docs/dokka/1.0.0/vdi-component-json/org.veupathdb.vdi.lib.json/index.html old mode 100644 new mode 100755 diff --git a/docs/dokka/1.0.0/vdi-component-json/org.veupathdb.vdi.lib.json/to-j-s-o-n-string.html b/docs/dokka/1.0.0/vdi-component-json/org.veupathdb.vdi.lib.json/to-j-s-o-n-string.html old mode 100644 new mode 100755 diff --git a/docs/dokka/1.0.0/vdi-component-json/package-list b/docs/dokka/1.0.0/vdi-component-json/package-list old mode 100644 new mode 100755 diff --git a/gradle.properties b/gradle.properties old mode 100644 new mode 100755 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar old mode 100644 new mode 100755 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties old mode 100644 new mode 100755 diff --git a/gradlew.bat b/gradlew.bat old mode 100644 new mode 100755 diff --git a/license b/license old mode 100644 new mode 100755 diff --git a/readme.adoc b/readme.adoc old mode 100644 new mode 100755 diff --git a/settings.gradle.kts b/settings.gradle.kts old mode 100644 new mode 100755 diff --git a/src/main/kotlin/org/veupathdb/vdi/lib/json/JSON.kt b/src/main/kotlin/org/veupathdb/vdi/lib/json/JSON.kt old mode 100644 new mode 100755 index 7d40378..5dbd6b9 --- a/src/main/kotlin/org/veupathdb/vdi/lib/json/JSON.kt +++ b/src/main/kotlin/org/veupathdb/vdi/lib/json/JSON.kt @@ -5,6 +5,8 @@ import com.fasterxml.jackson.datatype.jdk8.Jdk8Module import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule import com.fasterxml.jackson.module.kotlin.KotlinModule import com.fasterxml.jackson.module.paramnames.ParameterNamesModule +import java.text.SimpleDateFormat +import java.util.TimeZone /** * Jackson Object Mapper @@ -20,6 +22,10 @@ val JSON = JsonMapper.builder() .addModule(JavaTimeModule()) .addModule(KotlinModule.Builder().build()) .build()!! + .also { + it.dateFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX") + it.dateFormat.timeZone = TimeZone.getDefault() + } /** * Writes an arbitrary value as a JSON string.