SONAR-5237 - fixed with IT tests for batch and server

diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BootstrapContainer.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BootstrapContainer.java
index 29aebf3396d03788204ceaeccad11fd606174a4f..c2076bc83f31c3bbf47fab4aa2840bac632ca638 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BootstrapContainer.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BootstrapContainer.java
@@ -19,6 +19,8 @@
  */
 package org.sonar.batch.bootstrap;
 
+import org.sonar.core.cluster.NullQueue;
+
 import org.apache.commons.configuration.PropertiesConfiguration;
 import org.sonar.api.Plugin;
 import org.sonar.api.config.EmailSettings;
@@ -121,6 +123,7 @@ public class BootstrapContainer extends ComponentContainer {
       JdbcDriverHolder.class,
       BatchDatabase.class,
       MyBatis.class,
+      NullQueue.class,
       DatabaseVersion.class,
       // TODO check that it still works (see @Freddy)
       DatabaseCompatibility.class,

diff --git a/sonar-core/src/main/java/org/sonar/core/cluster/NullQueue.java b/sonar-core/src/main/java/org/sonar/core/cluster/NullQueue.java
index ec0e9ac83f802079f22984d3ba794663404eead1..f999d265e57b24aadd2f663c75b0651ec8b202ef 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/cluster/NullQueue.java
+++ b/sonar-core/src/main/java/org/sonar/core/cluster/NullQueue.java
@@ -23,7 +23,7 @@ import java.io.Serializable;
 
 public class NullQueue implements WorkQueue {
 
-  NullQueue(){
+  public NullQueue(){
 
   }
 

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 d613f63e365431fc648951294a5a60fb7d73a534..bd2ceb9d76f5381a287b1be3ca70257987f07833 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java
+++ b/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java
@@ -19,6 +19,8 @@
  */
 package org.sonar.server.platform;
 
+import org.sonar.core.cluster.LocalNonBlockingWorkQueue;
+
 import com.google.common.collect.Lists;
 import org.apache.commons.configuration.BaseConfiguration;
 import org.sonar.api.config.EmailSettings;
@@ -154,6 +156,7 @@ class ServerComponents {
       EmbeddedDatabaseFactory.class,
       DefaultDatabase.class,
       MyBatis.class,
+      LocalNonBlockingWorkQueue.class,
       DatabaseServerCompatibility.class,
       DatabaseVersion.class,
       PurgeProfiler.class,

diff --git a/sonar-server/src/test/java/org/sonar/server/search/BaseIndexTest.java b/sonar-server/src/test/java/org/sonar/server/search/BaseIndexTest.java
index bc46751c24b738bacbfeb913798749e6102d95ab..64fde5de3e573decc893d1ef122ccc47f8e0389d 100644 (file)
--- a/sonar-server/src/test/java/org/sonar/server/search/BaseIndexTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/search/BaseIndexTest.java
@@ -40,8 +40,8 @@ import java.util.Map;
 
 import static org.fest.assertions.Assertions.assertThat;
 
-@RunWith(ElasticsearchRunner.class)
 @Ignore("Should be fixed")
+@RunWith(ElasticsearchRunner.class)
 public class BaseIndexTest {
 
   private static final String TEST_NODE_NAME = "es_node_for_tests";