From: Julien Lancelot Date: Thu, 14 Jan 2016 09:14:42 +0000 (+0100) Subject: Fix quality flaws X-Git-Tag: 5.4-M6~11 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=877dfdc7ef5b0f6368f0da1693501d8e8f71a9c3;p=sonarqube.git Fix quality flaws --- diff --git a/server/sonar-server/src/main/java/org/sonar/server/batch/ProjectDataLoader.java b/server/sonar-server/src/main/java/org/sonar/server/batch/ProjectDataLoader.java index 2b05482cabd..6e3558cb0b7 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/batch/ProjectDataLoader.java +++ b/server/sonar-server/src/main/java/org/sonar/server/batch/ProjectDataLoader.java @@ -182,7 +182,7 @@ public class ProjectDataLoader { } } - private void checkPermission(boolean preview, boolean hasScanPerm, boolean hasPreviewPerm) { + private static void checkPermission(boolean preview, boolean hasScanPerm, boolean hasPreviewPerm) { if (!hasPreviewPerm && !hasScanPerm) { throw new ForbiddenException(Messages.NO_PERMISSION); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/BackendCleanup.java b/server/sonar-server/src/main/java/org/sonar/server/platform/BackendCleanup.java index badc0fb4eb2..ccbcf912120 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/BackendCleanup.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/BackendCleanup.java @@ -67,15 +67,10 @@ public class BackendCleanup { try { statement = connection.createStatement(); for (String table : DatabaseVersion.TABLES) { - try { - statement.execute("TRUNCATE TABLE " + table.toLowerCase()); - // commit is useless on some databases - connection.commit(); - } catch (Exception e) { - throw new IllegalStateException("Fail to truncate db table " + table, e); - } + statement.execute("TRUNCATE TABLE " + table.toLowerCase()); + // commit is useless on some databases + connection.commit(); } - } catch (Exception e) { throw new IllegalStateException("Fail to clear db", e); } finally { @@ -118,13 +113,9 @@ public class BackendCleanup { statement = connection.createStatement(); // Clear inspection tables for (String table : INSPECTION_TABLES) { - try { - statement.execute("TRUNCATE TABLE " + table.toLowerCase()); - // commit is useless on some databases - connection.commit(); - } catch (Exception e) { - throw new IllegalStateException("Fail to truncate db table " + table, e); - } + statement.execute("TRUNCATE TABLE " + table.toLowerCase()); + // commit is useless on some databases + connection.commit(); } // Clear resource related tables diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/issue/package-info.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/issue/package-info.java new file mode 100644 index 00000000000..ed73ac7d2ac --- /dev/null +++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/issue/package-info.java @@ -0,0 +1,44 @@ +/* + * SonarQube + * Copyright (C) 2009-2016 SonarSource SA + * mailto:contact AT sonarsource DOT com + * + * This program 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. + * + * This program 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. + */ +/* + * 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.sonarqube.ws.client.issue; + +import javax.annotation.ParametersAreNonnullByDefault; +