Skip to content

#311 - provide fluent setter for usingDefaultExcludes flag in Abstrac… #312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 26, 2023
Merged

#311 - provide fluent setter for usingDefaultExcludes flag in Abstrac… #312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/main/java/org/codehaus/plexus/archiver/util/AbstractFileSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,12 @@ public T includeEmptyDirs(boolean includeEmptyDirectories) {
return (T) this;
}

@SuppressWarnings("unchecked")
public T usingDefaultExcludes(boolean usingDefaultExcludes) {
setUsingDefaultExcludes(usingDefaultExcludes);
return (T) this;
}

public void setStreamTransformer(@Nonnull InputStreamTransformer streamTransformer) {
this.streamTransformer = streamTransformer;
}
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/org/codehaus/plexus/archiver/tar/TarArchiverTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,8 +449,8 @@ void testSymlinkArchivedFileSet() throws Exception {
final File tarFile2 = getTestFile("target/output/pasymlinks-archivedFileset.tar");
final TarArchiver tarArchiver = getPosixTarArchiver();
tarArchiver.setDestFile(tarFile2);
DefaultArchivedFileSet archivedFileSet = DefaultArchivedFileSet.archivedFileSet(tarFile);
archivedFileSet.setUsingDefaultExcludes(false);
DefaultArchivedFileSet archivedFileSet =
DefaultArchivedFileSet.archivedFileSet(tarFile).usingDefaultExcludes(false);
tarArchiver.addArchivedFileSet(archivedFileSet);
tarArchiver.createArchive();

Expand Down
9 changes: 7 additions & 2 deletions src/test/java/org/codehaus/plexus/archiver/util/DefaultFileSetTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,16 @@ class DefaultFileSetTest {
void testCreate() {
final String[] includes = {"zz", "yy"};
final String[] exc = {"xx1", "xx2"};
final DefaultFileSet dfs =
fileSet(new File("foo")).prefixed("pfx").include(includes).exclude(exc);
final boolean usingDefaultExcludes = true;
final DefaultFileSet dfs = fileSet(new File("foo"))
.prefixed("pfx")
.include(includes)
.exclude(exc)
.usingDefaultExcludes(usingDefaultExcludes);
assertEquals("foo", dfs.getDirectory().getName());
assertEquals("pfx", dfs.getPrefix());
assertEquals("zz", dfs.getIncludes()[0]);
assertEquals("xx1", dfs.getExcludes()[0]);
assertEquals(usingDefaultExcludes, dfs.isUsingDefaultExcludes());
}
}