equal
deleted
inserted
replaced
29 import java.net.CookieHandler; |
29 import java.net.CookieHandler; |
30 import java.util.List; |
30 import java.util.List; |
31 import java.util.Map; |
31 import java.util.Map; |
32 import java.util.Optional; |
32 import java.util.Optional; |
33 import java.net.http.HttpHeaders; |
33 import java.net.http.HttpHeaders; |
34 import jdk.internal.net.http.common.HttpHeadersImpl; |
34 import jdk.internal.net.http.common.HttpHeadersBuilder; |
35 import jdk.internal.net.http.common.Log; |
35 import jdk.internal.net.http.common.Log; |
36 import jdk.internal.net.http.common.Utils; |
36 import jdk.internal.net.http.common.Utils; |
37 |
37 |
38 class CookieFilter implements HeaderFilter { |
38 class CookieFilter implements HeaderFilter { |
39 |
39 |
48 CookieHandler cookieHandler = cookieHandlerOpt.get(); |
48 CookieHandler cookieHandler = cookieHandlerOpt.get(); |
49 Map<String,List<String>> userheaders = r.getUserHeaders().map(); |
49 Map<String,List<String>> userheaders = r.getUserHeaders().map(); |
50 Map<String,List<String>> cookies = cookieHandler.get(r.uri(), userheaders); |
50 Map<String,List<String>> cookies = cookieHandler.get(r.uri(), userheaders); |
51 |
51 |
52 // add the returned cookies |
52 // add the returned cookies |
53 HttpHeadersImpl systemHeaders = r.getSystemHeaders(); |
53 HttpHeadersBuilder systemHeadersBuilder = r.getSystemHeadersBuilder(); |
54 if (cookies.isEmpty()) { |
54 if (cookies.isEmpty()) { |
55 Log.logTrace("Request: no cookie to add for {0}", r.uri()); |
55 Log.logTrace("Request: no cookie to add for {0}", r.uri()); |
56 } else { |
56 } else { |
57 Log.logTrace("Request: adding cookies for {0}", r.uri()); |
57 Log.logTrace("Request: adding cookies for {0}", r.uri()); |
58 } |
58 } |
63 continue; |
63 continue; |
64 List<String> values = entry.getValue(); |
64 List<String> values = entry.getValue(); |
65 if (values == null || values.isEmpty()) continue; |
65 if (values == null || values.isEmpty()) continue; |
66 for (String val : values) { |
66 for (String val : values) { |
67 if (Utils.isValidValue(val)) { |
67 if (Utils.isValidValue(val)) { |
68 systemHeaders.addHeader(hdrname, val); |
68 systemHeadersBuilder.addHeader(hdrname, val); |
69 } |
69 } |
70 } |
70 } |
71 } |
71 } |
72 } else { |
72 } else { |
73 Log.logTrace("Request: No cookie manager found for {0}", r.uri()); |
73 Log.logTrace("Request: No cookie manager found for {0}", r.uri()); |