diff options
5 files changed, 13 insertions, 0 deletions
diff --git a/documentgen-test/etc/complex/music.sd b/documentgen-test/etc/complex/music.sd index b95edd2b4f3..1eb3939f4eb 100644 --- a/documentgen-test/etc/complex/music.sd +++ b/documentgen-test/etc/complex/music.sd @@ -21,6 +21,9 @@ search music { field year type int { indexing: attribute|index|summary } + field eitheror type bool { + indexing: attribute|summary + } annotation recordlabel {} annotation person { diff --git a/documentgen-test/src/test/java/com/yahoo/vespa/config/DocumentGenPluginTest.java b/documentgen-test/src/test/java/com/yahoo/vespa/config/DocumentGenPluginTest.java index 6b524af63ff..969b93b1f28 100644 --- a/documentgen-test/src/test/java/com/yahoo/vespa/config/DocumentGenPluginTest.java +++ b/documentgen-test/src/test/java/com/yahoo/vespa/config/DocumentGenPluginTest.java @@ -110,6 +110,7 @@ public class DocumentGenPluginTest { assertEquals(music.getUri(), "https://astro.burger"); music.setYear(2006); assertEquals(music.getYear(), (Integer)2006); + assertTrue(music.getEitheror()); } @Test @@ -772,6 +773,7 @@ public class DocumentGenPluginTest { music.setYear(2005); music.setUri("http://astro.burger"); music.setWeight_src(10.654f); + music.setEitheror(true); return music; } diff --git a/vespa-documentgen-plugin/etc/music/music.sd b/vespa-documentgen-plugin/etc/music/music.sd index b5083d4e490..5295b1bf449 100644 --- a/vespa-documentgen-plugin/etc/music/music.sd +++ b/vespa-documentgen-plugin/etc/music/music.sd @@ -24,6 +24,10 @@ search music { indexing: summary | attribute } + field eitheror type bool { + indexing: summary | attribute + } + field url type uri { indexing: summary | index } 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 3afd84725bf..ae40ad6154a 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 @@ -894,6 +894,7 @@ public class DocumentGenMojo extends AbstractMojo { if (DataType.DOCUMENT.equals(dt)) return "com.yahoo.document.Document"; if (DataType.URI.equals(dt)) return "java.net.URI"; if (DataType.BYTE.equals(dt)) return "java.lang.Byte"; + if (DataType.BOOL.equals(dt)) return "java.lang.Boolean"; if (DataType.TAG.equals(dt)) return "java.lang.String"; if (dt instanceof StructDataType) return className(dt.getName()); if (dt instanceof WeightedSetDataType) return "java.util.Map<"+toJavaType(((WeightedSetDataType)dt).getNestedType())+",java.lang.Integer>"; @@ -921,6 +922,7 @@ public class DocumentGenMojo extends AbstractMojo { if (DataType.DOCUMENT.equals(dt)) return "com.yahoo.document.DataType.DOCUMENT"; if (DataType.URI.equals(dt)) return "com.yahoo.document.DataType.URI"; if (DataType.BYTE.equals(dt)) return "com.yahoo.document.DataType.BYTE"; + if (DataType.BOOL.equals(dt)) return "com.yahoo.document.DataType.BOOL"; if (DataType.TAG.equals(dt)) return "com.yahoo.document.DataType.TAG"; if (dt instanceof StructDataType) return "new com.yahoo.document.StructDataType(\""+dt.getName()+"\")"; if (dt instanceof WeightedSetDataType) return "new com.yahoo.document.WeightedSetDataType("+toJavaReference(((WeightedSetDataType)dt).getNestedType())+", "+ 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 c195e116bf0..a65701fe261 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 @@ -5,6 +5,7 @@ import com.yahoo.document.DataType; import com.yahoo.document.StructDataType; import com.yahoo.document.WeightedSetDataType; import com.yahoo.searchdefinition.Search; +import org.junit.Ignore; import org.junit.Test; import java.io.File; @@ -23,6 +24,7 @@ public class DocumentGenTest { Map<String, Search> 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); } @Test |