Skip to content

Commit fca25e5

Browse files
redzislachiewicz
authored andcommitted
#311 - provide fluent setter for usingDefaultExcludes flag in AbstractFileSet.
1 parent 9c0e021 commit fca25e5

File tree

3 files changed

+15
-4
lines changed

3 files changed

+15
-4
lines changed

src/main/java/org/codehaus/plexus/archiver/util/AbstractFileSet.java

+6
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,12 @@ public T includeEmptyDirs(boolean includeEmptyDirectories) {
162162
return (T) this;
163163
}
164164

165+
@SuppressWarnings("unchecked")
166+
public T usingDefaultExcludes(boolean usingDefaultExcludes) {
167+
setUsingDefaultExcludes(usingDefaultExcludes);
168+
return (T) this;
169+
}
170+
165171
public void setStreamTransformer(@Nonnull InputStreamTransformer streamTransformer) {
166172
this.streamTransformer = streamTransformer;
167173
}

src/test/java/org/codehaus/plexus/archiver/tar/TarArchiverTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -449,8 +449,8 @@ void testSymlinkArchivedFileSet() throws Exception {
449449
final File tarFile2 = getTestFile("target/output/pasymlinks-archivedFileset.tar");
450450
final TarArchiver tarArchiver = getPosixTarArchiver();
451451
tarArchiver.setDestFile(tarFile2);
452-
DefaultArchivedFileSet archivedFileSet = DefaultArchivedFileSet.archivedFileSet(tarFile);
453-
archivedFileSet.setUsingDefaultExcludes(false);
452+
DefaultArchivedFileSet archivedFileSet =
453+
DefaultArchivedFileSet.archivedFileSet(tarFile).usingDefaultExcludes(false);
454454
tarArchiver.addArchivedFileSet(archivedFileSet);
455455
tarArchiver.createArchive();
456456

src/test/java/org/codehaus/plexus/archiver/util/DefaultFileSetTest.java

+7-2
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,16 @@ class DefaultFileSetTest {
1616
void testCreate() {
1717
final String[] includes = {"zz", "yy"};
1818
final String[] exc = {"xx1", "xx2"};
19-
final DefaultFileSet dfs =
20-
fileSet(new File("foo")).prefixed("pfx").include(includes).exclude(exc);
19+
final boolean usingDefaultExcludes = true;
20+
final DefaultFileSet dfs = fileSet(new File("foo"))
21+
.prefixed("pfx")
22+
.include(includes)
23+
.exclude(exc)
24+
.usingDefaultExcludes(usingDefaultExcludes);
2125
assertEquals("foo", dfs.getDirectory().getName());
2226
assertEquals("pfx", dfs.getPrefix());
2327
assertEquals("zz", dfs.getIncludes()[0]);
2428
assertEquals("xx1", dfs.getExcludes()[0]);
29+
assertEquals(usingDefaultExcludes, dfs.isUsingDefaultExcludes());
2530
}
2631
}

0 commit comments

Comments
 (0)