Use Path as user type for models

4 files changed, 9 insertions, 12 deletions

diff --git a/configgen/src/main/java/com/yahoo/config/codegen/BuilderGenerator.java b/configgen/src/main/java/com/yahoo/config/codegen/BuilderGenerator.java
index e7b6455f3e0..78ef17f613a 100644
--- a/configgen/src/main/java/com/yahoo/config/codegen/BuilderGenerator.java
+++ b/configgen/src/main/java/com/yahoo/config/codegen/BuilderGenerator.java
@@ -271,7 +271,7 @@ public class BuilderGenerator {
 
             String bType = builderType(n);
             String stringSetter = "";
-            if ( ! "String".equals(bType) &&  ! "FileReference".equals(bType)) {
+            if ( ! "String".equals(bType) &&  ! "FileReference".equals(bType) && ! "ModelReference".equals(bType)) {
                 String type = boxedDataType(n);
                 if ("UrlReference".equals(bType))
                     type = bType;
diff --git a/configgen/src/main/java/com/yahoo/config/codegen/ConfigGenerator.java b/configgen/src/main/java/com/yahoo/config/codegen/ConfigGenerator.java
index fd3aa388ed6..5ffe18b1699 100644
--- a/configgen/src/main/java/com/yahoo/config/codegen/ConfigGenerator.java
+++ b/configgen/src/main/java/com/yahoo/config/codegen/ConfigGenerator.java
@@ -434,7 +434,7 @@ public class ConfigGenerator {
         } else if (node instanceof UrlLeaf) {
             return "File";
         } else if (node instanceof ModelLeaf) {
-            return "ModelReference";
+            return "Path";
         } else if (node instanceof IntegerLeaf) {
             return "int";
         } else if (node instanceof LongLeaf) {
diff --git a/configgen/src/main/java/com/yahoo/config/codegen/JavaClassBuilder.java b/configgen/src/main/java/com/yahoo/config/codegen/JavaClassBuilder.java
index 4141a3b6e09..78977f43bdd 100644
--- a/configgen/src/main/java/com/yahoo/config/codegen/JavaClassBuilder.java
+++ b/configgen/src/main/java/com/yahoo/config/codegen/JavaClassBuilder.java
@@ -138,7 +138,7 @@ public class JavaClassBuilder implements ClassBuilder {
         for (int i = 1;; i++) {
             String candidate = (i < basis.length()) ? basis.substring(0, i)
                     : ReservedWords.INTERNAL_PREFIX + basis + rng.nextInt(Integer.MAX_VALUE);
-            if (usedSymbols.contains(candidate) == false) {
+            if ( ! usedSymbols.contains(candidate)) {
                 return candidate;
             }
         }
diff --git a/configgen/src/test/resources/allfeatures.reference b/configgen/src/test/resources/allfeatures.reference
index 0961d3aa922..8a681048f65 100644
--- a/configgen/src/test/resources/allfeatures.reference
+++ b/configgen/src/test/resources/allfeatures.reference
@@ -430,9 +430,6 @@ public final class AllfeaturesConfig extends ConfigInstance {
       return this;
     }
 
-    private Builder modelVal(String __value) {
-      return modelVal(ModelReference.valueOf(__value));
-    }
 
     public Builder boolarr(Boolean __value) {
       boolarr.add(__value);
@@ -774,7 +771,7 @@ public final class AllfeaturesConfig extends ConfigInstance {
   private final LeafNodeVector<FileReference, FileNode> filearr;
   private final LeafNodeVector<Path, PathNode> pathArr;
   private final LeafNodeVector<File, UrlNode> urlArr;
-  private final LeafNodeVector<ModelReference, ModelNode> modelArr;
+  private final LeafNodeVector<Path, ModelNode> modelArr;
   private final Map<String, IntegerNode> intMap;
   private final Map<String, FileNode> pathMap;
   private final Map<String, UrlNode> urlMap;
@@ -972,7 +969,7 @@ public final class AllfeaturesConfig extends ConfigInstance {
   /**
    * @return allfeatures.modelVal
    */
-  public ModelReference modelVal() {
+  public Path modelVal() {
     return modelVal.value();
   }
 
@@ -1129,7 +1126,7 @@ public final class AllfeaturesConfig extends ConfigInstance {
   /**
    * @return allfeatures.modelArr[]
    */
-  public List<ModelReference> modelArr() {
+  public List<Path> modelArr() {
     return modelArr.asList();
   }
 
@@ -1137,7 +1134,7 @@ public final class AllfeaturesConfig extends ConfigInstance {
    * @param i the index of the value to return
    * @return allfeatures.modelArr[]
    */
-  public ModelReference modelArr(int i) {
+  public Path modelArr(int i) {
     return modelArr.get(i).value();
   }
 
@@ -1189,7 +1186,7 @@ public final class AllfeaturesConfig extends ConfigInstance {
   /**
    * @return allfeatures.modelMap{}
    */
-  public Map<String, ModelReference> modelMap() {
+  public Map<String, Path> modelMap() {
     return LeafNodeMaps.asValueMap(modelMap);
   }
 
@@ -1197,7 +1194,7 @@ public final class AllfeaturesConfig extends ConfigInstance {
    * @param key the key of the value to return
    * @return allfeatures.modelMap{}
    */
-  public ModelReference modelMap(String key) {
+  public Path modelMap(String key) {
     return modelMap.get(key).value();
   }