X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fjson%2Fv1_15%2FAccountListParser.java;h=33c554c85b41f0406a5cff7197ce1826a4c94e02;hp=8e71cbd09d3a72cd448eda5bd6c95e0a43bfd18b;hb=bcf517d0eae491de46b71a1e0f288852ca3d64df;hpb=48e81a77a6f218ccaaa4b77fa1a84084422c7a86 diff --git a/app/src/main/java/net/ktnx/mobileledger/json/v1_15/AccountListParser.java b/app/src/main/java/net/ktnx/mobileledger/json/v1_15/AccountListParser.java index 8e71cbd0..33c554c8 100644 --- a/app/src/main/java/net/ktnx/mobileledger/json/v1_15/AccountListParser.java +++ b/app/src/main/java/net/ktnx/mobileledger/json/v1_15/AccountListParser.java @@ -17,33 +17,18 @@ package net.ktnx.mobileledger.json.v1_15; -import com.fasterxml.jackson.databind.MappingIterator; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectReader; import java.io.IOException; import java.io.InputStream; -import static net.ktnx.mobileledger.utils.Logger.debug; - -public class AccountListParser { - - private final MappingIterator iter; +public class AccountListParser extends net.ktnx.mobileledger.json.AccountListParser { public AccountListParser(InputStream input) throws IOException { ObjectMapper mapper = new ObjectMapper(); ObjectReader reader = mapper.readerFor(ParsedLedgerAccount.class); - iter = reader.readValues(input); - } - public ParsedLedgerAccount nextAccount() { - if (!iter.hasNext()) return null; - - ParsedLedgerAccount next = iter.next(); - - if (next.getAname().equalsIgnoreCase("root")) return nextAccount(); - - debug("accounts", String.format("Got account '%s' [v1.15]", next.getAname())); - return next; + iterator = reader.readValues(input); } }