[java-identity-provider] branch main updated: IDP-2327 Bogus warning from plugin installer about zip distributions

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch main
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=5ef5794d2ce619dff86579058b6f1b2275fd6e70

The following commit(s) were added to refs/heads/main by this push:
     new 5ef5794d2 IDP-2327 Bogus warning from plugin installer about zip distributions
5ef5794d2 is described below

commit 5ef5794d2ce619dff86579058b6f1b2275fd6e70
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Oct 1 19:06:31 2024 +0100

    IDP-2327 Bogus warning from plugin installer about zip distributions
    
    https://shibboleth.atlassian.net/browse/IDP-2327
---
 .../net/shibboleth/idp/installer/plugin/impl/PluginInstaller.java  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstaller.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstaller.java
index 82aa0803c..5e133e64d 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstaller.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstaller.java
@@ -849,7 +849,11 @@ public final class PluginInstaller extends AbstractInitializableComponent implem
         try {
             final Path upDir = unpackDirectory = Files.createTempDirectory("plugin-installer-unpack");
             assert upDir != null;
-            unpack(upDir, fullName, isZip(fileName), false);
+            final boolean isZip = isZip(fileName);
+            if (isZip) {
+                DeprecationSupport.warnOnce(ObjectType.CLI_OPTION, "zip Plugin Distributions", null, "tar.gz distribution");
+            }
+            unpack(upDir, fullName, isZip, false);
             try (final DirectoryStream<Path> unpackDirStream = Files.newDirectoryStream(upDir)) {
                 final Iterator<Path> contents = unpackDirStream.iterator();
                 if (!contents.hasNext()) {
@@ -947,7 +951,6 @@ public final class PluginInstaller extends AbstractInitializableComponent implem
             throws IOException {
         final InputStream inStream = new BufferedInputStream(new FileInputStream(fullName.toFile()));
         if (isZip) {
-            DeprecationSupport.warnOnce(ObjectType.CLI_OPTION, "zip Plugin Distributions", null, "tar.gz distribution");
             return new ZipArchiveInputStream(inStream);
         }
         return new TarArchiveInputStream(new GzipCompressorInputStream(inStream));

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.