fix quality issues (code format and coverage)

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 5dad5622ad077e516f9635f3aafe67f9a66c8615..3b30c26faf4d811739a3c1bf10a196b854d5ae76 100644 (file)
--- 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 a4e7a1ac10f7a5b0713b593c44ae242c4f7563fa..53b6adea1e6b3b2a09e9be7b87a8d260c5efac87 100644 (file)
--- 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 3ff8056c7be8539458d5d28bae64bea0a0ec8337..57192454d1fbaa2377190442a4bd90cbef1a573f 100644 (file)
--- 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 8a1eadfc8de174b8cfd6b176363a0247f184cc7f..c7933b557227618fd34c85873dd34cfa90d18ce1 100644 (file)
--- 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 c058ce9c8f0a47aeb8ae2724ddf7f536c0bfa6cb..54d9eed60d60608dd88b24e2f561811208109387 100644 (file)
--- 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 ce31e68294723b60fb49b1debf1b2bff59f2f90f..6362ffb4a69459200b05e2f8f8946232704b10a9 100644 (file)
--- 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 24694fda230e4fa6743c871aaefc6900a10bc6fc..46369fe0d8e6f05af966577cbf937a05d4c1b4f3 100644 (file)
--- 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<Rule> 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 fdd660f0b020696c8b34833ead63c48b0507ba47..7663fd48017f5eb70294f2bf029af8bc246f9a4a 100644 (file)
--- 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 52592d2460b319880b73109a90db3cb579b66f3a..54834fb65992149ffc46233ca44bb188c7d7e54f 100644 (file)
--- 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);