move internal details from public API

3 files changed, 16 insertions, 6 deletions

diff --git a/config-model/src/main/java/com/yahoo/schema/processing/AdjustPositionSummaryFields.java b/config-model/src/main/java/com/yahoo/schema/processing/AdjustPositionSummaryFields.java
index 6c2d62f37cb..fa663fbec96 100644
--- a/config-model/src/main/java/com/yahoo/schema/processing/AdjustPositionSummaryFields.java
+++ b/config-model/src/main/java/com/yahoo/schema/processing/AdjustPositionSummaryFields.java
@@ -42,6 +42,16 @@ public class AdjustPositionSummaryFields extends Processor {
         }
     }
 
+    static String getPositionSummaryFieldName(String fieldName) {
+        // Only used in v7 legacy mode, remove in Vespa 9
+        return fieldName + ".position";
+    }
+
+    static String getDistanceSummaryFieldName(String fieldName) {
+        // Only used in v7 legacy mode, remove in Vespa 9
+        return fieldName + ".distance";
+    }
+
     private void scanSummary(DocumentSummary summary) {
         for (SummaryField summaryField : summary.getSummaryFields().values()) {
             if ( ! GeoPos.isAnyPos(summaryField.getDataType())) continue;
@@ -75,12 +85,12 @@ public class AdjustPositionSummaryFields extends Processor {
         summaryField.getSources().clear();
         summaryField.addSource(source);
         ensureSummaryField(summary,
-                           PositionDataType.getPositionSummaryFieldName(summaryField.getName()),
+                           getPositionSummaryFieldName(summaryField.getName()),
                            DataType.getArray(DataType.STRING),
                            source,
                            SummaryTransform.POSITIONS);
         ensureSummaryField(summary,
-                           PositionDataType.getDistanceSummaryFieldName(summaryField.getName()),
+                           getDistanceSummaryFieldName(summaryField.getName()),
                            DataType.INT,
                            source,
                            SummaryTransform.DISTANCE);
diff --git a/config-model/src/main/java/com/yahoo/schema/processing/CreatePositionZCurve.java b/config-model/src/main/java/com/yahoo/schema/processing/CreatePositionZCurve.java
index 5bb5079fab6..e39b78d0d9f 100644
--- a/config-model/src/main/java/com/yahoo/schema/processing/CreatePositionZCurve.java
+++ b/config-model/src/main/java/com/yahoo/schema/processing/CreatePositionZCurve.java
@@ -78,11 +78,11 @@ public class CreatePositionZCurve extends Processor {
             Collection<String> summaryTo = removeSummaryTo(field);
             if (! useV8GeoPositions) {
                 ensureCompatibleSummary(field, zName,
-                                        PositionDataType.getPositionSummaryFieldName(fieldName),
+                                        AdjustPositionSummaryFields.getPositionSummaryFieldName(fieldName),
                                         DataType.getArray(DataType.STRING), // will become "xmlstring"
                                         SummaryTransform.POSITIONS, summaryTo, validate);
                 ensureCompatibleSummary(field, zName,
-                                        PositionDataType.getDistanceSummaryFieldName(fieldName),
+                                        AdjustPositionSummaryFields.getDistanceSummaryFieldName(fieldName),
                                         DataType.INT,
                                         SummaryTransform.DISTANCE, summaryTo, validate);
             }
diff --git a/config-model/src/main/java/com/yahoo/schema/processing/ImplicitSummaries.java b/config-model/src/main/java/com/yahoo/schema/processing/ImplicitSummaries.java
index 7b4bc00230a..cb28e74b4b1 100644
--- a/config-model/src/main/java/com/yahoo/schema/processing/ImplicitSummaries.java
+++ b/config-model/src/main/java/com/yahoo/schema/processing/ImplicitSummaries.java
@@ -92,12 +92,12 @@ public class ImplicitSummaries extends Processor {
         if (field.doesSummarying()) {
             for (Attribute attribute : field.getAttributes().values()) {
                 if ( ! attribute.isPosition()) continue;
-                var distField = field.getSummaryField(PositionDataType.getDistanceSummaryFieldName(fieldName));
+                var distField = field.getSummaryField(AdjustPositionSummaryFields.getDistanceSummaryFieldName(fieldName));
                 if (distField != null) {
                     DocumentSummary attributePrefetchSummary = getOrCreateAttributePrefetchSummary(schema);
                     attributePrefetchSummary.add(distField);
                 }
-                var posField = field.getSummaryField(PositionDataType.getPositionSummaryFieldName(fieldName));
+                var posField = field.getSummaryField(AdjustPositionSummaryFields.getPositionSummaryFieldName(fieldName));
                 if (posField != null) {
                     DocumentSummary attributePrefetchSummary = getOrCreateAttributePrefetchSummary(schema);
                     attributePrefetchSummary.add(posField);