Skip to content

Commit

Permalink
Jetty 12 - New HTTP Cookie interface (#9205)
Browse files Browse the repository at this point in the history 
Convert HttpCookie to an interface.
  • Loading branch information
@gregw
gregw authored Jan 30, 2023
1 parent b2bd8b9 commit 50a8818
Show file tree
Hide file tree
Showing 32 changed files with 835 additions and 995 deletions.
2 changes: 1 addition & 1 deletion ...y-core/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientIdleTimeoutTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ protected void service(Request request, Response response)
if (cookies == null || cookies.size() == 0)
{
// Send a cookie in the first response.
Response.addCookie(response, new HttpCookie("name", "value"));
Response.addCookie(response, HttpCookie.from("name", "value"));
}
else
{
Expand Down
25 changes: 13 additions & 12 deletions jetty-core/jetty-client/src/test/java/org/eclipse/jetty/client/HttpCookieTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit;

Expand Down Expand Up @@ -48,7 +49,7 @@ public void testCookieIsStored(Scenario scenario) throws Exception
@Override
protected void service(Request request, org.eclipse.jetty.server.Response response)
{
org.eclipse.jetty.server.Response.addCookie(response, new org.eclipse.jetty.http.HttpCookie(name, value));
org.eclipse.jetty.server.Response.addCookie(response, org.eclipse.jetty.http.HttpCookie.from(name, value));
}
});

