From e31a877a6462f21e26ae53007d77f1be9e85f034 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20B=C3=BCscher?= Date: Fri, 13 Jul 2018 11:06:01 +0200 Subject: [PATCH] Fix problematic chars in javadoc Java 11 complains about unescaped ">" characters in javadocs. Also fixed some compiler complaints about javadoc in StringFunctionUtils. --- .../index/rankeval/ExpectedReciprocalRankTests.java | 4 ++-- .../function/scalar/string/StringFunctionUtils.java | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/rank-eval/src/test/java/org/elasticsearch/index/rankeval/ExpectedReciprocalRankTests.java b/modules/rank-eval/src/test/java/org/elasticsearch/index/rankeval/ExpectedReciprocalRankTests.java index a888bf010f9..e2be8696e66 100644 --- a/modules/rank-eval/src/test/java/org/elasticsearch/index/rankeval/ExpectedReciprocalRankTests.java +++ b/modules/rank-eval/src/test/java/org/elasticsearch/index/rankeval/ExpectedReciprocalRankTests.java @@ -69,7 +69,7 @@ public class ExpectedReciprocalRankTests extends ESTestCase { * 4 | 1 | 0.03125 | 0.078125 | 0.00244140625 | * } * - * err => sum of last column + * err = sum of last column */ public void testERRAt() { List rated = new ArrayList<>(); @@ -94,7 +94,7 @@ public class ExpectedReciprocalRankTests extends ESTestCase { * 4 | 1 | 0.03125 | 0.125 | 0.00390625 | * } * - * err => sum of last column + * err = sum of last column */ public void testERRMissingRatings() { List rated = new ArrayList<>(); diff --git a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/function/scalar/string/StringFunctionUtils.java b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/function/scalar/string/StringFunctionUtils.java index 059ad665836..75db52ed099 100644 --- a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/function/scalar/string/StringFunctionUtils.java +++ b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/function/scalar/string/StringFunctionUtils.java @@ -6,9 +6,9 @@ package org.elasticsearch.xpack.sql.expression.function.scalar.string; abstract class StringFunctionUtils { - + /** - * Trims the trailing whitespace characters from the given String. Uses {@link java.lang.Character.isWhitespace(char)} + * Trims the trailing whitespace characters from the given String. Uses @link java.lang.Character.isWhitespace(char) * to determine if a character is whitespace or not. * * @param s the original String @@ -18,16 +18,16 @@ abstract class StringFunctionUtils { if (!hasLength(s)) { return s; } - + StringBuilder sb = new StringBuilder(s); while (sb.length() > 0 && Character.isWhitespace(sb.charAt(sb.length() - 1))) { sb.deleteCharAt(sb.length() - 1); } return sb.toString(); } - + /** - * Trims the leading whitespace characters from the given String. Uses {@link java.lang.Character.isWhitespace(char)} + * Trims the leading whitespace characters from the given String. Uses @link java.lang.Character.isWhitespace(char) * to determine if a character is whitespace or not. * * @param s the original String @@ -37,7 +37,7 @@ abstract class StringFunctionUtils { if (!hasLength(s)) { return s; } - + StringBuilder sb = new StringBuilder(s); while (sb.length() > 0 && Character.isWhitespace(sb.charAt(0))) { sb.deleteCharAt(0);