This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/main by this push:
new 10d793b6cb Clean up FeatureExport.copyFileToDirectory() (#2628)
10d793b6cb is described below
commit 10d793b6cbaa1a78bbcc160944a23ea57d1e4e1f
Author: Robert Varga <[email protected]>
AuthorDate: Sat Jun 13 06:40:04 2026 +0200
Clean up FeatureExport.copyFileToDirectory() (#2628)
Use Files.copy() instead of open-coding the copy operation.
Signed-off-by: Robert Varga <[email protected]>
---
.../karaf/features/command/FeatureExport.java | 38 ++++++++--------------
1 file changed, 14 insertions(+), 24 deletions(-)
diff --git
a/features/command/src/main/java/org/apache/karaf/features/command/FeatureExport.java
b/features/command/src/main/java/org/apache/karaf/features/command/FeatureExport.java
index 9085d99378..efc4b0db90 100644
---
a/features/command/src/main/java/org/apache/karaf/features/command/FeatureExport.java
+++
b/features/command/src/main/java/org/apache/karaf/features/command/FeatureExport.java
@@ -17,10 +17,9 @@
package org.apache.karaf.features.command;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.NoSuchFileException;
import org.apache.karaf.features.BundleInfo;
import org.apache.karaf.features.Dependency;
@@ -42,7 +41,6 @@ import org.ops4j.pax.url.mvn.MavenResolver;
* file system. This is useful for several use cases, such as in the event you
* need to deploy the functionality offered by a particular feature to an OBR
* repository.
- *
*/
@Service
@Command(scope = "feature", name = "export-bundles", description = "Export all
of the bundles that make up a specified feature to a directory on the file
system.")
@@ -111,7 +109,7 @@ public class FeatureExport extends FeaturesCommandSupport {
/**
* Prepare the target destination directory.
- *
+ *
* @param destination
* Where we'll save the bundles
* @return true if it is valid, false otherwise
@@ -122,7 +120,7 @@ public class FeatureExport extends FeaturesCommandSupport {
/**
* Save the feature bundles, and all of its transitive dependency bundles.
- *
+ *
* @param dest
* The target directory where we'll save the feature bundles
* @param feature
@@ -158,13 +156,13 @@ public class FeatureExport extends FeaturesCommandSupport
{
/**
* Simple method to copy a file to a target destination directory.
- *
+ *
* @param file
* The file to copy
* @param directory
* The directory to copy it to
* @return true if successful, false if it wasn't
- * @throws FileNotFoundException
+ * @throws NoSuchFileException
* If the file specified doesn't exist
* @throws IOException
* If there is an issue performing the copy
@@ -172,23 +170,15 @@ public class FeatureExport extends FeaturesCommandSupport
{
private static boolean copyFileToDirectory(final File file, final File
directory) throws IOException {
if (!directory.isDirectory()) {
throw new IOException("Can't copy to non-directory specified: " +
directory.getAbsolutePath());
- } else {
- boolean copied = false;
- final File newFile = new File(directory.getAbsolutePath() + "/" +
file.getName());
- if (!newFile.isFile()) {
- try (final FileInputStream fis = new FileInputStream(file)) {
- try (final FileOutputStream fos = new
FileOutputStream(newFile)) {
- byte[] buffer = new byte[1024 * 8];
- int read = -1;
- while ((read = fis.read(buffer)) >= 0) {
- fos.write(buffer, 0, read);
- }
- }
- }
- copied = true;
- }
- return copied;
}
+
+ final var newFile = directory.toPath().resolve(file.getName());
+ if (Files.isRegularFile(newFile)) {
+ return false;
+ }
+
+ Files.copy(file.toPath(), newFile);
+ return true;
}
}
