diff options
Diffstat (limited to 'sonar-core/src')
-rw-r--r-- | sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/DataCleanerProperties.java (renamed from sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/DbCleanerProperties.java) | 4 | ||||
-rw-r--r-- | sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java | 4 | ||||
-rw-r--r-- | sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/DataCleanerPropertiesTest.java (renamed from sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/DbCleanerPropertiesTest.java) | 4 | ||||
-rw-r--r-- | sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/DefaultPurgeTaskTest.java | 6 |
4 files changed, 9 insertions, 9 deletions
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/DataCleanerProperties.java index c19dec51c49..f4bc98dea9a 100644 --- a/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/DbCleanerProperties.java +++ b/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/DataCleanerProperties.java @@ -28,9 +28,9 @@ import org.sonar.api.resources.Qualifiers; import java.util.Arrays; import java.util.List; -public final class DbCleanerProperties { +public final class DataCleanerProperties { - private DbCleanerProperties() { + private DataCleanerProperties() { } public static List<PropertyDefinition> all() { diff --git a/sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java b/sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java index b678394d38a..d10afcf4cf9 100644 --- a/sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java +++ b/sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java @@ -24,7 +24,7 @@ import com.google.common.collect.Lists; import org.sonar.api.CoreProperties; import org.sonar.api.config.PropertyDefinition; import org.sonar.api.resources.Qualifiers; -import org.sonar.core.computation.dbcleaner.DbCleanerProperties; +import org.sonar.core.computation.dbcleaner.DataCleanerProperties; import java.util.List; @@ -40,7 +40,7 @@ public class CorePropertyDefinitions { defs.addAll(ExclusionProperties.all()); defs.addAll(SecurityProperties.all()); defs.addAll(DebtProperties.all()); - defs.addAll(DbCleanerProperties.all()); + defs.addAll(DataCleanerProperties.all()); defs.addAll(ImmutableList.of( // BATCH 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/DataCleanerPropertiesTest.java index 3a0ab992968..da34eb61566 100644 --- a/sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/DbCleanerPropertiesTest.java +++ b/sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/DataCleanerPropertiesTest.java @@ -24,10 +24,10 @@ import org.junit.Test; import static org.fest.assertions.Assertions.assertThat; -public class DbCleanerPropertiesTest { +public class DataCleanerPropertiesTest { @Test public void shouldGetExtensions() { - assertThat(DbCleanerProperties.all()).hasSize(6); + assertThat(DataCleanerProperties.all()).hasSize(6); } } diff --git a/sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/DefaultPurgeTaskTest.java b/sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/DefaultPurgeTaskTest.java index 17942e730c4..5871fb71761 100644 --- a/sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/DefaultPurgeTaskTest.java +++ b/sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/DefaultPurgeTaskTest.java @@ -67,7 +67,7 @@ public class DefaultPurgeTaskTest { @Test public void shouldNotDeleteHistoricalDataOfDirectories() { PurgeDao purgeDao = mock(PurgeDao.class); - Settings settings = new Settings(new PropertyDefinitions(DbCleanerProperties.all())); + Settings settings = new Settings(new PropertyDefinitions(DataCleanerProperties.all())); settings.setProperty(DbCleanerConstants.PROPERTY_CLEAN_DIRECTORY, "false"); DefaultPurgeTask task = new DefaultPurgeTask(purgeDao, resourceDao, settings, mock(DefaultPeriodCleaner.class), mock(PurgeProfiler.class)); @@ -85,7 +85,7 @@ public class DefaultPurgeTaskTest { @Test public void shouldDeleteHistoricalDataOfDirectoriesByDefault() { PurgeDao purgeDao = mock(PurgeDao.class); - Settings settings = new Settings(new PropertyDefinitions(DbCleanerProperties.all())); + Settings settings = new Settings(new PropertyDefinitions(DataCleanerProperties.all())); DefaultPurgeTask task = new DefaultPurgeTask(purgeDao, resourceDao, settings, mock(DefaultPeriodCleaner.class), mock(PurgeProfiler.class)); task.purge(1L); @@ -118,7 +118,7 @@ public class DefaultPurgeTaskTest { PurgeConfiguration conf = new PurgeConfiguration(1L, new String[0], 30); PurgeDao purgeDao = mock(PurgeDao.class); when(purgeDao.purge(conf)).thenThrow(new RuntimeException()); - Settings settings = new Settings(new PropertyDefinitions(DbCleanerProperties.all())); + Settings settings = new Settings(new PropertyDefinitions(DataCleanerProperties.all())); settings.setProperty(CoreProperties.PROFILING_LOG_PROPERTY, true); PurgeProfiler profiler = mock(PurgeProfiler.class); |