diff options
| author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2018-04-04 14:45:19 +0200 |
|---|---|---|
| committer | SonarTech <sonartech@sonarsource.com> | 2018-04-05 20:20:48 +0200 |
| commit | c9b849fd78b6c18a1531c5c1fd17b394878799e2 (patch) | |
| tree | 52a92e7c0d25b12af691e0046dc15a60f49fccd8 /server/sonar-ce | |
| parent | 689bd9e74a90b68c311c0f13b158ed04050c0384 (diff) | |
| download | sonarqube-c9b849fd78b6c18a1531c5c1fd17b394878799e2.tar.gz sonarqube-c9b849fd78b6c18a1531c5c1fd17b394878799e2.zip | |
Delete deprecated PropertiesDao
Diffstat (limited to 'server/sonar-ce')
3 files changed, 5 insertions, 23 deletions
diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java b/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java index fab459bc449..58c0c97ec50 100644 --- a/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java +++ b/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java @@ -73,6 +73,7 @@ import org.sonar.db.DaoModule; import org.sonar.db.DatabaseChecker; import org.sonar.db.DbClient; import org.sonar.db.DefaultDatabase; +import org.sonar.db.MyBatis; import org.sonar.db.purge.PurgeProfiler; import org.sonar.process.NetworkUtilsImpl; import org.sonar.process.Props; @@ -84,6 +85,7 @@ import org.sonar.server.computation.task.projectanalysis.ProjectAnalysisTaskModu import org.sonar.server.config.ConfigurationProvider; import org.sonar.server.debt.DebtModelPluginRepository; import org.sonar.server.debt.DebtRulesXMLImporter; +import org.sonar.server.es.EsModule; import org.sonar.server.es.ProjectIndexersImpl; import org.sonar.server.event.NewAlerts; import org.sonar.server.favorite.FavoriteUpdater; @@ -146,7 +148,6 @@ import org.sonar.server.rule.DefaultRuleFinder; import org.sonar.server.rule.DeprecatedRulesDefinitionLoader; import org.sonar.server.rule.RuleDefinitionsLoader; import org.sonar.server.rule.index.RuleIndex; -import org.sonar.server.es.EsModule; import org.sonar.server.setting.DatabaseSettingLoader; import org.sonar.server.setting.DatabaseSettingsEnabler; import org.sonar.server.setting.ThreadLocalSettings; @@ -250,9 +251,7 @@ public class ComputeEngineContainerImpl implements ComputeEngineContainer { LogbackHelper.class, DefaultDatabase.class, DatabaseChecker.class, - // must instantiate deprecated class in 5.2 and only this one (and not its replacement) - // to avoid having two SqlSessionFactory instances - org.sonar.core.persistence.MyBatis.class, + MyBatis.class, PurgeProfiler.class, ServerFileSystemImpl.class, new TempFolderProvider(), diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/db/ReadOnlyPropertiesDao.java b/server/sonar-ce/src/main/java/org/sonar/ce/db/ReadOnlyPropertiesDao.java index d4e2c26b95c..d7b6f8c18cb 100644 --- a/server/sonar-ce/src/main/java/org/sonar/ce/db/ReadOnlyPropertiesDao.java +++ b/server/sonar-ce/src/main/java/org/sonar/ce/db/ReadOnlyPropertiesDao.java @@ -21,9 +21,9 @@ package org.sonar.ce.db; import java.util.Map; import org.sonar.api.utils.System2; -import org.sonar.core.properties.PropertiesDao; import org.sonar.db.DbSession; import org.sonar.db.MyBatis; +import org.sonar.db.property.PropertiesDao; import org.sonar.db.property.PropertyDto; /** @@ -90,9 +90,4 @@ public class ReadOnlyPropertiesDao extends PropertiesDao { // do nothing } - @Override - public void setProperty(org.sonar.core.properties.PropertyDto property) { - // do nothing - } - } diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/db/ReadOnlyPropertiesDaoTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/db/ReadOnlyPropertiesDaoTest.java index d8e7e342cca..c986d009d8d 100644 --- a/server/sonar-ce/src/test/java/org/sonar/ce/db/ReadOnlyPropertiesDaoTest.java +++ b/server/sonar-ce/src/test/java/org/sonar/ce/db/ReadOnlyPropertiesDaoTest.java @@ -32,7 +32,7 @@ public class ReadOnlyPropertiesDaoTest { private MyBatis myBatis = mock(MyBatis.class); private DbSession dbSession = mock(DbSession.class); private PropertyDto propertyDto = mock(PropertyDto.class); - private org.sonar.core.properties.PropertyDto oldPropertyDto = mock(org.sonar.core.properties.PropertyDto.class); + private PropertyDto oldPropertyDto = mock(PropertyDto.class); private ReadOnlyPropertiesDao underTest = new ReadOnlyPropertiesDao(myBatis, System2.INSTANCE); @Test @@ -78,7 +78,6 @@ public class ReadOnlyPropertiesDaoTest { underTest.deleteProjectProperties(null, null, dbSession); assertNoInteraction(); - } @Test @@ -86,7 +85,6 @@ public class ReadOnlyPropertiesDaoTest { underTest.deleteGlobalProperty(null); assertNoInteraction(); - } @Test @@ -94,7 +92,6 @@ public class ReadOnlyPropertiesDaoTest { underTest.deleteGlobalProperty(null, dbSession); assertNoInteraction(); - } @Test @@ -102,7 +99,6 @@ public class ReadOnlyPropertiesDaoTest { underTest.saveGlobalProperties(null); assertNoInteraction(); - } @Test @@ -110,7 +106,6 @@ public class ReadOnlyPropertiesDaoTest { underTest.renamePropertyKey(null, null); assertNoInteraction(); - } @Test @@ -120,13 +115,6 @@ public class ReadOnlyPropertiesDaoTest { assertNoInteraction(); } - @Test - public void setProperty() { - underTest.setProperty(oldPropertyDto); - - assertNoInteraction(); - } - private void assertNoInteraction() { verifyNoMoreInteractions(myBatis, dbSession, propertyDto); } |