TS-38628 Migrated: teamscale-client module

cqse · Apr 27, 2024 · 98a79b3 · 98a79b3
1 parent f968675
commit 98a79b3
Show file tree

Hide file tree

Showing 82 changed files with 2,014 additions and 2,131 deletions.
diff --git a/agent/src/main/java/com/teamscale/jacoco/agent/PreMain.java b/agent/src/main/java/com/teamscale/jacoco/agent/PreMain.java
@@ -1,6 +1,6 @@
 package com.teamscale.jacoco.agent;
 
-import com.teamscale.client.HttpUtils;
+import com.teamscale.client.utils.HttpUtils;
 import com.teamscale.jacoco.agent.configuration.AgentOptionReceiveException;
 import com.teamscale.jacoco.agent.options.AgentOptionParseException;
 import com.teamscale.jacoco.agent.options.AgentOptions;

diff --git a/...om/teamscale/jacoco/agent/commit_resolution/git_properties/GitPropertiesLocatorUtils.java b/...om/teamscale/jacoco/agent/commit_resolution/git_properties/GitPropertiesLocatorUtils.java
@@ -1,7 +1,7 @@
 package com.teamscale.jacoco.agent.commit_resolution.git_properties;
 
-import com.teamscale.client.FileSystemUtils;
-import com.teamscale.client.StringUtils;
+import com.teamscale.client.utils.FileSystemUtils;
+import com.teamscale.client.utils.StringUtils;
 import com.teamscale.jacoco.agent.options.ProjectRevision;
 import com.teamscale.report.util.BashFileSkippingInputStream;
 import org.conqat.lib.commons.collections.Pair;

