Fix CR comments

3 files changed, 25 insertions, 13 deletions

diff --git a/vespaclient-java/src/main/java/com/yahoo/vespasignificance/ClientParameters.java b/vespaclient-java/src/main/java/com/yahoo/vespasignificance/ClientParameters.java
index f0c351581e4..326b932cabc 100644
--- a/vespaclient-java/src/main/java/com/yahoo/vespasignificance/ClientParameters.java
+++ b/vespaclient-java/src/main/java/com/yahoo/vespasignificance/ClientParameters.java
@@ -1,3 +1,4 @@
+// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespasignificance;
 
 
@@ -22,17 +23,22 @@ public class ClientParameters {
     // Language for the program
     public final String language;
 
+    // Document type identifier
+    public final String docType;
+
     public ClientParameters(
             boolean help,
             String inputFile,
             String outputFile,
             String field,
-            String language) {
+            String language,
+            String docType) {
         this.help = help;
         this.inputFile = inputFile;
         this.outputFile = outputFile;
         this.field = field;
         this.language = language;
+        this.docType = docType;
     }
 
     public static class Builder {
@@ -42,6 +48,8 @@ public class ClientParameters {
         private String field;
         private String language;
 
+        private String docType;
+
         public Builder setHelp(boolean help) {
             this.help = help;
             return this;
@@ -66,8 +74,13 @@ public class ClientParameters {
             return this;
         }
 
+        public Builder setDocType(String docType) {
+            this.docType = docType;
+            return this;
+        }
+
         public ClientParameters build() {
-            return new ClientParameters(help, inputFile, outputFile, field, language);
+            return new ClientParameters(help, inputFile, outputFile, field, language, docType);
         }
     }
 }
diff --git a/vespaclient-java/src/main/java/com/yahoo/vespasignificance/CommandLineOptions.java b/vespaclient-java/src/main/java/com/yahoo/vespasignificance/CommandLineOptions.java
index 3090b31b9b5..e5d16854647 100644
--- a/vespaclient-java/src/main/java/com/yahoo/vespasignificance/CommandLineOptions.java
+++ b/vespaclient-java/src/main/java/com/yahoo/vespasignificance/CommandLineOptions.java
@@ -25,17 +25,9 @@ public class CommandLineOptions {
     public static final String OUTPUT_OPTION = "out";
     public static final String FIELD_OPTION = "field";
     public static final String LANGUAGE_OPTION = "language";
+    public static final String DOC_TYPE_OPTION = "doc-type";
 
     private final Options options = createOptions();
-    private final InputStream stdIn;
-
-    public CommandLineOptions(InputStream stdIn) {
-        this.stdIn = stdIn;
-    }
-
-    public CommandLineOptions() {
-        this(System.in);
-    }
 
     @SuppressWarnings("AccessStaticViaInstance")
     private static Options createOptions() {
@@ -71,6 +63,12 @@ public class CommandLineOptions {
                 .longOpt(LANGUAGE_OPTION)
                 .build());
 
+        options.addOption(Option.builder("d")
+                .hasArg(true)
+                .desc("Document type identifier")
+                .longOpt(DOC_TYPE_OPTION)
+                .build());
+
         return options;
     }
 
@@ -94,6 +92,7 @@ public class CommandLineOptions {
             builder.setOutputFile(cl.getOptionValue(OUTPUT_OPTION));
             builder.setField(cl.getOptionValue(FIELD_OPTION));
             builder.setLanguage(cl.getOptionValue(LANGUAGE_OPTION));
+            builder.setDocType(cl.getOptionValue(DOC_TYPE_OPTION));
 
             return builder.build();
         } catch (ParseException e) {
diff --git a/vespaclient-java/src/main/java/com/yahoo/vespasignificance/SignificanceModelGenerator.java b/vespaclient-java/src/main/java/com/yahoo/vespasignificance/SignificanceModelGenerator.java
index 16a7ee18a02..e27158da3cb 100644
--- a/vespaclient-java/src/main/java/com/yahoo/vespasignificance/SignificanceModelGenerator.java
+++ b/vespaclient-java/src/main/java/com/yahoo/vespasignificance/SignificanceModelGenerator.java
@@ -69,7 +69,7 @@ public class SignificanceModelGenerator {
 
         language = Language.fromLanguageTag(clientParameters.language);
 
-        docType = new DocumentType(language.languageCode().toLowerCase());
+        docType = new DocumentType(clientParameters.docType);
         docType.addField(new Field(clientParameters.field, DataType.STRING));
         types.registerDocumentType(docType);
     }
@@ -113,7 +113,7 @@ public class SignificanceModelGenerator {
             modelFile = new SignificanceModelFile(VERSION, ID, SIGNIFICANCE_DESCRIPTION, languages);
         }
         try {
-            objectMapper.setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY);
+            //objectMapper.setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY);
             ObjectWriter writer = objectMapper.writerWithDefaultPrettyPrinter();
             writer.writeValue(new File(clientParameters.outputFile), modelFile);
         } catch (IOException e) {