Revert "Revert "Jonmv/async document v1""

This reverts commit 7b03effca945dea607ed7a3c3debebda303992ab.

2 files changed, 60 insertions, 0 deletions

diff --git a/container-core/src/main/java/com/yahoo/container/core/documentapi/MessageBusDocumentAccessProvider.java b/container-core/src/main/java/com/yahoo/container/core/documentapi/MessageBusDocumentAccessProvider.java
new file mode 100644
index 00000000000..c3cd78e4da9
--- /dev/null
+++ b/container-core/src/main/java/com/yahoo/container/core/documentapi/MessageBusDocumentAccessProvider.java
@@ -0,0 +1,55 @@
+package com.yahoo.container.core.documentapi;
+
+import com.google.inject.Inject;
+import com.yahoo.component.AbstractComponent;
+import com.yahoo.container.di.componentgraph.Provider;
+import com.yahoo.document.config.DocumentmanagerConfig;
+import com.yahoo.documentapi.DocumentAccess;
+import com.yahoo.documentapi.messagebus.MessageBusDocumentAccess;
+import com.yahoo.documentapi.messagebus.MessageBusParams;
+import com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet;
+import com.yahoo.vespa.config.content.LoadTypeConfig;
+
+/**
+ * Has a lazily populated reference to a {@link MessageBusDocumentAccess}.
+ *
+ * @author jonmv
+ */
+public class MessageBusDocumentAccessProvider extends AbstractComponent implements Provider<DocumentAccess> {
+
+    private final DocumentmanagerConfig documentmanagerConfig;
+    private final LoadTypeConfig loadTypeConfig;
+    private final Object monitor = new Object();
+    private boolean shutDown = false;
+    private DocumentAccess access = null;
+
+    @Inject
+    public MessageBusDocumentAccessProvider(DocumentmanagerConfig documentmanagerConfig, LoadTypeConfig loadTypeConfig) {
+        this.documentmanagerConfig = documentmanagerConfig;
+        this.loadTypeConfig = loadTypeConfig;
+    }
+
+    @Override
+    public DocumentAccess get() {
+        synchronized (monitor) {
+            if (access == null) {
+                access = new MessageBusDocumentAccess((MessageBusParams) new MessageBusParams(new LoadTypeSet(loadTypeConfig)).setDocumentmanagerConfig(documentmanagerConfig));
+                if (shutDown)
+                    access.shutdown();
+            }
+            return access;
+        }
+    }
+
+    @Override
+    public void deconstruct() {
+        synchronized (monitor) {
+            if ( ! shutDown) {
+                shutDown = true;
+                if (access != null)
+                    access.shutdown();
+            }
+        }
+    }
+
+}
diff --git a/container-core/src/main/java/com/yahoo/container/core/documentapi/package-info.java b/container-core/src/main/java/com/yahoo/container/core/documentapi/package-info.java
new file mode 100644
index 00000000000..de524237499
--- /dev/null
+++ b/container-core/src/main/java/com/yahoo/container/core/documentapi/package-info.java
@@ -0,0 +1,5 @@
+// Copyright 2020 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+@ExportPackage
+package com.yahoo.container.core.documentapi;
+
+import com.yahoo.osgi.annotation.ExportPackage;