summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@oath.com>2018-07-23 14:03:00 +0200
committerGitHub <noreply@github.com>2018-07-23 14:03:00 +0200
commitc22ac79cf445a1917f2e484cc41d8508dbc776bc (patch)
tree13297e297eed6cccc2ca85e145cb9dba81c091e1 /config
parentce4798777d1991beb72c3df2e54352db3eb1a4ee (diff)
parent36805c46674077714af3e076d2a35868534c5b04 (diff)
Merge pull request #6444 from vespa-engine/bratseth/java-model-inference
Bratseth/java model inference
Diffstat (limited to 'config')
-rw-r--r--config/src/main/java/com/yahoo/config/subscription/ConfigURI.java3
-rw-r--r--config/src/main/java/com/yahoo/config/subscription/FileSource.java6
-rw-r--r--config/src/main/java/com/yahoo/vespa/config/ConfigFileFormat.java2
3 files changed, 6 insertions, 5 deletions
diff --git a/config/src/main/java/com/yahoo/config/subscription/ConfigURI.java b/config/src/main/java/com/yahoo/config/subscription/ConfigURI.java
index 537aff096a9..850dbcc1bf4 100644
--- a/config/src/main/java/com/yahoo/config/subscription/ConfigURI.java
+++ b/config/src/main/java/com/yahoo/config/subscription/ConfigURI.java
@@ -10,9 +10,9 @@ import com.yahoo.config.subscription.impl.JRTConfigRequester;
* object to simplify parameter passing.
*
* @author lulf
- * @since 5.1
*/
public class ConfigURI {
+
private String configId;
private ConfigSource source;
@@ -54,4 +54,5 @@ public class ConfigURI {
public static ConfigURI createFromIdAndSource(String configId, ConfigSource source) {
return new ConfigURI(configId, source);
}
+
}
diff --git a/config/src/main/java/com/yahoo/config/subscription/FileSource.java b/config/src/main/java/com/yahoo/config/subscription/FileSource.java
index d69e2429dbb..27129853eae 100644
--- a/config/src/main/java/com/yahoo/config/subscription/FileSource.java
+++ b/config/src/main/java/com/yahoo/config/subscription/FileSource.java
@@ -5,15 +5,15 @@ import java.io.File;
/**
* Source specifying config from one local file
- * @author vegardh
- * @since 5.1
*
+ * @author vegardh
*/
public class FileSource implements ConfigSource {
+
private final File file;
public FileSource(File file) {
- if (!file.isFile()) throw new IllegalArgumentException("Not an ordinary file: "+file);
+ if ( ! file.isFile()) throw new IllegalArgumentException("Not an ordinary file: "+file);
this.file = file;
}
diff --git a/config/src/main/java/com/yahoo/vespa/config/ConfigFileFormat.java b/config/src/main/java/com/yahoo/vespa/config/ConfigFileFormat.java
index da51df143d2..751f6578575 100644
--- a/config/src/main/java/com/yahoo/vespa/config/ConfigFileFormat.java
+++ b/config/src/main/java/com/yahoo/vespa/config/ConfigFileFormat.java
@@ -13,9 +13,9 @@ import java.util.Stack;
/**
* @author lulf
- * @since 5.1
*/
public class ConfigFileFormat implements SlimeFormat, ObjectTraverser {
+
private final InnerCNode root;
private DataOutputStream out = null;
private Stack<Node> nodeStack;