From a9dcf43339069fbf477567076cc7b37c24f121df Mon Sep 17 00:00:00 2001
From: Jan-Olav Eide <jan-olav.eide@nav.no>
Date: Fri, 18 Jun 2021 10:26:10 +0200
Subject: [PATCH] remove query

---
 .../integrasjon/rest/jersey/JerseyUriMapper.java    | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/integrasjon/rest-klient/src/main/java/no/nav/vedtak/felles/integrasjon/rest/jersey/JerseyUriMapper.java b/integrasjon/rest-klient/src/main/java/no/nav/vedtak/felles/integrasjon/rest/jersey/JerseyUriMapper.java
index afbd210e2..efe0b96a8 100644
--- a/integrasjon/rest-klient/src/main/java/no/nav/vedtak/felles/integrasjon/rest/jersey/JerseyUriMapper.java
+++ b/integrasjon/rest-klient/src/main/java/no/nav/vedtak/felles/integrasjon/rest/jersey/JerseyUriMapper.java
@@ -2,11 +2,13 @@
 
 import static java.util.stream.Collectors.joining;
 
+import java.net.URISyntaxException;
 import java.util.Arrays;
 import java.util.function.Function;
 import java.util.function.Predicate;
 
 import org.apache.http.HttpRequest;
+import org.apache.http.client.utils.URIBuilder;
 
 class JerseyUriMapper implements Function<HttpRequest, String> {
 
@@ -14,11 +16,20 @@ class JerseyUriMapper implements Function<HttpRequest, String> {
 
     @Override
     public String apply(HttpRequest req) {
-        return Arrays.stream(req.getRequestLine().getUri().split(SLASH))
+        String uri = removeQuery(req.getRequestLine().getUri());
+        return Arrays.stream(uri.split(SLASH))
                 .filter(Predicate.not(this::digits))
                 .collect(joining(SLASH));
     }
 
+    private String removeQuery(String uri) {
+        try {
+            return new URIBuilder(uri).removeQuery().build().toString();
+        } catch (URISyntaxException e) {
+            return uri;
+        }
+    }
+
     private boolean digits(String element) {
         try {
             Long.parseLong(element);