1 files changed, 16 insertions, 60 deletions

diff --git a/linguistics/src/main/java/com/yahoo/language/significance/impl/DefaultSignificanceModel.java b/linguistics/src/main/java/com/yahoo/language/significance/impl/DefaultSignificanceModel.java
index 7ed6f442610..3244b8373ad 100644
--- a/linguistics/src/main/java/com/yahoo/language/significance/impl/DefaultSignificanceModel.java
+++ b/linguistics/src/main/java/com/yahoo/language/significance/impl/DefaultSignificanceModel.java
@@ -1,13 +1,11 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.language.significance.impl;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.yahoo.language.significance.DocumentFrequency;
 import com.yahoo.language.significance.SignificanceModel;
 
+import java.io.IOException;
 import java.nio.file.Path;
 import java.util.HashMap;
 
@@ -18,70 +16,22 @@ import java.util.HashMap;
 public class DefaultSignificanceModel implements SignificanceModel {
     private final long corpusSize;
     private final HashMap<String, Long> frequencies;
-    private final Path path;
 
-    @JsonIgnoreProperties(ignoreUnknown = true)
-    public static class SignificanceModelFile {
-        private final String version;
-        private final String id;
-        private final String description;
-        private final long corpusSize;
-        private final String language;
-
-        private final long wordCount;
-        private final HashMap<String, Long> frequencies;
-
-        @JsonCreator
-        public SignificanceModelFile(
-                @JsonProperty("version") String version,
-                @JsonProperty("id") String id,
-                @JsonProperty("description") String description,
-                @JsonProperty("corpus-size") long corpusSize,
-                @JsonProperty("language") String language,
-                @JsonProperty("word-count") long wordCount,
-                @JsonProperty("frequencies") HashMap<String, Long> frequencies) {
-            this.version = version;
-            this.id = id;
-            this.description = description;
-            this.corpusSize = corpusSize;
-            this.language = language;
-            this.wordCount = wordCount;
-            this.frequencies = frequencies;
-        }
-
-        @JsonProperty("version")
-        public String version() { return version; }
-
-        @JsonProperty("id")
-        public String id() { return id; }
-
-        @JsonProperty("description")
-        public String description() { return description; }
-
-        @JsonProperty("corpus-size")
-        public long corpusSize() { return corpusSize; }
-
-        @JsonProperty("language")
-        public String language() { return language; }
-
-        @JsonProperty("frequencies")
-        public HashMap<String, Long> frequencies() { return frequencies; }
-
-        @JsonProperty("word-count")
-        public long wordCount() { return wordCount; }
+    private String id;
 
+    public DefaultSignificanceModel(DocumentFrequencyFile file, String id) {
+        this.frequencies = file.frequencies();
+        this.corpusSize = file.documentCount();
+        this.id = id;
     }
 
     public DefaultSignificanceModel(Path path) {
-        this.path = path;
-
         ObjectMapper objectMapper = new ObjectMapper();
-
         try {
-            SignificanceModelFile model = objectMapper.readValue(this.path.toFile(), SignificanceModelFile.class);
-            this.corpusSize = model.corpusSize;
-            this.frequencies = model.frequencies;
-        } catch (Exception e) {
+            var file         = objectMapper.readValue(path.toFile(), DocumentFrequencyFile.class);
+            this.frequencies = file.frequencies();
+            this.corpusSize  = file.documentCount();
+        } catch (IOException e) {
             throw new RuntimeException("Failed to load model from " + path, e);
         }
     }
@@ -93,4 +43,10 @@ public class DefaultSignificanceModel implements SignificanceModel {
         }
         return new DocumentFrequency(1, corpusSize);
     }
+
+    @Override
+    public String getId() {
+        return this.id;
+    }
+
 }