-
Notifications
You must be signed in to change notification settings - Fork 18
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Motivation: The existing file based filter is bad, in particular as it requires naming the Simulation classes as XXXSimulation. Modification: use standard scan mechanism don't use filters for the user defined simulation class name (gatlingRun-FQCN) replace file path filters matching source files with ant based filters on class names
- Loading branch information
Showing
10 changed files
with
68 additions
and
115 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
71 changes: 23 additions & 48 deletions
71
src/main/groovy/io/gatling/gradle/SimulationFilesUtils.groovy
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,64 +1,39 @@ | ||
| package io.gatling.gradle | ||
|
|
||
| import org.gradle.api.Project | ||
| import org.gradle.api.file.FileTree | ||
| import org.gradle.api.tasks.InputFiles | ||
| import io.gatling.scanner.SimulationScanner | ||
| import org.codehaus.plexus.util.SelectorUtils | ||
|
|
||
| import java.nio.file.Path | ||
| import java.nio.file.Paths | ||
| import java.util.stream.Collectors | ||
|
|
||
| final class SimulationFilesUtils { | ||
|
|
||
| static Iterable<String> resolveSimulations(Project project, Closure simulations) { | ||
| def javaSrcDirs = project.sourceSets.gatling.java.srcDirs.collect { Paths.get(it.absolutePath) } | ||
| def javaFiles = getJavaSimulationSources(project, simulations).collect { Paths.get(it.absolutePath) } | ||
| static List<String> resolveSimulations(Collection<File> classpath, List<String> includes, List<String> excludes) { | ||
| def dependencies = new ArrayList<File>() | ||
| def classDirectories = new ArrayList<File>() | ||
|
|
||
| def javaFQNs = javaFiles.collect { Path srcFile -> | ||
| javaSrcDirs.find { srcFile.startsWith(it) }.relativize(srcFile).join(".") - ".java" | ||
| } | ||
|
|
||
| List<String> kotlinFQNs | ||
| if (project.sourceSets.gatling.hasProperty("kotlin")) { | ||
| def kotlinSrcDirs = project.sourceSets.gatling.kotlin.srcDirs.collect { Paths.get(it.absolutePath) } | ||
| def kotlinFiles = getKotlinSimulationSources(project, simulations).collect { Paths.get(it.absolutePath) } | ||
|
|
||
| kotlinFQNs = kotlinFiles.collect { Path srcFile -> | ||
| kotlinSrcDirs.find { srcFile.startsWith(it) }.relativize(srcFile).join(".") - ".kt" | ||
| classpath.forEach {file -> | ||
| if (file.isDirectory()) { | ||
| classDirectories.add(file) | ||
| } else if (file.isFile()) { | ||
| dependencies.add(file) | ||
| } | ||
| } else { | ||
| kotlinFQNs = [] | ||
| } | ||
|
|
||
| def scalaSrcDirs = project.sourceSets.gatling.scala.srcDirs.collect { Paths.get(it.absolutePath) } | ||
| def scalaFiles = getScalaSimulationSources(project, simulations).collect { Paths.get(it.absolutePath) } | ||
|
|
||
| def scalaFQNs = scalaFiles.collect { Path srcFile -> | ||
| scalaSrcDirs.find { srcFile.startsWith(it) }.relativize(srcFile).join(".") - ".scala" | ||
| } | ||
|
|
||
| return javaFQNs + kotlinFQNs + scalaFQNs | ||
| } | ||
| def allSimulationClasses = SimulationScanner.scan(dependencies, classDirectories).simulationClasses | ||
|
|
||
| @InputFiles | ||
| static FileTree getJavaSimulationSources(Project project, Closure simulations) { | ||
| def simulationFilter = simulations ?: project.gatling.simulations | ||
| return project.sourceSets.gatling.java.matching(simulationFilter) | ||
| } | ||
| List<String> filteredSimulationClasses = allSimulationClasses.stream() | ||
| .filter( | ||
| className -> { | ||
| boolean isIncluded = includes.isEmpty() || match(includes, className) | ||
| boolean isExcluded = !excludes.isEmpty() && match(excludes, className) | ||
| return isIncluded && !isExcluded | ||
| }) | ||
| .collect(Collectors.toList()) | ||
|
|
||
| @InputFiles | ||
| static FileTree getKotlinSimulationSources(Project project, Closure simulations) { | ||
| if (project.sourceSets.gatling.hasProperty("kotlin")) { | ||
| def simulationFilter = simulations ?: project.gatling.simulations | ||
| return project.sourceSets.gatling.kotlin.matching(simulationFilter) | ||
| } else { | ||
| return project.files().asFileTree | ||
| } | ||
| return filteredSimulationClasses | ||
| } | ||
|
|
||
| @InputFiles | ||
| static FileTree getScalaSimulationSources(Project project, Closure simulations) { | ||
| def simulationFilter = simulations ?: project.gatling.simulations | ||
| return project.sourceSets.gatling.scala.matching(simulationFilter) | ||
| private static boolean match(List<String> patterns, String string) { | ||
| return patterns.any {it != null && SelectorUtils.match(it, string) } | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.