From 6c0f05695ef287f3a0e88f1908fe2292f1cd1950 Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Wed, 14 Jan 2015 18:27:20 +0100 Subject: [PATCH] Fix quality flaws --- .../server/component/DefaultRubyComponentService.java | 5 +---- .../migrations/v51/CopyScmAccountsFromAuthorsToUsers.java | 7 +++++-- .../sonar/server/duplication/ws/DuplicationsParser.java | 3 +++ .../server/component/DefaultRubyComponentServiceTest.java | 5 +---- .../main/java/org/sonar/core/issue/db/ActionPlanDto.java | 4 ++-- .../java/org/sonar/core/issue/db/ActionPlanStatsDto.java | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/DefaultRubyComponentService.java b/server/sonar-server/src/main/java/org/sonar/server/component/DefaultRubyComponentService.java index 6ed56407785..30f4ced420e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/component/DefaultRubyComponentService.java +++ b/server/sonar-server/src/main/java/org/sonar/server/component/DefaultRubyComponentService.java @@ -22,7 +22,6 @@ package org.sonar.server.component; import com.google.common.base.Strings; import org.sonar.api.component.Component; import org.sonar.api.component.RubyComponentService; -import org.sonar.api.i18n.I18n; import org.sonar.api.resources.Qualifiers; import org.sonar.core.component.ComponentDto; import org.sonar.core.resource.ResourceDao; @@ -41,13 +40,11 @@ public class DefaultRubyComponentService implements RubyComponentService { private final ResourceDao resourceDao; private final DefaultComponentFinder finder; private final ComponentService componentService; - private final I18n i18n; - public DefaultRubyComponentService(ResourceDao resourceDao, DefaultComponentFinder finder, ComponentService componentService, I18n i18n) { + public DefaultRubyComponentService(ResourceDao resourceDao, DefaultComponentFinder finder, ComponentService componentService) { this.resourceDao = resourceDao; this.finder = finder; this.componentService = componentService; - this.i18n = i18n; } @Override diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/CopyScmAccountsFromAuthorsToUsers.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/CopyScmAccountsFromAuthorsToUsers.java index ab401370f2c..b5ed489b350 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/CopyScmAccountsFromAuthorsToUsers.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/CopyScmAccountsFromAuthorsToUsers.java @@ -113,9 +113,12 @@ public class CopyScmAccountsFromAuthorsToUsers extends BaseDataChange { } Select select = context.prepareSelect(sql.toString()); select.setBoolean(1, true); - int currentIndex = 2; + int currentIndex = 1; for (String author : authors) { - select.setString(currentIndex++, author).setString(currentIndex++, author); + currentIndex++; + select.setString(currentIndex, author); + currentIndex++; + select.setString(currentIndex, author); } select.scroll(new Select.RowHandler() { diff --git a/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsParser.java b/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsParser.java index 2da4ffc443c..26721ddb5a6 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsParser.java +++ b/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsParser.java @@ -104,6 +104,7 @@ public class DuplicationsParser implements ServerComponent { @VisibleForTesting static class DuplicationComparator implements Comparator { + private static final long serialVersionUID = 1; private final ComponentDto component; @@ -146,6 +147,8 @@ public class DuplicationsParser implements ServerComponent { } private static class BlockComparator implements Comparator { + private static final long serialVersionUID = 1; + @Override public int compare(@Nullable Block b1, @Nullable Block b2) { diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/DefaultRubyComponentServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/DefaultRubyComponentServiceTest.java index b9483a0015f..c05ad5ac675 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/DefaultRubyComponentServiceTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/component/DefaultRubyComponentServiceTest.java @@ -24,7 +24,6 @@ import org.junit.Before; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.sonar.api.component.Component; -import org.sonar.api.i18n.I18n; import org.sonar.api.resources.Qualifiers; import org.sonar.core.component.ComponentDto; import org.sonar.core.resource.ResourceDao; @@ -45,7 +44,6 @@ public class DefaultRubyComponentServiceTest { ResourceDao resourceDao; DefaultComponentFinder finder; ComponentService componentService; - I18n i18n; DefaultRubyComponentService service; @@ -54,8 +52,7 @@ public class DefaultRubyComponentServiceTest { resourceDao = mock(ResourceDao.class); finder = mock(DefaultComponentFinder.class); componentService = mock(ComponentService.class); - i18n = mock(I18n.class); - service = new DefaultRubyComponentService(resourceDao, finder, componentService, i18n); + service = new DefaultRubyComponentService(resourceDao, finder, componentService); } @Test diff --git a/sonar-core/src/main/java/org/sonar/core/issue/db/ActionPlanDto.java b/sonar-core/src/main/java/org/sonar/core/issue/db/ActionPlanDto.java index 07b6f81cc58..fac4c384dab 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/db/ActionPlanDto.java +++ b/sonar-core/src/main/java/org/sonar/core/issue/db/ActionPlanDto.java @@ -46,8 +46,8 @@ public class ActionPlanDto { private Date createdAt; private Date updatedAt; - // joins - private transient String projectKey; + // return by joins + private String projectKey; public Long getId() { return id; diff --git a/sonar-core/src/main/java/org/sonar/core/issue/db/ActionPlanStatsDto.java b/sonar-core/src/main/java/org/sonar/core/issue/db/ActionPlanStatsDto.java index 217f0358f32..8f7e5dd38e6 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/db/ActionPlanStatsDto.java +++ b/sonar-core/src/main/java/org/sonar/core/issue/db/ActionPlanStatsDto.java @@ -43,8 +43,8 @@ public class ActionPlanStatsDto { private Date updatedAt; private int totalIssues; private int unresolvedIssues; - // joins - private transient String projectKey; + // return by joins + private String projectKey; public Integer getId() { return id; -- 2.39.5