didinst/fias
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Zip64: utils.zip to apache.commons.compress.archivers.zip

Browse Source
This commit is contained in:
Terekhin Alexander
2020-09-14 19:35:46 +03:00
parent 24f177cf15
commit 0545cc6932
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pom.xml
+6
View File
@@ -19,6 +19,12 @@
</properties> </properties>
<dependencies> <dependencies>
<!-- ZIP64 -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.20</version>
</dependency>
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
src/main/java/me/bearns/fias/helpers/UpdaterImpl.java
+6 -8
View File
@@ -23,9 +23,9 @@ import java.util.Map;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future; import java.util.concurrent.Future;
import java.util.function.Predicate; import java.util.function.Predicate;
import java.util.zip.ZipEntry;
import java.util.zip.ZipException; import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
import java.util.zip.ZipFile; import org.apache.commons.compress.archivers.zip.ZipFile;
@Slf4j @Slf4j
@Component @Component
@@ -105,16 +105,17 @@ public class UpdaterImpl implements UpdateHelper {
} }
private void processArchive(File file, Predicate filter) throws CommonException { private void processArchive(File file, Predicate filter) throws CommonException {
//TODO
try(final ZipFile zipFile = new ZipFile(file)){ try(final ZipFile zipFile = new ZipFile(file)){
log.debug("Process Zip file"); log.debug("Process Zip file");
final Enumeration<? extends ZipEntry> entries = zipFile.entries(); final Enumeration<ZipArchiveEntry> entries = zipFile.getEntries();
while (entries.hasMoreElements()){ while (entries.hasMoreElements()){
final ZipEntry entry = entries.nextElement(); final ZipArchiveEntry entry = entries.nextElement();
final String name = entry.getName(); final String name = entry.getName();
log.debug("Find '{}' in zip", name); log.debug("Find '{}' in zip", name);
@@ -133,9 +134,6 @@ public class UpdaterImpl implements UpdateHelper {
log.debug("Completed Zip file"); log.debug("Completed Zip file");
} catch (ZipException e) {
log.error("Common Zip exception");
throw new UnzipException(e);
} catch (IOException e) { } catch (IOException e) {
log.error("IO Unzip Exception"); log.error("IO Unzip Exception");
throw new UnzipException(e); throw new UnzipException(e);