aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@sonarsource.com>2014-09-01 11:38:57 +0200
committerSimon Brandhof <simon.brandhof@sonarsource.com>2014-09-01 11:38:57 +0200
commit1cbddc7257f081c53619ad15d0d4f58f62d4b4ba (patch)
treeb3e3799d0a6ae2491459e79f1136fc39fbe93ed7
parent62374033d773d4a6aa94bd46466aecdcf29cab1f (diff)
downloadsonarqube-1cbddc7257f081c53619ad15d0d4f58f62d4b4ba.tar.gz
sonarqube-1cbddc7257f081c53619ad15d0d4f58f62d4b4ba.zip
Fix some quality flaws
-rw-r--r--server/process/sonar-process/src/main/java/org/sonar/process/package-info.java23
-rw-r--r--server/sonar-server/src/main/java/org/sonar/server/app/Connectors.java3
-rw-r--r--server/sonar-server/src/main/java/org/sonar/server/app/Logging.java3
-rw-r--r--server/sonar-server/src/main/java/org/sonar/server/app/Webapp.java3
-rw-r--r--server/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java1
5 files changed, 32 insertions, 1 deletions
diff --git a/server/process/sonar-process/src/main/java/org/sonar/process/package-info.java b/server/process/sonar-process/src/main/java/org/sonar/process/package-info.java
new file mode 100644
index 00000000000..09da5ce266d
--- /dev/null
+++ b/server/process/sonar-process/src/main/java/org/sonar/process/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * SonarQube, open source software quality management tool.
+ * Copyright (C) 2008-2014 SonarSource
+ * mailto:contact AT sonarsource DOT com
+ *
+ * SonarQube is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * SonarQube is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+@ParametersAreNonnullByDefault
+package org.sonar.process;
+
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/app/Connectors.java b/server/sonar-server/src/main/java/org/sonar/server/app/Connectors.java
index 340c3b3ccbf..6a743f88c92 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/app/Connectors.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/app/Connectors.java
@@ -39,6 +39,9 @@ class Connectors {
static final String HTTP_PROTOCOL = "HTTP/1.1";
static final String AJP_PROTOCOL = "AJP/1.3";
+ private Connectors() {
+ }
+
static void configure(Tomcat tomcat, Props props) {
List<Connector> connectors = new ArrayList<Connector>();
connectors.addAll(Arrays.asList(newHttpConnector(props), newAjpConnector(props), newHttpsConnector(props)));
diff --git a/server/sonar-server/src/main/java/org/sonar/server/app/Logging.java b/server/sonar-server/src/main/java/org/sonar/server/app/Logging.java
index 777a06883cb..fefc1444a3b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/app/Logging.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/app/Logging.java
@@ -54,6 +54,9 @@ class Logging {
static final String ACCESS_RELATIVE_PATH = "WEB-INF/config/logback-access.xml";
static final String PROPERTY_ENABLE_ACCESS_LOGS = "sonar.web.accessLogs.enable";
+ private Logging() {
+ }
+
static void init(Props props) {
configureLogback(props);
diff --git a/server/sonar-server/src/main/java/org/sonar/server/app/Webapp.java b/server/sonar-server/src/main/java/org/sonar/server/app/Webapp.java
index 006bbafd237..f959faed106 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/app/Webapp.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/app/Webapp.java
@@ -35,6 +35,9 @@ class Webapp {
private static final String RAILS_ENV = "rails.env";
private static final String PROPERTY_CONTEXT = "sonar.web.context";
+ private Webapp() {
+ }
+
static StandardContext configure(Tomcat tomcat, Props props) {
try {
StandardContext context = (StandardContext) tomcat.addWebapp(getContextPath(props), webappPath(props));
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java b/server/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java
index 5e7613339d1..f77088beb21 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java
@@ -20,7 +20,6 @@
package org.sonar.server.ui;
import org.slf4j.LoggerFactory;
-import org.sonar.api.CoreProperties;
import org.sonar.api.config.License;
import org.sonar.api.config.PropertyDefinitions;
import org.sonar.api.config.Settings;