Merge pull request #770 from cqse/ts/44092_remove_teamscale_commons

TS-44092 Remove teamscale commons

Author: stahlbauer

CHANGELOG.md

@@ -6,6 +6,7 @@ We use [semantic versioning](http://semver.org/):
 
 # Next version
 - [breaking fix] _teamscale-gradle-plugin_: Adjusted to breaking API changes in Gradle 9.0
+- [feature] Reduced dependencies and hence the size of all artifacts
 
 # 35.2.2
 - [fix] _teamscale-gradle-plugin_: TeamscaleUpload task did not properly validate `revision` argument

agent/build.gradle.kts

@@ -51,11 +51,11 @@ dependencies {
 	implementation(libs.logback.classic)
 
 	implementation(libs.jcommander)
-	implementation(libs.teamscaleLibCommons)
 
 	implementation(libs.retrofit.core)
 
 	implementation(libs.jackson.databind)
+	implementation(libs.jetbrains.annotations)
 
 	testImplementation(project(":tia-client"))
 	testImplementation(libs.retrofit.converter.jackson)

agent/src/main/java/com/teamscale/jacoco/agent/Agent.java

@@ -5,27 +5,25 @@
 +-------------------------------------------------------------------------*/
 package com.teamscale.jacoco.agent;
 
+import com.teamscale.client.FileSystemUtils;
+import com.teamscale.client.StringUtils;
 import com.teamscale.jacoco.agent.options.AgentOptions;
 import com.teamscale.jacoco.agent.upload.IUploadRetry;
 import com.teamscale.jacoco.agent.upload.IUploader;
 import com.teamscale.jacoco.agent.upload.UploaderException;
 import com.teamscale.jacoco.agent.util.AgentUtils;
 import com.teamscale.jacoco.agent.util.Benchmark;
-import com.teamscale.jacoco.agent.util.FileSystemUtilsClone;
 import com.teamscale.jacoco.agent.util.Timer;
 import com.teamscale.report.jacoco.CoverageFile;
 import com.teamscale.report.jacoco.EmptyReportException;
 import com.teamscale.report.jacoco.JaCoCoXmlReportGenerator;
 import com.teamscale.report.jacoco.dump.Dump;
-import org.conqat.lib.commons.string.StringUtils;
 import org.glassfish.jersey.server.ResourceConfig;
 import org.glassfish.jersey.server.ServerProperties;
 
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.lang.instrument.Instrumentation;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.time.Duration;
@@ -91,7 +89,7 @@ private void retryUnsuccessfulUploads(AgentOptions options, IUploader uploader)
 			return;
 		}
 
-		List<File> reuploadCandidates = FileSystemUtilsClone.listFilesRecursively(parentPath.toFile(),
+		List<File> reuploadCandidates = FileSystemUtils.listFilesRecursively(parentPath.toFile(),
 				filepath -> filepath.getName().endsWith(RETRY_UPLOAD_FILE_SUFFIX));
 		for (File file : reuploadCandidates) {
 			reuploadCoverageFromPropertiesFile(file, uploader);
@@ -100,10 +98,8 @@ private void retryUnsuccessfulUploads(AgentOptions options, IUploader uploader)
 
 	private void reuploadCoverageFromPropertiesFile(File file, IUploader uploader) {
 		logger.info("Retrying previously unsuccessful coverage upload for file {}.", file);
-		try (InputStreamReader reader = new InputStreamReader(Files.newInputStream(file.toPath()),
-				StandardCharsets.UTF_8)) {
-			Properties properties = new Properties();
-			properties.load(reader);
+		try {
+			Properties properties = FileSystemUtils.readProperties(file);
 			CoverageFile coverageFile = new CoverageFile(
 					new File(StringUtils.stripSuffix(file.getAbsolutePath(), RETRY_UPLOAD_FILE_SUFFIX)));
 

agent/src/main/java/com/teamscale/jacoco/agent/Main.java

@@ -4,11 +4,11 @@
 import com.beust.jcommander.JCommander.Builder;
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.ParameterException;
+import com.teamscale.client.StringUtils;
 import com.teamscale.jacoco.agent.commandline.Validator;
 import com.teamscale.jacoco.agent.convert.ConvertCommand;
 import com.teamscale.jacoco.agent.logging.LoggingUtils;
 import com.teamscale.jacoco.agent.util.AgentUtils;
-import org.conqat.lib.commons.string.StringUtils;
 import org.jacoco.core.JaCoCo;
 import org.slf4j.Logger;
 
@@ -30,8 +30,8 @@ public static void main(String[] args) throws Exception {
 	}
 
 	/**
-	 * Parses the given command line arguments. Exits the program or throws an
-	 * exception if the arguments are not valid. Then runs the specified command.
+	 * Parses the given command line arguments. Exits the program or throws an exception if the arguments are not valid.
+	 * Then runs the specified command.
 	 */
 	private void parseCommandLineAndRun(String[] args) throws Exception {
 		Builder builder = createJCommanderBuilder();

agent/src/main/java/com/teamscale/jacoco/agent/PreMain.java

@@ -1,6 +1,8 @@
 package com.teamscale.jacoco.agent;
 
+import com.teamscale.client.FileSystemUtils;
 import com.teamscale.client.HttpUtils;
+import com.teamscale.client.StringUtils;
 import com.teamscale.jacoco.agent.configuration.AgentOptionReceiveException;
 import com.teamscale.jacoco.agent.logging.DebugLogDirectoryPropertyDefiner;
 import com.teamscale.jacoco.agent.logging.LogDirectoryPropertyDefiner;
@@ -17,10 +19,7 @@
 import com.teamscale.jacoco.agent.upload.UploaderException;
 import com.teamscale.jacoco.agent.util.AgentUtils;
 import com.teamscale.report.util.ILogger;
-import org.conqat.lib.commons.collections.CollectionUtils;
-import org.conqat.lib.commons.collections.Pair;
-import org.conqat.lib.commons.filesystem.FileSystemUtils;
-import org.conqat.lib.commons.string.StringUtils;
+import kotlin.Pair;
 import org.slf4j.Logger;
 
 import java.io.File;
@@ -32,6 +31,7 @@
 import java.nio.file.Paths;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 import static com.teamscale.jacoco.agent.logging.LoggingUtils.getLoggerContext;
 
@@ -123,8 +123,8 @@ private static Pair<AgentOptions, List<Exception>> getAndApplyAgentOptions(Strin
 			String environmentConfigFile) throws AgentOptionParseException, IOException, AgentOptionReceiveException {
 
 		DelayedLogger delayedLogger = new DelayedLogger();
-		List<String> javaAgents = CollectionUtils.filter(ManagementFactory.getRuntimeMXBean().getInputArguments(),
-				s -> s.contains("-javaagent"));
+		List<String> javaAgents = ManagementFactory.getRuntimeMXBean().getInputArguments().stream().filter(
+				s -> s.contains("-javaagent")).collect(Collectors.toList());
 		// We allow multiple instances of the teamscale-jacoco-agent as we ensure with the #LOCKING_SYSTEM_PROPERTY to only use it once
 		if (!javaAgents.stream().allMatch(javaAgent -> javaAgent.contains("teamscale-jacoco-agent.jar"))) {
 			delayedLogger.warn("Using multiple java agents could interfere with coverage recording.");

agent/src/main/java/com/teamscale/jacoco/agent/ResourceBase.java

@@ -1,11 +1,11 @@
 package com.teamscale.jacoco.agent;
 
 import com.teamscale.client.CommitDescriptor;
+import com.teamscale.client.StringUtils;
 import com.teamscale.client.TeamscaleServer;
-import com.teamscale.jacoco.agent.testimpact.TestwiseCoverageAgent;
 import com.teamscale.jacoco.agent.logging.LoggingUtils;
+import com.teamscale.jacoco.agent.testimpact.TestwiseCoverageAgent;
 import com.teamscale.report.testwise.model.RevisionInfo;
-import org.conqat.lib.commons.string.StringUtils;
 import org.jetbrains.annotations.Contract;
 import org.slf4j.Logger;
 

agent/src/main/java/com/teamscale/jacoco/agent/commandline/Validator.java

@@ -5,8 +5,8 @@
 +-------------------------------------------------------------------------*/
 package com.teamscale.jacoco.agent.commandline;
 
-import org.conqat.lib.commons.assertion.CCSMAssert;
-import org.conqat.lib.commons.string.StringUtils;
+import com.teamscale.client.StringUtils;
+import com.teamscale.jacoco.agent.util.Assertions;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -35,27 +35,24 @@ public void ensure(ExceptionBasedValidation validation) {
 	public interface ExceptionBasedValidation {
 
 		/**
-		 * Throws an {@link Exception} or {@link AssertionError} if the validation
-		 * fails.
+		 * Throws an {@link Exception} or {@link AssertionError} if the validation fails.
 		 */
 		void validate() throws Exception, AssertionError;
 
 	}
 
 	/**
-	 * Checks that the given condition is <code>true</code> or adds the given error
-	 * message.
+	 * Checks that the given condition is <code>true</code> or adds the given error message.
 	 */
 	public void isTrue(boolean condition, String message) {
-		ensure(() -> CCSMAssert.isTrue(condition, message));
+		ensure(() -> Assertions.isTrue(condition, message));
 	}
 
 	/**
-	 * Checks that the given condition is <code>false</code> or adds the given error
-	 * message.
+	 * Checks that the given condition is <code>false</code> or adds the given error message.
 	 */
 	public void isFalse(boolean condition, String message) {
-		ensure(() -> CCSMAssert.isFalse(condition, message));
+		ensure(() -> Assertions.isFalse(condition, message));
 	}
 
 	/** Returns <code>true</code> if the validation succeeded. */
@@ -65,7 +62,7 @@ public boolean isValid() {
 
 	/** Returns an error message with all validation problems that were found. */
 	public String getErrorMessage() {
-		return "- " + StringUtils.concat(messages, StringUtils.LINE_FEED + "- ");
+		return "- " + String.join(StringUtils.LINE_FEED + "- ", messages);
 	}
 
 }

agent/src/main/java/com/teamscale/jacoco/agent/commit_resolution/git_properties/GitPropertiesLocatingTransformer.java

@@ -1,9 +1,9 @@
 package com.teamscale.jacoco.agent.commit_resolution.git_properties;
 
+import com.teamscale.client.StringUtils;
 import com.teamscale.jacoco.agent.logging.LoggingUtils;
 import com.teamscale.report.util.ClasspathWildcardIncludeFilter;
-import org.conqat.lib.commons.collections.Pair;
-import org.conqat.lib.commons.string.StringUtils;
+import kotlin.Pair;
 import org.slf4j.Logger;
 
 import java.io.File;
@@ -26,14 +26,14 @@ public class GitPropertiesLocatingTransformer implements ClassFileTransformer {
 	private final ClasspathWildcardIncludeFilter locationIncludeFilter;
 
 	public GitPropertiesLocatingTransformer(IGitPropertiesLocator locator,
-											ClasspathWildcardIncludeFilter locationIncludeFilter) {
+			ClasspathWildcardIncludeFilter locationIncludeFilter) {
 		this.locator = locator;
 		this.locationIncludeFilter = locationIncludeFilter;
 	}
 
 	@Override
 	public byte[] transform(ClassLoader classLoader, String className, Class<?> aClass,
-							ProtectionDomain protectionDomain, byte[] classFileContent) {
+			ProtectionDomain protectionDomain, byte[] classFileContent) {
 		if (protectionDomain == null) {
 			// happens for e.g. java.lang. We can ignore these classes
 			return null;
@@ -56,7 +56,8 @@ public byte[] transform(ClassLoader classLoader, String className, Class<?> aCla
 			}
 
 			URL jarOrClassFolderUrl = codeSource.getLocation();
-			Pair<File, Boolean> searchRoot = GitPropertiesLocatorUtils.extractGitPropertiesSearchRoot(jarOrClassFolderUrl);
+			Pair<File, Boolean> searchRoot = GitPropertiesLocatorUtils.extractGitPropertiesSearchRoot(
+					jarOrClassFolderUrl);
 			if (searchRoot == null || searchRoot.getFirst() == null) {
 				logger.warn("Not searching location for git.properties with unknown protocol or extension {}." +
 								" If this location contains your git.properties, please report this warning as a" +

agent/src/main/java/com/teamscale/jacoco/agent/commit_resolution/git_properties/GitPropertiesLocatorUtils.java

@@ -5,7 +5,7 @@
 import com.teamscale.client.StringUtils;
 import com.teamscale.jacoco.agent.options.ProjectAndCommit;
 import com.teamscale.report.util.BashFileSkippingInputStream;
-import org.conqat.lib.commons.collections.Pair;
+import kotlin.Pair;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -127,14 +127,14 @@ public static Pair<File, Boolean> extractGitPropertiesSearchRoot(
 			case "file":
 				File jarOrClassFolderFile = new File(jarOrClassFolderUrl.toURI());
 				if (jarOrClassFolderFile.isDirectory() || isJarLikeFile(jarOrClassFolderUrl.getPath())) {
-					return Pair.createPair(new File(jarOrClassFolderUrl.toURI()), !jarOrClassFolderFile.isDirectory());
+					return new Pair<>(new File(jarOrClassFolderUrl.toURI()), !jarOrClassFolderFile.isDirectory());
 				}
 				break;
 			case "jar":
 				// Used e.g. by Spring Boot. Example: jar:file:/home/k/demo.jar!/BOOT-INF/classes!/
 				Matcher jarMatcher = JAR_URL_REGEX.matcher(jarOrClassFolderUrl.toString());
 				if (jarMatcher.matches()) {
-					return Pair.createPair(new File(jarMatcher.group(1)), true);
+					return new Pair<>(new File(jarMatcher.group(1)), true);
 				}
 				// Intentionally no break to handle ear and war files
 			case "war":
@@ -143,7 +143,7 @@ public static Pair<File, Boolean> extractGitPropertiesSearchRoot(
 				// Example: war:file:/Users/example/apache-tomcat/webapps/demo.war*/WEB-INF/lib/demoLib-1.0-SNAPSHOT.jar
 				Matcher nestedMatcher = NESTED_JAR_REGEX.matcher(jarOrClassFolderUrl.toString());
 				if (nestedMatcher.matches()) {
-					return Pair.createPair(new File(nestedMatcher.group(1)), true);
+					return new Pair<>(new File(nestedMatcher.group(1)), true);
 				}
 				break;
 			case "vfs":
@@ -170,7 +170,7 @@ private static Pair<File, Boolean> getVfsContentFolder(
 		// obtain the physical location of the class file. It is created on demand in <jboss-installation-dir>/standalone/tmp/vfs
 		Method getPhysicalFileMethod = virtualFileClass.getMethod("getPhysicalFile");
 		File file = (File) getPhysicalFileMethod.invoke(virtualFile);
-		return Pair.createPair(file, !file.isDirectory());
+		return new Pair<>(file, !file.isDirectory());
 	}
 
 	/**
@@ -198,7 +198,7 @@ private static String extractArtefactUrl(URL jarOrClassFolderUrl) {
 	}
 
 	private static boolean isJarLikeFile(String segment) {
-		return org.conqat.lib.commons.string.StringUtils.endsWithOneOf(
+		return StringUtils.endsWithOneOf(
 				segment.toLowerCase(), ".jar", ".war", ".ear", ".aar");
 	}
 
@@ -224,7 +224,6 @@ public static List<ProjectAndCommit> getProjectRevisionsFromGitProperties(
 						"No entry or empty value for both '" + GIT_PROPERTIES_GIT_COMMIT_ID + "'/'" + GIT_PROPERTIES_GIT_COMMIT_ID_FULL +
 								"' and '" + GIT_PROPERTIES_TEAMSCALE_PROJECT + "' in " + file + "." +
 								"\nContents of " + GIT_PROPERTIES_FILE_NAME + ": " + entryWithProperties.getSecond()
-								.toString()
 				);
 			}
 			result.add(new ProjectAndCommit(project, commitInfo));
@@ -304,7 +303,7 @@ private static List<Pair<String, Properties>> findGitPropertiesInFolder(File dir
 				gitProperties.load(is);
 				String relativeFilePath = directoryFile.getName() + File.separator + directoryFile.toPath()
 						.relativize(gitPropertiesFile.toPath());
-				result.add(Pair.createPair(relativeFilePath, gitProperties));
+				result.add(new Pair<>(relativeFilePath, gitProperties));
 			} catch (IOException e) {
 				throw new IOException(
 						"Reading directory " + gitPropertiesFile.getAbsolutePath() + " for obtaining commit " +
@@ -330,7 +329,7 @@ static List<Pair<String, Properties>> findGitPropertiesInArchive(
 			if (Paths.get(entry.getName()).getFileName().toString().equalsIgnoreCase(GIT_PROPERTIES_FILE_NAME)) {
 				Properties gitProperties = new Properties();
 				gitProperties.load(in);
-				result.add(Pair.createPair(fullEntryName, gitProperties));
+				result.add(new Pair<>(fullEntryName, gitProperties));
 			} else if (isJarLikeFile(entry.getName()) && recursiveSearch) {
 				result.addAll(findGitPropertiesInArchive(new JarInputStream(in), fullEntryName, true));
 			}
@@ -343,9 +342,9 @@ static List<Pair<String, Properties>> findGitPropertiesInArchive(
 	}
 
 	/**
-	 * Returns the CommitInfo (revision and branch + timestmap) from a git properties file. The revision can be either in
-	 * {@link #GIT_PROPERTIES_GIT_COMMIT_ID} or {@link #GIT_PROPERTIES_GIT_COMMIT_ID_FULL}. The branch and timestamp in
-	 * {@link #GIT_PROPERTIES_GIT_BRANCH} + {@link #GIT_PROPERTIES_GIT_COMMIT_TIME} or in
+	 * Returns the CommitInfo (revision and branch + timestmap) from a git properties file. The revision can be either
+	 * in {@link #GIT_PROPERTIES_GIT_COMMIT_ID} or {@link #GIT_PROPERTIES_GIT_COMMIT_ID_FULL}. The branch and timestamp
+	 * in {@link #GIT_PROPERTIES_GIT_BRANCH} + {@link #GIT_PROPERTIES_GIT_COMMIT_TIME} or in
 	 * {@link #GIT_PROPERTIES_TEAMSCALE_COMMIT_BRANCH} + {@link #GIT_PROPERTIES_TEAMSCALE_COMMIT_TIME}. By default,
 	 * times will be parsed with {@link #GIT_PROPERTIES_DEFAULT_GRADLE_DATE_FORMAT} and
 	 * {@link #GIT_PROPERTIES_DEFAULT_MAVEN_DATE_FORMAT}. An additional format can be given with

agent/src/main/java/com/teamscale/jacoco/agent/commit_resolution/git_properties/GitSingleProjectPropertiesLocator.java

@@ -3,7 +3,7 @@
 import com.teamscale.jacoco.agent.logging.LoggingUtils;
 import com.teamscale.jacoco.agent.upload.delay.DelayedUploader;
 import com.teamscale.jacoco.agent.util.DaemonThreadFactory;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 
 import java.io.File;