Cleanup after merge and changed interface.

2 files changed, 7 insertions, 7 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/RankingConstant.java b/config-model/src/main/java/com/yahoo/searchdefinition/RankingConstant.java
index f8562a1c1b9..a2bdc6834c9 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/RankingConstant.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/RankingConstant.java
@@ -18,7 +18,7 @@ public class RankingConstant {
     private final String name;
     private TensorType tensorType = null;
     private String path = null;
-    private String fileRef = "";
+    private String fileReference = "";
 
     public PathType getPathType() {
         return pathType;
@@ -33,7 +33,7 @@ public class RankingConstant {
     public RankingConstant(String name, TensorType type, String fileName) {
         this(name);
         this.tensorType = type;
-        this.fileName = fileName;
+        this.path = fileName;
         validate();
     }
 
@@ -60,7 +60,7 @@ public class RankingConstant {
     public String getName() { return name; }
     public String getFileName() { return path; }
     public String getUri() { return path; }
-    public String getFileReference() { return fileRef; }
+    public String getFileReference() { return fileReference; }
     public TensorType getTensorType() { return tensorType; }
     public String getType() { return tensorType.toString(); }
 
@@ -75,7 +75,7 @@ public class RankingConstant {
         StringBuilder b = new StringBuilder();
         b.append("constant '").append(name)
          .append(pathType == PathType.FILE ? "' from file '" : " from uri ").append(path)
-         .append("' with ref '").append(fileRef)
+         .append("' with ref '").append(fileReference)
          .append("' of type '").append(tensorType)
          .append("'");
         return b.toString();
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/RankingConstantTest.java b/config-model/src/test/java/com/yahoo/searchdefinition/RankingConstantTest.java
index df5f4f94ade..9bad5373191 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/RankingConstantTest.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/RankingConstantTest.java
@@ -120,7 +120,7 @@ public class RankingConstantTest {
         ));
         searchBuilder.build();
         Search search = searchBuilder.getSearch();
-        RankingConstant constant = search.getRankingConstants().iterator().next();
+        RankingConstant constant = search.getRankingConstants().values().iterator().next();
         assertEquals(RankingConstant.PathType.URI, constant.getPathType());
         assertEquals("http://somwhere.far.away/in/another-galaxy", constant.getUri());
     }
@@ -139,7 +139,7 @@ public class RankingConstantTest {
         ));
         searchBuilder.build();
         Search search = searchBuilder.getSearch();
-        RankingConstant constant = search.getRankingConstants().iterator().next();
+        RankingConstant constant = search.getRankingConstants().values().iterator().next();
         assertEquals(RankingConstant.PathType.URI, constant.getPathType());
         assertEquals("http://somwhere.far.away:4080/in/another-galaxy", constant.getUri());
     }
@@ -158,7 +158,7 @@ public class RankingConstantTest {
         ));
         searchBuilder.build();
         Search search = searchBuilder.getSearch();
-        RankingConstant constant = search.getRankingConstants().iterator().next();
+        RankingConstant constant = search.getRankingConstants().values().iterator().next();
         assertEquals(RankingConstant.PathType.URI, constant.getPathType());
         assertEquals("http:somwhere.far.away/in/another-galaxy", constant.getUri());
     }