From 9f94469ff15a90692c80af7780edfab28dbc546b Mon Sep 17 00:00:00 2001
From: Terekhin Alexander <aterekhin@bcc.ru>
Date: Fri, 18 Sep 2020 19:36:25 +0300
Subject: [PATCH] Rewrite from functional style to simplify code

---
 .../fias/helpers/ThrowingBiConsumer.java      | 20 -------------------
 .../me/bearns/fias/helpers/UpdaterImpl.java   | 17 ++++++++++++----
 2 files changed, 13 insertions(+), 24 deletions(-)
 delete mode 100644 src/main/java/me/bearns/fias/helpers/ThrowingBiConsumer.java

diff --git a/src/main/java/me/bearns/fias/helpers/ThrowingBiConsumer.java b/src/main/java/me/bearns/fias/helpers/ThrowingBiConsumer.java
deleted file mode 100644
index da40d82..0000000
--- a/src/main/java/me/bearns/fias/helpers/ThrowingBiConsumer.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package me.bearns.fias.helpers;
-
-import me.bearns.fias.exceptions.UnmarshallingException;
-import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
-
-import java.util.function.BiConsumer;
-
-public interface ThrowingBiConsumer<K extends UnmarshallerParameters, V extends ZipArchiveEntry, E extends Throwable> {
-    void accept(K k, V v) throws E;
-
-    static  <K extends UnmarshallerParameters, V extends ZipArchiveEntry, E extends Throwable> BiConsumer<K,V> unchecked(ThrowingBiConsumer<K, V, E> f) {
-        return (k,v) -> {
-            try {
-                f.accept(k,v);
-            } catch (Throwable e) {
-                throw new RuntimeException(e);
-            };
-        };
-    }
-}
diff --git a/src/main/java/me/bearns/fias/helpers/UpdaterImpl.java b/src/main/java/me/bearns/fias/helpers/UpdaterImpl.java
index fcda478..43b5f6d 100644
--- a/src/main/java/me/bearns/fias/helpers/UpdaterImpl.java
+++ b/src/main/java/me/bearns/fias/helpers/UpdaterImpl.java
@@ -135,19 +135,28 @@ public class UpdaterImpl implements UpdateHelper {
                 }
             }
 
-            map.forEach(ThrowingBiConsumer.unchecked((config, entry) -> {
+/*            map.forEach(ThrowingBiConsumer.unchecked((config, entry) -> {
                 try (InputStream is = zipFile.getInputStream(entry)) {
                     log.debug("Process '{}' in zip", entry.getName());
                     unmarshaller.process(is, config, filter);
                 }
-            }));
+            }));*/
+
+            for (Map.Entry<UnmarshallerParameters, ZipArchiveEntry> next : map.entrySet()) {
+                final UnmarshallerParameters config = next.getKey();
+                final ZipArchiveEntry entry = next.getValue();
+                try (InputStream is = zipFile.getInputStream(entry)) {
+                    log.debug("Process '{}' in zip", entry.getName());
+                    unmarshaller.process(is, config, filter);
+                }
+            }
 
             log.debug("Completed Zip file");
 
         } catch (IOException e) {
             log.error("IO Unzip Exception");
             throw new UnzipException(e);
-        } catch (RuntimeException e) {
+        } /*catch (RuntimeException e) {
             final Throwable cause = e.getCause();
 
             if(cause instanceof CommonException) {
@@ -156,7 +165,7 @@ public class UpdaterImpl implements UpdateHelper {
             } else {
                 log.error("Unknown exception occured");
             }
-        }
+        }*/
 
     }
 }