From a9a7a8a7a6b0b0aa1b59db3206c668cbf129da7e Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Lesaint?= Date: Tue, 15 Mar 2016 18:10:20 +0100 Subject: [PATCH] SONAR-6732 remove useless migrations from Compute Engine container --- .../org/sonar/ce/container/ComputeEngineContainerImpl.java | 3 +-- .../org/sonar/ce/container/ComputeEngineContainerImplTest.java | 3 +-- 2 files changed, 2 insertions(+), 4 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 d54123f8afc..3d16c5fbeb7 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 @@ -58,7 +58,6 @@ import org.sonar.db.DefaultDatabase; import org.sonar.db.permission.PermissionRepository; import org.sonar.db.purge.PurgeProfiler; import org.sonar.db.version.DatabaseVersion; -import org.sonar.db.version.MigrationStepModule; import org.sonar.process.Props; import org.sonar.server.activity.ActivityService; import org.sonar.server.activity.index.ActivityIndex; @@ -161,7 +160,7 @@ public class ComputeEngineContainerImpl implements ComputeEngineContainer { // DB DbClient.class, DaoModule.class, - MigrationStepModule.class, + // MigrationStepModule.class, DB maintenance, responsibility of Web Server // Elasticsearch EsSearchModule.class, diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java index e70112231e5..7310d34be0c 100644 --- a/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java +++ b/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java @@ -88,12 +88,11 @@ public class ComputeEngineContainerImplTest { ); assertThat(picoContainer.getParent().getParent().getParent().getComponentAdapters()).hasSize( COMPONENTS_IN_LEVEL_1_AT_CONSTRUCTION - + 22 // level 1 + + 21 // level 1 + 47 // content of DaoModule + 1 // content of EsSearchModule + 58 // content of CorePropertyDefinitions + 1 // content of CePropertyDefinitions - + 59 // content of MigrationStepModule ); assertThat(picoContainer.getParent().getParent().getParent().getParent()).isNull(); underTest.stop(); -- 2.39.5