Dirty hack #2

Allow the listProvidersService to be optional, which resolves the cycle that
ElasticsearchIndex relies on ListProvidersService, which relies on
ResourceProviders, which can depend on the ElasticsearchIndex.

Author: geichelberger

modules/elasticsearch-index/src/main/java/org/opencastproject/elasticsearch/index/ElasticsearchIndex.java

@@ -57,6 +57,9 @@
 import org.osgi.service.component.annotations.Deactivate;
 import org.osgi.service.component.annotations.Modified;
 import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.component.annotations.ReferenceCardinality;
+import org.osgi.service.component.annotations.ReferencePolicy;
+import org.osgi.service.component.annotations.ReferencePolicyOption;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -123,11 +126,19 @@ public class ElasticsearchIndex extends AbstractElasticsearchIndex {
 
   private boolean episodeIdRole = false;
 
-  @Reference
+  @Reference(
+      cardinality = ReferenceCardinality.OPTIONAL,
+      policy = ReferencePolicy.DYNAMIC,
+      policyOption = ReferencePolicyOption.GREEDY
+  )
   public void setListProvidersService(ListProvidersService listProvidersService) {
     this.listProvidersService = listProvidersService;
   }
 
+  public void unsetListProvidersService(ListProvidersService listProvidersService) {
+    this.listProvidersService = null;
+  }
+
   /**
    * OSGi callback to activate this component instance.
    *

modules/list-providers-service/src/main/java/org/opencastproject/list/impl/ListProvidersServiceImpl.java

@@ -32,6 +32,7 @@
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ReferenceCardinality;
 import org.osgi.service.component.annotations.ReferencePolicy;
+import org.osgi.service.component.annotations.ReferencePolicyOption;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -105,6 +106,7 @@ public void setSecurityService(SecurityService securityService) {
   @Reference(
       cardinality = ReferenceCardinality.MULTIPLE,
       policy = ReferencePolicy.DYNAMIC,
+      policyOption = ReferencePolicyOption.GREEDY,
       unbind = "removeProvider"
   )
   public void addProvider(ResourceListProvider provider) {