Merge pull request #2188 from schemacrawler/tweaks

Minor code updates

Author: sualeh

.github/workflows/early-release.yml

@@ -69,7 +69,7 @@ jobs:
         git push --delete origin early-access-release || true
         git tag -a early-access-release -m "SchemaCrawler Early Access Release"
         git push --follow-tags origin early-access-release
-        git show early-access-release
+        git show --no-patch early-access-release
     - id: create-release
       name: Create GitHub early access release
       uses: softprops/action-gh-release@v2

schemacrawler-lint/src/main/java/schemacrawler/tools/lint/formatter/BaseLintReportJacksonGenerator.java

@@ -12,6 +12,7 @@
 import static tools.jackson.core.StreamReadFeature.IGNORE_UNDEFINED;
 import static tools.jackson.core.StreamReadFeature.INCLUDE_SOURCE_IN_LOCATION;
 import static tools.jackson.core.StreamWriteFeature.IGNORE_UNKNOWN;
+import static tools.jackson.databind.DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES;
 import static tools.jackson.databind.SerializationFeature.INDENT_OUTPUT;
 import static tools.jackson.databind.SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS;
 import static tools.jackson.databind.SerializationFeature.USE_EQUALITY_FOR_OBJECT_ID;
@@ -38,6 +39,7 @@ private static ObjectMapper newConfiguredObjectMapper(
 
     requireNonNull(mapperBuilder, "No mapper builder provided");
     mapperBuilder.enable(ORDER_MAP_ENTRIES_BY_KEYS, INDENT_OUTPUT, USE_EQUALITY_FOR_OBJECT_ID);
+    mapperBuilder.disable(FAIL_ON_NULL_FOR_PRIMITIVES);
     mapperBuilder.enable(INCLUDE_SOURCE_IN_LOCATION, IGNORE_UNDEFINED);
     mapperBuilder.enable(IGNORE_UNKNOWN);
 

schemacrawler-operations/src/main/java/schemacrawler/tools/text/formatter/operation/BaseJacksonFormatter.java

@@ -12,6 +12,7 @@
 import static tools.jackson.core.StreamReadFeature.IGNORE_UNDEFINED;
 import static tools.jackson.core.StreamReadFeature.INCLUDE_SOURCE_IN_LOCATION;
 import static tools.jackson.core.StreamWriteFeature.IGNORE_UNKNOWN;
+import static tools.jackson.databind.DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES;
 import static tools.jackson.databind.SerializationFeature.INDENT_OUTPUT;
 import static tools.jackson.databind.SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS;
 import static tools.jackson.databind.SerializationFeature.USE_EQUALITY_FOR_OBJECT_ID;
@@ -86,6 +87,7 @@ private static ObjectMapper newConfiguredObjectMapper(
 
     requireNonNull(mapperBuilder, "No mapper builder provided");
     mapperBuilder.enable(ORDER_MAP_ENTRIES_BY_KEYS, INDENT_OUTPUT, USE_EQUALITY_FOR_OBJECT_ID);
+    mapperBuilder.disable(FAIL_ON_NULL_FOR_PRIMITIVES);
     mapperBuilder.enable(INCLUDE_SOURCE_IN_LOCATION, IGNORE_UNDEFINED);
     mapperBuilder.enable(IGNORE_UNKNOWN);
 

schemacrawler-scripting/src/main/java/schemacrawler/tools/formatter/serialize/BaseJacksonSerializedCatalog.java

@@ -13,6 +13,7 @@
 import static tools.jackson.core.StreamReadFeature.IGNORE_UNDEFINED;
 import static tools.jackson.core.StreamReadFeature.INCLUDE_SOURCE_IN_LOCATION;
 import static tools.jackson.core.StreamWriteFeature.IGNORE_UNKNOWN;
+import static tools.jackson.databind.DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES;
 import static tools.jackson.databind.SerializationFeature.INDENT_OUTPUT;
 import static tools.jackson.databind.SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS;
 import static tools.jackson.databind.SerializationFeature.USE_EQUALITY_FOR_OBJECT_ID;
@@ -115,6 +116,7 @@ private static ObjectMapper newConfiguredObjectMapper(
 
     requireNonNull(mapperBuilder, "No mapper builder provided");
     mapperBuilder.enable(ORDER_MAP_ENTRIES_BY_KEYS, INDENT_OUTPUT, USE_EQUALITY_FOR_OBJECT_ID);
+    mapperBuilder.disable(FAIL_ON_NULL_FOR_PRIMITIVES);
     mapperBuilder.enable(INCLUDE_SOURCE_IN_LOCATION, IGNORE_UNDEFINED);
     mapperBuilder.enable(IGNORE_UNKNOWN);