Fix quality flaws

diff --git a/sonar-core/src/main/java/org/sonar/core/util/ProtobufJsonFormat.java b/sonar-core/src/main/java/org/sonar/core/util/ProtobufJsonFormat.java
index 30bc9bccd6922a2a9afd25d70d6582320ed814ed..5c0cd07c7fb4fb67bbe876b1e8b7aa95299264cb 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/util/ProtobufJsonFormat.java
+++ b/sonar-core/src/main/java/org/sonar/core/util/ProtobufJsonFormat.java
@@ -74,7 +74,7 @@ public class ProtobufJsonFormat {
     // only statics
   }
 
-  private static abstract class MessageField {
+  private abstract static class MessageField {
     protected final Descriptors.FieldDescriptor descriptor;
 
     public MessageField(Descriptors.FieldDescriptor descriptor) {

diff --git a/sonar-db/src/main/java/org/sonar/db/MyBatis.java b/sonar-db/src/main/java/org/sonar/db/MyBatis.java
index fc6308269cea5456b44e351166b1f90ee7a3e960..dbd1dba7bc4eb2d57da96682419c39dbd509fe45 100644 (file)
--- a/sonar-db/src/main/java/org/sonar/db/MyBatis.java
+++ b/sonar-db/src/main/java/org/sonar/db/MyBatis.java
@@ -284,7 +284,7 @@ public class MyBatis {
     return newScrollingSelectStatement(session, sql, fetchSize);
   }
 
-  private PreparedStatement newScrollingSelectStatement(DbSession session, String sql, int fetchSize) {
+  private static PreparedStatement newScrollingSelectStatement(DbSession session, String sql, int fetchSize) {
     try {
       PreparedStatement stmt = session.getConnection().prepareStatement(sql, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
       stmt.setFetchSize(fetchSize);

diff --git a/sonar-db/src/main/java/org/sonar/db/component/ResourceDto.java b/sonar-db/src/main/java/org/sonar/db/component/ResourceDto.java
index 769ee2376fca869bdf3f11ead6defa2d6de31b35..d82928f386a48fa401ca8f84697d0dcf50c3813b 100644 (file)
--- a/sonar-db/src/main/java/org/sonar/db/component/ResourceDto.java
+++ b/sonar-db/src/main/java/org/sonar/db/component/ResourceDto.java
@@ -207,11 +207,11 @@ public class ResourceDto {
   }
 
   public Date getCreatedAt() {
-    return createdAt;// NOSONAR May expose internal representation by returning reference to mutable object
+    return createdAt;
   }
 
   public ResourceDto setCreatedAt(Date date) {
-    this.createdAt = date;// NOSONAR May expose internal representation by incorporating reference to mutable object
+    this.createdAt = date;
     return this;
   }
 

diff --git a/sonar-db/src/main/java/org/sonar/db/component/ResourceIndexDao.java b/sonar-db/src/main/java/org/sonar/db/component/ResourceIndexDao.java
index 2e6e4ad79e437fb8a813e433c709ff32f4d31792..dd7103504ec303cd208c66aa0d5a6931f0f78860 100644 (file)
--- a/sonar-db/src/main/java/org/sonar/db/component/ResourceIndexDao.java
+++ b/sonar-db/src/main/java/org/sonar/db/component/ResourceIndexDao.java
@@ -176,14 +176,14 @@ public class ResourceIndexDao extends AbstractDao {
     return indexed;
   }
 
-  private void insertIndexEntries(String key, long resourceId, String qualifier, long rootId, int nameLength, ResourceIndexMapper mapper) {
+  private static void insertIndexEntries(String key, long resourceId, String qualifier, long rootId, int nameLength, ResourceIndexMapper mapper) {
     ResourceIndexDto dto = new ResourceIndexDto()
       .setResourceId(resourceId)
       .setQualifier(qualifier)
       .setRootProjectId(rootId)
       .setNameSize(nameLength);
 
-    int maxPosition = key.length() == SINGLE_INDEX_SIZE ? 0 : key.length() - MINIMUM_KEY_SIZE;
+    int maxPosition = (key.length() == SINGLE_INDEX_SIZE ? 0 : key.length() - MINIMUM_KEY_SIZE);
     for (int position = 0; position <= maxPosition; position++) {
       dto.setPosition(position);
       dto.setKey(StringUtils.substring(key, position));
@@ -196,7 +196,7 @@ public class ResourceIndexDao extends AbstractDao {
    * If the resource is indexed with a different key, then this index is dropped and the
    * resource must be indexed again.
    */
-  private boolean sanitizeIndex(long resourceId, String key, ResourceIndexMapper mapper) {
+  private static boolean sanitizeIndex(long resourceId, String key, ResourceIndexMapper mapper) {
     ResourceIndexDto masterIndex = mapper.selectMasterIndexByResourceId(resourceId);
     if (masterIndex != null && !StringUtils.equals(key, masterIndex.getKey())) {
       // resource has been renamed -> drop existing indexes

diff --git a/sonar-db/src/main/java/org/sonar/db/component/ResourceKeyUpdaterDao.java b/sonar-db/src/main/java/org/sonar/db/component/ResourceKeyUpdaterDao.java
index 1ec320febf58f29f6f6b0af71f83382c5094e862..5c452b74bd079a837ee5f663f9bb5b1cd4f3e206 100644 (file)
--- a/sonar-db/src/main/java/org/sonar/db/component/ResourceKeyUpdaterDao.java
+++ b/sonar-db/src/main/java/org/sonar/db/component/ResourceKeyUpdaterDao.java
@@ -145,7 +145,7 @@ public class ResourceKeyUpdaterDao implements Dao {
     return modules;
   }
 
-  private void checkNewNameOfAllModules(Set<ResourceDto> modules, String stringToReplace, String replacementString, ResourceKeyUpdaterMapper mapper) {
+  private static void checkNewNameOfAllModules(Set<ResourceDto> modules, String stringToReplace, String replacementString, ResourceKeyUpdaterMapper mapper) {
     for (ResourceDto module : modules) {
       String newName = computeNewKey(module, stringToReplace, replacementString);
       if (mapper.countResourceByKey(newName) > 0) {

diff --git a/sonar-db/src/main/java/org/sonar/db/deprecated/ClusterAction.java b/sonar-db/src/main/java/org/sonar/db/deprecated/ClusterAction.java
index d6bfb3b30abded8fb279b8bd0ce27bb37835289d..2f392ed020a455dcb166452593f1b8bab80dfed7 100644 (file)
--- a/sonar-db/src/main/java/org/sonar/db/deprecated/ClusterAction.java
+++ b/sonar-db/src/main/java/org/sonar/db/deprecated/ClusterAction.java
@@ -24,5 +24,5 @@ import java.util.concurrent.Callable;
 public interface ClusterAction<K> extends Callable<K> {
 
   @Override
-  public K call() throws Exception;
+  K call() throws Exception;
 }

diff --git a/sonar-db/src/main/java/org/sonar/db/property/package-info.java b/sonar-db/src/main/java/org/sonar/db/property/package-info.java
new file mode 100644 (file)
index 0000000..a1cbdbe
--- /dev/null
+++ b/sonar-db/src/main/java/org/sonar/db/property/package-info.java
@@ -0,0 +1,24 @@
+/*
+ * 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.db.property;
+
+import javax.annotation.ParametersAreNonnullByDefault;
+

diff --git a/sonar-db/src/main/java/org/sonar/db/purge/PurgeProfiler.java b/sonar-db/src/main/java/org/sonar/db/purge/PurgeProfiler.java
index c68c8dfa2ccad65e97433b8771342033d20ca020..a5e07c43e5e6cfc6bfd6eddc3bb82dbba3f1c8f3 100644 (file)
--- a/sonar-db/src/main/java/org/sonar/db/purge/PurgeProfiler.java
+++ b/sonar-db/src/main/java/org/sonar/db/purge/PurgeProfiler.java
@@ -82,7 +82,7 @@ public class PurgeProfiler {
     }
   }
 
-  private List<Entry<String, Long>> truncateList(List<Entry<String, Long>> sortedFullList) {
+  private static List<Entry<String, Long>> truncateList(List<Entry<String, Long>> sortedFullList) {
     int maxSize = 10;
     List<Entry<String, Long>> result = new ArrayList<>(maxSize);
     int i = 0;

diff --git a/sonar-db/src/main/java/org/sonar/db/qualitygate/package-info.java b/sonar-db/src/main/java/org/sonar/db/qualitygate/package-info.java
new file mode 100644 (file)
index 0000000..07cbdd9
--- /dev/null
+++ b/sonar-db/src/main/java/org/sonar/db/qualitygate/package-info.java
@@ -0,0 +1,24 @@
+/*
+ * 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.db.qualitygate;
+
+import javax.annotation.ParametersAreNonnullByDefault;
+

diff --git a/sonar-db/src/main/java/org/sonar/db/qualityprofile/package-info.java b/sonar-db/src/main/java/org/sonar/db/qualityprofile/package-info.java
new file mode 100644 (file)
index 0000000..34262af
--- /dev/null
+++ b/sonar-db/src/main/java/org/sonar/db/qualityprofile/package-info.java
@@ -0,0 +1,24 @@
+/*
+ * 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.db.qualityprofile;
+
+import javax.annotation.ParametersAreNonnullByDefault;
+

diff --git a/sonar-db/src/main/java/org/sonar/db/rule/package-info.java b/sonar-db/src/main/java/org/sonar/db/rule/package-info.java
new file mode 100644 (file)
index 0000000..c8a566e
--- /dev/null
+++ b/sonar-db/src/main/java/org/sonar/db/rule/package-info.java
@@ -0,0 +1,24 @@
+/*
+ * 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.db.rule;
+
+import javax.annotation.ParametersAreNonnullByDefault;
+

diff --git a/sonar-db/src/main/java/org/sonar/db/source/package-info.java b/sonar-db/src/main/java/org/sonar/db/source/package-info.java
new file mode 100644 (file)
index 0000000..818667c
--- /dev/null
+++ b/sonar-db/src/main/java/org/sonar/db/source/package-info.java
@@ -0,0 +1,24 @@
+/*
+ * 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.db.source;
+
+import javax.annotation.ParametersAreNonnullByDefault;
+

diff --git a/sonar-db/src/main/java/org/sonar/db/user/package-info.java b/sonar-db/src/main/java/org/sonar/db/user/package-info.java
new file mode 100644 (file)
index 0000000..2f52b2e
--- /dev/null
+++ b/sonar-db/src/main/java/org/sonar/db/user/package-info.java
@@ -0,0 +1,24 @@
+/*
+ * 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.db.user;
+
+import javax.annotation.ParametersAreNonnullByDefault;
+