Merge pull request #10099 from vespa-engine/hmusum/fix-todo

Clean up todo

3 files changed, 11 insertions, 11 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/DerivedConfiguration.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/DerivedConfiguration.java
index da1ea85f2ea..f25dd0be7b2 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/DerivedConfiguration.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/DerivedConfiguration.java
@@ -78,7 +78,7 @@ public class DerivedConfiguration {
         if ( ! search.isDocumentsOnly()) {
             attributeFields = new AttributeFields(search);
             summaries = new Summaries(search, deployLogger);
-            summaryMap = new SummaryMap(search, summaries);
+            summaryMap = new SummaryMap(search);
             juniperrc = new Juniperrc(search);
             rankProfileList = new RankProfileList(search, search.rankingConstants(), attributeFields, rankProfileRegistry, queryProfiles, importedModels);
             indexingScript = new IndexingScript(search);
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryMap.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryMap.java
index 930d164ac4b..71bf05dbb6e 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryMap.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryMap.java
@@ -22,13 +22,12 @@ public class SummaryMap extends Derived implements SummarymapConfig.Producer {
 
     private Map<String,FieldResultTransform> resultTransforms = new java.util.LinkedHashMap<>();
 
-    /** Crateate a summary map from a search definition */
-    public SummaryMap(Search search, Summaries summaries) {
-        derive(search, summaries);
+    /** Creates a summary map from a search definition */
+    SummaryMap(Search search) {
+        derive(search);
     }
 
-    protected void derive(Search search, Summaries summaries) {
-        // TODO: This should really derive from the 'summaries' argument. Bug?
+    protected void derive(Search search) {
         for (DocumentSummary documentSummary : search.getSummaries().values()) {
             derive(documentSummary);
         }
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryMapTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryMapTestCase.java
index 17c767f4029..b03db1d7f2e 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryMapTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryMapTestCase.java
@@ -17,6 +17,7 @@ import java.io.IOException;
 import java.util.Iterator;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 /**
  * Tests summary map extraction
@@ -27,7 +28,7 @@ public class SummaryMapTestCase extends SearchDefinitionTestCase {
     @Test
     public void testDeriving() throws IOException, ParseException {
         Search search = SearchBuilder.buildFromFile("src/test/examples/simple.sd");
-        SummaryMap summaryMap=new SummaryMap(search, new Summaries(search, new BaseDeployLogger()));
+        SummaryMap summaryMap=new SummaryMap(search);
 
         Iterator transforms=summaryMap.resultTransformIterator();
         FieldResultTransform transform = (FieldResultTransform)transforms.next();
@@ -66,7 +67,7 @@ public class SummaryMapTestCase extends SearchDefinitionTestCase {
         assertEquals("access", transform.getFieldName());
         assertEquals(SummaryTransform.ATTRIBUTE,transform.getTransform());
 
-        assertTrue(!transforms.hasNext());
+        assertFalse(transforms.hasNext());
     }
     @Test
     public void testPositionDeriving() {
@@ -77,7 +78,7 @@ public class SummaryMapTestCase extends SearchDefinitionTestCase {
         SDField field = document.addField(fieldName, PositionDataType.INSTANCE);
         field.parseIndexingScript("{ attribute | summary }");
         new Processing().process(search, new BaseDeployLogger(), new RankProfileRegistry(), new QueryProfiles(), true, false);
-        SummaryMap summaryMap = new SummaryMap(search, new Summaries(search, new BaseDeployLogger()));
+        SummaryMap summaryMap = new SummaryMap(search);
 
         Iterator transforms = summaryMap.resultTransformIterator();
 
@@ -106,7 +107,7 @@ public class SummaryMapTestCase extends SearchDefinitionTestCase {
         assertEquals("location_zcurve", transform.getFieldName());
         assertEquals(SummaryTransform.ATTRIBUTE,transform.getTransform());
 
-        assertTrue(!transforms.hasNext());
+        assertFalse(transforms.hasNext());
 
         SummarymapConfig.Builder scb = new SummarymapConfig.Builder();
         summaryMap.getConfig(scb);
@@ -143,7 +144,7 @@ public class SummaryMapTestCase extends SearchDefinitionTestCase {
     @Test
     public void testFailOnSummaryFieldSourceCollision() {
         try {
-            Search search = SearchBuilder.buildFromFile("src/test/examples/summaryfieldcollision.sd");
+            SearchBuilder.buildFromFile("src/test/examples/summaryfieldcollision.sd");
         } catch (Exception e) {
             assertTrue(e.getMessage().matches(".*equally named field.*"));
         }