This is an automated email from the ASF dual-hosted git repository. martin_s pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/archiva.git
commit 7ddf0265ee0e6ba67b5fc34432250eb971bb9f5a Author: Martin Stockhammer <[email protected]> AuthorDate: Sat Feb 29 19:02:27 2020 +0100 Changing visibility of utility method --- .../apache/archiva/repository/storage/util/StorageUtil.java | 2 +- .../org/apache/archiva/repository/storage/FsStorageUtil.java | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/archiva-modules/archiva-base/archiva-storage-api/src/main/java/org/apache/archiva/repository/storage/util/StorageUtil.java b/archiva-modules/archiva-base/archiva-storage-api/src/main/java/org/apache/archiva/repository/storage/util/StorageUtil.java index f8c5745..fa637c6 100644 --- a/archiva-modules/archiva-base/archiva-storage-api/src/main/java/org/apache/archiva/repository/storage/util/StorageUtil.java +++ b/archiva-modules/archiva-base/archiva-storage-api/src/main/java/org/apache/archiva/repository/storage/util/StorageUtil.java @@ -214,7 +214,7 @@ public class StorageUtil } - public static final void wrapWriteFunction( ReadableByteChannel is, RepositoryStorage targetStorage, StorageAsset target, boolean locked) { + private static final void wrapWriteFunction( ReadableByteChannel is, RepositoryStorage targetStorage, StorageAsset target, boolean locked) { try { targetStorage.writeDataToChannel( target, os -> copy(is, os), locked ); } catch (Exception e) { diff --git a/archiva-modules/archiva-base/archiva-storage-fs/src/main/java/org/apache/archiva/repository/storage/FsStorageUtil.java b/archiva-modules/archiva-base/archiva-storage-fs/src/main/java/org/apache/archiva/repository/storage/FsStorageUtil.java index a009440..50eacac 100644 --- a/archiva-modules/archiva-base/archiva-storage-fs/src/main/java/org/apache/archiva/repository/storage/FsStorageUtil.java +++ b/archiva-modules/archiva-base/archiva-storage-fs/src/main/java/org/apache/archiva/repository/storage/FsStorageUtil.java @@ -22,11 +22,13 @@ package org.apache.archiva.repository.storage; import org.apache.archiva.common.filelock.FileLockException; import org.apache.archiva.common.filelock.FileLockManager; import org.apache.archiva.common.filelock.Lock; +import org.apache.archiva.repository.storage.util.StorageUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.IOException; import java.nio.channels.FileChannel; +import java.nio.channels.ReadableByteChannel; import java.nio.file.*; import java.util.HashSet; @@ -104,7 +106,7 @@ public class FsStorageUtil try { final RepositoryStorage sourceStorage = source.getStorage(); final RepositoryStorage targetStorage = target.getStorage(); - sourceStorage.consumeDataFromChannel( source, is -> org.apache.archiva.repository.storage.util.StorageUtil.wrapWriteFunction( is, targetStorage, target, locked ), locked); + sourceStorage.consumeDataFromChannel( source, is -> wrapWriteFunction( is, targetStorage, target, locked ), locked); } catch (IOException e) { throw e; } catch (Throwable e) { @@ -119,6 +121,14 @@ public class FsStorageUtil } } + private static final void wrapWriteFunction( ReadableByteChannel is, RepositoryStorage targetStorage, StorageAsset target, boolean locked) { + try { + targetStorage.writeDataToChannel( target, os -> StorageUtil.copy(is, os), locked ); + } catch (Exception e) { + throw new RuntimeException( e ); + } + } + public static final void copyToLocalFile(StorageAsset asset, Path destination, CopyOption... copyOptions) throws IOException { if (asset.isFileBased()) {
