Access in this when modifying

5 files changed, 6 insertions, 6 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ImplicitSummaries.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/ImplicitSummaries.java
index 38703007f58..ef2e75cfcd8 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ImplicitSummaries.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/ImplicitSummaries.java
@@ -64,7 +64,7 @@ public class ImplicitSummaries extends Processor {
         }
         if (fieldSummaryField != null) {
             for (String dest : fieldSummaryField.getDestinations()) {
-                DocumentSummary summary = schema.getSummary(dest);
+                DocumentSummary summary = schema.getSummariesInThis().get(dest);
                 if (summary != null) {
                     summary.add(fieldSummaryField);
                 }
@@ -209,7 +209,7 @@ public class ImplicitSummaries extends Processor {
     }
 
     private void addToDestination(String destinationName, SummaryField summaryField, Schema schema) {
-        DocumentSummary destination = schema.getSummary(destinationName);
+        DocumentSummary destination = schema.getSummariesInThis().get(destinationName);
         if (destination == null) {
             destination = new DocumentSummary(destinationName, schema);
             schema.addSummary(destination);
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/MakeDefaultSummaryTheSuperSet.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/MakeDefaultSummaryTheSuperSet.java
index a82c8d0c6be..f38de14bb9e 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/MakeDefaultSummaryTheSuperSet.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/MakeDefaultSummaryTheSuperSet.java
@@ -35,7 +35,7 @@ public class MakeDefaultSummaryTheSuperSet extends Processor {
 
     @Override
     public void process(boolean validate, boolean documentsOnly) {
-        DocumentSummary defaultSummary= schema.getSummary("default");
+        DocumentSummary defaultSummary= schema.getSummariesInThis().get("default");
         for (SummaryField summaryField : schema.getUniqueNamedSummaryFields().values() ) {
             if (defaultSummary.getSummaryField(summaryField.getName()) != null) continue;
             if (summaryField.getTransform() == SummaryTransform.ATTRIBUTE) continue;
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/PredicateProcessor.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/PredicateProcessor.java
index 73b75d6e23a..493bf9b5251 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/PredicateProcessor.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/PredicateProcessor.java
@@ -68,7 +68,7 @@ public class PredicateProcessor extends Processor {
                         attribute.setDensePostingListThreshold(threshold);
                         addPredicateOptimizationIlScript(field, booleanDefinition);
                     }
-                    DocumentSummary summary = schema.getSummary("attributeprefetch");
+                    DocumentSummary summary = schema.getSummariesInThis().get("attributeprefetch");
                     if (summary != null) {
                         summary.remove(attribute.getName());
                     }
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ReferenceFieldsProcessor.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/ReferenceFieldsProcessor.java
index 19bfb41289d..57833fecc7a 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ReferenceFieldsProcessor.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/ReferenceFieldsProcessor.java
@@ -51,7 +51,7 @@ public class ReferenceFieldsProcessor extends Processor {
     }
 
     private void removeFromAttributePrefetchSummaryClass(SDField field) {
-        DocumentSummary summary = schema.getSummary("attributeprefetch");
+        DocumentSummary summary = schema.getSummariesInThis().get("attributeprefetch");
         if (summary != null) {
             summary.remove(field.getName());
         }
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/SummaryConsistency.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/SummaryConsistency.java
index 8b86674e4d0..e2e0cf94bb8 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/SummaryConsistency.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/SummaryConsistency.java
@@ -43,7 +43,7 @@ public class SummaryConsistency extends Processor {
 
     private void assertConsistency(SummaryField summaryField, Schema schema, boolean validate) {
         // Compare to default:
-        SummaryField existingDefault = schema.getSummary("default").getSummaryField(summaryField.getName());
+        SummaryField existingDefault = schema.getSummariesInThis().get("default").getSummaryField(summaryField.getName());
         if (existingDefault != null) {
             if (validate)
                 assertConsistentTypes(existingDefault, summaryField);