Fix some quality flaws

13 files changed, 22 insertions, 14 deletions

diff --git a/sonar-server/src/dev/web.xml b/sonar-server/src/dev/web.xml
index 73445144d8b..fef16ea1aaf 100644
--- a/sonar-server/src/dev/web.xml
+++ b/sonar-server/src/dev/web.xml
@@ -42,7 +42,7 @@
   </filter>
   <filter>
     <filter-name>UserSessionFilter</filter-name>
-    <filter-class>org.sonar.server.platform.UserSessionFilter</filter-class>
+    <filter-class>org.sonar.server.user.UserSessionFilter</filter-class>
   </filter>
   <filter>
     <filter-name>RackFilter</filter-name>
diff --git a/sonar-server/src/main/java/org/sonar/server/issue/DefaultIssueFinder.java b/sonar-server/src/main/java/org/sonar/server/issue/DefaultIssueFinder.java
index 0f099d0f259..c983cac184d 100644
--- a/sonar-server/src/main/java/org/sonar/server/issue/DefaultIssueFinder.java
+++ b/sonar-server/src/main/java/org/sonar/server/issue/DefaultIssueFinder.java
@@ -40,7 +40,7 @@ import org.sonar.core.persistence.MyBatis;
 import org.sonar.core.resource.ResourceDao;
 import org.sonar.core.rule.DefaultRuleFinder;
 import org.sonar.core.user.AuthorizationDao;
-import org.sonar.server.platform.UserSession;
+import org.sonar.server.user.UserSession;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/sonar-server/src/main/java/org/sonar/server/issue/InternalRubyIssueService.java b/sonar-server/src/main/java/org/sonar/server/issue/InternalRubyIssueService.java
index 1b4ac5a61b2..05ea65440dd 100644
--- a/sonar-server/src/main/java/org/sonar/server/issue/InternalRubyIssueService.java
+++ b/sonar-server/src/main/java/org/sonar/server/issue/InternalRubyIssueService.java
@@ -38,7 +38,7 @@ import org.sonar.core.issue.workflow.Transition;
 import org.sonar.core.resource.ResourceDao;
 import org.sonar.core.resource.ResourceDto;
 import org.sonar.core.resource.ResourceQuery;
-import org.sonar.server.platform.UserSession;
+import org.sonar.server.user.UserSession;
 import org.sonar.server.util.RubyUtils;
 
 import javax.annotation.Nullable;
diff --git a/sonar-server/src/main/java/org/sonar/server/issue/IssueCommentService.java b/sonar-server/src/main/java/org/sonar/server/issue/IssueCommentService.java
index 5095ce59d37..8a518028514 100644
--- a/sonar-server/src/main/java/org/sonar/server/issue/IssueCommentService.java
+++ b/sonar-server/src/main/java/org/sonar/server/issue/IssueCommentService.java
@@ -31,7 +31,7 @@ import org.sonar.core.issue.IssueUpdater;
 import org.sonar.core.issue.db.IssueChangeDao;
 import org.sonar.core.issue.db.IssueChangeDto;
 import org.sonar.core.issue.db.IssueStorage;
-import org.sonar.server.platform.UserSession;
+import org.sonar.server.user.UserSession;
 
 import java.util.Date;
 
diff --git a/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java b/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java
index b3f8b8521f6..27f0b0efbbc 100644
--- a/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java
+++ b/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java
@@ -34,7 +34,7 @@ import org.sonar.core.issue.IssueUpdater;
 import org.sonar.core.issue.db.IssueStorage;
 import org.sonar.core.issue.workflow.IssueWorkflow;
 import org.sonar.core.issue.workflow.Transition;
-import org.sonar.server.platform.UserSession;
+import org.sonar.server.user.UserSession;
 
 import javax.annotation.Nullable;
 
diff --git a/sonar-server/src/main/java/org/sonar/server/issue/IssueStatsFinder.java b/sonar-server/src/main/java/org/sonar/server/issue/IssueStatsFinder.java
index a19829113f0..561272244d4 100644
--- a/sonar-server/src/main/java/org/sonar/server/issue/IssueStatsFinder.java
+++ b/sonar-server/src/main/java/org/sonar/server/issue/IssueStatsFinder.java
@@ -29,7 +29,7 @@ import org.sonar.api.user.User;
 import org.sonar.api.user.UserFinder;
 import org.sonar.core.issue.db.IssueStatsColumn;
 import org.sonar.core.issue.db.IssueStatsDao;
-import org.sonar.server.platform.UserSession;
+import org.sonar.server.user.UserSession;
 
 import javax.annotation.CheckForNull;
 
