1 files changed, 21 insertions, 16 deletions
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/DocumentAccessParams.java b/documentapi/src/main/java/com/yahoo/documentapi/DocumentAccessParams.java
index 57cfdbd32e1..701fafbab06 100755
--- a/documentapi/src/main/java/com/yahoo/documentapi/DocumentAccessParams.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/DocumentAccessParams.java
@@ -1,6 +1,10 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.documentapi;
 
+import com.yahoo.document.config.DocumentmanagerConfig;
+
+import java.util.Optional;
+
 /**
  * Superclass of the classes which contains the parameters for creating or opening a document access.
  *
@@ -8,26 +12,27 @@ package com.yahoo.documentapi;
  */
 public class DocumentAccessParams {
 
-    // The id to resolve to document manager config.
+    /** The id to resolve to document manager config. Not needed if the config is passed here */
     private String documentManagerConfigId = "client";
 
-    /**
-     * Returns the config id that the document manager should subscribe to.
-     *
-     * @return The config id.
-     */
-    public String getDocumentManagerConfigId() {
-        return documentManagerConfigId;
-    }
+    /** The document manager config, or empty if not provided (in which case a subscription must be created) */
+    private Optional<DocumentmanagerConfig> documentmanagerConfig = Optional.empty();
+    
+    /** Returns the config id that the document manager should subscribe to. */
+    public String getDocumentManagerConfigId() { return documentManagerConfigId; }
+    
+    /** Returns the document manager config to use, or empty if it it necessary to subscribe to get it */
+    public Optional<DocumentmanagerConfig> documentmanagerConfig() { return documentmanagerConfig; }
 
-    /**
-     * Sets the config id that the document manager should subscribe to.
-     *
-     * @param configId The config id.
-     * @return This, to allow chaining.
-     */
+    /** Sets the config id that the document manager should subscribe to. */
     public DocumentAccessParams setDocumentManagerConfigId(String configId) {
         documentManagerConfigId = configId;
         return this;
     }
+
+    public DocumentAccessParams setDocumentmanagerConfig(DocumentmanagerConfig documentmanagerConfig) {
+        this.documentmanagerConfig = Optional.of(documentmanagerConfig);
+        return this;
+    }
+
 }
 \ No newline at end of file