Skip to content

Commit 26eef36

Browse files
AvanatikerAvanatiker
committed
TS-38628 Reformat
1 parent 4db31cf commit 26eef36

45 files changed

Lines changed: 110 additions & 187 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎agent/src/main/kotlin/com/teamscale/jacoco/agent/DelayedLogger.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package com.teamscale.jacoco.agent
22

33
import com.teamscale.report.util.ILogger
44
import org.slf4j.Logger
5-
import java.util.function.Consumer
65

76
/**
87
* A logger that buffers logs in memory and writes them to the actual logger at a later point. This is needed when stuff

‎agent/src/main/kotlin/com/teamscale/jacoco/agent/JacocoRuntimeController.kt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@ package com.teamscale.jacoco.agent
22

33
import com.teamscale.report.jacoco.dump.Dump
44
import org.jacoco.agent.rt.IAgent
5-
import org.jacoco.core.data.ExecutionData
65
import org.jacoco.core.data.ExecutionDataReader
76
import org.jacoco.core.data.ExecutionDataStore
8-
import org.jacoco.core.data.IExecutionDataVisitor
97
import org.jacoco.core.data.ISessionInfoVisitor
108
import org.jacoco.core.data.SessionInfo
119
import java.io.ByteArrayInputStream

‎agent/src/main/kotlin/com/teamscale/jacoco/agent/PreMain.kt‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,13 @@ package com.teamscale.jacoco.agent
33
import com.teamscale.client.FileSystemUtils
44
import com.teamscale.client.HttpUtils
55
import com.teamscale.client.StringUtils
6+
import com.teamscale.jacoco.agent.PreMain.premain
67
import com.teamscale.jacoco.agent.configuration.AgentOptionReceiveException
78
import com.teamscale.jacoco.agent.logging.DebugLogDirectoryPropertyDefiner
89
import com.teamscale.jacoco.agent.logging.LogDirectoryPropertyDefiner
910
import com.teamscale.jacoco.agent.logging.LogToTeamscaleAppender
1011
import com.teamscale.jacoco.agent.logging.LoggingUtils
11-
import com.teamscale.jacoco.agent.options.AgentOptionParseException
12-
import com.teamscale.jacoco.agent.options.AgentOptions
13-
import com.teamscale.jacoco.agent.options.AgentOptionsParser
14-
import com.teamscale.jacoco.agent.options.FilePatternResolver
15-
import com.teamscale.jacoco.agent.options.JacocoAgentOptionsBuilder
16-
import com.teamscale.jacoco.agent.options.TeamscalePropertiesUtils
12+
import com.teamscale.jacoco.agent.options.*
1713
import com.teamscale.jacoco.agent.testimpact.TestwiseCoverageAgent
1814
import com.teamscale.jacoco.agent.upload.UploaderException
1915
import com.teamscale.jacoco.agent.util.AgentUtils
@@ -24,7 +20,6 @@ import java.lang.management.ManagementFactory
2420
import java.nio.file.Files
2521
import java.nio.file.Path
2622
import java.nio.file.Paths
27-
import kotlin.use
2823

2924
/** Container class for the premain entry point for the agent. */
3025
object PreMain {
@@ -277,7 +272,7 @@ object PreMain {
277272
)
278273
}
279274
}
280-
}
275+
}
281276

282277
return LoggingUtils.initializeDefaultLogging()
283278
}

‎agent/src/main/kotlin/com/teamscale/jacoco/agent/ResourceBase.kt‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@ import com.teamscale.jacoco.agent.logging.LoggingUtils
66
import com.teamscale.report.testwise.model.RevisionInfo
77
import org.jetbrains.annotations.Contract
88
import org.slf4j.Logger
9-
import javax.ws.rs.BadRequestException
10-
import javax.ws.rs.GET
11-
import javax.ws.rs.PUT
12-
import javax.ws.rs.Path
13-
import javax.ws.rs.Produces
9+
import javax.ws.rs.*
1410
import javax.ws.rs.core.MediaType
1511
import javax.ws.rs.core.Response
1612

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package com.teamscale.jacoco.agent.commit_resolution.git_properties
22

33
import com.teamscale.client.CommitDescriptor
4-
import com.teamscale.client.StringUtils.isEmpty
5-
import java.util.*
64

75
/** Hold information regarding a commit. */
86
data class CommitInfo(

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ class GitMultiProjectPropertiesLocator(
2929
gitPropertiesCommitTimeFormat: DateTimeFormatter?
3030
) : this(
3131
uploader, Executors.newSingleThreadExecutor(
32-
DaemonThreadFactory(
33-
GitMultiProjectPropertiesLocator::class.java,
34-
"git.properties Jar scanner thread"
35-
)
36-
), recursiveSearch, gitPropertiesCommitTimeFormat
32+
DaemonThreadFactory(
33+
GitMultiProjectPropertiesLocator::class.java,
34+
"git.properties Jar scanner thread"
35+
)
36+
), recursiveSearch, gitPropertiesCommitTimeFormat
3737
)
3838

