TS-38628 More tests

Author: Avanatiker

agent/src/main/kotlin/com/teamscale/jacoco/agent/commit_resolution/git_properties/GitSingleProjectPropertiesLocator.kt

@@ -15,29 +15,20 @@ import java.util.concurrent.Executors
  */
 class GitSingleProjectPropertiesLocator<T>(
 	private val uploader: DelayedUploader<T>,
-	private val dataExtractor: DataExtractor<T>,
-	private val executor: Executor,
 	private val recursiveSearch: Boolean,
-	private val gitPropertiesCommitTimeFormat: DateTimeFormatter?
+	private val gitPropertiesCommitTimeFormat: DateTimeFormatter?,
+	private val executor: Executor = Executors.newSingleThreadExecutor(
+		DaemonThreadFactory(
+			GitSingleProjectPropertiesLocator::class.java,
+			"git.properties Jar scanner thread"
+		)
+	),
+	private val dataExtractor: DataExtractor<T>
 ) : IGitPropertiesLocator {
 	private val logger = getLogger(this)
 	private var foundData: T? = null
 	private var jarFileWithGitProperties: File? = null
 
-	constructor(
-		uploader: DelayedUploader<T>,
-		dataExtractor: DataExtractor<T>,
-		recursiveSearch: Boolean,
-		gitPropertiesCommitTimeFormat: DateTimeFormatter?
-	) : this(
-		uploader, dataExtractor, Executors.newSingleThreadExecutor(
-				DaemonThreadFactory(
-					GitSingleProjectPropertiesLocator::class.java,
-					"git.properties Jar scanner thread"
-				)
-			), recursiveSearch, gitPropertiesCommitTimeFormat
-	)
-
 	/**
 	 * Asynchronously searches the given jar file for a git.properties file.
 	 */
@@ -96,7 +87,8 @@ class GitSingleProjectPropertiesLocator<T>(
 		/** Extracts data from the JAR.  */
 		@Throws(IOException::class, InvalidGitPropertiesException::class)
 		fun extractData(
-			file: File, isJarFile: Boolean,
+			file: File,
+			isJarFile: Boolean,
 			recursiveSearch: Boolean,
 			gitPropertiesCommitTimeFormat: DateTimeFormatter?
 		): List<T>

agent/src/main/kotlin/com/teamscale/jacoco/agent/options/AgentOptions.kt

@@ -525,31 +525,27 @@ open class AgentOptions(private val logger: ILogger) {
 		uploader: DelayedUploader<ProjectAndCommit>,
 		gitPropertiesJar: File
 	) {
-		val locator = GitSingleProjectPropertiesLocator(
-			uploader,
-			{ file, isJarFile, recursiveSearch, timeFormat ->
-				getProjectRevisionsFromGitProperties(file, isJarFile, recursiveSearch, timeFormat)
-			}, searchGitPropertiesRecursively,
-			gitPropertiesCommitTimeFormat
-		)
-		locator.searchFileForGitPropertiesAsync(gitPropertiesJar, true)
+		GitSingleProjectPropertiesLocator(
+			uploader, searchGitPropertiesRecursively, gitPropertiesCommitTimeFormat
+		) { file, isJarFile, recursiveSearch, timeFormat ->
+			getProjectRevisionsFromGitProperties(file, isJarFile, recursiveSearch, timeFormat)
+		}.searchFileForGitPropertiesAsync(gitPropertiesJar, true)
 	}
 
 	private fun registerSingleGitPropertiesLocator(
 		uploader: DelayedUploader<ProjectAndCommit>,
 		instrumentation: Instrumentation?
 	) {
-		val locator = GitSingleProjectPropertiesLocator(uploader,
-			{ file, isJarFile, recursiveSearch, timeFormat ->
-				getProjectRevisionsFromGitProperties(file, isJarFile, recursiveSearch, timeFormat)
-			}, searchGitPropertiesRecursively,
-			gitPropertiesCommitTimeFormat
-		)
+		val locator = GitSingleProjectPropertiesLocator(
+			uploader, searchGitPropertiesRecursively, gitPropertiesCommitTimeFormat
+		) { file, isJarFile, recursiveSearch, timeFormat ->
+			getProjectRevisionsFromGitProperties(file, isJarFile, recursiveSearch, timeFormat)
+		}
 		instrumentation?.addTransformer(GitPropertiesLocatingTransformer(locator, locationIncludeFilter))
 	}
 
-	private fun createDelayedSingleProjectTeamscaleUploader() = DelayedUploader(
-		{ projectAndCommit: ProjectAndCommit ->
+	private fun createDelayedSingleProjectTeamscaleUploader() =
+		DelayedUploader<ProjectAndCommit>(outputDirectory!!) { projectAndCommit ->
 			if (!isEmpty(projectAndCommit.project) && (teamscaleServer.project != projectAndCommit.project)) {
 				logger.warn(
 					"Teamscale project '" + teamscaleServer.project + "' specified in the agent configuration is not the same as the Teamscale project '" + projectAndCommit.project + "' specified in git.properties file(s). Proceeding to upload to the" +
@@ -564,8 +560,7 @@ open class AgentOptions(private val logger: ILogger) {
 				teamscaleServer.revision = projectAndCommit.commitInfo.revision
 			}
 			TeamscaleUploader(teamscaleServer)
-		}, outputDirectory!!
-	)
+		}
 
 	private fun startMultiGitPropertiesFileSearchInJarFile(
 		uploader: DelayedTeamscaleMultiProjectUploader,
@@ -587,21 +582,17 @@ open class AgentOptions(private val logger: ILogger) {
 	}
 
 	private fun createDelayedArtifactoryUploader(instrumentation: Instrumentation?): IUploader {
-		val uploader = DelayedUploader<CommitInfo>(
-			{ commitInfo ->
+		val uploader = DelayedUploader<CommitInfo>(outputDirectory!!) { commitInfo ->
 				artifactoryConfig.commitInfo = commitInfo
 				ArtifactoryUploader(artifactoryConfig, additionalMetaDataFiles, reportFormat)
-			}, outputDirectory!!
-		)
+			}
 		val locator = GitSingleProjectPropertiesLocator(
-			uploader,
-			{ file, isJarFile, recursiveSearch, timeFormat ->
-				getCommitInfoFromGitProperties(
-					file, isJarFile, recursiveSearch, timeFormat
-				)
-			},
-			searchGitPropertiesRecursively, gitPropertiesCommitTimeFormat
-		)
+			uploader, searchGitPropertiesRecursively, gitPropertiesCommitTimeFormat
+		) { file, isJarFile, recursiveSearch, timeFormat ->
+			getCommitInfoFromGitProperties(
+				file, isJarFile, recursiveSearch, timeFormat
+			)
+		}
 		instrumentation?.addTransformer(GitPropertiesLocatingTransformer(locator, locationIncludeFilter))
 		return uploader
 	}

agent/src/main/kotlin/com/teamscale/jacoco/agent/upload/delay/DelayedUploader.kt

@@ -18,19 +18,15 @@ import kotlin.io.path.walk
  * information describing a commit is asynchronously made available.
  */
 class DelayedUploader<T> internal constructor(
-	private val wrappedUploaderFactory: Function<T, IUploader>,
 	private val cacheDir: Path,
-	private val executor: Executor
+	private val executor: Executor = Executors.newSingleThreadExecutor(
+		DaemonThreadFactory(DelayedUploader::class.java, "Delayed cache upload thread")
+	),
+	private val wrappedUploaderFactory: (T) -> IUploader,
 ) : IUploader {
 	private val logger = getLogger(this)
 	private var wrappedUploader: IUploader? = null
 
-	constructor(wrappedUploaderFactory: Function<T, IUploader>, cacheDir: Path) : this(
-		wrappedUploaderFactory, cacheDir, Executors.newSingleThreadExecutor(
-			DaemonThreadFactory(DelayedUploader::class.java, "Delayed cache upload thread")
-		)
-	)
-
 	/**
 	 * Visible for testing. Allows tests to control the [Executor] to test the
 	 * asynchronous functionality of this class.
@@ -79,7 +75,7 @@ class DelayedUploader<T> internal constructor(
 	@Synchronized
 	fun setCommitAndTriggerAsynchronousUpload(information: T) {
 		if (wrappedUploader == null) {
-			wrappedUploader = wrappedUploaderFactory.apply(information)
+			wrappedUploader = wrappedUploaderFactory(information)
 			logger.info(
 				"Commit to upload to has been found: {}. Uploading any cached XMLs now to {}", information,
 				wrappedUploader?.describe()