From 792efa7c241dd86af855b7c83aefcdafa0696847 Mon Sep 17 00:00:00 2001 From: Daniel Beck <1831569+daniel-beck@users.noreply.github.com> Date: Sat, 6 Feb 2021 16:39:47 +0100 Subject: [PATCH] Clean up VirtualFile after adding base implementation (#5212) Co-authored-by: Daniel Beck --- .../main/java/jenkins/util/VirtualFile.java | 24 ------------------- 1 file changed, 24 deletions(-) diff --git a/core/src/main/java/jenkins/util/VirtualFile.java b/core/src/main/java/jenkins/util/VirtualFile.java index 1a4a9a52dd..b09929b9c9 100644 --- a/core/src/main/java/jenkins/util/VirtualFile.java +++ b/core/src/main/java/jenkins/util/VirtualFile.java @@ -660,18 +660,6 @@ public abstract class VirtualFile implements Comparable, Serializab return new Scanner(includes, excludes, useDefaultExcludes, rootPath, noFollowLinks).invoke(f, null); } - @Override - public int zip(OutputStream outputStream, String includes, String excludes, boolean useDefaultExcludes, - boolean noFollowLinks, String prefix) throws IOException { - String rootPath = determineRootPath(); - DirScanner.Glob globScanner = new DirScanner.Glob(includes, excludes, useDefaultExcludes, !noFollowLinks); - ArchiverFactory archiverFactory = noFollowLinks ? ArchiverFactory.createZipWithoutSymlink(prefix) : ArchiverFactory.ZIP; - try (Archiver archiver = archiverFactory.create(outputStream)) { - globScanner.scan(f, FilePath.ignoringSymlinks(archiver, rootPath, noFollowLinks)); - return archiver.countEntries(); - } - } - @Override public boolean hasSymlink(boolean noFollowLinks) throws IOException { String rootPath = determineRootPath(); @@ -969,18 +957,6 @@ public abstract class VirtualFile implements Comparable, Serializab } } - @Override - public int zip(OutputStream outputStream, String includes, String excludes, boolean useDefaultExcludes, - boolean noFollowLinks, String prefix) throws IOException { - try { - String rootPath = root == null ? null : root.getRemote(); - DirScanner.Glob globScanner = new DirScanner.Glob(includes, excludes, useDefaultExcludes, !noFollowLinks); - return f.zip(outputStream, globScanner, rootPath, noFollowLinks, prefix); - } catch (InterruptedException x) { - throw new IOException(x); - } - } - @Override public VirtualFile child(String name) { return new FilePathVF(f.child(name), this.root); }