Commit 60ddcd8

committed

Further fixes for issue #70 - adding CustomData to Entry and Group

1 parent 30561dd commit 60ddcd8Copy full SHA for 60ddcd8

File tree

+24

-0

lines changed

example/src/test/java/org/linguafranca/pwdb/kdbx/validation
- Issue70Test.java
jackson/src/main/java/org/linguafranca/pwdb/kdbx/jackson
- JacksonEntry.java
- JacksonGroup.java
test/src/test/resources/issue-70
- test-hugoo10.kdbx

+24

-0

lines changed

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,11 @@ public class Issue70Test {`
`16`	`16`	`public static final KdbxCreds CREDENTIALS1 = new KdbxCreds("KeePassJava2".getBytes());`
`17`	`17`	`public static final String TEST_RESOURCE2 = "Database-4.1-123.kdbx";`
`18`	`18`	`public static final KdbxCreds CREDENTIALS2 = new KdbxCreds("123".getBytes());`
	`19`	`+ public static final String TEST_RESOURCE3 = "issue-70/test-hugoo10.kdbx";`
	`20`	`+ public static final KdbxCreds CREDENTIALS3 = new KdbxCreds("test".getBytes());`
`19`	`21`
	`22`	`+`
	`23`	`+ /* custom data missing from meta */`
`20`	`24`	`@Test`
`21`	`25`	`public void testCustomData() throws IOException {`
`22`	`26`	`try (InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream(TEST_RESOURCE1)) {`
`@@ -30,4 +34,12 @@ public void testFileFormat_4_1() throws IOException {`
`30`	`34`	`JacksonDatabase database = JacksonDatabase.load(CREDENTIALS2, inputStream);`
`31`	`35`	`}`
`32`	`36`	`}`
	`37`	`+`
	`38`	`+ /* custom data missing from entry definition */`
	`39`	`+ @Test`
	`40`	`+ public void testCustomData2() throws IOException {`
	`41`	`+ try (InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream(TEST_RESOURCE3)){`
	`42`	`+ JacksonDatabase database = JacksonDatabase.load(CREDENTIALS3, inputStream);`
	`43`	`+ }`
	`44`	`+ }`
`33`	`45`	`}`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -55,11 +55,13 @@`
`55`	`55`	`"foregroundColor",`
`56`	`56`	`"backgroundColor",`
`57`	`57`	`"overrideURL",`
	`58`	`+ "previousParentGroup",`
`58`	`59`	`"tags",`
`59`	`60`	`"times",`
`60`	`61`	`"string",`
`61`	`62`	`"binary",`
`62`	`63`	`"autoType",`
	`64`	`+ "customData",`
`63`	`65`	`"history",`
`64`	`66`	`})`
`65`	`67`
`@@ -137,6 +139,9 @@ public static JacksonEntry createEntry(JacksonDatabase database) {`
`137`	`139`	`@JacksonXmlProperty(localName = "AutoType")`
`138`	`140`	`protected AutoType autoType;`
`139`	`141`
	`142`	`+ @JacksonXmlProperty(localName = "CustomData")`
	`143`	`+ protected KeePassFile.CustomData customData;`
	`144`	`+`
`140`	`145`	`@JacksonXmlProperty(localName = "History") /* Workaround jackson */`
`141`	`146`	`protected JacksonHistory history;`
`142`	`147`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@`
`29`	`29`	`import org.linguafranca.pwdb.kdbx.jackson.converter.BooleanToStringConverter;`
`30`	`30`	`import org.linguafranca.pwdb.kdbx.jackson.converter.StringToBooleanConverter;`
`31`	`31`	`import org.linguafranca.pwdb.kdbx.jackson.converter.UUIDToBase64Converter;`
	`32`	`+import org.linguafranca.pwdb.kdbx.jackson.model.KeePassFile;`
`32`	`33`	`import org.linguafranca.pwdb.kdbx.jackson.model.Times;`
`33`	`34`
`34`	`35`	`import java.util.ArrayList;`
`@@ -48,6 +49,9 @@`
`48`	`49`	`"enableAutoType",`
`49`	`50`	`"enableSearching",`
`50`	`51`	`"lastTopVisibleEntry",`
	`52`	`+"previousParentGroup",`
	`53`	`+"tags",`
	`54`	`+"customData",`
`51`	`55`	`"entry",`
`52`	`56`	`"group",`
`53`	`57`	`})`
`@@ -107,6 +111,9 @@ public class JacksonGroup extends AbstractGroup <JacksonDatabase, JacksonGroup,`
`107`	`111`	`@JacksonXmlProperty(localName = "Tags")`
`108`	`112`	`protected String tags;`
`109`	`113`
	`114`	`+ @JacksonXmlProperty(localName = "CustomData")`
	`115`	`+ protected KeePassFile.CustomData customData;`
	`116`	`+`
`110`	`117`	`@JacksonXmlProperty(localName = "Entry") /* Workaround jackson */`
`111`	`118`	`@JacksonXmlElementWrapper(useWrapping = false)`
`112`	`119`	`protected List<JacksonEntry> entries;`

2.16 KB

Binary file not shown.

Comments

(0)