NO-JIRA Fix code quality issues

Author: ericg138

server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/PersistMeasuresStepIT.java

@@ -105,7 +105,7 @@ class PersistMeasuresStepIT {
   private final DbClient dbClient = db.getDbClient();
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     MetricDto stringMetricDto = db.measures().insertMetric(m -> m.setKey(STRING_METRIC.getKey()).setValueType(Metric.ValueType.STRING.name()));
     MetricDto intMetricDto = db.measures().insertMetric(m -> m.setKey(INT_METRIC.getKey()).setValueType(Metric.ValueType.INT.name()));
     MetricDto bestValueMetricDto = db.measures()
@@ -389,14 +389,13 @@ private void insertBranch() {
     db.commit();
   }
 
-  private ComponentDto insertComponent(String key, String uuid) {
+  private void insertComponent(String key, String uuid) {
     ComponentDto componentDto = new ComponentDto()
       .setKey(key)
       .setUuid(uuid)
       .setUuidPath(uuid + ".")
       .setBranchUuid(uuid);
     db.components().insertComponent(componentDto);
-    return componentDto;
   }
 
   private PersistMeasuresStep step() {

sonar-core/src/test/java/org/sonar/core/issue/DefaultIssueTest.java

@@ -31,7 +31,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -107,9 +107,9 @@ void test_equals_and_hashCode() {
 
   @Test
   void comments_should_not_be_modifiable() {
-    DefaultIssue issue = new DefaultIssue().setKey("AAA");
+    DefaultIssue defaultIssue = new DefaultIssue().setKey("AAA");
 
-    List<DefaultIssueComment> comments = issue.defaultIssueComments();
+    List<DefaultIssueComment> comments = defaultIssue.defaultIssueComments();
     assertThat(comments).isEmpty();
     DefaultIssueComment defaultIssueComment = new DefaultIssueComment();
     try {
@@ -128,42 +128,42 @@ void all_changes_contain_current_change() {
     when(issueChangeContext.getExternalUser()).thenReturn("toto");
     when(issueChangeContext.getWebhookSource()).thenReturn("github");
 
-    DefaultIssue issue = new DefaultIssue()
+    DefaultIssue defaultIssue = new DefaultIssue()
       .setKey("AAA")
       .setFieldChange(issueChangeContext, "actionPlan", "1.0", "1.1");
 
-    assertThat(issue.changes()).hasSize(1);
-    FieldDiffs actualDiffs = issue.changes().iterator().next();
+    assertThat(defaultIssue.changes()).hasSize(1);
+    FieldDiffs actualDiffs = defaultIssue.changes().iterator().next();
     assertThat(actualDiffs.externalUser()).contains(issueChangeContext.getExternalUser());
     assertThat(actualDiffs.webhookSource()).contains(issueChangeContext.getWebhookSource());
   }
 
   @Test
   void setFieldChange_whenAddingChange_shouldUpdateCurrentChange() {
     IssueChangeContext issueChangeContext = mock(IssueChangeContext.class);
-    DefaultIssue issue = new DefaultIssue().setKey("AAA");
+    DefaultIssue defaultIssue = new DefaultIssue().setKey("AAA");
 
-    issue.setFieldChange(issueChangeContext, "actionPlan", "1.0", "1.1");
-    assertThat(issue.changes()).hasSize(1);
-    FieldDiffs currentChange = issue.currentChange();
+    defaultIssue.setFieldChange(issueChangeContext, "actionPlan", "1.0", "1.1");
+    assertThat(defaultIssue.changes()).hasSize(1);
+    FieldDiffs currentChange = defaultIssue.currentChange();
     assertThat(currentChange).isNotNull();
     assertThat(currentChange.get("actionPlan")).isNotNull();
     assertThat(currentChange.get("authorLogin")).isNull();
 
-    issue.setFieldChange(issueChangeContext, "authorLogin", null, "testuser");
-    assertThat(issue.changes()).hasSize(1);
+    defaultIssue.setFieldChange(issueChangeContext, "authorLogin", null, "testuser");
+    assertThat(defaultIssue.changes()).hasSize(1);
     assertThat(currentChange.get("actionPlan")).isNotNull();
     assertThat(currentChange.get("authorLogin")).isNotNull();
     assertThat(currentChange.get("authorLogin").newValue()).isEqualTo("testuser");
   }
 
   @Test
   void adding_null_change_has_no_effect() {
-    DefaultIssue issue = new DefaultIssue();
+    DefaultIssue defaultIssue = new DefaultIssue();
 
-    issue.addChange(null);
+    defaultIssue.addChange(null);
 
-    assertThat(issue.changes()).isEmpty();
+    assertThat(defaultIssue.changes()).isEmpty();
   }
 
   @Test

sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/DeprecatedPropertiesWarningGeneratorTest.java

@@ -51,7 +51,7 @@ public class DeprecatedPropertiesWarningGeneratorTest {
     analysisWarnings, environmentInformation);
 
   @Before
-  public void setUp() throws Exception {
+  public void setUp() {
     settings.removeProperty(CoreProperties.LOGIN);
     when(environmentInformation.getKey()).thenReturn("ScannerCLI");
   }