Stop Jackson serialising empty elements #76

Author: jorabin

jackson/src/main/java/org/linguafranca/pwdb/kdbx/jackson/JacksonDatabase.java

@@ -194,6 +194,9 @@ public boolean shouldProtect(String s) {
     }
 
     public List<KeePassFile.Binary> getBinaries() {
+        if (keePassFile.meta.binaries == null) {
+            keePassFile.createBinaries();
+        }
         return keePassFile.meta.binaries;
     }
 

jackson/src/main/java/org/linguafranca/pwdb/kdbx/jackson/JacksonSerializableDatabase.java

@@ -17,6 +17,7 @@
 
 import com.ctc.wstx.api.WstxInputProperties;
 import com.ctc.wstx.api.WstxOutputProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.SerializationFeature;
@@ -98,6 +99,7 @@ public void save(OutputStream outputStream) {
             mapper.enable(ToXmlGenerator.Feature.WRITE_XML_DECLARATION);
             mapper.enable(SerializationFeature.INDENT_OUTPUT);
             mapper.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
+            mapper.setSerializationInclusion(JsonInclude.Include.NON_EMPTY);
 
             // set the serializer to Woodstox
             System.setProperty("javax.xml.stream.XMLOutputFactory", "com.ctc.wstx.stax.WstxOutputFactory");

kdbx/src/main/resources/base.kdbx.xml

@@ -16,7 +16,7 @@
 
 <KeePassFile>
     <Meta>
-        <Generator>Keepass-Java-2</Generator>
+        <Generator>KeePassJava2</Generator>
         <HeaderHash></HeaderHash>
         <DatabaseName>New Database</DatabaseName>
         <DatabaseNameChanged>${creationDate}</DatabaseNameChanged>