3939
/**

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,11 @@ import java.net.URI
1313
import java.net.URISyntaxException
1414
import java.net.URL
1515
import java.nio.file.Files
16-
import java.nio.file.Paths
1716
import java.time.ZonedDateTime
1817
import java.time.format.DateTimeFormatter
1918
import java.time.format.DateTimeFormatterBuilder
2019
import java.time.format.DateTimeParseException
2120
import java.util.*
22-
import java.util.jar.JarEntry
2321
import java.util.jar.JarInputStream
2422
import java.util.regex.Pattern
2523

@@ -345,7 +343,8 @@ object GitPropertiesLocatorUtils {
345343
var entry = inputStream.nextJarEntry
346344
while (entry != null) {
347345
isEmpty = false
348-
val fullEntryName = if (archiveName.isNullOrEmpty()) entry.name else "$archiveName${File.separator}${entry.name}"
346+
val fullEntryName =
347+
if (archiveName.isNullOrEmpty()) entry.name else "$archiveName${File.separator}${entry.name}"
349348
val fileName = entry.name.substringAfterLast('/')
350349

351350
if (fileName.equals(GIT_PROPERTIES_FILE_NAME, ignoreCase = true)) {
@@ -354,7 +353,8 @@ object GitPropertiesLocatorUtils {
354353
} else if (recursiveSearch && isJarLikeFile(entry.name)) {
355354
val nestedJarStream = JarInputStream(inputStream)
356355
result.addAll(
357-
findGitPropertiesInArchive(nestedJarStream, fullEntryName,
356+
findGitPropertiesInArchive(
357+
nestedJarStream, fullEntryName,
358358
recursiveSearch = true,
359359
isRootArchive = false
360360
)

‎agent/src/main/kotlin/com/teamscale/jacoco/agent/commit_resolution/sapnwdi/NwdiMarkerClassLocatingTransformer.kt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.teamscale.jacoco.agent.commit_resolution.sapnwdi
22

33
import com.teamscale.client.CommitDescriptor
4-
import com.teamscale.client.StringUtils.isEmpty
54
import com.teamscale.jacoco.agent.logging.LoggingUtils.getLogger
65
import com.teamscale.jacoco.agent.options.sapnwdi.DelayedSapNwdiMultiUploader
76
import com.teamscale.jacoco.agent.options.sapnwdi.SapNwdiApplication
@@ -11,8 +10,6 @@ import java.nio.file.Files
1110
import java.nio.file.Paths
1211
import java.nio.file.attribute.BasicFileAttributes
1312
import java.security.ProtectionDomain
14-
import java.util.function.Function
15-
import java.util.stream.Collectors
1613

1714
/**
1815
* [ClassFileTransformer] that doesn't change the loaded classes but guesses the rough commit timestamp by

‎agent/src/main/kotlin/com/teamscale/jacoco/agent/configuration/ConfigurationViaTeamscale.kt‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
package com.teamscale.jacoco.agent.configuration
22

33
import com.fasterxml.jackson.core.JsonProcessingException
4-
import com.teamscale.client.ITeamscaleService
5-
import com.teamscale.client.JsonUtils
6-
import com.teamscale.client.ProcessInformation
7-
import com.teamscale.client.ProfilerConfiguration
8-
import com.teamscale.client.ProfilerInfo
9-
import com.teamscale.client.ProfilerRegistration
10-
import com.teamscale.client.TeamscaleServiceGenerator
4+
import com.teamscale.client.*
115
import com.teamscale.jacoco.agent.logging.LoggingUtils
126
import com.teamscale.jacoco.agent.util.AgentUtils
137
import com.teamscale.report.util.ILogger
@@ -17,7 +11,6 @@ import retrofit2.Response
1711
import java.io.IOException
1812
import java.time.Duration
1913
import java.util.concurrent.Executors
20-
import java.util.concurrent.ThreadFactory
2114
import java.util.concurrent.TimeUnit
2215

2316
/**

‎agent/src/main/kotlin/com/teamscale/jacoco/agent/logging/LogToTeamscaleAppender.kt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ import com.teamscale.client.ProfilerLogEntry
1010
import com.teamscale.jacoco.agent.options.AgentOptions
1111
import java.net.ConnectException
1212
import java.time.Duration
13-
import java.util.Collections
14-
import java.util.IdentityHashMap
15-
import java.util.LinkedHashSet
13+
import java.util.*
1614
import java.util.concurrent.CompletableFuture
1715
import java.util.concurrent.Executors
1816
import java.util.concurrent.ScheduledExecutorService

0 commit comments

Comments
 (0)