From 5b5ed1fd82079a9acac11d9699997cf40cff216d Mon Sep 17 00:00:00 2001 From: Kunal Shroff Date: Tue, 18 Jun 2024 10:49:18 -0400 Subject: [PATCH] Fixing the unit test dependencies to guava --- .../reader/json/HttpServerTestBase.java | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/app/databrowser-json/src/test/java/org/phoebus/archive/reader/json/HttpServerTestBase.java b/app/databrowser-json/src/test/java/org/phoebus/archive/reader/json/HttpServerTestBase.java index afa7d7437b..aaad15aa28 100644 --- a/app/databrowser-json/src/test/java/org/phoebus/archive/reader/json/HttpServerTestBase.java +++ b/app/databrowser-json/src/test/java/org/phoebus/archive/reader/json/HttpServerTestBase.java @@ -8,8 +8,6 @@ package org.phoebus.archive.reader.json; -import com.google.common.base.Splitter; -import com.google.common.collect.Maps; import com.sun.net.httpserver.Headers; import com.sun.net.httpserver.HttpHandler; import com.sun.net.httpserver.HttpServer; @@ -23,10 +21,12 @@ import java.net.URI; import java.net.URLDecoder; import java.nio.charset.StandardCharsets; +import java.util.Arrays; import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.function.Consumer; +import java.util.stream.Collectors; /** * Base class for tests that need an HTTP server. @@ -62,12 +62,18 @@ public record HttpRequest( */ public static Map parseQueryString( final String query_string) { - return Maps.transformValues( - Splitter - .on('&') - .withKeyValueSeparator('=') - .split(query_string), - (value) -> URLDecoder.decode(value, StandardCharsets.UTF_8)); + + return Arrays.stream(query_string.split("&")) + .collect(Collectors.toMap( + k -> k.split("=")[0], + k -> URLDecoder.decode(k.split("=")[1], StandardCharsets.UTF_8))); +// +// return Maps.transformValues( +// Splitter +// .on('&') +// .withKeyValueSeparator('=') +// .split(query_string), +// (value) -> URLDecoder.decode(value, StandardCharsets.UTF_8)); } /**