diff --git a/sonar-server/src/main/java/org/sonar/server/rule/RubyRuleService.java b/sonar-server/src/main/java/org/sonar/server/rule/RubyRuleService.java
index 9a61e560eae..0bd88c37885 100644
--- a/sonar-server/src/main/java/org/sonar/server/rule/RubyRuleService.java
+++ b/sonar-server/src/main/java/org/sonar/server/rule/RubyRuleService.java
@@ -23,7 +23,7 @@ import org.picocontainer.Startable;
 import org.sonar.api.ServerComponent;
 import org.sonar.api.rules.Rule;
 import org.sonar.core.i18n.RuleI18nManager;
-import org.sonar.server.platform.UserSession;
+import org.sonar.server.user.UserSession;
 
 /**
  * Used through ruby code <pre>Internal.rules</pre>
diff --git a/sonar-server/src/main/java/org/sonar/server/platform/UserSession.java b/sonar-server/src/main/java/org/sonar/server/user/UserSession.java
index c81409d11cd..87fbe6a1368 100644
--- a/sonar-server/src/main/java/org/sonar/server/platform/UserSession.java
+++ b/sonar-server/src/main/java/org/sonar/server/user/UserSession.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.server.platform;
+package org.sonar.server.user;
 
 import com.google.common.base.Objects;
 import org.sonar.server.ui.JRubyI18n;
@@ -26,6 +26,11 @@ import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
 import java.util.Locale;
 
+/**
+ * Part of the current HTTP session
+ *
+ * @since 3.6
+ */
 public class UserSession {
 
   private static final ThreadLocal<UserSession> THREAD_LOCAL = new ThreadLocal<UserSession>();
diff --git a/sonar-server/src/main/java/org/sonar/server/platform/UserSessionFilter.java b/sonar-server/src/main/java/org/sonar/server/user/UserSessionFilter.java
index 87274425de7..80b6613a56c 100644
--- a/sonar-server/src/main/java/org/sonar/server/platform/UserSessionFilter.java
+++ b/sonar-server/src/main/java/org/sonar/server/user/UserSessionFilter.java
@@ -17,11 +17,14 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.server.platform;
+package org.sonar.server.user;
 
 import javax.servlet.*;
 import java.io.IOException;
 
+/**
+ * @since 3.6
+ */
 public class UserSessionFilter implements Filter {
   @Override
   public void init(FilterConfig filterConfig) throws ServletException {
diff --git a/sonar-server/src/main/webapp/WEB-INF/web.xml b/sonar-server/src/main/webapp/WEB-INF/web.xml
index 55b93f2f7da..2249a67997a 100644
--- a/sonar-server/src/main/webapp/WEB-INF/web.xml
+++ b/sonar-server/src/main/webapp/WEB-INF/web.xml
@@ -42,7 +42,7 @@
   </filter>
   <filter>
     <filter-name>UserSessionFilter</filter-name>
-    <filter-class>org.sonar.server.platform.UserSessionFilter</filter-class>
+    <filter-class>org.sonar.server.user.UserSessionFilter</filter-class>
   </filter>
   <filter>
     <filter-name>RackFilter</filter-name>
diff --git a/sonar-server/src/test/java/org/sonar/server/rule/RubyRuleServiceTest.java b/sonar-server/src/test/java/org/sonar/server/rule/RubyRuleServiceTest.java
index ec7e19e6fc9..be0cbdad32b 100644
--- a/sonar-server/src/test/java/org/sonar/server/rule/RubyRuleServiceTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/rule/RubyRuleServiceTest.java
@@ -22,7 +22,7 @@ package org.sonar.server.rule;
 import org.junit.Test;
 import org.sonar.api.rules.Rule;
 import org.sonar.core.i18n.RuleI18nManager;
-import org.sonar.server.platform.UserSession;
+import org.sonar.server.user.UserSession;
 
 import java.util.Locale;
 
diff --git a/sonar-server/src/test/java/org/sonar/server/platform/UserSessionFilterTest.java b/sonar-server/src/test/java/org/sonar/server/user/UserSessionFilterTest.java
index edcc91f9c6f..496a8416292 100644
--- a/sonar-server/src/test/java/org/sonar/server/platform/UserSessionFilterTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/user/UserSessionFilterTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.server.platform;
+package org.sonar.server.user;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -26,7 +26,6 @@ import javax.servlet.FilterChain;
 import javax.servlet.FilterConfig;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
-
 import java.util.Locale;
 
 import static org.fest.assertions.Assertions.assertThat;
diff --git a/sonar-server/src/test/java/org/sonar/server/platform/UserSessionTest.java b/sonar-server/src/test/java/org/sonar/server/user/UserSessionTest.java
index 4a14af1b980..3c696a14201 100644
--- a/sonar-server/src/test/java/org/sonar/server/platform/UserSessionTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/user/UserSessionTest.java
@@ -17,9 +17,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.server.platform;
+package org.sonar.server.user;
 
 import org.junit.Test;
+import org.sonar.server.user.UserSession;
 
 import java.util.Locale;