Minor base upate

GuicedEE · Dec 23, 2023 · 8559f0a · 8559f0a
1 parent c070aca
commit 8559f0a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -88,6 +88,12 @@
             <artifactId>jackson-databind</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+        </dependency>
+
+
         <dependency>
             <groupId>com.guicedee.services</groupId>
             <artifactId>json</artifactId>

diff --git a/src/jre11/java/module-info.java b/src/jre11/java/module-info.java
@@ -20,6 +20,7 @@
     requires static java.xml;
 
     requires static org.slf4j;
+    requires transitive com.fasterxml.jackson.datatype.jsr310;
 
     exports com.guicedee.guicedinjection;
 	exports com.guicedee.guicedinjection.interfaces;

diff --git a/src/main/java/com/guicedee/guicedinjection/interfaces/ObjectBinderKeys.java b/src/main/java/com/guicedee/guicedinjection/interfaces/ObjectBinderKeys.java
@@ -41,8 +41,4 @@ public class ObjectBinderKeys
 	 * The object reader for tiny
 	 */
 	public static final Key<ObjectReader> JavaScriptObjectReader = Key.get(ObjectReader.class, Names.named("Javascript"));
-
-	public static ObjectMapper ObjectMapperInstance;
-
-
 }
diff --git a/src/main/java/com/guicedee/guicedinjection/json/ObjectMapperBinder.java b/src/main/java/com/guicedee/guicedinjection/json/ObjectMapperBinder.java
@@ -8,6 +8,7 @@
 import com.guicedee.guicedinjection.interfaces.*;
 import com.guicedee.logger.*;
 import jakarta.inject.*;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 
 import static com.fasterxml.jackson.core.JsonParser.Feature.*;
 import static com.guicedee.guicedinjection.interfaces.ObjectBinderKeys.*;
@@ -34,16 +35,18 @@ public class ObjectMapperBinder
 	@Override
 	public void onBind(GuiceInjectorModule module)
 	{
-		log.fine("Bound ObjectMapper (DefaultObjectMapper) as singleton [" + singleton+ "]");
+		log.config("Bound ObjectMapper (DefaultObjectMapper) as singleton [" + singleton+ "]");
 		var p = (Provider<ObjectMapper>) () -> new ObjectMapper()
-				.registerModule(new LaxJsonModule())
+				.registerModule(new JavaTimeModule())
+				//.registerModule(new LaxJsonModule())
 				.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false)
-				.configure(DeserializationFeature.FAIL_ON_MISSING_CREATOR_PROPERTIES, false)
+				.configure(DeserializationFeature.FAIL_ON_MISSING_CREATOR_PROPERTIES, true)
 				.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
 				.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
 				.configure(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL, true)
 				.configure(JsonGenerator.Feature.ESCAPE_NON_ASCII, true)
 				.enable(ALLOW_UNQUOTED_CONTROL_CHARS)
+				.enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING)
 				.setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY)
 				.setVisibility(PropertyAccessor.GETTER, JsonAutoDetect.Visibility.NONE)
 				.setVisibility(PropertyAccessor.IS_GETTER, JsonAutoDetect.Visibility.NONE)
@@ -92,7 +95,7 @@ public void onBind(GuiceInjectorModule module)
 
 		log.fine("Bound ObjectWriter.class @Named(JavaScriptObjectReader)");
 		module.bind(ObjectBinderKeys.JavascriptObjectMapper)
-		      .toInstance(ObjectMapperInstance = new ObjectMapper()
+		      .toInstance(new ObjectMapper()
 				      .registerModule(new LaxJsonModule())
 				      .configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false)
 				      .configure(DeserializationFeature.FAIL_ON_MISSING_CREATOR_PROPERTIES, false)
@@ -140,7 +143,7 @@ public void onBind(GuiceInjectorModule module)
 	}
 
 	/**
-	 * Returns the object mapper instance
+	 * Returns the object mapper instance for JAVASCRIPT
 	 * @return
 	 */
 	public static ObjectMapper getObjectMapper()