fix UpdaterImpl for new UnmarshallerParameters interface

src/main/java/me/bearns/fias/service/FiasUpdater.java

@@ -5,6 +5,8 @@ import me.bearns.fias.exceptions.CommonException;
 import me.bearns.fias.exceptions.DownloadException;
 import me.bearns.fias.exceptions.UnzipException;
 import me.bearns.fias.repository.FiasVersionRepository;
+import me.bearns.fias.util.Catalog;
+import me.bearns.fias.util.UnmarshallerParameters;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -20,13 +22,19 @@ import java.util.zip.ZipFile;
 public class FiasUpdater implements Updater {
 
     @Autowired
-    FiasVersionRepository versions;
+    private static FiasVersionRepository versions;
 
     @Autowired
-    private static Downloader service;
+    private static StreamSaver unmarshaller;
 
     @Autowired
-    OnlineVersion clientStub;
+    private static Downloader fileService;
+
+    @Autowired
+    private static OnlineVersion clientStub;
+
+    @Autowired
+    private static Catalog catalog;
 
     @Override
     public void update() throws CommonException {
@@ -77,7 +85,7 @@ public class FiasUpdater implements Updater {
         Map<FiasVersion, Future<File>> map = new HashMap<>();
 
         //start download
-        updates.forEach(u -> map.put(u, service.download(reloadFlag ? u.getFiasCompleteXmlUrl() : u.getFiasDeltaXmlUrl())));
+        updates.forEach(u -> map.put(u, fileService.download(reloadFlag ? u.getFiasCompleteXmlUrl() : u.getFiasDeltaXmlUrl())));
 
         //strict order
         for (FiasVersion item : updates) {
@@ -114,7 +122,13 @@ public class FiasUpdater implements Updater {
 
                 final ZipEntry entry = entries.nextElement();
 
-                if(check(entry)) processEntry(zipFile.getInputStream(entry), regions);
+                final UnmarshallerParameters config = catalog.getByPrefix(entry.getName());
+
+                if(config!=null) { //todo
+                    try (InputStream is = zipFile.getInputStream(entry)) {
+                        unmarshaller.process(is, config, null);
+                    }
+                }
             }
 
         } catch (ZipException e) {
@@ -124,13 +138,4 @@ public class FiasUpdater implements Updater {
         }
 
     }
-
-    private void processEntry(InputStream is, Long ... regions){
-        //todo
-    }
-
-    private boolean check(ZipEntry entry){
-        //todo
-        return true;
-    }
 }

src/main/java/me/bearns/fias/service/StreamSaver.java

@@ -0,0 +1,11 @@
+package me.bearns.fias.service;
+
+import me.bearns.fias.util.UnmarshallerParameters;
+
+import java.io.InputStream;
+import java.util.function.Predicate;
+
+public interface StreamSaver {
+
+    public void process(InputStream is, UnmarshallerParameters conf, Predicate filter);
+}

src/main/java/me/bearns/fias/service/StreamSaverImpl.java

@@ -0,0 +1,95 @@
+package me.bearns.fias.service;
+
+import me.bearns.fias.util.UnmarshallerParameters;
+import org.springframework.stereotype.Component;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Unmarshaller;
+import javax.xml.stream.XMLEventReader;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.events.StartElement;
+import javax.xml.stream.events.XMLEvent;
+import java.io.InputStream;
+import java.util.function.Predicate;
+
+@Component
+public class StreamSaverImpl implements StreamSaver{
+    @Override
+    public void process(InputStream is, UnmarshallerParameters conf, Predicate filter) {
+
+        try {
+            // create xml event reader for input stream
+            final XMLInputFactory xmlInputFactory = XMLInputFactory.newInstance();
+            final XMLEventReader xmlEventReader = xmlInputFactory.createXMLEventReader(is);
+
+
+            // initialize jaxb
+            final JAXBContext context = JAXBContext.newInstance(conf.getParentCls());
+            final Unmarshaller unmarshaller = context.createUnmarshaller();
+
+            XMLEvent e = null;
+
+            long countRead=0, countWrite=0, countErrors=0;
+
+            // loop though the xml stream
+            while (true) {
+
+                    if (!((e = xmlEventReader.peek()) != null)) break;
+
+                countRead++;
+
+                // check the event is a Document start element
+                if (e.isStartElement() && ((StartElement) e).getName().equals(conf.getQName())) {
+
+                    Object obj;
+                    try {
+                        // unmarshall the document
+                        obj = unmarshaller.unmarshal(xmlEventReader, conf.getCls()).getValue();
+
+                    } catch (Exception ex) {
+                        countErrors++;
+                        //log.error("Unmarshalling error {} in {}", ex.getMessage(),  file.getName());
+
+                        /*final Iterator attributes = ((StartElement) e).getAttributes();
+                        attributes.forEachRemaining(
+                                (a) -> log.error("Object dump: {} {}", ((Attribute) a).getName(), ((Attribute) a).getValue())
+                        );*/
+
+                        continue;
+                    }
+
+                    //if(countRead%100000==0) log.info("Read {} item from {}", countRead, file.getName());
+
+                    //Region filter
+                    if(filter != null && !filter.test(obj)) continue;
+
+                    //Save to repository
+                    conf.getRepository().save(obj);
+
+                    /*if(++countWrite%10000==0) {
+                        repository.flush();
+                        log.info("Write {} items to repository.", countWrite);
+                    }*/
+
+                } else {
+                    xmlEventReader.next();
+                }
+            }
+    } catch (XMLStreamException ex) {
+        ex.printStackTrace(); //createXMLEventReader & peak
+    } catch (JAXBException ex) {
+        ex.printStackTrace(); //createUnmarshaller();
+    }
+
+        //write to DB from cache
+        conf.getRepository().flush();
+
+        /*log.info("SUCSESS: read={}, write={}", countRead, countWrite);
+        if(countErrors > 0) {
+            log.warn("Unmarshalling errors suppressed: {}", countErrors);
+            log.warn("Check data consistency in {}", file.getName());
+        }*/
+    }
+}

src/main/java/me/bearns/fias/util/Catalog.java

@@ -0,0 +1,82 @@
+package me.bearns.fias.util;
+
+import me.bearns.fias.repository.FiasVersionRepository;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Component;
+
+import javax.xml.namespace.QName;
+import java.util.ArrayList;
+import java.util.List;
+
+@Component
+public class Catalog {
+
+    private final List<Item> prefixList = new ArrayList<>();
+
+    public Catalog(FiasVersionRepository FIASJPA_REPOSITORY) {
+        prefixList.add(
+                new Item(
+                        "AS_ADDROBJ_",
+                        null,
+                        new QName("","Object"),
+                        null,
+                        null
+                )
+            );
+        prefixList.add(
+                new Item(
+                        "AS_HOUSE_",
+                        null,
+                        new QName("","House"),
+                        null,
+                        null
+                )
+            );
+    }
+
+    public Item getByPrefix(String s){
+        if(s!=null) {
+
+            for (Item item : prefixList) {
+                if (s.startsWith(item.prefix)) return item;
+            }
+        }
+        return null;
+    }
+
+    public class Item implements UnmarshallerParameters {
+        private Item(String prefix, JpaRepository repository, QName qName, Class cls, Class parentCls) {
+            this.prefix = prefix;
+            this.repository = repository;
+            this.qName = qName;
+            this.cls = cls;
+            this.parentCls = parentCls;
+        }
+        private final String prefix;
+        private final JpaRepository repository;
+        private final QName qName;
+        private final Class cls;
+        private final Class parentCls;
+
+
+        @Override
+        public JpaRepository getRepository() {
+            return repository;
+        }
+
+        @Override
+        public QName getQName() {
+            return qName;
+        }
+
+        @Override
+        public Class getCls() {
+            return cls;
+        }
+
+        @Override
+        public Class getParentCls() {
+            return parentCls;
+        }
+    }
+}

src/main/java/me/bearns/fias/util/UnmarshallerParameters.java

@@ -0,0 +1,12 @@
+package me.bearns.fias.util;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import javax.xml.namespace.QName;
+
+public interface UnmarshallerParameters {
+    public JpaRepository getRepository();
+    public QName getQName();
+    public Class getCls();
+    public Class getParentCls();
+}