Merge pull request #19653 from vespa-engine/bratseth/schema-inheritance

Bratseth/schema inheritance

2 files changed, 9 insertions, 9 deletions

diff --git a/vespa-documentgen-plugin/src/main/java/com/yahoo/vespa/DocumentGenMojo.java b/vespa-documentgen-plugin/src/main/java/com/yahoo/vespa/DocumentGenMojo.java
index 39dc6240b84..3a4b36d9bb5 100644
--- a/vespa-documentgen-plugin/src/main/java/com/yahoo/vespa/DocumentGenMojo.java
+++ b/vespa-documentgen-plugin/src/main/java/com/yahoo/vespa/DocumentGenMojo.java
@@ -17,7 +17,7 @@ import com.yahoo.document.annotation.AnnotationReferenceDataType;
 import com.yahoo.document.annotation.AnnotationType;
 import com.yahoo.documentmodel.NewDocumentType;
 import com.yahoo.documentmodel.VespaDocumentType;
-import com.yahoo.searchdefinition.Search;
+import com.yahoo.searchdefinition.Schema;
 import com.yahoo.searchdefinition.SearchBuilder;
 import com.yahoo.searchdefinition.document.FieldSet;
 import com.yahoo.searchdefinition.parser.ParseException;
@@ -101,7 +101,7 @@ public class DocumentGenMojo extends AbstractMojo {
             required = true)
     private File outputDirectory;
 
-    private Map<String, Search> searches;
+    private Map<String, Schema> searches;
     private Map<String, String> docTypes;
     private Map<String, String> structTypes;
     private Map<String, String> annotationTypes;
@@ -149,8 +149,8 @@ public class DocumentGenMojo extends AbstractMojo {
             }
         }
         builder.build();
-        for (Search search : builder.getSearchList() ) {
-            this.searches.put(search.getName(), search);
+        for (Schema schema : builder.getSearchList() ) {
+            this.searches.put(schema.getName(), schema);
         }
         return builder;
     }
@@ -993,7 +993,7 @@ public class DocumentGenMojo extends AbstractMojo {
         execute(dir, this.outputDirectory, packageName);
     }
 
-    Map<String, Search> getSearches() {
+    Map<String, Schema> getSearches() {
         return searches;
     }
 
diff --git a/vespa-documentgen-plugin/src/test/java/com/yahoo/vespa/DocumentGenTest.java b/vespa-documentgen-plugin/src/test/java/com/yahoo/vespa/DocumentGenTest.java
index 3aaaf52e54a..3879067be2e 100644
--- a/vespa-documentgen-plugin/src/test/java/com/yahoo/vespa/DocumentGenTest.java
+++ b/vespa-documentgen-plugin/src/test/java/com/yahoo/vespa/DocumentGenTest.java
@@ -4,7 +4,7 @@ package com.yahoo.vespa;
 import com.yahoo.document.DataType;
 import com.yahoo.document.StructDataType;
 import com.yahoo.document.WeightedSetDataType;
-import com.yahoo.searchdefinition.Search;
+import com.yahoo.searchdefinition.Schema;
 import org.junit.Test;
 
 import java.io.File;
@@ -20,7 +20,7 @@ public class DocumentGenTest {
     public void testMusic() {
         DocumentGenMojo mojo = new DocumentGenMojo();
         mojo.execute(new File("etc/music/"), new File("target/generated-test-sources/vespa-documentgen-plugin/"), "com.yahoo.vespa.document");
-        Map<String, Search> searches = mojo.getSearches();
+        Map<String, Schema> searches = mojo.getSearches();
         assertEquals(searches.size(),1);
         assertEquals(searches.get("music").getDocument("music").getField("title").getDataType(), DataType.STRING);
         assertEquals(searches.get("music").getDocument("music").getField("eitheror").getDataType(), DataType.BOOL);
@@ -30,7 +30,7 @@ public class DocumentGenTest {
     public void testComplex() {
         DocumentGenMojo mojo = new DocumentGenMojo();
         mojo.execute(new File("etc/complex/"), new File("target/generated-test-sources/vespa-documentgen-plugin/"), "com.yahoo.vespa.document");
-        Map<String, Search> searches = mojo.getSearches();
+        Map<String, Schema> searches = mojo.getSearches();
         assertEquals(searches.get("video").getDocument("video").getField("weight").getDataType(), DataType.FLOAT);
         assertEquals(searches.get("book").getDocument("book").getField("sw1").getDataType(), DataType.FLOAT);
         assertTrue(searches.get("music3").getDocument("music3").getField("pos").getDataType() instanceof StructDataType);
@@ -44,7 +44,7 @@ public class DocumentGenTest {
     public void testLocalApp() {
         DocumentGenMojo mojo = new DocumentGenMojo();
         mojo.execute(new File("etc/localapp/"), new File("target/generated-test-sources/vespa-documentgen-plugin/"), "com.yahoo.vespa.document");
-        Map<String, Search> searches = mojo.getSearches();
+        Map<String, Schema> searches = mojo.getSearches();
         assertEquals(searches.get("video").getDocument("video").getField("weight").getDataType(), DataType.FLOAT);
         assertTrue(searches.get("book").getDocument("book").getField("mystruct").getDataType() instanceof StructDataType);
         assertTrue(searches.get("book").getDocument("book").getField("mywsfloat").getDataType() instanceof WeightedSetDataType);