[java-identity-provider] branch main updated: Remove a couple of warnings
Rod Widdowson
rdw at steadingsoftware.com
Mon Jul 29 10:06:35 UTC 2024
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=44f068d5bba113373ac0b8f85edbc25590611032
The following commit(s) were added to refs/heads/main by this push:
new 44f068d5b Remove a couple of warnings
44f068d5b is described below
commit 44f068d5bba113373ac0b8f85edbc25590611032
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Jul 29 11:05:46 2024 +0100
Remove a couple of warnings
---
.../net/shibboleth/idp/installer/plugin/impl/PluginInstaller.java | 6 +++---
1 file changed, 3 insertions(+), 3 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 9c983bf00..856758ff9 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
@@ -55,7 +55,7 @@ import org.apache.commons.compress.archivers.ArchiveInputStream;
import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream;
import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream;
-import org.apache.commons.compress.utils.IOUtils;
+import org.apache.commons.io.IOUtils;
import org.apache.hc.client5.http.classic.HttpClient;
import org.apache.tools.ant.BuildException;
import org.opensaml.security.httpclient.HttpClientSecurityContextHandler;
@@ -755,7 +755,7 @@ public final class PluginInstaller extends AbstractInitializableComponent implem
final Path fullName = base.resolve(fileName);
assert fullName!=null;
- try (final ArchiveInputStream inStream = getStreamFor(fullName, isZip(fileName))) {
+ try (final ArchiveInputStream<?> inStream = getStreamFor(fullName, isZip(fileName))) {
ArchiveEntry entry = null;
while ((entry = inStream.getNextEntry()) != null) {
@@ -827,7 +827,7 @@ public final class PluginInstaller extends AbstractInitializableComponent implem
* @return the the appropriate {@link ArchiveInputStream}
* @throws IOException if we trip over an unpack
*/
- @Nonnull private ArchiveInputStream getStreamFor(@Nonnull final Path fullName, final boolean isZip)
+ @Nonnull private ArchiveInputStream<?> getStreamFor(@Nonnull final Path fullName, final boolean isZip)
throws IOException {
final InputStream inStream = new BufferedInputStream(new FileInputStream(fullName.toFile()));
if (isZip) {
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list