diff options
author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2021-01-28 08:31:04 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-28 08:31:04 +0100 |
commit | 2e2e2edeb3ea99f2c04925070cf44601e2cd94fb (patch) | |
tree | 51b8ba2272b299ab676cdae6e04b3f050979ac12 /container-core | |
parent | e4a2b4d09f15ef07c41c35520a23e0970895b2aa (diff) |
Revert "Jonmv/reapply document protocol super config [run-systemtest]"
Diffstat (limited to 'container-core')
2 files changed, 5 insertions, 13 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/core/documentapi/DocumentAccessProvider.java b/container-core/src/main/java/com/yahoo/container/core/documentapi/DocumentAccessProvider.java index 8b75e2d7660..5e3f873bba9 100644 --- a/container-core/src/main/java/com/yahoo/container/core/documentapi/DocumentAccessProvider.java +++ b/container-core/src/main/java/com/yahoo/container/core/documentapi/DocumentAccessProvider.java @@ -7,8 +7,6 @@ import com.yahoo.component.AbstractComponent; import com.yahoo.container.di.componentgraph.Provider; import com.yahoo.document.config.DocumentmanagerConfig; import com.yahoo.messagebus.MessagebusConfig; -import com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig; -import com.yahoo.vespa.config.content.DistributionConfig; import com.yahoo.vespa.config.content.LoadTypeConfig; /** @@ -21,11 +19,10 @@ public class DocumentAccessProvider extends AbstractComponent implements Provide private final VespaDocumentAccess access; @Inject + // TODO jonmv: Have Slobrok and RPC config injected as well. public DocumentAccessProvider(DocumentmanagerConfig documentmanagerConfig, LoadTypeConfig loadTypeConfig, - SlobroksConfig slobroksConfig, MessagebusConfig messagebusConfig, - DocumentProtocolPoliciesConfig policiesConfig, DistributionConfig distributionConfig) { - this.access = new VespaDocumentAccess(documentmanagerConfig, loadTypeConfig, slobroksConfig, messagebusConfig, - policiesConfig, distributionConfig); + SlobroksConfig slobroksConfig, MessagebusConfig messagebusConfig) { + this.access = new VespaDocumentAccess(documentmanagerConfig, loadTypeConfig, slobroksConfig, messagebusConfig); } @Override diff --git a/container-core/src/main/java/com/yahoo/container/core/documentapi/VespaDocumentAccess.java b/container-core/src/main/java/com/yahoo/container/core/documentapi/VespaDocumentAccess.java index d55df15b2fd..2918ffb2c80 100644 --- a/container-core/src/main/java/com/yahoo/container/core/documentapi/VespaDocumentAccess.java +++ b/container-core/src/main/java/com/yahoo/container/core/documentapi/VespaDocumentAccess.java @@ -20,8 +20,6 @@ import com.yahoo.documentapi.messagebus.MessageBusDocumentAccess; import com.yahoo.documentapi.messagebus.MessageBusParams; import com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet; import com.yahoo.messagebus.MessagebusConfig; -import com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig; -import com.yahoo.vespa.config.content.DistributionConfig; import com.yahoo.vespa.config.content.LoadTypeConfig; /** @@ -41,12 +39,9 @@ public class VespaDocumentAccess extends DocumentAccess { VespaDocumentAccess(DocumentmanagerConfig documentmanagerConfig, LoadTypeConfig loadTypeConfig, SlobroksConfig slobroksConfig, - MessagebusConfig messagebusConfig, - DocumentProtocolPoliciesConfig policiesConfig, - DistributionConfig distributionConfig) { + MessagebusConfig messagebusConfig) { super(new DocumentAccessParams().setDocumentmanagerConfig(documentmanagerConfig)); - this.parameters = new MessageBusParams(new LoadTypeSet(loadTypeConfig)) - .setDocumentProtocolPoliciesConfig(policiesConfig, distributionConfig); + this.parameters = new MessageBusParams(new LoadTypeSet(loadTypeConfig)); this.parameters.setDocumentmanagerConfig(documentmanagerConfig); this.parameters.getRPCNetworkParams().setSlobroksConfig(slobroksConfig); this.parameters.getMessageBusParams().setMessageBusConfig(messagebusConfig); |