Expand Down Expand Up @@ -179,7 +180,7 @@ protected void service(Request request, org.eclipse.jetty.server.Response respon
int r = (int)request.getHeaders().getLongField(headerName);
if ("/foo".equals(target) && r == 0)
{
org.eclipse.jetty.http.HttpCookie cookie = new org.eclipse.jetty.http.HttpCookie(cookieName, cookieValue);
org.eclipse.jetty.http.HttpCookie cookie = org.eclipse.jetty.http.HttpCookie.from(cookieName, cookieValue);
org.eclipse.jetty.server.Response.addCookie(response, cookie);
}
else
Expand Down Expand Up @@ -234,7 +235,7 @@ protected void service(Request request, org.eclipse.jetty.server.Response respon
int r = (int)request.getHeaders().getLongField(headerName);
if ("/foo/bar".equals(target) && r == 0)
{
org.eclipse.jetty.http.HttpCookie cookie = new org.eclipse.jetty.http.HttpCookie(cookieName, cookieValue);
org.eclipse.jetty.http.HttpCookie cookie = org.eclipse.jetty.http.HttpCookie.from(cookieName, cookieValue);
org.eclipse.jetty.server.Response.addCookie(response, cookie);
}
else
Expand Down Expand Up @@ -290,7 +291,7 @@ protected void service(Request request, org.eclipse.jetty.server.Response respon
int r = (int)request.getHeaders().getLongField(headerName);
if ("/foo".equals(target) && r == 0)
{
org.eclipse.jetty.http.HttpCookie cookie = new org.eclipse.jetty.http.HttpCookie(cookieName, cookieValue, null, "/foo/bar");
org.eclipse.jetty.http.HttpCookie cookie = org.eclipse.jetty.http.HttpCookie.from(cookieName, cookieValue, Map.of(org.eclipse.jetty.http.HttpCookie.PATH_ATTRIBUTE, "/foo/bar"));
org.eclipse.jetty.server.Response.addCookie(response, cookie);
}
else
Expand Down Expand Up @@ -346,7 +347,7 @@ protected void service(Request request, org.eclipse.jetty.server.Response respon
int r = (int)request.getHeaders().getLongField(headerName);
if ("/foo/bar".equals(target) && r == 0)
{
org.eclipse.jetty.http.HttpCookie cookie = new org.eclipse.jetty.http.HttpCookie(cookieName, cookieValue, null, "/foo");
org.eclipse.jetty.http.HttpCookie cookie = org.eclipse.jetty.http.HttpCookie.from(cookieName, cookieValue, Map.of(org.eclipse.jetty.http.HttpCookie.PATH_ATTRIBUTE, "/foo"));
org.eclipse.jetty.server.Response.addCookie(response, cookie);
}
else
Expand Down Expand Up @@ -403,9 +404,9 @@ protected void service(Request request, org.eclipse.jetty.server.Response respon
int r = (int)request.getHeaders().getLongField(headerName);
if ("/foo".equals(target) && r == 0)
{
org.eclipse.jetty.http.HttpCookie cookie = new org.eclipse.jetty.http.HttpCookie(cookieName, cookieValue1, null, "/foo");
org.eclipse.jetty.http.HttpCookie cookie = org.eclipse.jetty.http.HttpCookie.from(cookieName, cookieValue1, Map.of(org.eclipse.jetty.http.HttpCookie.PATH_ATTRIBUTE, "/foo"));
org.eclipse.jetty.server.Response.addCookie(response, cookie);
cookie = new org.eclipse.jetty.http.HttpCookie(cookieName, cookieValue2, null, "/foo");
cookie = org.eclipse.jetty.http.HttpCookie.from(cookieName, cookieValue2, Map.of(org.eclipse.jetty.http.HttpCookie.PATH_ATTRIBUTE, "/foo"));
org.eclipse.jetty.server.Response.addCookie(response, cookie);
}
else
Expand Down Expand Up @@ -462,9 +463,9 @@ protected void service(Request request, org.eclipse.jetty.server.Response respon
int r = (int)request.getHeaders().getLongField(headerName);
if ("/foo".equals(target) && r == 0)
{
org.eclipse.jetty.http.HttpCookie cookie = new org.eclipse.jetty.http.HttpCookie(cookieName, cookieValue1, null, "/foo");
org.eclipse.jetty.http.HttpCookie cookie = org.eclipse.jetty.http.HttpCookie.from(cookieName, cookieValue1, Map.of(org.eclipse.jetty.http.HttpCookie.PATH_ATTRIBUTE, "/foo"));
org.eclipse.jetty.server.Response.addCookie(response, cookie);
cookie = new org.eclipse.jetty.http.HttpCookie(cookieName, cookieValue2, null, "/bar");
cookie = org.eclipse.jetty.http.HttpCookie.from(cookieName, cookieValue2, Map.of(org.eclipse.jetty.http.HttpCookie.PATH_ATTRIBUTE, "/bar"));
org.eclipse.jetty.server.Response.addCookie(response, cookie);
}
else
Expand Down Expand Up @@ -528,9 +529,9 @@ protected void service(Request request, org.eclipse.jetty.server.Response respon
int r = (int)request.getHeaders().getLongField(headerName);
if ("/foo".equals(target) && r == 0)
{
org.eclipse.jetty.http.HttpCookie cookie = new org.eclipse.jetty.http.HttpCookie(cookieName, cookieValue1, null, "/foo");
org.eclipse.jetty.http.HttpCookie cookie = org.eclipse.jetty.http.HttpCookie.from(cookieName, cookieValue1, Map.of(org.eclipse.jetty.http.HttpCookie.PATH_ATTRIBUTE, "/foo"));
org.eclipse.jetty.server.Response.addCookie(response, cookie);
cookie = new org.eclipse.jetty.http.HttpCookie(cookieName, cookieValue2, null, "/foo/bar");
cookie = org.eclipse.jetty.http.HttpCookie.from(cookieName, cookieValue2, Map.of(org.eclipse.jetty.http.HttpCookie.PATH_ATTRIBUTE, "/foo/bar"));
org.eclipse.jetty.server.Response.addCookie(response, cookie);
}
else
Expand Down Expand Up @@ -598,7 +599,7 @@ protected void service(Request request, org.eclipse.jetty.server.Response respon
int r = (int)request.getHeaders().getLongField(headerName);
if ("/foo/bar".equals(target) && r == 0)
{
org.eclipse.jetty.http.HttpCookie cookie = new org.eclipse.jetty.http.HttpCookie(cookieName, cookieValue, null, "/foo/");
org.eclipse.jetty.http.HttpCookie cookie = org.eclipse.jetty.http.HttpCookie.from(cookieName, cookieValue, Map.of(org.eclipse.jetty.http.HttpCookie.PATH_ATTRIBUTE, "/foo/"));
org.eclipse.jetty.server.Response.addCookie(response, cookie);
}
else
Expand Down
13 changes: 12 additions & 1 deletion jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/CookieCache.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.ListIterator;
import java.util.Map;

import org.eclipse.jetty.util.StringUtil;
import org.slf4j.Logger;
Expand Down Expand Up @@ -48,7 +50,16 @@ public CookieCache(CookieCompliance compliance, ComplianceViolation.Listener com
@Override
protected void addCookie(String cookieName, String cookieValue, String cookieDomain, String cookiePath, int cookieVersion, String cookieComment)
{
_cookieList.add(new HttpCookie(cookieName, cookieValue, cookieDomain, cookiePath, -1, false, false, cookieComment, cookieVersion));
if (StringUtil.isEmpty(cookieDomain) && StringUtil.isEmpty(cookiePath) && cookieVersion <= 0 && StringUtil.isEmpty(cookieComment))
_cookieList.add(HttpCookie.from(cookieName, cookieValue));
else
{
Map<String, String> attributes = new HashMap<>();
attributes.put(HttpCookie.DOMAIN_ATTRIBUTE, cookieDomain);
attributes.put(HttpCookie.PATH_ATTRIBUTE, cookiePath);
attributes.put(HttpCookie.COMMENT_ATTRIBUTE, cookieComment);
_cookieList.add(HttpCookie.from(cookieName, cookieValue, cookieVersion, attributes));
}
}
};
}
Expand Down
Loading

0 comments on commit 50a8818

Please sign in to comment.