diff options
27 files changed, 101 insertions, 153 deletions
diff --git a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/ConfigserverSslContextFactoryProvider.java b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/ConfigserverSslContextFactoryProvider.java index a117d283146..7dc3496adc9 100644 --- a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/ConfigserverSslContextFactoryProvider.java +++ b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/ConfigserverSslContextFactoryProvider.java @@ -45,6 +45,7 @@ import java.util.logging.Logger; * @author bjorncs */ public class ConfigserverSslContextFactoryProvider extends TlsContextBasedProvider { + private static final String CERTIFICATE_ALIAS = "athenz"; private static final Duration EXPIRATION_MARGIN = Duration.ofHours(6); private static final Path VESPA_SIA_DIRECTORY = Paths.get(Defaults.getDefaults().underVespaHome("var/vespa/sia")); diff --git a/config-application-package/src/main/java/com/yahoo/config/application/Xml.java b/config-application-package/src/main/java/com/yahoo/config/application/Xml.java index e28c5eac0bb..1cdb54a743c 100644 --- a/config-application-package/src/main/java/com/yahoo/config/application/Xml.java +++ b/config-application-package/src/main/java/com/yahoo/config/application/Xml.java @@ -68,6 +68,7 @@ public class Xml { static DocumentBuilder getPreprocessDocumentBuilder() throws ParserConfigurationException { DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); + factory.setFeature("http://xml.org/sax/features/external-general-entities", false); // XXE prevention factory.setNamespaceAware(true); factory.setXIncludeAware(false); factory.setValidating(false); diff --git a/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java b/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java index bedf8057b41..08956b272f6 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java @@ -306,9 +306,9 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Seri * calling {@link #getConfig(com.yahoo.config.ConfigInstance.Builder, String)}. The default values used will be those of the config * types in the model. * - * @param clazz The type of config - * @param configId The config id - * @return A config instance of the given type + * @param clazz the type of config + * @param configId the config id + * @return a config instance of the given type */ public <CONFIGTYPE extends ConfigInstance> CONFIGTYPE getConfig(Class<CONFIGTYPE> clazz, String configId) { try { diff --git a/config/src/main/java/com/yahoo/vespa/config/ConfigVerification.java b/config/src/main/java/com/yahoo/vespa/config/ConfigVerification.java index 0888004ef02..4da27e8c346 100644 --- a/config/src/main/java/com/yahoo/vespa/config/ConfigVerification.java +++ b/config/src/main/java/com/yahoo/vespa/config/ConfigVerification.java @@ -25,6 +25,7 @@ import java.util.Stack; * @author Ulf Lilleengen */ public class ConfigVerification { + private final static int port = 19071; private final static String prefix = "http://"; diff --git a/config/src/main/java/com/yahoo/vespa/config/buildergen/ConfigCompiler.java b/config/src/main/java/com/yahoo/vespa/config/buildergen/ConfigCompiler.java index e4cedfafeea..9473a05332f 100644 --- a/config/src/main/java/com/yahoo/vespa/config/buildergen/ConfigCompiler.java +++ b/config/src/main/java/com/yahoo/vespa/config/buildergen/ConfigCompiler.java @@ -7,5 +7,7 @@ package com.yahoo.vespa.config.buildergen; * @author Ulf Lilleengen */ public interface ConfigCompiler { + CompiledBuilder compile(ConfigDefinitionClass defClass); + } diff --git a/config/src/main/java/com/yahoo/vespa/config/buildergen/LazyConfigCompiler.java b/config/src/main/java/com/yahoo/vespa/config/buildergen/LazyConfigCompiler.java index 2fc3cd7aa19..2af19d1c6f2 100644 --- a/config/src/main/java/com/yahoo/vespa/config/buildergen/LazyConfigCompiler.java +++ b/config/src/main/java/com/yahoo/vespa/config/buildergen/LazyConfigCompiler.java @@ -16,9 +16,9 @@ import java.util.Locale; * {@link CompiledBuilder}. * * @author Ulf Lilleengen - * @since 5.2 */ public class LazyConfigCompiler implements ConfigCompiler { + private final File outputDirectory; private final ClassLoader classLoader; private final JavaCompiler compiler = ToolProvider.getSystemJavaCompiler(); diff --git a/container-search/src/main/java/com/yahoo/prelude/query/parser/UnicodePropertyDump.java b/container-search/src/main/java/com/yahoo/prelude/query/parser/UnicodePropertyDump.java index 0dc9a33e3f1..0dd2f4692d9 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/parser/UnicodePropertyDump.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/parser/UnicodePropertyDump.java @@ -16,9 +16,10 @@ import java.io.PrintStream; * <li>debug true|false</li> * </ol> * - * @author <a href="mailto:vlarsen@yahoo-inc.com">Vidar Larsen</a> + * @author Vidar Larsen */ class UnicodePropertyDump { + public static void main(String[] arg) { int start = 0; int end = 0xffff; diff --git a/container-search/src/main/java/com/yahoo/search/query/rewrite/RewriterUtils.java b/container-search/src/main/java/com/yahoo/search/query/rewrite/RewriterUtils.java index 30a3121902c..b73ef1298ee 100644 --- a/container-search/src/main/java/com/yahoo/search/query/rewrite/RewriterUtils.java +++ b/container-search/src/main/java/com/yahoo/search/query/rewrite/RewriterUtils.java @@ -153,13 +153,12 @@ public class RewriterUtils { * * @param query Query object from the searcher * @param paramName parameter to be retrieved - * * @return parameter value or null if not found */ public static String getUserParam(Query query, String paramName) { log(utilsLogger, query, "Retrieving user param value: " + paramName); - if(paramName==null) { + if (paramName == null) { error(utilsLogger, query, "Parameter name is null"); return null; } @@ -172,8 +171,7 @@ public class RewriterUtils { } /** - * Retrieve metadata passed by previous rewriter - * from query properties + * Retrieve metadata passed by previous rewriter from query properties * Initialize values if this is the first rewriter * * @param query Query object from the searcher @@ -183,10 +181,10 @@ public class RewriterUtils { log(utilsLogger, query, "Retrieving metadata passed by previous rewriter"); @SuppressWarnings("unchecked") - HashMap<String, Object> rewriteMeta = (HashMap<String, Object>) query - .properties().get(RewriterConstants.REWRITE_META); + HashMap<String, Object> rewriteMeta = + (HashMap<String, Object>)query.properties().get(RewriterConstants.REWRITE_META); - if(rewriteMeta==null) { + if (rewriteMeta == null) { log(utilsLogger, query, "No metadata available from previous rewriter"); rewriteMeta = new HashMap<>(); rewriteMeta.put(RewriterConstants.REWRITTEN, false); @@ -326,9 +324,9 @@ public class RewriterUtils { * @param msg Error message */ public static void error(Logger logger, Query query, String msg) { - if(query!=null) { + if (query != null) query.trace(logger.getName() + ": " + msg, true, TRACELEVEL); - } logger.severe(logger.getName() + ": " + msg); } + } diff --git a/fsa/src/main/java/com/yahoo/fsa/FSA.java b/fsa/src/main/java/com/yahoo/fsa/FSA.java index f0fc27a15c5..5a4a0e4475f 100644 --- a/fsa/src/main/java/com/yahoo/fsa/FSA.java +++ b/fsa/src/main/java/com/yahoo/fsa/FSA.java @@ -83,7 +83,7 @@ public class FSA implements Closeable { public void delta(String string){ ByteBuffer buf = fsa.encode(string); Maps m = fsa.map(); - while(state >0 && buf.position()<buf.limit()){ + while (state >0 && buf.position()<buf.limit()){ delta(m, buf.get()); } } @@ -106,7 +106,7 @@ public class FSA implements Closeable { /** Jumps ahead by a word - if this is not the first word, it must be preceeded by space. */ public void deltaWord(String string){ - if (state!=fsa.start()) { + if (state != fsa.start()) { delta((byte)' '); } delta(string); diff --git a/fsa/src/main/java/com/yahoo/fsa/segmenter/Segment.java b/fsa/src/main/java/com/yahoo/fsa/segmenter/Segment.java index 97453d97c6d..ab2ec75d7f3 100644 --- a/fsa/src/main/java/com/yahoo/fsa/segmenter/Segment.java +++ b/fsa/src/main/java/com/yahoo/fsa/segmenter/Segment.java @@ -4,39 +4,38 @@ package com.yahoo.fsa.segmenter; /** * Class encapsulation of a segment. * - * @author <a href="mailto:boros@yahoo-inc.com">Peter Boros</a> + * @author Peter Boros */ public class Segment { - int _beg; - int _end; - int _conn; + final int begin; + final int end; + final int conn; - public Segment(int b, int e, int c) - { - _beg = b; - _end = e; - _conn = c; + public Segment(int b, int e, int c) { + begin = b; + end = e; + conn = c; } public int beg() { - return _beg; + return begin; } public int end() { - return _end; + return end; } public int len() { - return _end-_beg; + return end - begin; } public int conn() { - return _conn; + return conn; } } diff --git a/fsa/src/main/java/com/yahoo/fsa/segmenter/Segmenter.java b/fsa/src/main/java/com/yahoo/fsa/segmenter/Segmenter.java index 64c20e38b55..505085c46cf 100644 --- a/fsa/src/main/java/com/yahoo/fsa/segmenter/Segmenter.java +++ b/fsa/src/main/java/com/yahoo/fsa/segmenter/Segmenter.java @@ -9,58 +9,56 @@ import com.yahoo.fsa.FSA; /** * API for accessing the Segmenter automata. * - * @author <a href="mailto:boros@yahoo-inc.com">Peter Boros</a> + * @author Peter Boros */ public class Segmenter { - private FSA _fsa; + private final FSA fsa; public Segmenter(FSA fsa) { - _fsa = fsa; + this.fsa = fsa; } public Segmenter(String filename) { - _fsa = new FSA(filename,"utf-8"); + fsa = new FSA(filename, "utf-8"); } public Segmenter(String filename, String charsetname) { - _fsa = new FSA(filename,charsetname); + fsa = new FSA(filename, charsetname); } - public boolean isOk() - { - return _fsa.isOk(); + public boolean isOk() { + return fsa.isOk(); } - public Segments segment(String input) - { + public Segments segment(String input) { String[] tokens = input.split("\\s"); return segment(tokens); } private class Detector { - FSA.State _state; - int _index; - public Detector(FSA.State s, int i) - { - _state = s; - _index = i; + final FSA.State state; + final int index; + + public Detector(FSA.State s, int i) { + state = s; + index = i; } public FSA.State state() { - return _state; + return state; } public int index() { - return _index; + return index; } + } - public Segments segment(String[] tokens) - { + public Segments segment(String[] tokens) { Segments segments = new Segments(tokens); LinkedList detectors = new LinkedList(); @@ -68,7 +66,7 @@ public class Segmenter { while(i<tokens.length){ - detectors.add(new Detector(_fsa.getState(),i)); + detectors.add(new Detector(fsa.getState(), i)); ListIterator det_it = detectors.listIterator(); while(det_it.hasNext()){ @@ -88,50 +86,5 @@ public class Segmenter { return segments; } - //// test //// - public static void main(String[] args) { - String fsafile = "/home/gv/fsa/automata/segments.fsa"; - - Segmenter segmenter = new Segmenter(fsafile); - - System.out.println("Loading segmenter FSA file "+fsafile+": "+segmenter.isOk()); - - for(int a=0;a<1||a<args.length;a++){ - - String query; - if(a==args.length){ - query = "times square head"; - } - else { - query = args[a]; - } - System.out.println("processing query \""+query+"\""); - - Segments segments = segmenter.segment(query); - System.out.println("all segments:"); - for(int i=0; i<segments.size();i++){ - System.out.println(" "+i+": \""+segments.sgm(i)+"\","+segments.conn(i)); - } - - Segments best; - - best = segments.segmentation(Segments.SEGMENTATION_WEIGHTED); - System.out.print("best segments (weighted): "); - for(int i=0; i<best.size();i++){ - System.out.print("("+best.sgm(i)+")"); - } - System.out.println(); - - best = segments.segmentation(Segments.SEGMENTATION_RIGHTMOST_LONGEST); - System.out.print("best segments (rightmost_longest):"); - for(int i=0; i<best.size();i++){ - System.out.print("("+best.sgm(i)+")"); - } - System.out.println(); - - } - - } - } diff --git a/fsa/src/main/java/com/yahoo/fsa/segmenter/Segments.java b/fsa/src/main/java/com/yahoo/fsa/segmenter/Segments.java index 6d7ee7be1a6..e01afa91cd5 100644 --- a/fsa/src/main/java/com/yahoo/fsa/segmenter/Segments.java +++ b/fsa/src/main/java/com/yahoo/fsa/segmenter/Segments.java @@ -6,7 +6,7 @@ import java.util.LinkedList; /** * Contains the segmentation() method. * - * @author <a href="mailto:boros@yahoo-inc.com">Peter Boros</a> + * @author Peter Boros */ public class Segments extends LinkedList { diff --git a/fsa/src/main/java/com/yahoo/fsa/topicpredictor/TopicPredictor.java b/fsa/src/main/java/com/yahoo/fsa/topicpredictor/TopicPredictor.java index f29dc38f2ce..cc3ff2e79ac 100644 --- a/fsa/src/main/java/com/yahoo/fsa/topicpredictor/TopicPredictor.java +++ b/fsa/src/main/java/com/yahoo/fsa/topicpredictor/TopicPredictor.java @@ -25,13 +25,13 @@ import com.yahoo.fsa.MetaData; * predicted topics for a term. Each topic has an attached weight and * a term vector (topicSegments). * - * @author <a href="mailto:boros@yahoo-inc.com">Peter Boros</a> - **/ + * @author Peter Boros + */ public class TopicPredictor extends MetaData { private static final String packageName = "com.yahoo.fsa.topicpredictor"; - private FSA fsa = null; + private final FSA fsa; public TopicPredictor(String fsafile, String datfile){ this(fsafile, datfile, "utf-8"); @@ -154,27 +154,4 @@ public class TopicPredictor extends MetaData { return getStringArrayEntry(user(0) + topicId, 2); } - - //// test //// - public static void main(String[] args) { - String segment = "new york"; - if (args.length >= 1) { - segment = args[0]; - } - - String fsafile = "/home/gv/fsa/automata/dmozPred_2.fsa"; - String datfile = "/home/gv/fsa/automata/dmozPred_2.dat"; - - TopicPredictor predictor = new TopicPredictor(fsafile, datfile); - - List predictedTopics = predictor.getPredictedTopics(segment, 25); - Iterator i = predictedTopics.iterator(); - while (i.hasNext()) { - PredictedTopic topic = (PredictedTopic) i.next(); - System.out.println("\n topic=" + topic.getTopic()); - System.out.println(" weight=" + topic.getWeight()); - System.out.println(" vector=" + topic.getVector()); - } - } - } diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/ExportPackages.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/ExportPackages.java index 6e890fd2c2d..5a2608b63be 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/core/ExportPackages.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/core/ExportPackages.java @@ -24,6 +24,7 @@ import java.util.logging.Logger; * @author gjoranv */ public class ExportPackages { + private static final Logger log = Logger.getLogger(ExportPackages.class.getName()); public static final String PROPERTIES_FILE = "/exportPackages.properties"; diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/JDiscSslContextFactory.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/JDiscSslContextFactory.java index 4d3bb4a280a..006a282e1e0 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/JDiscSslContextFactory.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/JDiscSslContextFactory.java @@ -33,4 +33,5 @@ class JDiscSslContextFactory extends SslContextFactory.Server { Objects.toString(getTrustStoreProvider(), getKeyStoreProvider()), trustStorePassword); } + } diff --git a/jrt/src/com/yahoo/jrt/slobrok/api/Mirror.java b/jrt/src/com/yahoo/jrt/slobrok/api/Mirror.java index 31d7543304a..5a4a79995d8 100644 --- a/jrt/src/com/yahoo/jrt/slobrok/api/Mirror.java +++ b/jrt/src/com/yahoo/jrt/slobrok/api/Mirror.java @@ -133,9 +133,9 @@ public class Mirror implements IMirror { * and end with '**' to match the rest of the name. * Note that this isn't quite globbing, as there is no backtracking. * - * @return true if the name matches the pattern * @param name the name * @param pattern the pattern + * @return true if the name matches the pattern */ static boolean match(char [] name, char [] pattern) { int ni = 0; diff --git a/jrt/src/com/yahoo/jrt/tool/RpcInvoker.java b/jrt/src/com/yahoo/jrt/tool/RpcInvoker.java index 7803767e4d0..6c36e8f9604 100644 --- a/jrt/src/com/yahoo/jrt/tool/RpcInvoker.java +++ b/jrt/src/com/yahoo/jrt/tool/RpcInvoker.java @@ -28,10 +28,10 @@ import java.util.ArrayList; public class RpcInvoker { private Value getArgument(Request request, String parameter) { - if (parameter.length()<=1 || parameter.charAt(1)!=':') + if (parameter.length() <= 1 || parameter.charAt(1) != ':') return new StringValue(parameter); - String value=parameter.substring(2); + String value = parameter.substring(2); switch (parameter.charAt(0)) { case 'b': return new Int8Value(Byte.parseByte(value)); @@ -53,9 +53,9 @@ public class RpcInvoker { "There is no jrt type identified by '" + parameter.charAt(0) + "'"); } - protected Request createRequest(String method,List<String> arguments) { - Request request=new Request(method); - if (arguments!=null) { + protected Request createRequest(String method, List<String> arguments) { + Request request = new Request(method); + if (arguments != null) { for (String argument : arguments) request.parameters().add(getArgument(request,argument)); } @@ -69,37 +69,37 @@ public class RpcInvoker { * @param method the name of the method to invoke * @param arguments the argument to the method, or null or an empty list if there are no arguments */ - public void invoke(String connectspec,String method, List<String> arguments) { - Supervisor supervisor=null; - Target target=null; + public void invoke(String connectspec, String method, List<String> arguments) { + Supervisor supervisor = null; + Target target = null; try { - if (connectspec.indexOf('/')<0) - connectspec="tcp/" + connectspec; + if (connectspec.indexOf('/') < 0) + connectspec = "tcp/" + connectspec; - supervisor=new Supervisor(new Transport()); + supervisor = new Supervisor(new Transport()); target = supervisor.connect(new Spec(connectspec)); - Request request=createRequest(method,arguments); + Request request = createRequest(method,arguments); target.invokeSync(request,10.0); if (request.isError()) { System.err.println("error(" + request.errorCode() + "): " + request.errorMessage()); return; } - Values returned=request.returnValues(); - for (int i=0; i<returned.size(); i++) { + Values returned = request.returnValues(); + for (int i = 0; i < returned.size(); i++) { System.out.println(returned.get(i)); } } finally { - if (target!=null) + if (target != null) target.close(); - if (supervisor!=null) + if (supervisor != null) supervisor.transport().shutdown().join(); } } public static void main(String[] args) { - if (args.length<1) { + if (args.length < 1) { System.err.println("usage: invoke [-h <connectspec>] <method> [arguments]"); System.err.println(" Connectspec: This is on the form hostname:port, or tcp/hostname:port"); System.err.println(" if omitted, localhost:8086 is used"); @@ -107,14 +107,14 @@ public class RpcInvoker { System.err.println(" supported types: {'b','h','i','l','f','d','s'}"); System.exit(0); } - List<String> arguments=new ArrayList<String>(Arrays.asList(args)); - String connectSpec="localhost:8086"; - if ("-h".equals(arguments.get(0)) && arguments.size()>=3) { + List<String> arguments = new ArrayList<String>(Arrays.asList(args)); + String connectSpec = "localhost:8086"; + if ("-h".equals(arguments.get(0)) && arguments.size() >= 3) { arguments.remove(0); // Consume -h - connectSpec=arguments.remove(0); + connectSpec = arguments.remove(0); } - String method=arguments.remove(0); - new RpcInvoker().invoke(connectSpec,method,arguments); + String method = arguments.remove(0); + new RpcInvoker().invoke(connectSpec, method, arguments); } } diff --git a/logserver/src/main/java/com/yahoo/plugin/SystemPropertyConfig.java b/logserver/src/main/java/com/yahoo/plugin/SystemPropertyConfig.java index 26021492df2..4d801cd6229 100644 --- a/logserver/src/main/java/com/yahoo/plugin/SystemPropertyConfig.java +++ b/logserver/src/main/java/com/yahoo/plugin/SystemPropertyConfig.java @@ -11,19 +11,18 @@ package com.yahoo.plugin; * @author Stig Bakken */ public class SystemPropertyConfig extends Config { + private final String prefix; /** - * @param prefix Prefix string prepended to config keys + * @param prefix prefix string prepended to config keys * as they are looked up as system properties. */ public SystemPropertyConfig(String prefix) { this.prefix = prefix; } - /** - * @return a config value for the specified key - */ + /** Returns a config value for the specified key */ public String get(String key, String defaultValue) { return System.getProperty(prefix + key, defaultValue); } @@ -31,4 +30,5 @@ public class SystemPropertyConfig extends Config { public String toString() { return "Prefix=" + prefix; } + } diff --git a/security-utils/src/main/java/com/yahoo/security/KeyStoreBuilder.java b/security-utils/src/main/java/com/yahoo/security/KeyStoreBuilder.java index 8bb7e0e5ab9..6e69c36d69c 100644 --- a/security-utils/src/main/java/com/yahoo/security/KeyStoreBuilder.java +++ b/security-utils/src/main/java/com/yahoo/security/KeyStoreBuilder.java @@ -100,6 +100,9 @@ public class KeyStoreBuilder { } catch (IOException e) { throw new UncheckedIOException(e); } + finally { + inputFilePassword = null; + } } private static class KeyEntry { @@ -125,4 +128,5 @@ public class KeyStoreBuilder { this.certificate = certificate; } } + } diff --git a/security-utils/src/main/java/com/yahoo/security/SslContextBuilder.java b/security-utils/src/main/java/com/yahoo/security/SslContextBuilder.java index 221018122bf..d2b98fd20d9 100644 --- a/security-utils/src/main/java/com/yahoo/security/SslContextBuilder.java +++ b/security-utils/src/main/java/com/yahoo/security/SslContextBuilder.java @@ -136,6 +136,9 @@ public class SslContextBuilder { } catch (IOException e) { throw new UncheckedIOException(e); } + finally { + keyStorePassword = null; + } } private static KeyStore createTrustStore(List<X509Certificate> caCertificates) { diff --git a/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaRecordWriter.java b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaRecordWriter.java index e5810c4e7b2..7ad51a55bff 100644 --- a/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaRecordWriter.java +++ b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaRecordWriter.java @@ -35,8 +35,7 @@ import java.util.concurrent.ThreadLocalRandom; import java.util.logging.Logger; /** - * VespaRecordWriter sends the output <key, value> to one or more Vespa - * endpoints. + * VespaRecordWriter sends the output <key, value> to one or more Vespa endpoints. * * @author lesters */ diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/runner/Runner.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/runner/Runner.java index fce7afdb436..0e202d1f348 100644 --- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/runner/Runner.java +++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/runner/Runner.java @@ -21,6 +21,7 @@ public class Runner { /** * Feed data from inputFile to session. + * * @param feedClient where to send data to * @param inputStream source of data * @param isJson if input stream is of json formatted data diff --git a/vespaclient-java/src/main/java/com/yahoo/vespastat/Main.java b/vespaclient-java/src/main/java/com/yahoo/vespastat/Main.java index 57f3ab20186..d3f05e18841 100644 --- a/vespaclient-java/src/main/java/com/yahoo/vespastat/Main.java +++ b/vespaclient-java/src/main/java/com/yahoo/vespastat/Main.java @@ -35,4 +35,5 @@ public class Main { private static BucketStatsRetriever.ShutdownHookRegistrar createShutdownHookRegistrar() { return runnable -> Runtime.getRuntime().addShutdownHook(new Thread(runnable)); } + } diff --git a/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisitTarget.java b/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisitTarget.java index 88a9a783f37..50f5c9d484c 100644 --- a/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisitTarget.java +++ b/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisitTarget.java @@ -27,9 +27,10 @@ import java.util.logging.Logger; /** * Example client using visiting * - * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>, based on work by <a href="mailto:humbe@yahoo-inc.com">Håkon Humberset</a> + * @author Einar M R Rosenvinge */ public class VdsVisitTarget { + private static final Logger log = Logger.getLogger(VdsVisitTarget.class.getName()); private boolean printIds = false; @@ -275,4 +276,5 @@ public class VdsVisitTarget { } } } + } diff --git a/vespajlib/src/main/java/com/yahoo/net/Url.java b/vespajlib/src/main/java/com/yahoo/net/Url.java index 60a9c98bce8..73584b4bc4e 100644 --- a/vespajlib/src/main/java/com/yahoo/net/Url.java +++ b/vespajlib/src/main/java/com/yahoo/net/Url.java @@ -250,4 +250,5 @@ public class Url { public String toString() { return image; } + } diff --git a/vespajlib/src/main/java/com/yahoo/net/UrlTokenizer.java b/vespajlib/src/main/java/com/yahoo/net/UrlTokenizer.java index 77d931b5278..860107a4cc3 100644 --- a/vespajlib/src/main/java/com/yahoo/net/UrlTokenizer.java +++ b/vespajlib/src/main/java/com/yahoo/net/UrlTokenizer.java @@ -175,4 +175,5 @@ public class UrlTokenizer { schemeToPort.put(scheme, str); portToScheme.put(str, scheme); } + } diff --git a/vespajlib/src/main/java/com/yahoo/vespa/objects/ObjectDumper.java b/vespajlib/src/main/java/com/yahoo/vespa/objects/ObjectDumper.java index 73b40222f55..4d8b5012c81 100755 --- a/vespajlib/src/main/java/com/yahoo/vespa/objects/ObjectDumper.java +++ b/vespajlib/src/main/java/com/yahoo/vespa/objects/ObjectDumper.java @@ -131,4 +131,5 @@ public class ObjectDumper extends ObjectVisitor { addLine(name + ": " + obj); } } + } |