aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien HENRY <julien.henry@sonarsource.com>2013-10-17 14:22:21 +0200
committerJulien HENRY <julien.henry@sonarsource.com>2013-10-17 14:22:42 +0200
commitddd23db4e89d8e112bc268734269959b4a23eaf0 (patch)
tree5bcab3215beb198b8d95b5a6d824af5e6d0542b4
parentd95e693578b05da9829b2ff9234aeec24d8a63a9 (diff)
downloadsonarqube-ddd23db4e89d8e112bc268734269959b4a23eaf0.tar.gz
sonarqube-ddd23db4e89d8e112bc268734269959b4a23eaf0.zip
Fix some quality flows
-rw-r--r--sonar-server/src/main/java/org/sonar/server/plugins/PluginDownloader.java5
-rw-r--r--sonar-testing-harness/pom.xml4
-rw-r--r--sonar-testing-harness/src/main/java/org/sonar/test/channel/package-info.java24
-rw-r--r--sonar-testing-harness/src/main/java/org/sonar/test/i18n/package-info.java24
-rw-r--r--sonar-testing-harness/src/main/java/org/sonar/test/package-info.java24
5 files changed, 79 insertions, 2 deletions
diff --git a/sonar-server/src/main/java/org/sonar/server/plugins/PluginDownloader.java b/sonar-server/src/main/java/org/sonar/server/plugins/PluginDownloader.java
index d59164e0e19..d1ac365862a 100644
--- a/sonar-server/src/main/java/org/sonar/server/plugins/PluginDownloader.java
+++ b/sonar-server/src/main/java/org/sonar/server/plugins/PluginDownloader.java
@@ -62,7 +62,7 @@ public class PluginDownloader implements ServerComponent, Startable {
public void start() {
try {
FileUtils.forceMkdir(downloadDir);
- Collection<File> tempFiles = FileUtils.listFiles(downloadDir, new String[]{TMP_SUFFIX}, false);
+ Collection<File> tempFiles = FileUtils.listFiles(downloadDir, new String[] {TMP_SUFFIX}, false);
for (File tempFile : tempFiles) {
FileUtils.deleteQuietly(tempFile);
}
@@ -74,6 +74,7 @@ public class PluginDownloader implements ServerComponent, Startable {
@Override
public void stop() {
+ // Nothing to do
}
public void cancelDownloads() {
@@ -92,7 +93,7 @@ public class PluginDownloader implements ServerComponent, Startable {
public List<String> getDownloads() {
List<String> names = new ArrayList<String>();
- List<File> files = (List<File>) FileUtils.listFiles(downloadDir, new String[]{"jar"}, false);
+ List<File> files = (List<File>) FileUtils.listFiles(downloadDir, new String[] {"jar"}, false);
for (File file : files) {
names.add(file.getName());
}
diff --git a/sonar-testing-harness/pom.xml b/sonar-testing-harness/pom.xml
index 99e4077deaf..638a1f64663 100644
--- a/sonar-testing-harness/pom.xml
+++ b/sonar-testing-harness/pom.xml
@@ -80,5 +80,9 @@
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </dependency>
</dependencies>
</project>
diff --git a/sonar-testing-harness/src/main/java/org/sonar/test/channel/package-info.java b/sonar-testing-harness/src/main/java/org/sonar/test/channel/package-info.java
new file mode 100644
index 00000000000..53d39f5af81
--- /dev/null
+++ b/sonar-testing-harness/src/main/java/org/sonar/test/channel/package-info.java
@@ -0,0 +1,24 @@
+/*
+ * SonarQube, open source software quality management tool.
+ * Copyright (C) 2008-2013 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.test.channel;
+
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/sonar-testing-harness/src/main/java/org/sonar/test/i18n/package-info.java b/sonar-testing-harness/src/main/java/org/sonar/test/i18n/package-info.java
new file mode 100644
index 00000000000..02b0ee7d382
--- /dev/null
+++ b/sonar-testing-harness/src/main/java/org/sonar/test/i18n/package-info.java
@@ -0,0 +1,24 @@
+/*
+ * SonarQube, open source software quality management tool.
+ * Copyright (C) 2008-2013 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.test.i18n;
+
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/sonar-testing-harness/src/main/java/org/sonar/test/package-info.java b/sonar-testing-harness/src/main/java/org/sonar/test/package-info.java
new file mode 100644
index 00000000000..137fd79702e
--- /dev/null
+++ b/sonar-testing-harness/src/main/java/org/sonar/test/package-info.java
@@ -0,0 +1,24 @@
+/*
+ * SonarQube, open source software quality management tool.
+ * Copyright (C) 2008-2013 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.test;
+
+import javax.annotation.ParametersAreNonnullByDefault;