From 2075cf6394c69683c42ee749eff843f3118f17b2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Lesaint?= Date: Fri, 15 May 2015 10:35:14 +0200 Subject: [PATCH] fix quality issues (code format and coverage) --- .../sonar/server/component/ComponentService.java | 3 +-- .../sonar/server/duplication/ws/ShowAction.java | 3 ++- .../server/issue/IssueChangelogFormatter.java | 1 - .../sonar/server/issue/IssueChangelogService.java | 1 - .../ws/ProjectAssociationActions.java | 3 ++- .../qualityprofile/ws/QProfileCreateAction.java | 3 ++- .../org/sonar/server/rule/RubyRuleService.java | 3 ++- .../org/sonar/server/user/UserSessionFilter.java | 3 +-- .../sonar/server/user/UserSessionFilterTest.java | 14 ++++++++++---- 9 files changed, 20 insertions(+), 14 deletions(-) diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ComponentService.java b/server/sonar-server/src/main/java/org/sonar/server/component/ComponentService.java index 5dad5622ad0..3b30c26faf4 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/component/ComponentService.java +++ b/server/sonar-server/src/main/java/org/sonar/server/component/ComponentService.java @@ -32,7 +32,6 @@ import java.util.Map; import java.util.Set; import javax.annotation.CheckForNull; import javax.annotation.Nullable; -import org.sonar.api.ServerComponent; import org.sonar.api.ServerSide; import org.sonar.api.i18n.I18n; import org.sonar.api.resources.Scopes; @@ -64,7 +63,7 @@ public class ComponentService { private final UserSession userSession; public ComponentService(DbClient dbClient, ResourceKeyUpdaterDao resourceKeyUpdaterDao, I18n i18n, ResourceIndexerDao resourceIndexerDao, - InternalPermissionService permissionService, UserSession userSession) { + InternalPermissionService permissionService, UserSession userSession) { this.dbClient = dbClient; this.resourceKeyUpdaterDao = resourceKeyUpdaterDao; this.i18n = i18n; diff --git a/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/ShowAction.java b/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/ShowAction.java index a4e7a1ac10f..53b6adea1e6 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/ShowAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/ShowAction.java @@ -50,7 +50,8 @@ public class ShowAction implements RequestHandler { private final DuplicationsJsonWriter duplicationsJsonWriter; private final UserSession userSession; - public ShowAction(DbClient dbClient, ComponentDao componentDao, MeasureDao measureDao, DuplicationsParser parser, DuplicationsJsonWriter duplicationsJsonWriter, UserSession userSession) { + public ShowAction(DbClient dbClient, ComponentDao componentDao, MeasureDao measureDao, DuplicationsParser parser, + DuplicationsJsonWriter duplicationsJsonWriter, UserSession userSession) { this.dbClient = dbClient; this.componentDao = componentDao; this.measureDao = measureDao; diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueChangelogFormatter.java b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueChangelogFormatter.java index 3ff8056c7be..57192454d1f 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueChangelogFormatter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueChangelogFormatter.java @@ -23,7 +23,6 @@ import java.io.Serializable; import java.util.List; import java.util.Locale; import java.util.Map; -import org.sonar.api.ServerComponent; import org.sonar.api.ServerSide; import org.sonar.api.i18n.I18n; import org.sonar.api.issue.internal.FieldDiffs; diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueChangelogService.java b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueChangelogService.java index 8a1eadfc8de..c7933b55722 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueChangelogService.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueChangelogService.java @@ -21,7 +21,6 @@ package org.sonar.server.issue; import java.util.Collection; import java.util.List; -import org.sonar.api.ServerComponent; import org.sonar.api.ServerSide; import org.sonar.api.issue.Issue; import org.sonar.api.issue.internal.FieldDiffs; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ProjectAssociationActions.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ProjectAssociationActions.java index c058ce9c8f0..54d9eed60d6 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ProjectAssociationActions.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ProjectAssociationActions.java @@ -51,7 +51,8 @@ public class ProjectAssociationActions { private final Languages languages; private final UserSession userSession; - public ProjectAssociationActions(QProfileProjectOperations profileProjectOperations, QProfileLookup profileLookup, ComponentService componentService, Languages languages, UserSession userSession) { + public ProjectAssociationActions(QProfileProjectOperations profileProjectOperations, QProfileLookup profileLookup, + ComponentService componentService, Languages languages, UserSession userSession) { this.profileProjectOperations = profileProjectOperations; this.profileLookup = profileLookup; this.componentService = componentService; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileCreateAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileCreateAction.java index ce31e682947..6362ffb4a69 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileCreateAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileCreateAction.java @@ -55,7 +55,8 @@ public class QProfileCreateAction implements BaseQProfileWsAction { private final ProfileImporter[] importers; private final UserSession userSession; - public QProfileCreateAction(DbClient dbClient, QProfileFactory profileFactory, QProfileExporters exporters, Languages languages, ProfileImporter[] importers, UserSession userSession) { + public QProfileCreateAction(DbClient dbClient, QProfileFactory profileFactory, QProfileExporters exporters, + Languages languages, ProfileImporter[] importers, UserSession userSession) { this.dbClient = dbClient; this.profileFactory = profileFactory; this.exporters = exporters; diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/RubyRuleService.java b/server/sonar-server/src/main/java/org/sonar/server/rule/RubyRuleService.java index 24694fda230..46369fe0d8e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/rule/RubyRuleService.java +++ b/server/sonar-server/src/main/java/org/sonar/server/rule/RubyRuleService.java @@ -109,7 +109,8 @@ public class RubyRuleService implements Startable { * Used in manual_rules_controller.rb */ public List searchManualRules() { - return service.search(new RuleQuery().setRepositories(newArrayList(RuleDoc.MANUAL_REPOSITORY)).setSortField(RuleNormalizer.RuleField.NAME), new QueryContext(userSession)).getHits(); + return service.search(new RuleQuery().setRepositories(newArrayList(RuleDoc.MANUAL_REPOSITORY)) + .setSortField(RuleNormalizer.RuleField.NAME), new QueryContext(userSession)).getHits(); } // sqale diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/UserSessionFilter.java b/server/sonar-server/src/main/java/org/sonar/server/user/UserSessionFilter.java index fdd660f0b02..7663fd48017 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/user/UserSessionFilter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/user/UserSessionFilter.java @@ -56,8 +56,7 @@ public class UserSessionFilter implements Filter { ThreadLocalUserSession userSession = platform.getContainer().getComponentByType(ThreadLocalUserSession.class); if (userSession == null) { Loggers.get(UserSessionFilter.class).error("Can not retrieve ThreadLocalUserSession from Platform"); - } - else { + } else { userSession.remove(); } } diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/UserSessionFilterTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/UserSessionFilterTest.java index 52592d2460b..54834fb6599 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/UserSessionFilterTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/UserSessionFilterTest.java @@ -41,11 +41,13 @@ public class UserSessionFilterTest { private ThreadLocalUserSession threadLocalUserSession = new ThreadLocalUserSession(); private Platform platform = mock(Platform.class); private ComponentContainer componentContainer = mock(ComponentContainer.class); + private HttpServletRequest httpRequest = mock(HttpServletRequest.class); + private ServletResponse httpResponse = mock(ServletResponse.class); + private FilterChain chain = mock(FilterChain.class); @Before public void setUp() { when(platform.getContainer()).thenReturn(componentContainer); - when(componentContainer.getComponentByType(ThreadLocalUserSession.class)).thenReturn(threadLocalUserSession); // for test isolation threadLocalUserSession.remove(); } @@ -57,9 +59,7 @@ public class UserSessionFilterTest { @Test public void should_cleanup_user_session_after_request_handling() throws IOException, ServletException { - HttpServletRequest httpRequest = mock(HttpServletRequest.class); - ServletResponse httpResponse = mock(ServletResponse.class); - FilterChain chain = mock(FilterChain.class); + when(componentContainer.getComponentByType(ThreadLocalUserSession.class)).thenReturn(threadLocalUserSession); threadLocalUserSession.set(new MockUserSession("karadoc").setUserId(123)); assertThat(threadLocalUserSession.hasSession()).isTrue(); @@ -70,6 +70,12 @@ public class UserSessionFilterTest { assertThat(threadLocalUserSession.hasSession()).isFalse(); } + @Test + public void does_not_fail_if_container_has_no_ThreadLocalUserSession() throws Exception { + UserSessionFilter filter = new UserSessionFilter(platform); + filter.doFilter(httpRequest, httpResponse, chain); + } + @Test public void just_for_fun_and_coverage() throws ServletException { UserSessionFilter filter = new UserSessionFilter(platform); -- 2.39.5