Skip to content

Commit f7002c6

Browse files
committed
TS-38628 Rename serialization
1 parent f015e47 commit f7002c6

8 files changed

Lines changed: 14 additions & 15 deletions

File tree

agent/src/main/java/com/teamscale/jacoco/agent/testimpact/CoverageToJsonStrategyBase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ private String createTestwiseCoverageReport(boolean partial) throws IOException,
141141
availableTests.clear();
142142
testExecutions.clear();
143143

144-
return JsonUtils.serialize(report);
144+
return JsonUtils.serializeToJson(report);
145145
}
146146

147147
}

agent/src/main/java/com/teamscale/jacoco/agent/testimpact/TestExecutionWriter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public TestExecutionWriter(File testExecutionFile) {
2929

3030
/** Appends the given {@link TestExecution} to the test execution list file. */
3131
public synchronized void append(TestExecution testExecution) throws IOException {
32-
String json = JsonUtils.serialize(testExecution);
32+
String json = JsonUtils.serializeToJson(testExecution);
3333

3434
// the file contains a JSON array if it exists and to append to it, we strip the trailing "]" and append
3535
// our new entry and a closing "]"

agent/src/test/java/com/teamscale/jacoco/agent/options/AgentOptionsParserTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public void environmentConfigIdOverridesCommandLineOptions() throws Exception {
101101
registration.profilerConfiguration = new ProfilerConfiguration();
102102
registration.profilerConfiguration.configurationId = "my-config";
103103
registration.profilerConfiguration.configurationOptions = "teamscale-partition=foo";
104-
mockWebServer.enqueue(new MockResponse().setBody(JsonUtils.serialize(registration)));
104+
mockWebServer.enqueue(new MockResponse().setBody(JsonUtils.serializeToJson(registration)));
105105
AgentOptionsParser parser = new AgentOptionsParser(new CommandLineLogger(), "my-config",
106106
null, teamscaleCredentials, null);
107107
AgentOptions options = parseAndThrow(parser, "teamscale-partition=bar");
@@ -125,7 +125,7 @@ public void environmentConfigFileOverridesConfigId() throws Exception {
125125
registration.profilerConfiguration = new ProfilerConfiguration();
126126
registration.profilerConfiguration.configurationId = "my-config";
127127
registration.profilerConfiguration.configurationOptions = "teamscale-partition=from-config-id";
128-
mockWebServer.enqueue(new MockResponse().setBody(JsonUtils.serialize(registration)));
128+
mockWebServer.enqueue(new MockResponse().setBody(JsonUtils.serializeToJson(registration)));
129129
AgentOptionsParser parser = new AgentOptionsParser(new CommandLineLogger(), "my-config", configFile.toString(),
130130
teamscaleCredentials, null);
131131
AgentOptions options = parseAndThrow(parser, "teamscale-partition=from-command-line");

agent/src/test/java/com/teamscale/jacoco/agent/options/AgentOptionsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ public void testTeamscaleProxyOptionsAreUsedWhileFetchingConfigFromTeamscale() t
389389
profilerRegistration.profilerConfiguration = expectedProfilerConfiguration;
390390

391391
mockProxyServer.enqueue(new MockResponse().setResponseCode(407));
392-
mockProxyServer.enqueue(new MockResponse().setResponseCode(200).setBody(JsonUtils.serialize(profilerRegistration)));
392+
mockProxyServer.enqueue(new MockResponse().setResponseCode(200).setBody(JsonUtils.serializeToJson(profilerRegistration)));
393393

394394
AgentOptions agentOptions= parseProxyOptions("config-id=config,", ProxySystemProperties.Protocol.HTTP, expectedHost, expectedPort, expectedUser, unexpectedPassword, passwordFile);
395395

common-system-test/src/main/kotlin/com/teamscale/test/commons/TeamscaleMockServer.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package com.teamscale.test.commons
33
import com.fasterxml.jackson.core.JsonProcessingException
44
import com.teamscale.client.*
55
import com.teamscale.client.JsonUtils.deserializeList
6-
import com.teamscale.client.JsonUtils.serialize
6+
import com.teamscale.client.JsonUtils.serializeToJson
77
import spark.*
88
import spark.utils.IOUtils
99
import java.io.IOException
@@ -143,7 +143,7 @@ class TeamscaleMockServer(port: Int) {
143143

144144
val sessionId = UUID.randomUUID().toString()
145145
sessions.put(sessionId, Session(request))
146-
return sessionId.serialize()
146+
return sessionId.serializeToJson()
147147
}
148148

149149
/** Configures the server to answer all impacted test calls with the given tests. */
@@ -191,7 +191,7 @@ class TeamscaleMockServer(port: Int) {
191191
clusterId.orElse(null),
192192
impactedTests.map { PrioritizableTest(it.testName) }
193193
)
194-
}.serialize()
194+
}.serializeToJson()
195195
}
196196

197197
@Throws(JsonProcessingException::class)
@@ -205,7 +205,7 @@ class TeamscaleMockServer(port: Int) {
205205
val registration = ProfilerRegistration()
206206
registration.profilerConfiguration = this.profilerConfiguration
207207
registration.profilerId = "123"
208-
return registration.serialize()
208+
return registration.serializeToJson()
209209
}
210210

211211
private fun handleProfilerHeartbeat(request: Request, response: Response): String {

report-generator/src/main/kotlin/com/teamscale/report/ReportUtils.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@ package com.teamscale.report
33
import com.fasterxml.jackson.core.JsonProcessingException
44
import com.teamscale.client.FileSystemUtils
55
import com.teamscale.client.JsonUtils
6-
import com.teamscale.client.JsonUtils.serialize
6+
import com.teamscale.client.JsonUtils.serializeToJson
77
import com.teamscale.client.TestDetails
88
import com.teamscale.report.testwise.ETestArtifactFormat
99
import com.teamscale.report.testwise.model.TestExecution
1010
import com.teamscale.report.testwise.model.TestwiseCoverageReport
1111
import java.io.File
1212
import java.io.IOException
13-
import java.util.*
1413

1514
/** Utilities for generating reports. */
1615
object ReportUtils {
@@ -37,7 +36,7 @@ object ReportUtils {
3736
/** Converts to given report to a json string. For testing only. */
3837
@JvmStatic
3938
@Throws(JsonProcessingException::class)
40-
fun getTestwiseCoverageReportAsString(report: TestwiseCoverageReport) = report.serialize()
39+
fun getTestwiseCoverageReportAsString(report: TestwiseCoverageReport) = report.serializeToJson()
4140

4241
/** Writes the report object to the given file as json. */
4342
@Throws(IOException::class)

teamscale-client/src/main/kotlin/com/teamscale/client/JsonUtils.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ object JsonUtils {
7070
*/
7171
@JvmStatic
7272
@Throws(JsonProcessingException::class)
73-
fun Any.serialize(): String =
73+
fun Any.serializeToJson(): String =
7474
OBJECT_MAPPER.writeValueAsString(this)
7575

7676
/**

tia-client/src/main/kotlin/com/teamscale/tia/client/CommandLineInterface.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package com.teamscale.tia.client
22

33
import com.teamscale.client.ClusteredTestDetails
44
import com.teamscale.client.JsonUtils.deserializeList
5-
import com.teamscale.client.JsonUtils.serialize
5+
import com.teamscale.client.JsonUtils.serializeToJson
66
import com.teamscale.client.StringUtils.isEmpty
77
import com.teamscale.report.testwise.model.ETestExecutionResult
88
import com.teamscale.report.testwise.model.TestExecution
@@ -108,7 +108,7 @@ class CommandLineInterface(arguments: Array<String>) {
108108
) {
109109
api.testRunStarted(includeNonImpacted, baseline, baselineRevision, availableTests)
110110
}?.let {
111-
println(it.serialize())
111+
println(it.serializeToJson())
112112
}
113113
}
114114

0 commit comments

Comments
 (0)