fixing errors after merge

Author: toddn

app/controllers/Files.scala

@@ -1113,13 +1113,9 @@ class Files @Inject() (
                     // FIXME create a service instead of calling salat directly
                     datasets.addFile(dataset.id, files.get(f.id).get)
 
-                    // index in Elasticsearch
-                    current.plugin[ElasticsearchPlugin].foreach { es =>
-                      // index dataset
-                      datasets.index(dataset_id)
-                      // index file
-                      es.index(SearchUtils.getElasticsearchObject(f))
-                    }
+                    // index dataset and file
+                    searches.index(dataset, true)
+                    searches.index(f)
 
                     // notify extractors that a file has been uploaded and added to a dataset
                     extractionBusService.fileCreated(f, Some(dataset), Utils.baseUrl(request), request.apiKey)

app/services/DI.scala

@@ -37,7 +37,6 @@ class ConfigurationModule extends AbstractModule {
     bind(classOf[PreviewService]).to(get("service.previews", "services.mongodb.MongoDBPreviewService"))
     bind(classOf[ExtractionService]).to(get("service.extractions", "services.mongodb.MongoDBExtractionService"))
     bind(classOf[TempFileService]).to(get("service.tempFiles", "services.mongodb.MongoDBTempFileService"))
-    bind(classOf[ThreeDService]).to(get("service.3D", "services.mongodb.MongoDBThreeDService"))
     bind(classOf[ThumbnailService]).to(get("service.thumbnails", "services.mongodb.MongoDBThumbnailService"))
     bind(classOf[TileService]).to(get("service.tiles", "services.mongodb.MongoDBTileService"))
     bind(classOf[SectionIndexInfoService]).to(get("service.sectionIndexInfo", "services.mongodb.MongoDBSectionIndexInfoService"))

app/services/mongodb/MongoDBMetadataService.scala

@@ -149,12 +149,9 @@ class MongoDBMetadataService @Inject() (contextService: ContextLDService,
     }
 
     // send extractor message after attached to resource
-    current.plugin[RabbitmqPlugin].foreach { p =>
-      metadataDocs.foreach { m =>
-        p.metadataRemovedFromResource(m.id, resourceRef, host, apiKey, user)
-      }
+    metadataDocs.foreach { m =>
+      extractionBusService.metadataRemovedFromResource(m.id, resourceRef, host, apiKey, user)
     }
-
     metadataDocs.map(m => m.id)
   }
 
@@ -176,12 +173,9 @@ class MongoDBMetadataService @Inject() (contextService: ContextLDService,
     }
 
     // send extractor message after attached to resource
-    current.plugin[RabbitmqPlugin].foreach { p =>
-      metadataDocs.foreach { m =>
-        p.metadataRemovedFromResource(m.id, resourceRef, host, apiKey, user)
-      }
+    metadataDocs.foreach { m =>
+      extractionBusService.metadataRemovedFromResource(m.id, resourceRef, host, apiKey, user)
     }
-
     metadataDocs.map(m => m.id)
   }