diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-08-28 22:53:04 +0200 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2019-08-28 22:53:04 +0200 |
| commit | 8f53becb026e11f269a878de4ec3d0d4f3990eae (patch) | |
| tree | 1fffd82404487ce3589d6635b2952f9627317bde /vespa-documentgen-plugin | |
| parent | 3956de568b255b3f9a408d7664c4295eb9a9961a (diff) | |
Properly generate concrete documents for the bool type too.
Diffstat (limited to 'vespa-documentgen-plugin')
3 files changed, 8 insertions, 0 deletions
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 |