diff --git a/libraries-apache-commons-2/README.md b/libraries-apache-commons-2/README.md deleted file mode 100644 index 7f91a737d5..0000000000 --- a/libraries-apache-commons-2/README.md +++ /dev/null @@ -1,7 +0,0 @@ -## Apache Commons - -This module contains articles about Apache Commons libraries. - -### Relevant articles - -- More articles: [[<--prev]](../libraries-apache-commons) \ No newline at end of file diff --git a/libraries-apache-commons-2/log4j.properties b/libraries-apache-commons-2/log4j.properties deleted file mode 100644 index 2173c5d96f..0000000000 --- a/libraries-apache-commons-2/log4j.properties +++ /dev/null @@ -1 +0,0 @@ -log4j.rootLogger=INFO, stdout diff --git a/libraries-apache-commons-2/pom.xml b/libraries-apache-commons-2/pom.xml deleted file mode 100644 index c8392ac561..0000000000 --- a/libraries-apache-commons-2/pom.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - 4.0.0 - libraries-apache-commons-2 - libraries-apache-commons-2 - - - com.baeldung - parent-modules - 1.0.0-SNAPSHOT - - - - - org.apache.commons - commons-compress - ${commons-compress.version} - - - org.apache.ant - ant - ${ant.version} - - - org.apache.commons - commons-vfs2 - ${commons-vfs2.version} - - - - - 1.23.0 - 1.10.13 - 2.9.0 - - - diff --git a/libraries-apache-commons-2/src/main/java/com/baeldung/commons/untar/TarExtractor.java b/libraries-apache-commons-2/src/main/java/com/baeldung/commons/untar/TarExtractor.java deleted file mode 100644 index bd19a872f6..0000000000 --- a/libraries-apache-commons-2/src/main/java/com/baeldung/commons/untar/TarExtractor.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.baeldung.commons.untar; - -import java.io.IOException; -import java.io.InputStream; -import java.nio.file.Files; -import java.nio.file.Path; - -public abstract class TarExtractor { - - private InputStream tarStream; - private boolean gzip; - private Path destination; - - public TarExtractor(InputStream in, boolean gzip, Path destination) throws IOException { - this.tarStream = in; - this.gzip = gzip; - this.destination = destination; - - Files.createDirectories(destination); - } - - public TarExtractor(Path tarFile, Path destination) throws IOException { - this(Files.newInputStream(tarFile), tarFile.endsWith("gz"), destination); - } - - public Path getDestination() { - return destination; - } - - public InputStream getTarStream() { - return tarStream; - } - - public boolean isGzip() { - return gzip; - } - - abstract public void untar() throws IOException; -} diff --git a/libraries-apache-commons-2/src/main/java/com/baeldung/commons/untar/impl/TarExtractorAnt.java b/libraries-apache-commons-2/src/main/java/com/baeldung/commons/untar/impl/TarExtractorAnt.java deleted file mode 100644 index 5bb4d74beb..0000000000 --- a/libraries-apache-commons-2/src/main/java/com/baeldung/commons/untar/impl/TarExtractorAnt.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.baeldung.commons.untar.impl; - -import java.io.BufferedInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.StandardCopyOption; -import java.util.zip.GZIPInputStream; - -import org.apache.tools.tar.TarEntry; -import org.apache.tools.tar.TarInputStream; - -import com.baeldung.commons.untar.TarExtractor; - -public class TarExtractorAnt extends TarExtractor { - - public TarExtractorAnt(InputStream in, boolean gzip, Path destination) throws IOException { - super(in, gzip, destination); - } - - @Override - public void untar() throws IOException { - try (TarInputStream tar = new TarInputStream(new BufferedInputStream( // - isGzip() ? new GZIPInputStream(getTarStream()) : getTarStream()))) { - TarEntry entry; - while ((entry = tar.getNextEntry()) != null) { - Path extractTo = getDestination().resolve(entry.getName()); - if (entry.isDirectory()) { - Files.createDirectories(extractTo); - } else { - Files.copy(tar, extractTo, StandardCopyOption.REPLACE_EXISTING); - } - } - } - } -} \ No newline at end of file diff --git a/libraries-apache-commons-2/src/main/java/com/baeldung/commons/untar/impl/TarExtractorCommonsCompress.java b/libraries-apache-commons-2/src/main/java/com/baeldung/commons/untar/impl/TarExtractorCommonsCompress.java deleted file mode 100644 index 0f6d557f61..0000000000 --- a/libraries-apache-commons-2/src/main/java/com/baeldung/commons/untar/impl/TarExtractorCommonsCompress.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.baeldung.commons.untar.impl; - -import java.io.BufferedInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.StandardCopyOption; - -import org.apache.commons.compress.archivers.ArchiveEntry; -import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; -import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream; - -import com.baeldung.commons.untar.TarExtractor; - -public class TarExtractorCommonsCompress extends TarExtractor { - - public TarExtractorCommonsCompress(InputStream in, boolean gzip, Path destination) throws IOException { - super(in, gzip, destination); - } - - @Override - public void untar() throws IOException { - try (BufferedInputStream inputStream = new BufferedInputStream(getTarStream()); // - TarArchiveInputStream tar = new TarArchiveInputStream( // - isGzip() ? new GzipCompressorInputStream(inputStream) : inputStream)) { - ArchiveEntry entry; - while ((entry = tar.getNextEntry()) != null) { - Path extractTo = getDestination().resolve(entry.getName()); - if (entry.isDirectory()) { - Files.createDirectories(extractTo); - } else { - Files.copy(tar, extractTo, StandardCopyOption.REPLACE_EXISTING); - } - } - } - } -} diff --git a/libraries-apache-commons-2/src/main/java/com/baeldung/commons/untar/impl/TarExtractorVfs.java b/libraries-apache-commons-2/src/main/java/com/baeldung/commons/untar/impl/TarExtractorVfs.java deleted file mode 100644 index 2932b9c3bc..0000000000 --- a/libraries-apache-commons-2/src/main/java/com/baeldung/commons/untar/impl/TarExtractorVfs.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.baeldung.commons.untar.impl; - -import java.io.IOException; -import java.io.InputStream; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.nio.file.StandardCopyOption; -import java.util.Iterator; - -import org.apache.commons.vfs2.FileContent; -import org.apache.commons.vfs2.FileObject; -import org.apache.commons.vfs2.FileSystemManager; -import org.apache.commons.vfs2.FileType; -import org.apache.commons.vfs2.VFS; - -import com.baeldung.commons.untar.TarExtractor; - -public class TarExtractorVfs extends TarExtractor { - - public TarExtractorVfs(InputStream in, boolean gzip, Path destination) throws IOException { - super(in, gzip, destination); - } - - @Override - public void untar() throws IOException { - Path tmpTar = Files.createTempFile("temp", isGzip() ? ".tar.gz" : ".tar"); - Files.copy(getTarStream(), tmpTar, StandardCopyOption.REPLACE_EXISTING); - - FileSystemManager fsManager = VFS.getManager(); - String uri = String.format("%s:file://%s", isGzip() ? "tgz" : "tar", tmpTar.toString()); - FileObject tar = fsManager.resolveFile(uri); - - Iterator contents = tar.iterator(); - while (contents.hasNext()) { - FileObject entry = contents.next(); - - Path extractTo = Paths.get(getDestination().toString(), entry.getName() - .getPath()); - - if (entry.isReadable() && entry.getType() == FileType.FILE) { - Files.createDirectories(extractTo.getParent()); - - try (FileContent content = entry.getContent(); InputStream stream = content.getInputStream()) { - Files.copy(stream, extractTo, StandardCopyOption.REPLACE_EXISTING); - } - } - } - - Files.delete(tmpTar); - } -} diff --git a/libraries-apache-commons-2/src/main/resources/logback.xml b/libraries-apache-commons-2/src/main/resources/logback.xml deleted file mode 100644 index 7d900d8ea8..0000000000 --- a/libraries-apache-commons-2/src/main/resources/logback.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - \ No newline at end of file diff --git a/libraries-apache-commons-2/src/test/java/com/baeldung/commons/untar/Resources.java b/libraries-apache-commons-2/src/test/java/com/baeldung/commons/untar/Resources.java deleted file mode 100644 index 5b9b022d7f..0000000000 --- a/libraries-apache-commons-2/src/test/java/com/baeldung/commons/untar/Resources.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.baeldung.commons.untar; - -import java.io.InputStream; - -public interface Resources { - - static InputStream tarFile() { - return Resources.class.getResourceAsStream("/untar/test.tar"); - } - - static InputStream tarGzFile() { - return Resources.class.getResourceAsStream("/untar/test.tar.gz"); - } -} diff --git a/libraries-apache-commons-2/src/test/java/com/baeldung/commons/untar/TarExtractorAntUnitTest.java b/libraries-apache-commons-2/src/test/java/com/baeldung/commons/untar/TarExtractorAntUnitTest.java deleted file mode 100644 index 80b8fda104..0000000000 --- a/libraries-apache-commons-2/src/test/java/com/baeldung/commons/untar/TarExtractorAntUnitTest.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.baeldung.commons.untar; - -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; - -import org.junit.Test; - -import com.baeldung.commons.untar.impl.TarExtractorAnt; - -public class TarExtractorAntUnitTest { - - @Test - public void givenTarFile_whenUntar_thenExtractedToDestination() throws IOException { - Path destination = Paths.get("/tmp/ant"); - - new TarExtractorAnt(Resources.tarFile(), false, destination).untar(); - - assertTrue(Files.list(destination) - .findFirst() - .isPresent()); - } - - @Test - public void givenTarGzFile_whenUntar_thenExtractedToDestination() throws IOException { - Path destination = Paths.get("/tmp/ant-gz"); - - new TarExtractorAnt(Resources.tarGzFile(), true, destination).untar(); - - assertTrue(Files.list(destination) - .findFirst() - .isPresent()); - } -} diff --git a/libraries-apache-commons-2/src/test/java/com/baeldung/commons/untar/TarExtractorCommonsCompressUnitTest.java b/libraries-apache-commons-2/src/test/java/com/baeldung/commons/untar/TarExtractorCommonsCompressUnitTest.java deleted file mode 100644 index bea67ea3f5..0000000000 --- a/libraries-apache-commons-2/src/test/java/com/baeldung/commons/untar/TarExtractorCommonsCompressUnitTest.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.baeldung.commons.untar; - -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; - -import org.junit.jupiter.api.Test; - -import com.baeldung.commons.untar.impl.TarExtractorCommonsCompress; - -public class TarExtractorCommonsCompressUnitTest { - - @Test - public void givenTarFile_whenUntar_thenExtractedToDestination() throws IOException { - Path destination = Paths.get("/tmp/commons-compress"); - - new TarExtractorCommonsCompress(Resources.tarFile(), false, destination).untar(); - - assertTrue(Files.list(destination) - .findFirst() - .isPresent()); - } - - @Test - public void givenTarGzFile_whenUntar_thenExtractedToDestination() throws IOException { - Path destination = Paths.get("/tmp/commons-compress-gz"); - - new TarExtractorCommonsCompress(Resources.tarGzFile(), true, destination).untar(); - - assertTrue(Files.list(destination) - .findFirst() - .isPresent()); - } -} diff --git a/libraries-apache-commons-2/src/test/java/com/baeldung/commons/untar/TarExtractorVfsUnitTest.java b/libraries-apache-commons-2/src/test/java/com/baeldung/commons/untar/TarExtractorVfsUnitTest.java deleted file mode 100644 index 9a00fd7e56..0000000000 --- a/libraries-apache-commons-2/src/test/java/com/baeldung/commons/untar/TarExtractorVfsUnitTest.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.baeldung.commons.untar; - -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; - -import org.junit.Test; - -import com.baeldung.commons.untar.impl.TarExtractorVfs; - -public class TarExtractorVfsUnitTest { - - @Test - public void givenTarFile_whenUntar_thenExtractedToDestination() throws IOException { - Path destination = Paths.get("/tmp/vfs"); - - new TarExtractorVfs(Resources.tarFile(), false, destination).untar(); - - assertTrue(Files.list(destination) - .findFirst() - .isPresent()); - } - - @Test - public void givenTarGzFile_whenUntar_thenExtractedToDestination() throws IOException { - Path destination = Paths.get("/tmp/vfs-gz"); - - new TarExtractorVfs(Resources.tarGzFile(), true, destination).untar(); - - assertTrue(Files.list(destination) - .findFirst() - .isPresent()); - } -} diff --git a/libraries-apache-commons-2/src/test/resources/untar/test.tar b/libraries-apache-commons-2/src/test/resources/untar/test.tar deleted file mode 100644 index a0c9e8714f..0000000000 Binary files a/libraries-apache-commons-2/src/test/resources/untar/test.tar and /dev/null differ diff --git a/libraries-apache-commons-2/src/test/resources/untar/test.tar.gz b/libraries-apache-commons-2/src/test/resources/untar/test.tar.gz deleted file mode 100644 index 99bc3ec933..0000000000 Binary files a/libraries-apache-commons-2/src/test/resources/untar/test.tar.gz and /dev/null differ diff --git a/libraries-apache-commons/README.md b/libraries-apache-commons/README.md index 1c2215d8b0..aceea3282a 100644 --- a/libraries-apache-commons/README.md +++ b/libraries-apache-commons/README.md @@ -13,5 +13,4 @@ This module contains articles about Apache Commons libraries. - [Apache Commons BeanUtils](https://www.baeldung.com/apache-commons-beanutils) - [Histograms with Apache Commons Frequency](https://www.baeldung.com/apache-commons-frequency) - [An Introduction to Apache Commons Lang 3](https://www.baeldung.com/java-commons-lang-3) -- [Differences Between the Java WatchService API and the Apache Commons IO Monitor Library](https://www.baeldung.com/java-watchservice-vs-apache-commons-io-monitor-library) -- More articles: [[next-->]](../libraries-apache-commons-2) \ No newline at end of file +- [Differences Between the Java WatchService API and the Apache Commons IO Monitor Library](https://www.baeldung.com/java-watchservice-vs-apache-commons-io-monitor-library) \ No newline at end of file diff --git a/pom.xml b/pom.xml index 16156c0d91..79b2071507 100644 --- a/pom.xml +++ b/pom.xml @@ -872,7 +872,6 @@ libraries-6 libraries-apache-commons - libraries-apache-commons-2 libraries-apache-commons-collections libraries-apache-commons-io libraries-data-2 @@ -1135,7 +1134,6 @@ libraries-5 libraries-6 libraries-apache-commons - libraries-apache-commons-2 libraries-apache-commons-collections libraries-apache-commons-io libraries-data-2