summaryrefslogtreecommitdiffstats
path: root/container-search
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@verizonmedia.com>2020-01-06 21:06:26 +0100
committerJon Bratseth <bratseth@verizonmedia.com>2020-01-06 21:06:26 +0100
commit1f6753d9d0f35a4a6612987fe8c6ea42ff166495 (patch)
tree0cfd3557a7400b7178b5dd6aa884d3407237d552 /container-search
parentcc711b5a8fbc1a7a5897f8ee1761103fcb89e644 (diff)
Non-functional changes
Diffstat (limited to 'container-search')
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/query/parser/UnicodePropertyDump.java3
-rw-r--r--container-search/src/main/java/com/yahoo/search/query/rewrite/RewriterUtils.java16
2 files changed, 9 insertions, 10 deletions
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);
}
+
}