From 8d7d96bae86ba59fc270ce01b64320eeabaa043e Mon Sep 17 00:00:00 2001 From: simonbrandhof Date: Fri, 19 Nov 2010 14:51:14 +0000 Subject: [PATCH] move org.sonar.plugins.dbcleaner.util.PurgeUtils to org.sonar.plugins.dbcleaner.api --- .../main/java/org/sonar/plugins/dbcleaner/DbCleanerPlugin.java | 2 +- .../plugins/dbcleaner/{util => api}/DbCleanerConstants.java | 2 +- .../org/sonar/plugins/dbcleaner/{util => api}/PurgeUtils.java | 2 +- .../sonar/plugins/dbcleaner/period/DefaultPeriodCleaner.java | 2 +- .../main/java/org/sonar/plugins/dbcleaner/period/Periods.java | 2 +- .../sonar/plugins/dbcleaner/purges/PurgeDeletedResources.java | 2 +- .../org/sonar/plugins/dbcleaner/purges/PurgeDependencies.java | 2 +- .../sonar/plugins/dbcleaner/purges/PurgeDeprecatedLast.java | 2 +- .../sonar/plugins/dbcleaner/purges/PurgeDisabledResources.java | 2 +- .../java/org/sonar/plugins/dbcleaner/purges/PurgeEntities.java | 2 +- .../org/sonar/plugins/dbcleaner/purges/PurgeEventOrphans.java | 2 +- .../sonar/plugins/dbcleaner/purges/PurgeOrphanResources.java | 2 +- .../sonar/plugins/dbcleaner/purges/PurgePropertyOrphans.java | 2 +- .../org/sonar/plugins/dbcleaner/purges/PurgeResourceRoles.java | 2 +- .../org/sonar/plugins/dbcleaner/purges/PurgeRuleMeasures.java | 2 +- .../org/sonar/plugins/dbcleaner/purges/PurgeUnprocessed.java | 2 +- .../org/sonar/plugins/dbcleaner/purges/UnflagLastDoublons.java | 2 +- .../sonar/plugins/dbcleaner/{util => api}/PurgeUtilsTest.java | 3 ++- .../{util => api}/PurgeUtilsTest/purgeSnapshots-result.xml | 0 .../dbcleaner/{util => api}/PurgeUtilsTest/purgeSnapshots.xml | 0 20 files changed, 19 insertions(+), 18 deletions(-) rename plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/{util => api}/DbCleanerConstants.java (97%) rename plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/{util => api}/PurgeUtils.java (99%) rename plugins/sonar-dbcleaner-plugin/src/test/java/org/sonar/plugins/dbcleaner/{util => api}/PurgeUtilsTest.java (95%) rename plugins/sonar-dbcleaner-plugin/src/test/resources/org/sonar/plugins/dbcleaner/{util => api}/PurgeUtilsTest/purgeSnapshots-result.xml (100%) rename plugins/sonar-dbcleaner-plugin/src/test/resources/org/sonar/plugins/dbcleaner/{util => api}/PurgeUtilsTest/purgeSnapshots.xml (100%) diff --git a/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/DbCleanerPlugin.java b/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/DbCleanerPlugin.java index 41fa4916cf6..5e8a261d336 100644 --- a/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/DbCleanerPlugin.java +++ b/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/DbCleanerPlugin.java @@ -22,11 +22,11 @@ package org.sonar.plugins.dbcleaner; import org.sonar.api.Plugin; import org.sonar.api.Properties; import org.sonar.api.Property; +import org.sonar.plugins.dbcleaner.api.DbCleanerConstants; import org.sonar.plugins.dbcleaner.period.DefaultPeriodCleaner; import org.sonar.plugins.dbcleaner.period.PeriodPurge; import org.sonar.plugins.dbcleaner.purges.*; import org.sonar.plugins.dbcleaner.runner.PurgeRunner; -import org.sonar.plugins.dbcleaner.util.DbCleanerConstants; import java.util.Arrays; import java.util.List; diff --git a/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/util/DbCleanerConstants.java b/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/api/DbCleanerConstants.java similarity index 97% rename from plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/util/DbCleanerConstants.java rename to plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/api/DbCleanerConstants.java index 03a29472fb3..d39e0ae0db1 100644 --- a/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/util/DbCleanerConstants.java +++ b/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/api/DbCleanerConstants.java @@ -17,7 +17,7 @@ * License along with Sonar; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02 */ -package org.sonar.plugins.dbcleaner.util; +package org.sonar.plugins.dbcleaner.api; public interface DbCleanerConstants { diff --git a/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/util/PurgeUtils.java b/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/api/PurgeUtils.java similarity index 99% rename from plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/util/PurgeUtils.java rename to plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/api/PurgeUtils.java index 1fc28b31b57..229bcce88be 100644 --- a/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/util/PurgeUtils.java +++ b/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/api/PurgeUtils.java @@ -17,7 +17,7 @@ * License along with Sonar; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02 */ -package org.sonar.plugins.dbcleaner.util; +package org.sonar.plugins.dbcleaner.api; import org.apache.commons.configuration.Configuration; import org.sonar.api.database.DatabaseSession; diff --git a/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/period/DefaultPeriodCleaner.java b/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/period/DefaultPeriodCleaner.java index cc02ae077e0..43b707bbd67 100644 --- a/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/period/DefaultPeriodCleaner.java +++ b/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/period/DefaultPeriodCleaner.java @@ -26,7 +26,7 @@ import org.sonar.api.database.DatabaseSession; import org.sonar.api.database.model.Snapshot; import org.sonar.api.resources.Project; import org.sonar.plugins.dbcleaner.api.PeriodCleaner; -import org.sonar.plugins.dbcleaner.util.PurgeUtils; +import org.sonar.plugins.dbcleaner.api.PurgeUtils; import java.text.DateFormat; import java.util.Date; diff --git a/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/period/Periods.java b/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/period/Periods.java index 19b9ba349bf..19abce77db5 100644 --- a/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/period/Periods.java +++ b/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/period/Periods.java @@ -23,7 +23,7 @@ import org.apache.commons.configuration.Configuration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.sonar.api.resources.Project; -import org.sonar.plugins.dbcleaner.util.DbCleanerConstants; +import org.sonar.plugins.dbcleaner.api.DbCleanerConstants; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgeDeletedResources.java b/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgeDeletedResources.java index b0e3c3991f9..4e4708fa564 100644 --- a/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgeDeletedResources.java +++ b/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgeDeletedResources.java @@ -24,7 +24,7 @@ import org.sonar.api.database.model.ResourceModel; import org.sonar.api.database.model.Snapshot; import org.sonar.plugins.dbcleaner.api.Purge; import org.sonar.plugins.dbcleaner.api.PurgeContext; -import org.sonar.plugins.dbcleaner.util.PurgeUtils; +import org.sonar.plugins.dbcleaner.api.PurgeUtils; import java.util.List; diff --git a/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgeDependencies.java b/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgeDependencies.java index b3532177878..07f9e81efe8 100644 --- a/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgeDependencies.java +++ b/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgeDependencies.java @@ -24,7 +24,7 @@ import org.sonar.api.database.model.Snapshot; import org.sonar.api.design.DependencyDto; import org.sonar.plugins.dbcleaner.api.Purge; import org.sonar.plugins.dbcleaner.api.PurgeContext; -import org.sonar.plugins.dbcleaner.util.PurgeUtils; +import org.sonar.plugins.dbcleaner.api.PurgeUtils; import javax.persistence.Query; import java.util.List; diff --git a/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgeDeprecatedLast.java b/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgeDeprecatedLast.java index a08ba28718c..fb4d3782f03 100644 --- a/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgeDeprecatedLast.java +++ b/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgeDeprecatedLast.java @@ -23,7 +23,7 @@ import org.sonar.api.database.DatabaseSession; import org.sonar.api.database.model.Snapshot; import org.sonar.plugins.dbcleaner.api.Purge; import org.sonar.plugins.dbcleaner.api.PurgeContext; -import org.sonar.plugins.dbcleaner.util.PurgeUtils; +import org.sonar.plugins.dbcleaner.api.PurgeUtils; import java.util.List; diff --git a/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgeDisabledResources.java b/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgeDisabledResources.java index 27376509543..5ce0448833e 100644 --- a/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgeDisabledResources.java +++ b/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgeDisabledResources.java @@ -25,7 +25,7 @@ import org.sonar.api.database.model.Snapshot; import org.sonar.plugins.dbcleaner.api.Purge; import org.sonar.plugins.dbcleaner.api.PurgeContext; -import org.sonar.plugins.dbcleaner.util.PurgeUtils; +import org.sonar.plugins.dbcleaner.api.PurgeUtils; import java.util.List; diff --git a/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgeEntities.java b/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgeEntities.java index 98415599098..cff889cc37a 100644 --- a/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgeEntities.java +++ b/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgeEntities.java @@ -27,7 +27,7 @@ import org.sonar.api.resources.Resource; import org.sonar.api.utils.Logs; import org.sonar.plugins.dbcleaner.api.Purge; import org.sonar.plugins.dbcleaner.api.PurgeContext; -import org.sonar.plugins.dbcleaner.util.PurgeUtils; +import org.sonar.plugins.dbcleaner.api.PurgeUtils; import javax.persistence.Query; import java.util.Date; diff --git a/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgeEventOrphans.java b/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgeEventOrphans.java index 28dbc281293..16b01253ae9 100644 --- a/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgeEventOrphans.java +++ b/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgeEventOrphans.java @@ -24,7 +24,7 @@ import org.sonar.api.database.DatabaseSession; import org.sonar.api.database.model.ResourceModel; import org.sonar.plugins.dbcleaner.api.Purge; import org.sonar.plugins.dbcleaner.api.PurgeContext; -import org.sonar.plugins.dbcleaner.util.PurgeUtils; +import org.sonar.plugins.dbcleaner.api.PurgeUtils; import java.util.List; diff --git a/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgeOrphanResources.java b/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgeOrphanResources.java index 24bfd0f4467..680faa6633b 100644 --- a/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgeOrphanResources.java +++ b/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgeOrphanResources.java @@ -23,7 +23,7 @@ import org.sonar.api.database.DatabaseSession; import org.sonar.api.database.model.ResourceModel; import org.sonar.plugins.dbcleaner.api.Purge; import org.sonar.plugins.dbcleaner.api.PurgeContext; -import org.sonar.plugins.dbcleaner.util.PurgeUtils; +import org.sonar.plugins.dbcleaner.api.PurgeUtils; import java.util.List; diff --git a/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgePropertyOrphans.java b/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgePropertyOrphans.java index 251e94a2b6b..485a036bedd 100644 --- a/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgePropertyOrphans.java +++ b/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgePropertyOrphans.java @@ -25,7 +25,7 @@ import org.sonar.api.database.model.ResourceModel; import org.sonar.api.database.model.User; import org.sonar.plugins.dbcleaner.api.Purge; import org.sonar.plugins.dbcleaner.api.PurgeContext; -import org.sonar.plugins.dbcleaner.util.PurgeUtils; +import org.sonar.plugins.dbcleaner.api.PurgeUtils; import java.util.List; diff --git a/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgeResourceRoles.java b/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgeResourceRoles.java index 87b3aa123a3..80f16aadb9b 100644 --- a/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgeResourceRoles.java +++ b/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgeResourceRoles.java @@ -25,7 +25,7 @@ import org.sonar.api.security.GroupRole; import org.sonar.api.security.UserRole; import org.sonar.plugins.dbcleaner.api.Purge; import org.sonar.plugins.dbcleaner.api.PurgeContext; -import org.sonar.plugins.dbcleaner.util.PurgeUtils; +import org.sonar.plugins.dbcleaner.api.PurgeUtils; import java.util.List; diff --git a/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgeRuleMeasures.java b/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgeRuleMeasures.java index a67a0903f07..d61ad812499 100644 --- a/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgeRuleMeasures.java +++ b/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgeRuleMeasures.java @@ -24,7 +24,7 @@ import org.sonar.api.database.model.MeasureModel; import org.sonar.api.database.model.Snapshot; import org.sonar.plugins.dbcleaner.api.Purge; import org.sonar.plugins.dbcleaner.api.PurgeContext; -import org.sonar.plugins.dbcleaner.util.PurgeUtils; +import org.sonar.plugins.dbcleaner.api.PurgeUtils; import java.util.List; diff --git a/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgeUnprocessed.java b/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgeUnprocessed.java index 4911b3fe45d..579cadf275d 100644 --- a/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgeUnprocessed.java +++ b/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgeUnprocessed.java @@ -26,7 +26,7 @@ import org.sonar.api.database.model.Snapshot; import org.sonar.api.utils.Logs; import org.sonar.plugins.dbcleaner.api.Purge; import org.sonar.plugins.dbcleaner.api.PurgeContext; -import org.sonar.plugins.dbcleaner.util.PurgeUtils; +import org.sonar.plugins.dbcleaner.api.PurgeUtils; import javax.persistence.Query; import java.util.Date; diff --git a/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/UnflagLastDoublons.java b/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/UnflagLastDoublons.java index 0a1f030e466..bb309655a58 100644 --- a/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/UnflagLastDoublons.java +++ b/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/UnflagLastDoublons.java @@ -23,7 +23,7 @@ import org.sonar.api.database.DatabaseSession; import org.sonar.api.database.model.Snapshot; import org.sonar.plugins.dbcleaner.api.Purge; import org.sonar.plugins.dbcleaner.api.PurgeContext; -import org.sonar.plugins.dbcleaner.util.PurgeUtils; +import org.sonar.plugins.dbcleaner.api.PurgeUtils; import java.util.List; diff --git a/plugins/sonar-dbcleaner-plugin/src/test/java/org/sonar/plugins/dbcleaner/util/PurgeUtilsTest.java b/plugins/sonar-dbcleaner-plugin/src/test/java/org/sonar/plugins/dbcleaner/api/PurgeUtilsTest.java similarity index 95% rename from plugins/sonar-dbcleaner-plugin/src/test/java/org/sonar/plugins/dbcleaner/util/PurgeUtilsTest.java rename to plugins/sonar-dbcleaner-plugin/src/test/java/org/sonar/plugins/dbcleaner/api/PurgeUtilsTest.java index 31de15a3824..08bb8604fc2 100644 --- a/plugins/sonar-dbcleaner-plugin/src/test/java/org/sonar/plugins/dbcleaner/util/PurgeUtilsTest.java +++ b/plugins/sonar-dbcleaner-plugin/src/test/java/org/sonar/plugins/dbcleaner/api/PurgeUtilsTest.java @@ -17,11 +17,12 @@ * License along with Sonar; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02 */ -package org.sonar.plugins.dbcleaner.util; +package org.sonar.plugins.dbcleaner.api; import org.apache.commons.configuration.PropertiesConfiguration; import org.junit.Test; import org.sonar.jpa.test.AbstractDbUnitTestCase; +import org.sonar.plugins.dbcleaner.api.PurgeUtils; import java.sql.SQLException; import java.util.Arrays; diff --git a/plugins/sonar-dbcleaner-plugin/src/test/resources/org/sonar/plugins/dbcleaner/util/PurgeUtilsTest/purgeSnapshots-result.xml b/plugins/sonar-dbcleaner-plugin/src/test/resources/org/sonar/plugins/dbcleaner/api/PurgeUtilsTest/purgeSnapshots-result.xml similarity index 100% rename from plugins/sonar-dbcleaner-plugin/src/test/resources/org/sonar/plugins/dbcleaner/util/PurgeUtilsTest/purgeSnapshots-result.xml rename to plugins/sonar-dbcleaner-plugin/src/test/resources/org/sonar/plugins/dbcleaner/api/PurgeUtilsTest/purgeSnapshots-result.xml diff --git a/plugins/sonar-dbcleaner-plugin/src/test/resources/org/sonar/plugins/dbcleaner/util/PurgeUtilsTest/purgeSnapshots.xml b/plugins/sonar-dbcleaner-plugin/src/test/resources/org/sonar/plugins/dbcleaner/api/PurgeUtilsTest/purgeSnapshots.xml similarity index 100% rename from plugins/sonar-dbcleaner-plugin/src/test/resources/org/sonar/plugins/dbcleaner/util/PurgeUtilsTest/purgeSnapshots.xml rename to plugins/sonar-dbcleaner-plugin/src/test/resources/org/sonar/plugins/dbcleaner/api/PurgeUtilsTest/purgeSnapshots.xml -- 2.39.5