From c66a047068cc13b5e2fbcdb6572143ab296afe57 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Mon, 19 May 2014 10:33:08 +0200 Subject: [PATCH] Move measure filter classes from sonar-core to sonar-server --- .../org/sonar/core/persistence/DaoUtils.java | 17 ++++++++++---- .../sonar/server}/measure/MeasureFilter.java | 2 +- .../measure/MeasureFilterCondition.java | 2 +- .../server}/measure/MeasureFilterContext.java | 2 +- .../server}/measure/MeasureFilterEngine.java | 2 +- .../measure/MeasureFilterExecutor.java | 2 +- .../server}/measure/MeasureFilterFactory.java | 2 +- .../server}/measure/MeasureFilterResult.java | 2 +- .../server}/measure/MeasureFilterRow.java | 2 +- .../server}/measure/MeasureFilterSort.java | 2 +- .../server}/measure/MeasureFilterSql.java | 2 +- .../sonar/server/measure/package-info.java | 23 +++++++++++++++++++ .../sonar/server/measure/ws/package-info.java | 23 +++++++++++++++++++ .../server/platform/ServerComponents.java | 12 ++++++---- .../java/org/sonar/server/ui/JRubyFacade.java | 4 ++-- .../measure/MeasureFilterConditionTest.java | 2 +- .../measure/MeasureFilterContextTest.java | 5 +--- .../measure/MeasureFilterEngineTest.java | 2 +- .../measure/MeasureFilterExecutorTest.java | 2 +- .../measure/MeasureFilterFactoryTest.java | 2 +- .../server}/measure/MeasureFilterTest.java | 2 +- ...e_when_filter_by_component_name_or_key.xml | 0 .../ignore_person_measures.xml | 0 .../ignore_quality_model_measures.xml | 0 .../MeasureFilterExecutorTest/shared.xml | 0 .../sort_by_alert.xml | 0 26 files changed, 84 insertions(+), 30 deletions(-) rename {sonar-core/src/main/java/org/sonar/core => sonar-server/src/main/java/org/sonar/server}/measure/MeasureFilter.java (99%) rename {sonar-core/src/main/java/org/sonar/core => sonar-server/src/main/java/org/sonar/server}/measure/MeasureFilterCondition.java (99%) rename {sonar-core/src/main/java/org/sonar/core => sonar-server/src/main/java/org/sonar/server}/measure/MeasureFilterContext.java (98%) rename {sonar-core/src/main/java/org/sonar/core => sonar-server/src/main/java/org/sonar/server}/measure/MeasureFilterEngine.java (98%) rename {sonar-core/src/main/java/org/sonar/core => sonar-server/src/main/java/org/sonar/server}/measure/MeasureFilterExecutor.java (99%) rename {sonar-core/src/main/java/org/sonar/core => sonar-server/src/main/java/org/sonar/server}/measure/MeasureFilterFactory.java (99%) rename {sonar-core/src/main/java/org/sonar/core => sonar-server/src/main/java/org/sonar/server}/measure/MeasureFilterResult.java (98%) rename {sonar-core/src/main/java/org/sonar/core => sonar-server/src/main/java/org/sonar/server}/measure/MeasureFilterRow.java (98%) rename {sonar-core/src/main/java/org/sonar/core => sonar-server/src/main/java/org/sonar/server}/measure/MeasureFilterSort.java (98%) rename {sonar-core/src/main/java/org/sonar/core => sonar-server/src/main/java/org/sonar/server}/measure/MeasureFilterSql.java (99%) create mode 100644 sonar-server/src/main/java/org/sonar/server/measure/package-info.java create mode 100644 sonar-server/src/main/java/org/sonar/server/measure/ws/package-info.java rename {sonar-core/src/test/java/org/sonar/core => sonar-server/src/test/java/org/sonar/server}/measure/MeasureFilterConditionTest.java (99%) rename {sonar-core/src/test/java/org/sonar/core => sonar-server/src/test/java/org/sonar/server}/measure/MeasureFilterContextTest.java (93%) rename {sonar-core/src/test/java/org/sonar/core => sonar-server/src/test/java/org/sonar/server}/measure/MeasureFilterEngineTest.java (98%) rename {sonar-core/src/test/java/org/sonar/core => sonar-server/src/test/java/org/sonar/server}/measure/MeasureFilterExecutorTest.java (99%) rename {sonar-core/src/test/java/org/sonar/core => sonar-server/src/test/java/org/sonar/server}/measure/MeasureFilterFactoryTest.java (99%) rename {sonar-core/src/test/java/org/sonar/core => sonar-server/src/test/java/org/sonar/server}/measure/MeasureFilterTest.java (98%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-server/src/test/resources/org/sonar/server}/measure/MeasureFilterExecutorTest/escape_percent_and_underscore_when_filter_by_component_name_or_key.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-server/src/test/resources/org/sonar/server}/measure/MeasureFilterExecutorTest/ignore_person_measures.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-server/src/test/resources/org/sonar/server}/measure/MeasureFilterExecutorTest/ignore_quality_model_measures.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-server/src/test/resources/org/sonar/server}/measure/MeasureFilterExecutorTest/shared.xml (100%) rename {sonar-core/src/test/resources/org/sonar/core => sonar-server/src/test/resources/org/sonar/server}/measure/MeasureFilterExecutorTest/sort_by_alert.xml (100%) diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/DaoUtils.java b/sonar-core/src/main/java/org/sonar/core/persistence/DaoUtils.java index b45c9ac4bd0..771c8134ef6 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/DaoUtils.java +++ b/sonar-core/src/main/java/org/sonar/core/persistence/DaoUtils.java @@ -24,9 +24,14 @@ import org.sonar.core.dashboard.ActiveDashboardDao; import org.sonar.core.dashboard.DashboardDao; import org.sonar.core.duplication.DuplicationDao; import org.sonar.core.graph.jdbc.GraphDao; -import org.sonar.core.issue.db.*; +import org.sonar.core.issue.db.ActionPlanDao; +import org.sonar.core.issue.db.ActionPlanStatsDao; +import org.sonar.core.issue.db.IssueChangeDao; +import org.sonar.core.issue.db.IssueDao; +import org.sonar.core.issue.db.IssueFilterDao; +import org.sonar.core.issue.db.IssueFilterFavouriteDao; +import org.sonar.core.issue.db.IssueStatsDao; import org.sonar.core.measure.db.MeasureDao; -import org.sonar.core.measure.db.MeasureFilterDao; import org.sonar.core.notification.db.NotificationQueueDao; import org.sonar.core.permission.PermissionDao; import org.sonar.core.permission.PermissionTemplateDao; @@ -43,13 +48,18 @@ import org.sonar.core.source.db.SnapshotSourceDao; import org.sonar.core.technicaldebt.db.CharacteristicDao; import org.sonar.core.technicaldebt.db.RequirementDao; import org.sonar.core.template.LoadedTemplateDao; -import org.sonar.core.user.*; +import org.sonar.core.user.AuthorDao; +import org.sonar.core.user.AuthorizationDao; +import org.sonar.core.user.GroupMembershipDao; +import org.sonar.core.user.RoleDao; +import org.sonar.core.user.UserDao; import java.util.List; public final class DaoUtils { private DaoUtils() { + // only static stuff } @SuppressWarnings("unchecked") @@ -72,7 +82,6 @@ public final class DaoUtils { IssueFilterFavouriteDao.class, LoadedTemplateDao.class, MeasureDao.class, - MeasureFilterDao.class, NotificationQueueDao.class, PermissionDao.class, PermissionTemplateDao.class, diff --git a/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilter.java b/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilter.java similarity index 99% rename from sonar-core/src/main/java/org/sonar/core/measure/MeasureFilter.java rename to sonar-server/src/main/java/org/sonar/server/measure/MeasureFilter.java index 3b27ec55608..7454d8ff930 100644 --- a/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilter.java +++ b/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilter.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.measure; +package org.sonar.server.measure; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Strings; diff --git a/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterCondition.java b/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterCondition.java similarity index 99% rename from sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterCondition.java rename to sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterCondition.java index 80b80fced14..cbb161b3478 100644 --- a/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterCondition.java +++ b/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterCondition.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.measure; +package org.sonar.server.measure; import org.apache.commons.lang.builder.ReflectionToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; diff --git a/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterContext.java b/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterContext.java similarity index 98% rename from sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterContext.java rename to sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterContext.java index f291eb9a011..12d5cb0afc9 100644 --- a/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterContext.java +++ b/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterContext.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.measure; +package org.sonar.server.measure; import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; diff --git a/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterEngine.java b/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterEngine.java similarity index 98% rename from sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterEngine.java rename to sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterEngine.java index 3e3e4a1288a..280ab6e2197 100644 --- a/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterEngine.java +++ b/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterEngine.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.measure; +package org.sonar.server.measure; import com.google.common.base.Joiner; import org.apache.commons.lang.SystemUtils; diff --git a/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterExecutor.java b/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterExecutor.java similarity index 99% rename from sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterExecutor.java rename to sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterExecutor.java index 713280e3022..015d304c4fa 100644 --- a/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterExecutor.java +++ b/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterExecutor.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.measure; +package org.sonar.server.measure; import com.google.common.base.Strings; import org.apache.commons.dbutils.DbUtils; diff --git a/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterFactory.java b/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterFactory.java similarity index 99% rename from sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterFactory.java rename to sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterFactory.java index 45e78f61190..06d5143a6d0 100644 --- a/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterFactory.java +++ b/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterFactory.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.measure; +package org.sonar.server.measure; import com.google.common.base.Function; import com.google.common.base.Joiner; diff --git a/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterResult.java b/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterResult.java similarity index 98% rename from sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterResult.java rename to sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterResult.java index f1484170d4c..80e0612af33 100644 --- a/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterResult.java +++ b/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterResult.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.measure; +package org.sonar.server.measure; import javax.annotation.Nullable; diff --git a/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterRow.java b/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterRow.java similarity index 98% rename from sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterRow.java rename to sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterRow.java index adecb1a0cb8..bff50112501 100644 --- a/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterRow.java +++ b/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterRow.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.measure; +package org.sonar.server.measure; import org.apache.commons.lang.StringUtils; diff --git a/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterSort.java b/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterSort.java similarity index 98% rename from sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterSort.java rename to sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterSort.java index b8c09b1de16..0cbc114f775 100644 --- a/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterSort.java +++ b/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterSort.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.measure; +package org.sonar.server.measure; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.measures.Metric; diff --git a/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterSql.java b/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterSql.java similarity index 99% rename from sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterSql.java rename to sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterSql.java index 38713732c28..fdb42960eb4 100644 --- a/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterSql.java +++ b/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterSql.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.measure; +package org.sonar.server.measure; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; diff --git a/sonar-server/src/main/java/org/sonar/server/measure/package-info.java b/sonar-server/src/main/java/org/sonar/server/measure/package-info.java new file mode 100644 index 00000000000..14240ae8f63 --- /dev/null +++ b/sonar-server/src/main/java/org/sonar/server/measure/package-info.java @@ -0,0 +1,23 @@ +/* + * 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.server.measure; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/sonar-server/src/main/java/org/sonar/server/measure/ws/package-info.java b/sonar-server/src/main/java/org/sonar/server/measure/ws/package-info.java new file mode 100644 index 00000000000..fca450ad804 --- /dev/null +++ b/sonar-server/src/main/java/org/sonar/server/measure/ws/package-info.java @@ -0,0 +1,23 @@ +/* + * 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.server.measure.ws; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java b/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java index 0256c391473..b339f752715 100644 --- a/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java +++ b/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java @@ -49,9 +49,10 @@ import org.sonar.core.issue.IssueNotifications; import org.sonar.core.issue.IssueUpdater; import org.sonar.core.issue.workflow.FunctionExecutor; import org.sonar.core.issue.workflow.IssueWorkflow; -import org.sonar.core.measure.MeasureFilterEngine; -import org.sonar.core.measure.MeasureFilterExecutor; -import org.sonar.core.measure.MeasureFilterFactory; +import org.sonar.core.measure.db.MeasureFilterDao; +import org.sonar.server.measure.MeasureFilterEngine; +import org.sonar.server.measure.MeasureFilterExecutor; +import org.sonar.server.measure.MeasureFilterFactory; import org.sonar.core.metric.DefaultMetricFinder; import org.sonar.core.notification.DefaultNotificationManager; import org.sonar.core.permission.PermissionFacade; @@ -201,8 +202,9 @@ class ServerComponents { System2.INSTANCE, RuleDao.class, ActiveRuleDao.class, - DbClient.class - )); + DbClient.class, + MeasureFilterDao.class + )); components.addAll(CorePropertyDefinitions.all()); components.addAll(DatabaseMigrations.CLASSES); components.addAll(DaoUtils.getDaoClasses()); diff --git a/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java b/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java index b3f764ebc58..ecad707f006 100644 --- a/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java +++ b/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java @@ -37,8 +37,8 @@ import org.sonar.api.test.TestPlan; import org.sonar.api.test.Testable; import org.sonar.api.web.*; import org.sonar.core.component.SnapshotPerspectives; -import org.sonar.core.measure.MeasureFilterEngine; -import org.sonar.core.measure.MeasureFilterResult; +import org.sonar.server.measure.MeasureFilterEngine; +import org.sonar.server.measure.MeasureFilterResult; import org.sonar.core.persistence.Database; import org.sonar.core.preview.PreviewCache; import org.sonar.core.purge.PurgeDao; diff --git a/sonar-core/src/test/java/org/sonar/core/measure/MeasureFilterConditionTest.java b/sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterConditionTest.java similarity index 99% rename from sonar-core/src/test/java/org/sonar/core/measure/MeasureFilterConditionTest.java rename to sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterConditionTest.java index 81ff9f39a36..5f5ec58c18e 100644 --- a/sonar-core/src/test/java/org/sonar/core/measure/MeasureFilterConditionTest.java +++ b/sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterConditionTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.measure; +package org.sonar.server.measure; import org.junit.Rule; import org.junit.Test; diff --git a/sonar-core/src/test/java/org/sonar/core/measure/MeasureFilterContextTest.java b/sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterContextTest.java similarity index 93% rename from sonar-core/src/test/java/org/sonar/core/measure/MeasureFilterContextTest.java rename to sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterContextTest.java index 4f136546412..0a3edb136a6 100644 --- a/sonar-core/src/test/java/org/sonar/core/measure/MeasureFilterContextTest.java +++ b/sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterContextTest.java @@ -17,13 +17,10 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.measure; +package org.sonar.server.measure; -import com.google.common.collect.ImmutableMap; import org.junit.Test; -import java.util.Map; - import static org.fest.assertions.Assertions.assertThat; public class MeasureFilterContextTest { diff --git a/sonar-core/src/test/java/org/sonar/core/measure/MeasureFilterEngineTest.java b/sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterEngineTest.java similarity index 98% rename from sonar-core/src/test/java/org/sonar/core/measure/MeasureFilterEngineTest.java rename to sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterEngineTest.java index b3b258abfb7..285bc40f77f 100644 --- a/sonar-core/src/test/java/org/sonar/core/measure/MeasureFilterEngineTest.java +++ b/sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterEngineTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.measure; +package org.sonar.server.measure; import com.google.common.collect.ImmutableMap; import org.hamcrest.BaseMatcher; diff --git a/sonar-core/src/test/java/org/sonar/core/measure/MeasureFilterExecutorTest.java b/sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterExecutorTest.java similarity index 99% rename from sonar-core/src/test/java/org/sonar/core/measure/MeasureFilterExecutorTest.java rename to sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterExecutorTest.java index 97783f52f4d..babee4705db 100644 --- a/sonar-core/src/test/java/org/sonar/core/measure/MeasureFilterExecutorTest.java +++ b/sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterExecutorTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.measure; +package org.sonar.server.measure; import org.junit.Before; import org.junit.ClassRule; diff --git a/sonar-core/src/test/java/org/sonar/core/measure/MeasureFilterFactoryTest.java b/sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterFactoryTest.java similarity index 99% rename from sonar-core/src/test/java/org/sonar/core/measure/MeasureFilterFactoryTest.java rename to sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterFactoryTest.java index 40ea7b6ec46..bd6348e7a28 100644 --- a/sonar-core/src/test/java/org/sonar/core/measure/MeasureFilterFactoryTest.java +++ b/sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterFactoryTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.measure; +package org.sonar.server.measure; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; diff --git a/sonar-core/src/test/java/org/sonar/core/measure/MeasureFilterTest.java b/sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterTest.java similarity index 98% rename from sonar-core/src/test/java/org/sonar/core/measure/MeasureFilterTest.java rename to sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterTest.java index c50ed427494..89469a18d8b 100644 --- a/sonar-core/src/test/java/org/sonar/core/measure/MeasureFilterTest.java +++ b/sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.measure; +package org.sonar.server.measure; import com.google.common.collect.Lists; import org.junit.Test; diff --git a/sonar-core/src/test/resources/org/sonar/core/measure/MeasureFilterExecutorTest/escape_percent_and_underscore_when_filter_by_component_name_or_key.xml b/sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/escape_percent_and_underscore_when_filter_by_component_name_or_key.xml similarity index 100% rename from sonar-core/src/test/resources/org/sonar/core/measure/MeasureFilterExecutorTest/escape_percent_and_underscore_when_filter_by_component_name_or_key.xml rename to sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/escape_percent_and_underscore_when_filter_by_component_name_or_key.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/measure/MeasureFilterExecutorTest/ignore_person_measures.xml b/sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/ignore_person_measures.xml similarity index 100% rename from sonar-core/src/test/resources/org/sonar/core/measure/MeasureFilterExecutorTest/ignore_person_measures.xml rename to sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/ignore_person_measures.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/measure/MeasureFilterExecutorTest/ignore_quality_model_measures.xml b/sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/ignore_quality_model_measures.xml similarity index 100% rename from sonar-core/src/test/resources/org/sonar/core/measure/MeasureFilterExecutorTest/ignore_quality_model_measures.xml rename to sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/ignore_quality_model_measures.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/measure/MeasureFilterExecutorTest/shared.xml b/sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/shared.xml similarity index 100% rename from sonar-core/src/test/resources/org/sonar/core/measure/MeasureFilterExecutorTest/shared.xml rename to sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/shared.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/measure/MeasureFilterExecutorTest/sort_by_alert.xml b/sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/sort_by_alert.xml similarity index 100% rename from sonar-core/src/test/resources/org/sonar/core/measure/MeasureFilterExecutorTest/sort_by_alert.xml rename to sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/sort_by_alert.xml -- 2.39.5