diff --git a/agent/src/main/java/com/teamscale/jacoco/agent/configuration/ConfigurationViaTeamscale.java b/agent/src/main/java/com/teamscale/jacoco/agent/configuration/ConfigurationViaTeamscale.java
@@ -55,7 +55,7 @@ public static ConfigurationViaTeamscale retrieve(ILogger logger, String configur
 													 String userName,
 													 String userAccessToken) throws AgentOptionReceiveException, AgentOptionParseException {
 		ITeamscaleService teamscaleClient = TeamscaleServiceGenerator
-				.createService(ITeamscaleService.class, url, userName, userAccessToken, LONG_TIMEOUT, LONG_TIMEOUT);
+				.createServiceWithRequestLogging(ITeamscaleService.class, url, userName, userAccessToken, null, LONG_TIMEOUT, LONG_TIMEOUT);
 		try {
 			ProcessInformation processInformation = new ProcessInformationRetriever(logger).getProcessInformation();
 			Response<ProfilerRegistration> response = teamscaleClient.registerProfiler(configurationId,

diff --git a/agent/src/main/java/com/teamscale/jacoco/agent/options/AgentOptions.java b/agent/src/main/java/com/teamscale/jacoco/agent/options/AgentOptions.java
@@ -6,8 +6,10 @@
 package com.teamscale.jacoco.agent.options;
 
 import com.teamscale.client.ReportFormat;
-import com.teamscale.client.FileSystemUtils;
-import com.teamscale.client.StringUtils;
+import com.teamscale.client.ServerConfiguration;
+import com.teamscale.client.utils.FileSystemUtils;
+import com.teamscale.client.utils.HttpUtils;
+import com.teamscale.client.utils.StringUtils;
 import com.teamscale.client.TeamscaleClient;
 import com.teamscale.client.TeamscaleServer;
 import com.teamscale.jacoco.agent.commandline.Validator;
@@ -388,8 +390,14 @@ private void validateTestwiseCoverageConfig(Validator validator) {
 	 */
 	public TeamscaleClient createTeamscaleClient() {
 		if (teamscaleServer.isConfiguredForSingleProjectTeamscaleUpload()) {
-			return new TeamscaleClient(teamscaleServer.url.toString(), teamscaleServer.userName,
-					teamscaleServer.userAccessToken, teamscaleServer.project);
+			// ToDo: Proper config conversion on Kotlin migration
+			ServerConfiguration config = new ServerConfiguration(
+				teamscaleServer.url.toString(),
+				teamscaleServer.userName,
+				teamscaleServer.userAccessToken,
+				teamscaleServer.project
+			);
+			return new TeamscaleClient(config, null, HttpUtils.DEFAULT_READ_TIMEOUT, HttpUtils.DEFAULT_WRITE_TIMEOUT);
 		}
 		return null;
 	}

diff --git a/agent/src/main/java/com/teamscale/jacoco/agent/options/AgentOptionsParser.java b/agent/src/main/java/com/teamscale/jacoco/agent/options/AgentOptionsParser.java
@@ -6,7 +6,7 @@
 package com.teamscale.jacoco.agent.options;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.teamscale.client.StringUtils;
+import com.teamscale.client.utils.StringUtils;
 import com.teamscale.jacoco.agent.commandline.Validator;
 import com.teamscale.jacoco.agent.configuration.AgentOptionReceiveException;
 import com.teamscale.jacoco.agent.configuration.ConfigurationViaTeamscale;

diff --git a/agent/src/main/java/com/teamscale/jacoco/agent/testimpact/CoverageToJsonStrategyBase.java b/agent/src/main/java/com/teamscale/jacoco/agent/testimpact/CoverageToJsonStrategyBase.java
@@ -1,7 +1,7 @@
 package com.teamscale.jacoco.agent.testimpact;
 
 import com.teamscale.client.ClusteredTestDetails;
-import com.teamscale.client.JsonUtils;
+import com.teamscale.client.utils.JsonUtils;
 import com.teamscale.client.PrioritizableTestCluster;
 import com.teamscale.jacoco.agent.JacocoRuntimeController;
 import com.teamscale.jacoco.agent.options.AgentOptions;

diff --git a/agent/src/main/java/com/teamscale/jacoco/agent/testimpact/TestEventHandlerStrategyBase.java b/agent/src/main/java/com/teamscale/jacoco/agent/testimpact/TestEventHandlerStrategyBase.java
@@ -1,7 +1,7 @@
 package com.teamscale.jacoco.agent.testimpact;
 
 import com.teamscale.client.ClusteredTestDetails;
-import com.teamscale.client.HttpUtils;
+import com.teamscale.client.utils.HttpUtils;
 import com.teamscale.client.PrioritizableTestCluster;
 import com.teamscale.client.TeamscaleClient;
 import com.teamscale.jacoco.agent.JacocoRuntimeController;

diff --git a/agent/src/main/java/com/teamscale/jacoco/agent/testimpact/TestExecutionWriter.java b/agent/src/main/java/com/teamscale/jacoco/agent/testimpact/TestExecutionWriter.java
@@ -1,6 +1,6 @@
 package com.teamscale.jacoco.agent.testimpact;
 
-import com.teamscale.client.JsonUtils;
+import com.teamscale.client.utils.JsonUtils;
 import com.teamscale.jacoco.agent.util.LoggingUtils;
 import com.teamscale.report.testwise.model.TestExecution;
 import org.slf4j.Logger;

diff --git a/agent/src/main/java/com/teamscale/jacoco/agent/upload/HttpZipUploaderBase.java b/agent/src/main/java/com/teamscale/jacoco/agent/upload/HttpZipUploaderBase.java
@@ -9,10 +9,11 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
+import kotlin.Unit;
 import org.conqat.lib.commons.filesystem.FileSystemUtils;
 import org.slf4j.Logger;
 
-import com.teamscale.client.HttpUtils;
+import com.teamscale.client.utils.HttpUtils;
 import com.teamscale.jacoco.agent.util.Benchmark2;
 import com.teamscale.jacoco.agent.util.LoggingUtils;
 import com.teamscale.report.jacoco.CoverageFile;
@@ -55,8 +56,14 @@ protected void configureOkHttp(OkHttpClient.Builder builder) {
 	/** Returns the API for creating request to the http uploader */
 	protected T getApi() {
 		if (api == null) {
-			Retrofit retrofit = HttpUtils.createRetrofit(retrofitBuilder -> retrofitBuilder.baseUrl(uploadUrl),
-					this::configureOkHttp);
+			// ToDo: On Kotlin migration, this can be replaced with a lambda
+			Retrofit retrofit = HttpUtils.createRetrofit(retrofitBuilder -> {
+				retrofitBuilder.baseUrl(uploadUrl);
+				return Unit.INSTANCE;
+			}, builder -> {
+				this.configureOkHttp(builder);
+				return Unit.INSTANCE;
+			});
 			api = retrofit.create(apiClass);
 		}
 

diff --git a/agent/src/main/java/com/teamscale/jacoco/agent/upload/artifactory/ArtifactoryConfig.java b/agent/src/main/java/com/teamscale/jacoco/agent/upload/artifactory/ArtifactoryConfig.java
@@ -12,7 +12,7 @@
 import org.conqat.lib.commons.collections.Pair;
 
 import com.teamscale.client.CommitDescriptor;
-import com.teamscale.client.StringUtils;
+import com.teamscale.client.utils.StringUtils;
 import com.teamscale.jacoco.agent.commit_resolution.git_properties.GitPropertiesLocatorUtils;
 import com.teamscale.jacoco.agent.commit_resolution.git_properties.GitSingleProjectPropertiesLocator;
 import com.teamscale.jacoco.agent.commit_resolution.git_properties.InvalidGitPropertiesException;

diff --git a/agent/src/main/java/com/teamscale/jacoco/agent/upload/artifactory/ArtifactoryUploader.java b/agent/src/main/java/com/teamscale/jacoco/agent/upload/artifactory/ArtifactoryUploader.java
@@ -17,8 +17,8 @@
 import com.google.common.base.Strings;
 import com.teamscale.client.CommitDescriptor;
 import com.teamscale.client.ReportFormat;
-import com.teamscale.client.HttpUtils;
-import com.teamscale.client.StringUtils;
+import com.teamscale.client.utils.HttpUtils;
+import com.teamscale.client.utils.StringUtils;
 import com.teamscale.jacoco.agent.upload.HttpZipUploaderBase;
 import com.teamscale.jacoco.agent.upload.IUploadRetry;
 import com.teamscale.report.jacoco.CoverageFile;
@@ -55,7 +55,7 @@ public ArtifactoryUploader(ArtifactoryConfig config, List<Path> additionalMetaDa
 	@Override
 	public void markFileForUploadRetry(CoverageFile coverageFile) {
 		File uploadMetadataFile = new File(FileSystemUtils.replaceFilePathFilenameWith(
-				com.teamscale.client.FileSystemUtils.normalizeSeparators(coverageFile.toString()),
+				FileSystemUtils.normalizeSeparators(coverageFile.toString()),
 				coverageFile.getName() + RETRY_UPLOAD_FILE_SUFFIX));
 		Properties properties = createArtifactoryProperties();
 		try (FileWriter writer = new FileWriter(uploadMetadataFile)) {

diff --git a/agent/src/main/java/com/teamscale/jacoco/agent/upload/azure/AzureFileStorageUploader.java b/agent/src/main/java/com/teamscale/jacoco/agent/upload/azure/AzureFileStorageUploader.java
@@ -60,7 +60,7 @@ public AzureFileStorageUploader(AzureFileStorageConfig config, List<Path> additi
 	@Override
 	public void markFileForUploadRetry(CoverageFile coverageFile) {
 		File uploadMetadataFile = new File(FileSystemUtils.replaceFilePathFilenameWith(
-				com.teamscale.client.FileSystemUtils.normalizeSeparators(coverageFile.toString()),
+				FileSystemUtils.normalizeSeparators(coverageFile.toString()),
 				coverageFile.getName() + RETRY_UPLOAD_FILE_SUFFIX));
 		try {
 			uploadMetadataFile.createNewFile();

diff --git a/agent/src/main/java/com/teamscale/jacoco/agent/upload/teamscale/TeamscaleConfig.java b/agent/src/main/java/com/teamscale/jacoco/agent/upload/teamscale/TeamscaleConfig.java
@@ -1,7 +1,7 @@
 package com.teamscale.jacoco.agent.upload.teamscale;
 
 import com.teamscale.client.CommitDescriptor;
-import com.teamscale.client.StringUtils;
+import com.teamscale.client.utils.StringUtils;
 import com.teamscale.client.TeamscaleServer;
 import com.teamscale.jacoco.agent.options.AgentOptionParseException;
 import com.teamscale.jacoco.agent.options.AgentOptionsParser;

diff --git a/agent/src/main/java/com/teamscale/jacoco/agent/upload/teamscale/TeamscaleUploader.java b/agent/src/main/java/com/teamscale/jacoco/agent/upload/teamscale/TeamscaleUploader.java
@@ -19,7 +19,6 @@
 import com.google.common.base.Strings;
 import com.teamscale.client.CommitDescriptor;
 import com.teamscale.client.ReportFormat;
-import com.teamscale.client.HttpUtils;
 import com.teamscale.client.ITeamscaleService;
 import com.teamscale.client.TeamscaleServer;
 import com.teamscale.client.TeamscaleServiceGenerator;
@@ -83,7 +82,7 @@ private void doUpload(CoverageFile coverageFile, TeamscaleServer teamscaleServer
 	@Override
 	public void markFileForUploadRetry(CoverageFile coverageFile) {
 		File uploadMetadataFile = new File(FileSystemUtils.replaceFilePathFilenameWith(
-				com.teamscale.client.FileSystemUtils.normalizeSeparators(coverageFile.toString()),
+				FileSystemUtils.normalizeSeparators(coverageFile.toString()),
 				coverageFile.getName() + RETRY_UPLOAD_FILE_SUFFIX));
 		Properties serverProperties = this.createServerProperties();
 		try (OutputStreamWriter writer = new OutputStreamWriter(Files.newOutputStream(uploadMetadataFile.toPath()),
@@ -126,9 +125,8 @@ private boolean tryUploading(CoverageFile coverageFile, TeamscaleServer teamscal
 		try {
 			// Cannot be executed in the constructor as this causes issues in WildFly server
 			// (See #100)
-			ITeamscaleService api = TeamscaleServiceGenerator.createService(ITeamscaleService.class,
-					teamscaleServer.url, teamscaleServer.userName, teamscaleServer.userAccessToken,
-					HttpUtils.DEFAULT_READ_TIMEOUT, HttpUtils.DEFAULT_WRITE_TIMEOUT);
+			ITeamscaleService api = TeamscaleServiceGenerator.createServiceWithRequestLogging(ITeamscaleService.class,
+					teamscaleServer.url, teamscaleServer.userName, teamscaleServer.userAccessToken);
 			api.uploadReport(teamscaleServer.project, teamscaleServer.commit, teamscaleServer.revision,
 					teamscaleServer.partition, ReportFormat.JACOCO, teamscaleServer.getMessage(),
 					coverageFile.createFormRequestBody());

diff --git a/agent/src/main/java/com/teamscale/jacoco/agent/util/FileSystemUtilsClone.java b/agent/src/main/java/com/teamscale/jacoco/agent/util/FileSystemUtilsClone.java
@@ -1,5 +1,7 @@
 package com.teamscale.jacoco.agent.util;
 
+import com.teamscale.client.utils.FileSystemUtils;
+
 import java.io.File;
 import java.io.FileFilter;
 import java.util.ArrayList;
@@ -15,7 +17,7 @@
 public class FileSystemUtilsClone {
 
 	/**
-	 * Clone of {@link com.teamscale.client.FileSystemUtils#listFilesRecursively(File, FileFilter)}
+	 * Clone of {@link FileSystemUtils#listFilesRecursively(File, FileFilter)}
 	 */
 	public static List<File> listFilesRecursively(File directory, FileFilter filter) {
 		if (directory == null || !directory.isDirectory()) {
@@ -27,7 +29,7 @@ public static List<File> listFilesRecursively(File directory, FileFilter filter)
 	}
 
 	/**
-	 * Clone of {@link com.teamscale.client.FileSystemUtils#listFilesRecursively(File, Collection, FileFilter)} 
+	 * Clone of {@link FileSystemUtils#listFilesRecursively(File, Collection, FileFilter)}
 	 */
 	private static void listFilesRecursively(File directory, Collection<File> result, FileFilter filter) {
 		File[] files = directory.listFiles();

diff --git a/agent/src/test/java/com/teamscale/jacoco/agent/options/AgentOptionsParserTest.java b/agent/src/test/java/com/teamscale/jacoco/agent/options/AgentOptionsParserTest.java
@@ -1,6 +1,6 @@
 package com.teamscale.jacoco.agent.options;
 
-import com.teamscale.client.JsonUtils;
+import com.teamscale.client.utils.JsonUtils;
 import com.teamscale.client.ProfilerConfiguration;
 import com.teamscale.client.ProfilerRegistration;
 import com.teamscale.jacoco.agent.upload.artifactory.ArtifactoryConfig;

diff --git a/common-system-test/src/main/kotlin/com/teamscale/test/commons/TeamscaleMockServer.kt b/common-system-test/src/main/kotlin/com/teamscale/test/commons/TeamscaleMockServer.kt
@@ -2,9 +2,9 @@ package com.teamscale.test.commons
 
 import com.fasterxml.jackson.core.JsonProcessingException
 import com.teamscale.client.*
-import com.teamscale.client.JsonUtils.deserialize
-import com.teamscale.client.JsonUtils.deserializeAsList
-import com.teamscale.client.JsonUtils.serialize
+import com.teamscale.client.utils.JsonUtils.deserialize
+import com.teamscale.client.utils.JsonUtils.deserializeAsList
+import com.teamscale.client.utils.JsonUtils.serialize
 import com.teamscale.report.testwise.model.TestwiseCoverageReport
 import spark.Request
 import spark.Service

diff --git a/...test-engine/src/main/java/com/teamscale/test_impacted/engine/executor/AvailableTests.java b/...test-engine/src/main/java/com/teamscale/test_impacted/engine/executor/AvailableTests.java
@@ -2,7 +2,7 @@
 
 import com.teamscale.client.ClusteredTestDetails;
 import com.teamscale.client.PrioritizableTest;
-import com.teamscale.client.StringUtils;
+import com.teamscale.client.utils.StringUtils;
 import com.teamscale.client.TestDetails;
 import com.teamscale.test_impacted.commons.LoggerUtils;
 import org.junit.platform.engine.TestEngine;

diff --git a/...ngine/src/main/java/com/teamscale/test_impacted/engine/options/TestEngineOptionUtils.java b/...ngine/src/main/java/com/teamscale/test_impacted/engine/options/TestEngineOptionUtils.java
@@ -1,7 +1,7 @@
 package com.teamscale.test_impacted.engine.options;
 
 import com.teamscale.client.CommitDescriptor;
-import com.teamscale.client.StringUtils;
+import com.teamscale.client.utils.StringUtils;
 import org.junit.platform.engine.ConfigurationParameters;
 
 import java.util.Arrays;

diff --git a/report-generator/src/main/java/com/teamscale/report/jacoco/CoverageFile.java b/report-generator/src/main/java/com/teamscale/report/jacoco/CoverageFile.java
@@ -8,7 +8,7 @@
 import java.nio.file.Files;
 import java.util.Objects;
 
-import com.teamscale.client.FileSystemUtils;
+import com.teamscale.client.utils.FileSystemUtils;
 
 import okhttp3.MultipartBody;
 import okhttp3.RequestBody;

diff --git a/...t-generator/src/main/java/com/teamscale/report/testwise/TestwiseCoverageReportWriter.java b/...t-generator/src/main/java/com/teamscale/report/testwise/TestwiseCoverageReportWriter.java
@@ -2,8 +2,8 @@
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
-import com.teamscale.client.JsonUtils;
-import com.teamscale.client.StringUtils;
+import com.teamscale.client.utils.JsonUtils;
+import com.teamscale.client.utils.StringUtils;
 import com.teamscale.report.testwise.model.TestInfo;
 import com.teamscale.report.testwise.model.builder.TestCoverageBuilder;
 import com.teamscale.report.testwise.model.factory.TestInfoFactory;

diff --git a/...nerator/src/main/java/com/teamscale/report/testwise/jacoco/cache/ClassCoverageLookup.java b/...nerator/src/main/java/com/teamscale/report/testwise/jacoco/cache/ClassCoverageLookup.java
@@ -1,6 +1,6 @@
 package com.teamscale.report.testwise.jacoco.cache;
 
-import com.teamscale.client.StringUtils;
+import com.teamscale.client.utils.StringUtils;
 import com.teamscale.report.testwise.model.builder.FileCoverageBuilder;
 import com.teamscale.report.util.ILogger;
 import com.teamscale.report.util.SortedIntList;

diff --git a/report-generator/src/main/java/com/teamscale/report/util/AntPatternIncludeFilter.java b/report-generator/src/main/java/com/teamscale/report/util/AntPatternIncludeFilter.java
@@ -5,8 +5,8 @@
 +-------------------------------------------------------------------------*/
 package com.teamscale.report.util;
 
-import com.teamscale.client.AntPatternUtils;
-import com.teamscale.client.FileSystemUtils;
+import com.teamscale.client.utils.AntPatternUtils;
+import com.teamscale.client.utils.FileSystemUtils;
 
 import java.util.List;
 import java.util.function.Predicate;

diff --git a/report-generator/src/main/java/com/teamscale/report/util/ClasspathWildcardIncludeFilter.java b/report-generator/src/main/java/com/teamscale/report/util/ClasspathWildcardIncludeFilter.java
@@ -1,7 +1,7 @@
 package com.teamscale.report.util;
 
-import com.teamscale.client.FileSystemUtils;
-import com.teamscale.client.StringUtils;
+import com.teamscale.client.utils.FileSystemUtils;
+import com.teamscale.client.utils.StringUtils;
 import org.jacoco.core.runtime.WildcardMatcher;
 import org.jacoco.report.JavaNames;
 

diff --git a/report-generator/src/main/kotlin/com/teamscale/report/ReportUtils.kt b/report-generator/src/main/kotlin/com/teamscale/report/ReportUtils.kt
@@ -1,9 +1,8 @@
 package com.teamscale.report
 
-import com.teamscale.client.FileSystemUtils
-import com.teamscale.client.JsonUtils.deserialize
-import com.teamscale.client.JsonUtils.deserializeAsArray
-import com.teamscale.client.JsonUtils.serializeWriteToFile
+import com.teamscale.client.utils.FileSystemUtils
+import com.teamscale.client.utils.JsonUtils.deserializeAsArray
+import com.teamscale.client.utils.JsonUtils.serializeWriteToFile
 import com.teamscale.report.testwise.ETestArtifactFormat
 import java.io.File
 import java.io.IOException

diff --git a/...src/test/java/com/teamscale/report/testwise/jacoco/JaCoCoTestwiseReportGeneratorTest.java b/...src/test/java/com/teamscale/report/testwise/jacoco/JaCoCoTestwiseReportGeneratorTest.java
@@ -2,7 +2,6 @@
 
 import com.teamscale.client.TestDetails;
 import com.teamscale.report.EDuplicateClassFileBehavior;
-import com.teamscale.report.ReportUtils;
 import com.teamscale.report.testwise.model.ETestExecutionResult;
 import com.teamscale.report.testwise.model.TestExecution;
 import com.teamscale.report.testwise.model.TestwiseCoverage;
@@ -21,7 +20,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 
-import static com.teamscale.client.JsonUtils.serialize;
+import static com.teamscale.client.utils.JsonUtils.serialize;
 import static org.mockito.Mockito.mock;
 
 /** Tests for the {@link JaCoCoTestwiseReportGenerator} class. */

diff --git a/system-tests/tia-maven/src/test/java/com/teamscale/tia/TiaMavenCoverageConverterTest.java b/system-tests/tia-maven/src/test/java/com/teamscale/tia/TiaMavenCoverageConverterTest.java
@@ -1,6 +1,6 @@
 package com.teamscale.tia;
 
-import com.teamscale.client.JsonUtils;
+import com.teamscale.client.utils.JsonUtils;
 import com.teamscale.report.testwise.model.ETestExecutionResult;
 import com.teamscale.report.testwise.model.TestwiseCoverageReport;
 import com.teamscale.test.commons.SystemTestUtils;

diff --git a/system-tests/tia-maven/src/test/java/com/teamscale/tia/TiaMavenDumpToFileSystemTest.java b/system-tests/tia-maven/src/test/java/com/teamscale/tia/TiaMavenDumpToFileSystemTest.java
@@ -1,6 +1,6 @@
 package com.teamscale.tia;
 
-import com.teamscale.client.JsonUtils;
+import com.teamscale.client.utils.JsonUtils;
 import com.teamscale.report.testwise.model.ETestExecutionResult;
 import com.teamscale.report.testwise.model.TestwiseCoverageReport;
 import com.teamscale.test.commons.SystemTestUtils;