Remove unused setup method.

3 files changed, 3 insertions, 17 deletions

diff --git a/searchcore/src/tests/proton/attribute/attribute_aspect_delayer/attribute_aspect_delayer_test.cpp b/searchcore/src/tests/proton/attribute/attribute_aspect_delayer/attribute_aspect_delayer_test.cpp
index d935019be41..d8407355e41 100644
--- a/searchcore/src/tests/proton/attribute/attribute_aspect_delayer/attribute_aspect_delayer_test.cpp
+++ b/searchcore/src/tests/proton/attribute/attribute_aspect_delayer/attribute_aspect_delayer_test.cpp
@@ -154,9 +154,6 @@ public:
         field.name = name;
         _oldIndexSchema.indexfield.emplace_back(field);
     }
-    void setup(const AttributesConfig &newAttributesConfig, const SummarymapConfig &newSummarymapConfig) {
-        _delayer.setup(newAttributesConfig, newSummarymapConfig);
-    }
     void setup(const AttributesConfig &oldAttributesConfig, const SummarymapConfig &oldSummarymapConfig,
                const AttributesConfig &newAttributesConfig, const SummarymapConfig &newSummarymapConfig) {
         IndexschemaInspector indexschemaInspector(_oldIndexSchema);
@@ -178,13 +175,14 @@ public:
 
 TEST_F("require that empty config is OK", Fixture)
 {
-    f.setup(attrCfg({}), smCfg({}));
+    f.setup(attrCfg({}), smCfg({}), attrCfg({}), smCfg({}));
     TEST_DO(f.assertAttributeConfig({}));
+    TEST_DO(f.assertSummarymapConfig({}));
 }
 
 TEST_F("require that simple attribute config is OK", Fixture)
 {
-    f.setup(attrCfg({make_int32_sv_cfg()}), smCfg({make_attribute_override("a")}));
+    f.setup(attrCfg({make_int32_sv_cfg()}), smCfg({make_attribute_override("a")}), attrCfg({make_int32_sv_cfg()}), smCfg({make_attribute_override("a")}));
     TEST_DO(f.assertAttributeConfig({make_int32_sv_cfg()}));
     TEST_DO(f.assertSummarymapConfig({make_attribute_override("a")}));
 }
diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attribute_aspect_delayer.cpp b/searchcore/src/vespa/searchcore/proton/attribute/attribute_aspect_delayer.cpp
index d0f511c3bdb..f69036ba316 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/attribute_aspect_delayer.cpp
+++ b/searchcore/src/vespa/searchcore/proton/attribute/attribute_aspect_delayer.cpp
@@ -61,13 +61,6 @@ AttributeAspectDelayer::getSummarymapConfig() const
     return _summarymapConfig;
 }
 
-void
-AttributeAspectDelayer::setup(const AttributesConfig &newAttributesConfig, const SummarymapConfig &newSummarymapConfig)
-{
-    _attributesConfig = std::make_shared<AttributesConfigBuilder>(newAttributesConfig);
-    _summarymapConfig = std::make_shared<SummarymapConfigBuilder>(newSummarymapConfig);
-}
-
 namespace {
 
 void
diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attribute_aspect_delayer.h b/searchcore/src/vespa/searchcore/proton/attribute/attribute_aspect_delayer.h
index 6ed54908025..b9d387a9e30 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/attribute_aspect_delayer.h
+++ b/searchcore/src/vespa/searchcore/proton/attribute/attribute_aspect_delayer.h
@@ -37,11 +37,6 @@ public:
     ~AttributeAspectDelayer();
 
     /*
-     * Setup called from document db config manager and document db
-     * config scout.  No adjustments.
-     */
-    void setup(const AttributesConfig &newAttributesConfig, const SummarymapConfig &newSummarymapConfig);
-    /*
      * Setup to avoid reprocessing, used to create adjusted document db
      * config before applying new config when system is online.
      */