From f1c0b290ffffce39f62e06e76d913276f350bea8 Mon Sep 17 00:00:00 2001 From: Ivan Bella Date: Wed, 20 Dec 2023 10:44:23 -0500 Subject: [PATCH] Update web-services/query/src/main/java/datawave/webservice/query/util/LookupUUIDUtil.java Co-authored-by: Bill Oley --- .../webservice/query/util/LookupUUIDUtil.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/web-services/query/src/main/java/datawave/webservice/query/util/LookupUUIDUtil.java b/web-services/query/src/main/java/datawave/webservice/query/util/LookupUUIDUtil.java index 41b5dd7aef5..c1c31f3750e 100644 --- a/web-services/query/src/main/java/datawave/webservice/query/util/LookupUUIDUtil.java +++ b/web-services/query/src/main/java/datawave/webservice/query/util/LookupUUIDUtil.java @@ -432,22 +432,22 @@ private Query createSettings(MultivaluedMap queryParameters) { log.debug("Initial query parameters: " + queryParameters); Query query = responseObjectFactory.getQueryImpl(); if (queryParameters != null) { - MultivaluedMap parms = new MultivaluedMapImpl<>(); + MultivaluedMap optionalQueryParameters = new MultivaluedMapImpl<>(); if (defaultOptionalParams != null) { - parms.putAll(defaultOptionalParams); + optionalQueryParameters.putAll(defaultOptionalParams); } - String params = queryParameters.getFirst(QueryParameters.QUERY_PARAMS); - if (params != null) { - for (QueryImpl.Parameter pm : QueryUtil.parseParameters(params)) { - parms.putSingle(pm.getParameterName(), pm.getParameterValue()); + String delimitedParams = queryParameters.getFirst(QueryParameters.QUERY_PARAMS); + if (delimitedParams != null) { + for (QueryImpl.Parameter pm : QueryUtil.parseParameters(delimitedParams)) { + optionalQueryParameters.putSingle(pm.getParameterName(), pm.getParameterValue()); } } - parms.putAll(queryParameters); - log.debug("Final query parameters: " + parms); - query.setOptionalQueryParameters(parms); - for (String key : parms.keySet()) { - if (parms.get(key).size() == 1) { - query.addParameter(key, parms.getFirst(key)); + optionalQueryParameters.putAll(queryParameters); + log.debug("Final query parameters: " + optionalQueryParameters); + query.setOptionalQueryParameters(optionalQueryParameters); + for (String key : optionalQueryParameters.keySet()) { + if (optionalQueryParameters.get(key).size() == 1) { + query.addParameter(key, optionalQueryParameters.getFirst(key)); } } }