Added support for method parameters as collection

This commit is contained in:
Erik C. Thauvin 2023-11-06 12:56:29 -08:00
parent e5eb87400c
commit bbc0a92d23
4 changed files with 39 additions and 7 deletions

6
.idea/misc.xml generated
View file

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="EntryPointsManager"> <component name="EntryPointsManager">
<entry_points version="2.0"> <entry_points version="2.0">
@ -33,6 +34,11 @@
<option name="customRuleSets"> <option name="customRuleSets">
<list> <list>
<option value="$PROJECT_DIR$/config/pmd.xml" /> <option value="$PROJECT_DIR$/config/pmd.xml" />
<option value="K:\java\semver\config\pmd.xml" />
<option value="$PROJECT_DIR$/../bld-checkstyle/config/pmd.xml" />
<option value="$PROJECT_DIR$/../bld-exec/config/pmd.xml" />
<option value="$PROJECT_DIR$/../bld-testng/config/pmd.xml" />
<option value="$PROJECT_DIR$/../bld-pitest/config/pmd.xml" />
</list> </list>
</option> </option>
<option name="skipTestSources" value="false" /> <option name="skipTestSources" value="false" />

View file

@ -1,6 +1,6 @@
bld.downloadExtensionJavadoc=false bld.downloadExtensionJavadoc=false
bld.downloadExtensionSources=true bld.downloadExtensionSources=true
bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.1 bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.2-SNAPSHOT
bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
bld.downloadLocation= bld.downloadLocation=
bld.version=1.7.5 bld.version=1.7.5

View file

@ -25,7 +25,8 @@ import rife.bld.publish.PublishScm;
import java.util.List; import java.util.List;
import static rife.bld.dependencies.Repository.*; import static rife.bld.dependencies.Repository.MAVEN_CENTRAL;
import static rife.bld.dependencies.Repository.RIFE2_RELEASES;
import static rife.bld.dependencies.Scope.*; import static rife.bld.dependencies.Scope.*;
import static rife.bld.operations.JavadocOptions.DocLinkOption.NO_MISSING; import static rife.bld.operations.JavadocOptions.DocLinkOption.NO_MISSING;
@ -33,7 +34,7 @@ public class JacocoReportOperationBuild extends Project {
public JacocoReportOperationBuild() { public JacocoReportOperationBuild() {
pkg = "rife.bld.extension"; pkg = "rife.bld.extension";
name = "JacocoReportOperation"; name = "JacocoReportOperation";
version = version(0, 9, 1); version = version(0, 9, 2, "SNAPSHOT");
javaRelease = 17; javaRelease = 17;
downloadSources = true; downloadSources = true;
@ -53,6 +54,7 @@ public class JacocoReportOperationBuild extends Project {
javadocOperation() javadocOperation()
.javadocOptions() .javadocOptions()
.author()
.docLint(NO_MISSING) .docLint(NO_MISSING)
.link("https://rife2.github.io/bld/") .link("https://rife2.github.io/bld/")
.link("https://rife2.github.io/rife2/"); .link("https://rife2.github.io/rife2/");

View file

@ -35,7 +35,7 @@ import java.io.IOException;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
@ -113,7 +113,15 @@ public class JacocoReportOperation extends AbstractOperation<JacocoReportOperati
* Sets the locations of Java class files. * Sets the locations of Java class files.
**/ **/
public JacocoReportOperation classFiles(File... classFiles) { public JacocoReportOperation classFiles(File... classFiles) {
this.classFiles.addAll(Arrays.stream(classFiles).toList()); this.classFiles.addAll(List.of(classFiles));
return this;
}
/**
* Sets the locations of Java class files.
**/
public JacocoReportOperation classFiles(Collection<File> classFiles) {
this.classFiles.addAll(classFiles);
return this; return this;
} }
@ -145,7 +153,15 @@ public class JacocoReportOperation extends AbstractOperation<JacocoReportOperati
* Sets the locations of the JaCoCo *.exec files to read. * Sets the locations of the JaCoCo *.exec files to read.
*/ */
public JacocoReportOperation execFiles(File... execFiles) { public JacocoReportOperation execFiles(File... execFiles) {
this.execFiles.addAll(Arrays.stream(execFiles).toList()); this.execFiles.addAll(List.of(execFiles));
return this;
}
/**
* Sets the locations of the JaCoCo *.exec files to read.
*/
public JacocoReportOperation execFiles(Collection<File> execFiles) {
this.execFiles.addAll(execFiles);
return this; return this;
} }
@ -293,7 +309,15 @@ public class JacocoReportOperation extends AbstractOperation<JacocoReportOperati
* Sets the locations of the source files. (e.g., {@code src/main/java}) * Sets the locations of the source files. (e.g., {@code src/main/java})
**/ **/
public JacocoReportOperation sourceFiles(File... sourceFiles) { public JacocoReportOperation sourceFiles(File... sourceFiles) {
this.sourceFiles.addAll(Arrays.stream(sourceFiles).toList()); this.sourceFiles.addAll(List.of(sourceFiles));
return this;
}
/**
* Sets the locations of the source files. (e.g., {@code src/main/java})
**/
public JacocoReportOperation sourceFiles(Collection<File> sourceFiles) {
this.sourceFiles.addAll(sourceFiles);
return this; return this;
} }