Skip to content

Commit

Permalink
Update web-services/query/src/main/java/datawave/webservice/query/uti…
Browse files Browse the repository at this point in the history
…l/LookupUUIDUtil.java

Co-authored-by: Bill Oley <[email protected]>
  • Loading branch information
ivakegg and billoley committed Dec 20, 2023
1 parent 973e6c9 commit f1c0b29
Showing 1 changed file with 12 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -432,22 +432,22 @@ private Query createSettings(MultivaluedMap<String,String> queryParameters) {
log.debug("Initial query parameters: " + queryParameters);
Query query = responseObjectFactory.getQueryImpl();
if (queryParameters != null) {
MultivaluedMap<String,String> parms = new MultivaluedMapImpl<>();
MultivaluedMap<String,String> 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));
}
}
}
Expand Down

0 comments on commit f1c0b29

Please sign in to comment.