aboutsummaryrefslogtreecommitdiffstats
path: root/server/sonar-ce
diff options
context:
space:
mode:
authorZipeng WU <zipeng.wu@sonarsource.com>2023-01-10 11:51:59 +0100
committersonartech <sonartech@sonarsource.com>2023-01-12 20:02:51 +0000
commitc6a817468bcd71129f9da2b453a5a91af62df570 (patch)
tree0b20f3dd739bcb89c0e802c2d51724cbe8a7e70e /server/sonar-ce
parent2b61542b6a77fdfb62ff5a815856d3babee28a1a (diff)
downloadsonarqube-c6a817468bcd71129f9da2b453a5a91af62df570.tar.gz
sonarqube-c6a817468bcd71129f9da2b453a5a91af62df570.zip
[NO-JIRA] Use record for data classes
Diffstat (limited to 'server/sonar-ce')
-rw-r--r--server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeWorkerImpl.java4
-rw-r--r--server/sonar-ce/src/test/java/org/sonar/ce/notification/ReportAnalysisFailureNotificationExecutionListenerTest.java24
-rw-r--r--server/sonar-ce/src/test/java/org/sonar/ce/queue/InternalCeQueueImplTest.java8
-rw-r--r--server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeWorkerImplTest.java24
4 files changed, 30 insertions, 30 deletions
diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeWorkerImpl.java b/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeWorkerImpl.java
index 327f4317a0f..917a6fe582b 100644
--- a/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeWorkerImpl.java
+++ b/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeWorkerImpl.java
@@ -287,11 +287,11 @@ public class CeWorkerImpl implements CeWorker {
if (submitter == null) {
return null;
}
- String submitterLogin = submitter.getLogin();
+ String submitterLogin = submitter.login();
if (submitterLogin != null) {
return submitterLogin;
} else {
- return submitter.getUuid();
+ return submitter.uuid();
}
}
diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/notification/ReportAnalysisFailureNotificationExecutionListenerTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/notification/ReportAnalysisFailureNotificationExecutionListenerTest.java
index d018cb6ecde..fc223dc7f2a 100644
--- a/server/sonar-ce/src/test/java/org/sonar/ce/notification/ReportAnalysisFailureNotificationExecutionListenerTest.java
+++ b/server/sonar-ce/src/test/java/org/sonar/ce/notification/ReportAnalysisFailureNotificationExecutionListenerTest.java
@@ -221,15 +221,15 @@ public class ReportAnalysisFailureNotificationExecutionListenerTest {
ReportAnalysisFailureNotificationBuilder reportAnalysisFailureNotificationBuilder = notificationCaptor.getValue();
- ReportAnalysisFailureNotificationBuilder.Project notificationProject = reportAnalysisFailureNotificationBuilder.getProject();
- assertThat(notificationProject.getName()).isEqualTo(project.name());
- assertThat(notificationProject.getKey()).isEqualTo(project.getKey());
- assertThat(notificationProject.getUuid()).isEqualTo(project.uuid());
- assertThat(notificationProject.getBranchName()).isNull();
- ReportAnalysisFailureNotificationBuilder.Task notificationTask = reportAnalysisFailureNotificationBuilder.getTask();
- assertThat(notificationTask.getUuid()).isEqualTo(taskUuid);
- assertThat(notificationTask.getCreatedAt()).isEqualTo(createdAt);
- assertThat(notificationTask.getFailedAt()).isEqualTo(executedAt);
+ ReportAnalysisFailureNotificationBuilder.Project notificationProject = reportAnalysisFailureNotificationBuilder.project();
+ assertThat(notificationProject.name()).isEqualTo(project.name());
+ assertThat(notificationProject.key()).isEqualTo(project.getKey());
+ assertThat(notificationProject.uuid()).isEqualTo(project.uuid());
+ assertThat(notificationProject.branchName()).isNull();
+ ReportAnalysisFailureNotificationBuilder.Task notificationTask = reportAnalysisFailureNotificationBuilder.task();
+ assertThat(notificationTask.uuid()).isEqualTo(taskUuid);
+ assertThat(notificationTask.createdAt()).isEqualTo(createdAt);
+ assertThat(notificationTask.failedAt()).isEqualTo(executedAt);
}
@Test
@@ -243,7 +243,7 @@ public class ReportAnalysisFailureNotificationExecutionListenerTest {
ArgumentCaptor<ReportAnalysisFailureNotificationBuilder> notificationCaptor = verifyAndCaptureSerializedNotification();
ReportAnalysisFailureNotificationBuilder reportAnalysisFailureNotificationBuilder = notificationCaptor.getValue();
- assertThat(reportAnalysisFailureNotificationBuilder.getErrorMessage()).isEqualTo(message);
+ assertThat(reportAnalysisFailureNotificationBuilder.errorMessage()).isEqualTo(message);
}
@Test
@@ -258,7 +258,7 @@ public class ReportAnalysisFailureNotificationExecutionListenerTest {
ArgumentCaptor<ReportAnalysisFailureNotificationBuilder> notificationCaptor = verifyAndCaptureSerializedNotification();
ReportAnalysisFailureNotificationBuilder reportAnalysisFailureNotificationBuilder = notificationCaptor.getValue();
- assertThat(reportAnalysisFailureNotificationBuilder.getErrorMessage()).isNull();
+ assertThat(reportAnalysisFailureNotificationBuilder.errorMessage()).isNull();
}
@Test
@@ -296,7 +296,7 @@ public class ReportAnalysisFailureNotificationExecutionListenerTest {
verify(notificationService).deliver(same(notificationMock));
ArgumentCaptor<ReportAnalysisFailureNotificationBuilder> notificationCaptor = verifyAndCaptureSerializedNotification();
- assertThat(notificationCaptor.getValue().getTask().getFailedAt()).isEqualTo(now);
+ assertThat(notificationCaptor.getValue().task().failedAt()).isEqualTo(now);
}
private ReportAnalysisFailureNotification mockSerializer() {
diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/queue/InternalCeQueueImplTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/queue/InternalCeQueueImplTest.java
index f1ab19d7927..4a537ed3120 100644
--- a/server/sonar-ce/src/test/java/org/sonar/ce/queue/InternalCeQueueImplTest.java
+++ b/server/sonar-ce/src/test/java/org/sonar/ce/queue/InternalCeQueueImplTest.java
@@ -656,11 +656,11 @@ public class InternalCeQueueImplTest {
}
if (taskSubmit.getSubmitterUuid() != null) {
if (userDto == null) {
- assertThat(task.getSubmitter().getUuid()).isEqualTo(taskSubmit.getSubmitterUuid());
- assertThat(task.getSubmitter().getLogin()).isNull();
+ assertThat(task.getSubmitter().uuid()).isEqualTo(taskSubmit.getSubmitterUuid());
+ assertThat(task.getSubmitter().login()).isNull();
} else {
- assertThat(task.getSubmitter().getUuid()).isEqualTo(userDto.getUuid()).isEqualTo(taskSubmit.getSubmitterUuid());
- assertThat(task.getSubmitter().getUuid()).isEqualTo(userDto.getLogin());
+ assertThat(task.getSubmitter().uuid()).isEqualTo(userDto.getUuid()).isEqualTo(taskSubmit.getSubmitterUuid());
+ assertThat(task.getSubmitter().uuid()).isEqualTo(userDto.getLogin());
}
}
}
diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeWorkerImplTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeWorkerImplTest.java
index 685e74e891f..9b55622906f 100644
--- a/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeWorkerImplTest.java
+++ b/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeWorkerImplTest.java
@@ -367,8 +367,8 @@ public class CeWorkerImplTest {
verifyWorkerUuid();
List<String> logs = logTester.logs(LoggerLevel.INFO);
assertThat(logs).hasSize(2);
- assertThat(logs.get(0)).contains(" | submitter=" + submitter.getLogin());
- assertThat(logs.get(1)).contains(String.format(" | submitter=%s | status=SUCCESS | time=", submitter.getLogin()));
+ assertThat(logs.get(0)).contains(" | submitter=" + submitter.login());
+ assertThat(logs.get(1)).contains(String.format(" | submitter=%s | status=SUCCESS | time=", submitter.login()));
assertThat(logTester.logs(LoggerLevel.ERROR)).isEmpty();
assertThat(logTester.logs(LoggerLevel.DEBUG)).isEmpty();
}
@@ -387,8 +387,8 @@ public class CeWorkerImplTest {
verifyWorkerUuid();
List<String> logs = logTester.logs(LoggerLevel.INFO);
assertThat(logs).hasSize(2);
- assertThat(logs.get(0)).contains(" | submitter=" + submitter.getLogin());
- assertThat(logs.get(1)).contains(String.format(" | submitter=%s | status=FAILED | time=", submitter.getLogin()));
+ assertThat(logs.get(0)).contains(" | submitter=" + submitter.login());
+ assertThat(logs.get(1)).contains(String.format(" | submitter=%s | status=FAILED | time=", submitter.login()));
logs = logTester.logs(LoggerLevel.ERROR);
assertThat(logs).hasSize(1);
assertThat(logs.iterator().next()).isEqualTo("Failed to execute task " + ceTask.getUuid());
@@ -464,8 +464,8 @@ public class CeWorkerImplTest {
List<String> logs = logTester.logs(LoggerLevel.INFO);
assertThat(logs).hasSize(2);
- assertThat(logs.get(0)).contains(" | submitter=" + submitter.getLogin());
- assertThat(logs.get(1)).contains(String.format(" | submitter=%s | status=FAILED | time=", submitter.getLogin()));
+ assertThat(logs.get(0)).contains(" | submitter=" + submitter.login());
+ assertThat(logs.get(1)).contains(String.format(" | submitter=%s | status=FAILED | time=", submitter.login()));
logs = logTester.logs(LoggerLevel.ERROR);
assertThat(logs).hasSize(1);
assertThat(logs.iterator().next()).isEqualTo("Failed to execute task " + ceTask.getUuid());
@@ -482,8 +482,8 @@ public class CeWorkerImplTest {
List<String> logs = logTester.logs(LoggerLevel.INFO);
assertThat(logs).hasSize(2);
- assertThat(logs.get(1)).contains(" | submitter=" + submitter.getLogin());
- assertThat(logs.get(1)).contains(String.format(" | submitter=%s | status=FAILED | time=", submitter.getLogin()));
+ assertThat(logs.get(1)).contains(" | submitter=" + submitter.login());
+ assertThat(logs.get(1)).contains(String.format(" | submitter=%s | status=FAILED | time=", submitter.login()));
assertThat(logTester.logs(LoggerLevel.ERROR)).isEmpty();
}
@@ -512,8 +512,8 @@ public class CeWorkerImplTest {
List<String> logs = logTester.logs(LoggerLevel.INFO);
assertThat(logs).hasSize(2);
- assertThat(logs.get(0)).contains(" | submitter=" + submitter.getLogin());
- assertThat(logs.get(1)).contains(String.format(" | submitter=%s | status=FAILED | time=", submitter.getLogin()));
+ assertThat(logs.get(0)).contains(" | submitter=" + submitter.login());
+ assertThat(logs.get(1)).contains(String.format(" | submitter=%s | status=FAILED | time=", submitter.login()));
List<LogAndArguments> logAndArguments = logTester.getLogs(LoggerLevel.ERROR);
assertThat(logAndArguments).hasSize(2);
@@ -541,8 +541,8 @@ public class CeWorkerImplTest {
List<String> logs = logTester.logs(LoggerLevel.INFO);
assertThat(logs).hasSize(2);
- assertThat(logs.get(0)).contains(" | submitter=" + submitter.getLogin());
- assertThat(logs.get(1)).contains(String.format(" | submitter=%s | status=FAILED | time=", submitter.getLogin()));
+ assertThat(logs.get(0)).contains(" | submitter=" + submitter.login());
+ assertThat(logs.get(1)).contains(String.format(" | submitter=%s | status=FAILED | time=", submitter.login()));
List<LogAndArguments> logAndArguments = logTester.getLogs(LoggerLevel.ERROR);
assertThat(logAndArguments).hasSize(1);
assertThat(logAndArguments.get(0).getFormattedMsg()).isEqualTo("Failed to finalize task with uuid '" + ceTask.getUuid() + "' and persist its state to db");
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-31 09:05:49 +0000