aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@gmail.com>2023-07-11 19:55:05 +0200
committerGitHub <noreply@github.com>2023-07-11 19:55:05 +0200
commit20e2816a7ace4f988982ee48115967654157c32f (patch)
tree7af02a125378791831bf489cc00c51faf04cd939
parent4a916b96cfd9901a1b2c26fa13908d34d478eef8 (diff)
parent981746db2077d406489981a82a5d6cd3c21cfca9 (diff)
Merge pull request #27742 from vespa-engine/jonmv/remove-false-distribution-config-dependency
Remove unused config from dependency list
-rw-r--r--container-core/src/main/java/com/yahoo/container/core/documentapi/DocumentAccessProvider.java7
-rw-r--r--container-core/src/main/java/com/yahoo/container/core/documentapi/VespaDocumentAccess.java9
2 files changed, 4 insertions, 12 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 4212874c1a8..10f194ed8a1 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
@@ -18,11 +18,8 @@ public class DocumentAccessProvider implements Provider<VespaDocumentAccess> {
private final VespaDocumentAccess access;
@Inject
- public DocumentAccessProvider(DocumentmanagerConfig documentmanagerConfig,
- MessagebusConfig messagebusConfig, DocumentProtocolPoliciesConfig policiesConfig,
- DistributionConfig distributionConfig) {
- this.access = new VespaDocumentAccess(documentmanagerConfig, System.getProperty("config.id"),
- messagebusConfig, policiesConfig, distributionConfig);
+ public DocumentAccessProvider(DocumentmanagerConfig documentmanagerConfig, MessagebusConfig messagebusConfig) {
+ this.access = new VespaDocumentAccess(documentmanagerConfig, System.getProperty("config.id"), 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 c708e87e6c5..0e381860e98 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
@@ -39,14 +39,9 @@ public class VespaDocumentAccess extends DocumentAccess {
private final Memoized<DocumentAccess, RuntimeException> delegate;
- VespaDocumentAccess(DocumentmanagerConfig documentmanagerConfig,
- String slobroksConfigId,
- MessagebusConfig messagebusConfig,
- DocumentProtocolPoliciesConfig policiesConfig,
- DistributionConfig distributionConfig) {
+ VespaDocumentAccess(DocumentmanagerConfig documentmanagerConfig, String slobroksConfigId, MessagebusConfig messagebusConfig) {
super(new DocumentAccessParams().setDocumentmanagerConfig(documentmanagerConfig));
- this.parameters = new MessageBusParams()
- .setDocumentProtocolPoliciesConfig(policiesConfig, distributionConfig);
+ this.parameters = new MessageBusParams();
this.parameters.setDocumentmanagerConfig(documentmanagerConfig);
this.parameters.getRPCNetworkParams().setSlobrokConfigId(slobroksConfigId);
this.parameters.getMessageBusParams().setMessageBusConfig(messagebusConfig);