From 88b3201c49623697b9e634fea4b11869e6e39870 Mon Sep 17 00:00:00 2001 From: Slawomir Jaranowski Date: Sat, 6 May 2023 19:59:06 +0200 Subject: [PATCH] Add tzst alias for tar.zst archiver/unarchived --- .../PlexusIoTBZ2FileResourceCollection.java | 2 -- .../PlexusIoTGZFileResourceCollection.java | 2 -- .../PlexusIoTXZFileResourceCollection.java | 2 -- .../PlexusIoTZstdFileResourceCollection.java | 28 +++++++++++++++++++ .../plexus/archiver/tar/TZstdArchiver.java | 28 +++++++++++++++++++ .../plexus/archiver/tar/TZstdUnArchiver.java | 28 +++++++++++++++++++ src/site/apt/index.apt | 4 ++- .../archiver/manager/ArchiverManagerTest.java | 1 + 8 files changed, 88 insertions(+), 7 deletions(-) create mode 100644 src/main/java/org/codehaus/plexus/archiver/tar/PlexusIoTZstdFileResourceCollection.java create mode 100644 src/main/java/org/codehaus/plexus/archiver/tar/TZstdArchiver.java create mode 100644 src/main/java/org/codehaus/plexus/archiver/tar/TZstdUnArchiver.java diff --git a/src/main/java/org/codehaus/plexus/archiver/tar/PlexusIoTBZ2FileResourceCollection.java b/src/main/java/org/codehaus/plexus/archiver/tar/PlexusIoTBZ2FileResourceCollection.java index 924fed27c..b05bd661f 100644 --- a/src/main/java/org/codehaus/plexus/archiver/tar/PlexusIoTBZ2FileResourceCollection.java +++ b/src/main/java/org/codehaus/plexus/archiver/tar/PlexusIoTBZ2FileResourceCollection.java @@ -2,8 +2,6 @@ import javax.inject.Named; -import java.io.File; - /** * Alias for {@link PlexusIoTarBZip2FileResourceCollection} */ diff --git a/src/main/java/org/codehaus/plexus/archiver/tar/PlexusIoTGZFileResourceCollection.java b/src/main/java/org/codehaus/plexus/archiver/tar/PlexusIoTGZFileResourceCollection.java index 293945fed..450afbcdb 100644 --- a/src/main/java/org/codehaus/plexus/archiver/tar/PlexusIoTGZFileResourceCollection.java +++ b/src/main/java/org/codehaus/plexus/archiver/tar/PlexusIoTGZFileResourceCollection.java @@ -2,8 +2,6 @@ import javax.inject.Named; -import java.io.File; - /** * Alias for {@link PlexusIoTarGZipFileResourceCollection} */ diff --git a/src/main/java/org/codehaus/plexus/archiver/tar/PlexusIoTXZFileResourceCollection.java b/src/main/java/org/codehaus/plexus/archiver/tar/PlexusIoTXZFileResourceCollection.java index 2d7f90c0e..59ec6a9c2 100644 --- a/src/main/java/org/codehaus/plexus/archiver/tar/PlexusIoTXZFileResourceCollection.java +++ b/src/main/java/org/codehaus/plexus/archiver/tar/PlexusIoTXZFileResourceCollection.java @@ -17,8 +17,6 @@ import javax.inject.Named; -import java.io.File; - /** * Alias for {@link PlexusIoTarXZFileResourceCollection} */ diff --git a/src/main/java/org/codehaus/plexus/archiver/tar/PlexusIoTZstdFileResourceCollection.java b/src/main/java/org/codehaus/plexus/archiver/tar/PlexusIoTZstdFileResourceCollection.java new file mode 100644 index 000000000..b8606b26d --- /dev/null +++ b/src/main/java/org/codehaus/plexus/archiver/tar/PlexusIoTZstdFileResourceCollection.java @@ -0,0 +1,28 @@ +/* + * Copyright The Plexus developers. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.codehaus.plexus.archiver.tar; + +import javax.inject.Named; + +/** + * Alias for {@link PlexusIoTarZstdFileResourceCollection} + * + * @since 4.7.2 + */ +@Named( "tzst" ) +public class PlexusIoTZstdFileResourceCollection extends PlexusIoTarZstdFileResourceCollection +{ +} diff --git a/src/main/java/org/codehaus/plexus/archiver/tar/TZstdArchiver.java b/src/main/java/org/codehaus/plexus/archiver/tar/TZstdArchiver.java new file mode 100644 index 000000000..37ce36ac4 --- /dev/null +++ b/src/main/java/org/codehaus/plexus/archiver/tar/TZstdArchiver.java @@ -0,0 +1,28 @@ +/* + * Copyright The Plexus developers. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.codehaus.plexus.archiver.tar; + +import javax.inject.Named; + +/** + * Alias for {@link TarZstdArchiver}. + * + * @since 4.7.2 + */ +@Named( "tzst" ) +public class TZstdArchiver extends TarZstdArchiver +{ +} diff --git a/src/main/java/org/codehaus/plexus/archiver/tar/TZstdUnArchiver.java b/src/main/java/org/codehaus/plexus/archiver/tar/TZstdUnArchiver.java new file mode 100644 index 000000000..22ce49eab --- /dev/null +++ b/src/main/java/org/codehaus/plexus/archiver/tar/TZstdUnArchiver.java @@ -0,0 +1,28 @@ +/* + * Copyright The Plexus developers. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.codehaus.plexus.archiver.tar; + +import javax.inject.Named; + +/** + * Alias for {@link TarZstdUnArchiver} + * + * @since 4.7.2 + */ +@Named( "tzst" ) +public class TZstdUnArchiver extends TarZstdUnArchiver +{ +} diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt index e49b1cd03..071b5fabe 100644 --- a/src/site/apt/index.apt +++ b/src/site/apt/index.apt @@ -31,11 +31,12 @@ Plexus Archiver | | ({{{./apidocs/index.html?org/codehaus/plexus/archiver/tar/TGZArchiver.html}<<>>}}), | | {{{./apidocs/index.html?org/codehaus/plexus/archiver/tar/TarSnappyArchiver.html}<<>>}}, | | {{{./apidocs/index.html?org/codehaus/plexus/archiver/tar/TarZstdArchiver.html}<<>>}} +| | ({{{./apidocs/index.html?org/codehaus/plexus/archiver/tar/TZstdArchiver.html}<<>>}}), | | {{{./apidocs/index.html?org/codehaus/plexus/archiver/tar/TarXZArchiver.html}<<>>}} | | ({{{./apidocs/index.html?org/codehaus/plexus/archiver/tar/TXZArchiver.html}<<>>}}), | | {{{./apidocs/index.html?org/codehaus/plexus/archiver/war/WarArchiver.html}<<>>}}, | | {{{./apidocs/index.html?org/codehaus/plexus/archiver/xz/XZArchiver.html}<<>>}}, -| | {{{./apidocs/index.html?org/codehaus/plexus/archiver/zip/ZipArchiver.html}<<>>}}. +| | {{{./apidocs/index.html?org/codehaus/plexus/archiver/zip/ZipArchiver.html}<<>>}}, | | {{{./apidocs/index.html?org/codehaus/plexus/archiver/zstd/ZstdArchiver.html}<<>>}} | | *------------------+-----------------+ @@ -50,6 +51,7 @@ Plexus Archiver | | ({{{./apidocs/index.html?org/codehaus/plexus/archiver/tar/TGZUnArchiver.html}<<>>}}), | | {{{./apidocs/index.html?org/codehaus/plexus/archiver/tar/TarSnappyUnArchiver.html}<<>>}} | | {{{./apidocs/index.html?org/codehaus/plexus/archiver/tar/TarZstdUnArchiver.html}<<>>}} +| | ({{{./apidocs/index.html?org/codehaus/plexus/archiver/tar/TZstdUnArchiver.html}<<>>}}), | | {{{./apidocs/index.html?org/codehaus/plexus/archiver/tar/TarXZUnArchiver.html}<<>>}} | | ({{{./apidocs/index.html?org/codehaus/plexus/archiver/tar/TXZUnArchiver.html}<<>>}}), | | {{{./apidocs/index.html?org/codehaus/plexus/archiver/xz/XZUnArchiver.html}<<>>}}, diff --git a/src/test/java/org/codehaus/plexus/archiver/manager/ArchiverManagerTest.java b/src/test/java/org/codehaus/plexus/archiver/manager/ArchiverManagerTest.java index a5a1681e9..8f6341e73 100644 --- a/src/test/java/org/codehaus/plexus/archiver/manager/ArchiverManagerTest.java +++ b/src/test/java/org/codehaus/plexus/archiver/manager/ArchiverManagerTest.java @@ -67,6 +67,7 @@ private static Stream getArchiversAndUnArchiverForTests() "tbz2", "tgz", "txz", + "tzst", "war", "xz", "zip",