Commit 08928c7

committed

Stop Jackson serialising empty elements #76

1 parent c235d78 commit 08928c7Copy full SHA for 08928c7

File tree

-1

lines changed

jackson/src/main/java/org/linguafranca/pwdb/kdbx/jackson
- JacksonDatabase.java
- JacksonSerializableDatabase.java
kdbx/src/main/resources
- base.kdbx.xml

-1

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -194,6 +194,9 @@ public boolean shouldProtect(String s) {`
`194`	`194`	`}`
`195`	`195`
`196`	`196`	`public List<KeePassFile.Binary> getBinaries() {`
	`197`	`+ if (keePassFile.meta.binaries == null) {`
	`198`	`+ keePassFile.createBinaries();`
	`199`	`+ }`
`197`	`200`	`return keePassFile.meta.binaries;`
`198`	`201`	`}`
`199`	`202`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`
`18`	`18`	`import com.ctc.wstx.api.WstxInputProperties;`
`19`	`19`	`import com.ctc.wstx.api.WstxOutputProperties;`
	`20`	`+import com.fasterxml.jackson.annotation.JsonInclude;`
`20`	`21`	`import com.fasterxml.jackson.databind.DeserializationFeature;`
`21`	`22`	`import com.fasterxml.jackson.databind.MapperFeature;`
`22`	`23`	`import com.fasterxml.jackson.databind.SerializationFeature;`
`@@ -98,6 +99,7 @@ public void save(OutputStream outputStream) {`
`98`	`99`	`mapper.enable(ToXmlGenerator.Feature.WRITE_XML_DECLARATION);`
`99`	`100`	`mapper.enable(SerializationFeature.INDENT_OUTPUT);`
`100`	`101`	`mapper.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);`
	`102`	`+ mapper.setSerializationInclusion(JsonInclude.Include.NON_EMPTY);`
`101`	`103`
`102`	`104`	`// set the serializer to Woodstox`
`103`	`105`	`System.setProperty("javax.xml.stream.XMLOutputFactory", "com.ctc.wstx.stax.WstxOutputFactory");`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`
`17`	`17`	`<KeePassFile>`
`18`	`18`	`<Meta>`
`19`		`- <Generator>Keepass-Java-2</Generator>`
	`19`	`+ <Generator>KeePassJava2</Generator>`
`20`	`20`	`<HeaderHash></HeaderHash>`
`21`	`21`	`<DatabaseName>New Database</DatabaseName>`
`22`	`22`	`<DatabaseNameChanged>${creationDate}</DatabaseNameChanged>`

Comments

(0)