More API cleanups

This commit is contained in:
Erik C. Thauvin 2024-08-30 16:40:13 -07:00
parent b8e4cc9d91
commit 80ea834ea2
Signed by: erik
GPG key ID: 776702A6A2DA330E
2 changed files with 19 additions and 13 deletions

View file

@ -373,8 +373,7 @@ public class DokkaOperation extends AbstractProcessOperation<DokkaOperation> {
* @return this operation instance * @return this operation instance
*/ */
public DokkaOperation globalPackageOptions(String... options) { public DokkaOperation globalPackageOptions(String... options) {
globalPackageOptions_.addAll(List.of(options)); return globalPackageOptions(List.of(options));
return this;
} }
/** /**
@ -415,8 +414,7 @@ public class DokkaOperation extends AbstractProcessOperation<DokkaOperation> {
* @return this operation instance * @return this operation instance
*/ */
public DokkaOperation globalSrcLink(String... links) { public DokkaOperation globalSrcLink(String... links) {
globalSrcLinks_.addAll(List.of(links)); return globalSrcLink(List.of(links));
return this;
} }
/** /**
@ -448,6 +446,7 @@ public class DokkaOperation extends AbstractProcessOperation<DokkaOperation> {
* *
* @param files one or more files * @param files one or more files
* @return this operation instance * @return this operation instance
* @see #includes(Collection)
*/ */
public DokkaOperation includes(File... files) { public DokkaOperation includes(File... files) {
return includes(List.of(files)); return includes(List.of(files));
@ -462,6 +461,7 @@ public class DokkaOperation extends AbstractProcessOperation<DokkaOperation> {
* *
* @param files one or more files * @param files one or more files
* @return this operation instance * @return this operation instance
* @see #includesStrings(Collection)
*/ */
public DokkaOperation includes(String... files) { public DokkaOperation includes(String... files) {
return includesStrings(List.of(files)); return includesStrings(List.of(files));
@ -476,6 +476,7 @@ public class DokkaOperation extends AbstractProcessOperation<DokkaOperation> {
* *
* @param files one or more files * @param files one or more files
* @return this operation instance * @return this operation instance
* @see #includesPaths(Collection)
*/ */
public DokkaOperation includes(Path... files) { public DokkaOperation includes(Path... files) {
return includesPaths(List.of(files)); return includesPaths(List.of(files));
@ -500,6 +501,7 @@ public class DokkaOperation extends AbstractProcessOperation<DokkaOperation> {
* *
* @param files the markdown files * @param files the markdown files
* @return this operation instance * @return this operation instance
* @see #includes(File...)
*/ */
public DokkaOperation includes(Collection<File> files) { public DokkaOperation includes(Collection<File> files) {
includes_.addAll(files); includes_.addAll(files);
@ -515,10 +517,10 @@ public class DokkaOperation extends AbstractProcessOperation<DokkaOperation> {
* *
* @param files the markdown files * @param files the markdown files
* @return this operation instance * @return this operation instance
* @see #includes(Path...)
*/ */
public DokkaOperation includesPaths(Collection<Path> files) { public DokkaOperation includesPaths(Collection<Path> files) {
includes_.addAll(files.stream().map(Path::toFile).toList()); return includes(files.stream().map(Path::toFile).toList());
return this;
} }
/** /**
@ -530,10 +532,10 @@ public class DokkaOperation extends AbstractProcessOperation<DokkaOperation> {
* *
* @param files the markdown files * @param files the markdown files
* @return this operation instance * @return this operation instance
* @see #includes(String...)
*/ */
public DokkaOperation includesStrings(Collection<String> files) { public DokkaOperation includesStrings(Collection<String> files) {
includes_.addAll(files.stream().map(File::new).toList()); return includes(files.stream().map(File::new).toList());
return this;
} }
/** /**
@ -758,6 +760,7 @@ public class DokkaOperation extends AbstractProcessOperation<DokkaOperation> {
* *
* @param jars one or more jars * @param jars one or more jars
* @return this operation instance * @return this operation instance
* @see #includes(Collection)
*/ */
public DokkaOperation pluginsClasspath(File... jars) { public DokkaOperation pluginsClasspath(File... jars) {
return pluginsClasspath(List.of(jars)); return pluginsClasspath(List.of(jars));
@ -768,6 +771,7 @@ public class DokkaOperation extends AbstractProcessOperation<DokkaOperation> {
* *
* @param jars one or more jars * @param jars one or more jars
* @return this operation instance * @return this operation instance
* @see #pluginsClasspathStrings(Collection)
*/ */
public DokkaOperation pluginsClasspath(String... jars) { public DokkaOperation pluginsClasspath(String... jars) {
return pluginsClasspathStrings(List.of(jars)); return pluginsClasspathStrings(List.of(jars));
@ -778,6 +782,7 @@ public class DokkaOperation extends AbstractProcessOperation<DokkaOperation> {
* *
* @param jars one or more jars * @param jars one or more jars
* @return this operation instance * @return this operation instance
* @see #pluginsClasspathPaths(Collection)
*/ */
public DokkaOperation pluginsClasspath(Path... jars) { public DokkaOperation pluginsClasspath(Path... jars) {
return pluginsClasspathPaths(List.of(jars)); return pluginsClasspathPaths(List.of(jars));
@ -797,6 +802,7 @@ public class DokkaOperation extends AbstractProcessOperation<DokkaOperation> {
* *
* @param jars the jars * @param jars the jars
* @return this operation instance * @return this operation instance
* @see #pluginsClasspath(Collection)
*/ */
public DokkaOperation pluginsClasspath(Collection<File> jars) { public DokkaOperation pluginsClasspath(Collection<File> jars) {
pluginsClasspath_.addAll(jars); pluginsClasspath_.addAll(jars);
@ -808,10 +814,10 @@ public class DokkaOperation extends AbstractProcessOperation<DokkaOperation> {
* *
* @param jars the jars * @param jars the jars
* @return this operation instance * @return this operation instance
* @see #pluginsClasspath(Path...)
*/ */
public DokkaOperation pluginsClasspathPaths(Collection<Path> jars) { public DokkaOperation pluginsClasspathPaths(Collection<Path> jars) {
pluginsClasspath_.addAll(jars.stream().map(Path::toFile).toList()); return pluginsClasspath(jars.stream().map(Path::toFile).toList());
return this;
} }
/** /**
@ -819,10 +825,10 @@ public class DokkaOperation extends AbstractProcessOperation<DokkaOperation> {
* *
* @param jars the jars * @param jars the jars
* @return this operation instance * @return this operation instance
* @see #pluginsClasspath(String...)
*/ */
public DokkaOperation pluginsClasspathStrings(Collection<String> jars) { public DokkaOperation pluginsClasspathStrings(Collection<String> jars) {
pluginsClasspath_.addAll(jars.stream().map(File::new).toList()); return pluginsClasspath(jars.stream().map(File::new).toList());
return this;
} }
/** /**

View file

@ -245,7 +245,7 @@ class DokkaOperationTest {
@Test @Test
void pluginClasspathTest() { void pluginClasspathTest() {
var op = new DokkaOperation(); var op = new DokkaOperation();
op.pluginsClasspath(List.of(new File(FILE_1), new File(FILE_2))); op.pluginsClasspath(List.of(new File(FILE_1), new File(FILE_2)));
assertThat(op.pluginsClasspath()).as("List(File...)").containsExactly(new File(FILE_1), new File(FILE_2)); assertThat(op.pluginsClasspath()).as("List(File...)").containsExactly(new File(FILE_1), new File(FILE_2));
op.pluginsClasspath().clear(); op.pluginsClasspath().clear();