From 58f87e3e1313b39df5f3669ccf5f01f5d3e97490 Mon Sep 17 00:00:00 2001 From: Duarte Meneses Date: Mon, 26 Jun 2023 16:05:22 -0500 Subject: SONAR-19962 Upgrade Sonar Plugin API to v10.0.0.695 --- .../ReportAnalysisFailureNotificationExecutionListenerIT.java | 3 +-- .../java/org/sonar/ce/container/ComputeEngineContainerImpl.java | 8 -------- 2 files changed, 1 insertion(+), 10 deletions(-) (limited to 'server/sonar-ce') diff --git a/server/sonar-ce/src/it/java/org/sonar/ce/notification/ReportAnalysisFailureNotificationExecutionListenerIT.java b/server/sonar-ce/src/it/java/org/sonar/ce/notification/ReportAnalysisFailureNotificationExecutionListenerIT.java index f0184c08762..610a5329d81 100644 --- a/server/sonar-ce/src/it/java/org/sonar/ce/notification/ReportAnalysisFailureNotificationExecutionListenerIT.java +++ b/server/sonar-ce/src/it/java/org/sonar/ce/notification/ReportAnalysisFailureNotificationExecutionListenerIT.java @@ -199,7 +199,6 @@ public class ReportAnalysisFailureNotificationExecutionListenerIT { when(notificationService.hasProjectSubscribersForTypes(projectData.projectUuid(), singleton(ReportAnalysisFailureNotification.class))) .thenReturn(true); - Duration randomDuration = randomDuration(); assertThatThrownBy(() -> underTest.onEnd(ceTaskMock, CeActivityDto.Status.FAILED, randomDuration, ceTaskResultMock, throwableMock)) .isInstanceOf(RowNotFoundException.class) @@ -239,7 +238,7 @@ public class ReportAnalysisFailureNotificationExecutionListenerIT { long executedAt = random.nextInt(999_999); ProjectData project = random.nextBoolean() ? dbTester.components().insertPrivateProject() : dbTester.components().insertPublicProject(); - ComponentDto branchComponent = dbTester.components().insertProjectBranch(project.getMainBranchComponent(), b->b.setKey("otherbranch")); + ComponentDto branchComponent = dbTester.components().insertProjectBranch(project.getMainBranchComponent(), b -> b.setKey("otherbranch")); initMocksToPassConditionsForBranch(branchComponent, project, taskUuid, createdAt, executedAt); Notification notificationMock = mockSerializer(); diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java b/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java index bff8ef8ec94..8cdac135679 100644 --- a/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java +++ b/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java @@ -29,10 +29,7 @@ import org.sonar.api.SonarQubeSide; import org.sonar.api.config.EmailSettings; import org.sonar.api.internal.MetadataLoader; import org.sonar.api.internal.SonarRuntimeImpl; -import org.sonar.api.profiles.XMLProfileParser; -import org.sonar.api.profiles.XMLProfileSerializer; import org.sonar.api.resources.ResourceTypes; -import org.sonar.api.rules.AnnotationRuleParser; import org.sonar.api.server.profile.BuiltInQualityProfileAnnotationLoader; import org.sonar.api.server.rule.RulesDefinitionXmlLoader; import org.sonar.api.utils.Durations; @@ -110,7 +107,6 @@ import org.sonar.server.issue.workflow.IssueWorkflow; import org.sonar.server.l18n.ServerI18n; import org.sonar.server.log.ServerLogging; import org.sonar.server.measure.index.ProjectMeasuresIndexer; -import org.sonar.server.metric.MetricFinder; import org.sonar.server.metric.UnanalyzedLanguageMetrics; import org.sonar.server.notification.DefaultNotificationManager; import org.sonar.server.notification.NotificationService; @@ -361,13 +357,10 @@ public class ComputeEngineContainerImpl implements ComputeEngineContainer { // quality profile ActiveRuleIndexer.class, - XMLProfileParser.class, - XMLProfileSerializer.class, BuiltInQualityProfileAnnotationLoader.class, Rules.QProfiles.class, // rule - AnnotationRuleParser.class, DefaultRuleFinder.class, RulesDefinitionXmlLoader.class, AdHocRuleCreator.class, @@ -378,7 +371,6 @@ public class ComputeEngineContainerImpl implements ComputeEngineContainer { LanguagesProvider.class, // measure - MetricFinder.class, UnanalyzedLanguageMetrics.class, // components, -- cgit v1.2.3