From faa696264a959b883b189975f062189a60fe4de9 Mon Sep 17 00:00:00 2001 From: Julien HENRY Date: Wed, 11 Feb 2015 15:31:53 +0100 Subject: [PATCH] Revert move of Period component since it is used by devcockpit --- .../plugins/core/issue/CountUnresolvedIssuesDecorator.java | 4 ++-- .../core/timemachine/AbstractNewCoverageFileAnalyzer.java | 4 ++-- .../core/issue/CountUnresolvedIssuesDecoratorTest.java | 4 ++-- .../org/sonar/batch/{deprecated => }/components/Period.java | 5 ++++- .../org/sonar/batch/components/TimeMachineConfiguration.java | 1 - .../src/main/java/org/sonar/batch/debt/NewDebtDecorator.java | 4 ++-- .../java/org/sonar/batch/scan/filesystem/FileIndexer.java | 1 + .../test/java/org/sonar/batch/debt/NewDebtDecoratorTest.java | 4 ++-- 8 files changed, 15 insertions(+), 12 deletions(-) rename sonar-batch/src/main/java/org/sonar/batch/{deprecated => }/components/Period.java (95%) diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/CountUnresolvedIssuesDecorator.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/CountUnresolvedIssuesDecorator.java index 61a6b69cc74..afe895137bf 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/CountUnresolvedIssuesDecorator.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/CountUnresolvedIssuesDecorator.java @@ -19,9 +19,9 @@ */ package org.sonar.plugins.core.issue; -import org.sonar.batch.components.TimeMachineConfiguration; +import org.sonar.batch.components.Period; -import org.sonar.batch.deprecated.components.Period; +import org.sonar.batch.components.TimeMachineConfiguration; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.*; import org.apache.commons.lang.time.DateUtils; diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/AbstractNewCoverageFileAnalyzer.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/AbstractNewCoverageFileAnalyzer.java index c275645899e..1ade50dfc61 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/AbstractNewCoverageFileAnalyzer.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/AbstractNewCoverageFileAnalyzer.java @@ -19,9 +19,9 @@ */ package org.sonar.plugins.core.timemachine; -import org.sonar.batch.components.TimeMachineConfiguration; +import org.sonar.batch.components.Period; -import org.sonar.batch.deprecated.components.Period; +import org.sonar.batch.components.TimeMachineConfiguration; import org.sonar.api.batch.RequiresDB; import com.google.common.collect.Lists; import com.google.common.collect.Maps; diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/CountUnresolvedIssuesDecoratorTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/CountUnresolvedIssuesDecoratorTest.java index 912779a5356..935ff4a873c 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/CountUnresolvedIssuesDecoratorTest.java +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/CountUnresolvedIssuesDecoratorTest.java @@ -20,9 +20,9 @@ package org.sonar.plugins.core.issue; -import org.sonar.batch.components.TimeMachineConfiguration; +import org.sonar.batch.components.Period; -import org.sonar.batch.deprecated.components.Period; +import org.sonar.batch.components.TimeMachineConfiguration; import com.google.common.collect.Lists; import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang.time.DateUtils; diff --git a/sonar-batch/src/main/java/org/sonar/batch/deprecated/components/Period.java b/sonar-batch/src/main/java/org/sonar/batch/components/Period.java similarity index 95% rename from sonar-batch/src/main/java/org/sonar/batch/deprecated/components/Period.java rename to sonar-batch/src/main/java/org/sonar/batch/components/Period.java index 45ca282dd42..1b40539d4f5 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/deprecated/components/Period.java +++ b/sonar-batch/src/main/java/org/sonar/batch/components/Period.java @@ -18,13 +18,16 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.batch.deprecated.components; +package org.sonar.batch.components; import javax.annotation.CheckForNull; import javax.annotation.Nullable; import java.util.Date; +/** + * Used by devcockpit + */ public class Period { private int index; diff --git a/sonar-batch/src/main/java/org/sonar/batch/components/TimeMachineConfiguration.java b/sonar-batch/src/main/java/org/sonar/batch/components/TimeMachineConfiguration.java index ec346aa4dcc..36bec004e4a 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/components/TimeMachineConfiguration.java +++ b/sonar-batch/src/main/java/org/sonar/batch/components/TimeMachineConfiguration.java @@ -27,7 +27,6 @@ import org.sonar.api.batch.RequiresDB; import org.sonar.api.database.DatabaseSession; import org.sonar.api.database.model.Snapshot; import org.sonar.api.resources.Qualifiers; -import org.sonar.batch.deprecated.components.Period; import org.sonar.batch.deprecated.components.PeriodsDefinition; import javax.annotation.CheckForNull; diff --git a/sonar-batch/src/main/java/org/sonar/batch/debt/NewDebtDecorator.java b/sonar-batch/src/main/java/org/sonar/batch/debt/NewDebtDecorator.java index 452fe02551c..f437ffa3744 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/debt/NewDebtDecorator.java +++ b/sonar-batch/src/main/java/org/sonar/batch/debt/NewDebtDecorator.java @@ -20,9 +20,9 @@ package org.sonar.batch.debt; -import org.sonar.batch.components.TimeMachineConfiguration; +import org.sonar.batch.components.Period; -import org.sonar.batch.deprecated.components.Period; +import org.sonar.batch.components.TimeMachineConfiguration; import com.google.common.collect.ImmutableList; import org.sonar.api.batch.Decorator; import org.sonar.api.batch.DecoratorBarriers; diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/FileIndexer.java b/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/FileIndexer.java index f2afec0566a..4217c08bc4f 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/FileIndexer.java +++ b/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/FileIndexer.java @@ -97,6 +97,7 @@ public class FileIndexer implements BatchComponent { } private void waitForTasksToComplete() { + executorService.shutdown(); for (Future task : tasks) { try { task.get(); diff --git a/sonar-batch/src/test/java/org/sonar/batch/debt/NewDebtDecoratorTest.java b/sonar-batch/src/test/java/org/sonar/batch/debt/NewDebtDecoratorTest.java index c930eb1075e..fa7b4f9c4cb 100644 --- a/sonar-batch/src/test/java/org/sonar/batch/debt/NewDebtDecoratorTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/debt/NewDebtDecoratorTest.java @@ -20,9 +20,9 @@ package org.sonar.batch.debt; -import org.sonar.batch.components.TimeMachineConfiguration; +import org.sonar.batch.components.Period; -import org.sonar.batch.deprecated.components.Period; +import org.sonar.batch.components.TimeMachineConfiguration; import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang.time.DateUtils; import org.junit.Before; -- 2.39.5