fix quality flaws

diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ComponentCleanerService.java b/server/sonar-server/src/main/java/org/sonar/server/component/ComponentCleanerService.java
index e49061336a79cded17fb60afddfc736d69772059..b37ea6142933251cd8f0e0977606b7cbd343aa36 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/component/ComponentCleanerService.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/component/ComponentCleanerService.java
@@ -56,7 +56,7 @@ public class ComponentCleanerService implements ServerComponent {
   }
 
   private void deleteIssuesFromIndex(String projectKey) {
-
+    // TODO implement !
   }
 
   private void deletePermissionIndexes(DbSession session, String projectUuid) {

diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/SynchronizeProjectPermissionsStepMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/SynchronizeProjectPermissionsStepMediumTest.java
index c248b93e786719a04593eac55c13d57e791ef602..a4f08f5692c224037e202dfc8f5f86c328f97429 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/SynchronizeProjectPermissionsStepMediumTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/SynchronizeProjectPermissionsStepMediumTest.java
@@ -109,4 +109,18 @@ public class SynchronizeProjectPermissionsStepMediumTest {
 
     return project;
   }
+
+  @Test
+  public void do_nothing_when_permissions_are_already_set() throws Exception {
+    ComponentDto project = insertPermissionsForProject(DEFAULT_PROJECT_KEY);
+
+    queue.add(DEFAULT_PROJECT_KEY, 123L);
+    List<AnalysisReportDto> reports = queue.findByProjectKey(DEFAULT_PROJECT_KEY);
+    getAndSetProjectStep.execute(session, reports.get(0));
+
+    sut.execute(session, reports.get(0));
+
+    IssueAuthorizationDoc issueAuthorizationIndex = tester.get(IssueAuthorizationIndex.class).getNullableByKey(project.uuid());
+    assertThat(issueAuthorizationIndex).isNotNull();
+  }
 }

diff --git a/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/DbCleanerProperties.java b/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/DbCleanerProperties.java
index 744a887365762841c854f18d69354bab1ef967e6..c19dec51c49d3918df488c9d18d3d3f585dfbf71 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/DbCleanerProperties.java
+++ b/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/DbCleanerProperties.java
@@ -30,6 +30,9 @@ import java.util.List;
 
 public final class DbCleanerProperties {
 
+  private DbCleanerProperties() {
+  }
+
   public static List<PropertyDefinition> all() {
     return Arrays.asList(
       PropertyDefinition.builder(DbCleanerConstants.PROPERTY_CLEAN_DIRECTORY)
@@ -100,6 +103,6 @@ public final class DbCleanerProperties {
         .subCategory(CoreProperties.SUBCATEGORY_DATABASE_CLEANER)
         .index(6)
         .build()
-    );
+      );
   }
 }

diff --git a/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/DefaultPurgeTask.java b/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/DefaultPurgeTask.java
index 9f74b4fe341b2a195b5d3b900eb716c38dc6606b..60e76cf0a8c71f76e5504a473be113376329ce8d 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/DefaultPurgeTask.java
+++ b/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/DefaultPurgeTask.java
@@ -37,11 +37,10 @@ import org.sonar.plugins.dbcleaner.api.PurgeTask;
  */
 public class DefaultPurgeTask implements PurgeTask {
   private static final Logger LOG = LoggerFactory.getLogger(DefaultPurgeTask.class);
-
+  private final PurgeProfiler profiler;
   private PurgeDao purgeDao;
   private Settings settings;
   private DefaultPeriodCleaner periodCleaner;
-  private final PurgeProfiler profiler;
 
   public DefaultPurgeTask(PurgeDao purgeDao, Settings settings, DefaultPeriodCleaner periodCleaner, PurgeProfiler profiler) {
     this.purgeDao = purgeDao;
@@ -50,11 +49,13 @@ public class DefaultPurgeTask implements PurgeTask {
     this.profiler = profiler;
   }
 
+  @Override
   public DefaultPurgeTask delete(long resourceId) {
     purgeDao.deleteResourceTree(resourceId);
     return this;
   }
 
+  @Override
   public DefaultPurgeTask purge(long resourceId) {
     long start = System.currentTimeMillis();
     profiler.reset();

diff --git a/sonar-core/src/main/java/org/sonar/plugins/dbcleaner/api/DbCleanerConstants.java b/sonar-core/src/main/java/org/sonar/plugins/dbcleaner/api/DbCleanerConstants.java
index 881fca768a3400969c9e962bd9f3d1f0239d1d34..8cad98c10c5d700e82ab3614d5332e71bb5a78f9 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/plugins/dbcleaner/api/DbCleanerConstants.java
+++ b/sonar-core/src/main/java/org/sonar/plugins/dbcleaner/api/DbCleanerConstants.java
@@ -19,6 +19,9 @@
  */
 package org.sonar.plugins.dbcleaner.api;
 
+/**
+ * @deprecated (is used by the plugin views only. Will rely on the implementation when views analysis views moved on the server side)
+ */
 @Deprecated
 public interface DbCleanerConstants extends org.sonar.core.computation.dbcleaner.DbCleanerConstants {
 }

diff --git a/sonar-core/src/main/java/org/sonar/plugins/dbcleaner/api/PurgeTask.java b/sonar-core/src/main/java/org/sonar/plugins/dbcleaner/api/PurgeTask.java
index 070866a721ce855fec38a87be95dacfd91857f67..efe1fe5a1410df9b6295ff166c9f2e77072d9612 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/plugins/dbcleaner/api/PurgeTask.java
+++ b/sonar-core/src/main/java/org/sonar/plugins/dbcleaner/api/PurgeTask.java
@@ -24,6 +24,7 @@ import org.sonar.api.task.TaskExtension;
 
 /**
  * @since 2.14
+ * @deprecated (is used by the plugin views only. Will rely on the implementation when views analysis views moved on the server side)
  */
 @Deprecated
 public interface PurgeTask extends TaskExtension, ServerExtension {

diff --git a/sonar-core/src/main/java/org/sonar/plugins/dbcleaner/api/package-info.java b/sonar-core/src/main/java/org/sonar/plugins/dbcleaner/api/package-info.java
new file mode 100644 (file)
index 0000000..87f1b0c
--- /dev/null
+++ b/sonar-core/src/main/java/org/sonar/plugins/dbcleaner/api/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.plugins.dbcleaner.api;
+
+import javax.annotation.ParametersAreNonnullByDefault;

diff --git a/sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/DbCleanerPropertiesTest.java b/sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/DbCleanerPropertiesTest.java
index 4c4311aac3b51d22422e2917e42251dc9be649d6..3a0ab992968ae8affdc3cd086739ca2de2b74072 100644 (file)
--- a/sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/DbCleanerPropertiesTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/DbCleanerPropertiesTest.java
@@ -28,6 +28,6 @@ public class DbCleanerPropertiesTest {
 
   @Test
   public void shouldGetExtensions() {
-    assertThat(new DbCleanerProperties().all()).hasSize(6);
+    assertThat(DbCleanerProperties.all()).hasSize(6);
   }
 }