-
Notifications
You must be signed in to change notification settings - Fork 351
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
add possibility to use entity with http method Options in requests ac…
…cording to the RFC 7231 (#4837) * add possibility to use entity with http method Options in requests according to the RFC 7231 Signed-off-by: aserkes <[email protected]>
- Loading branch information
Showing
8 changed files
with
209 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
85 changes: 85 additions & 0 deletions
85
...rizzly-connector/src/test/java/org/glassfish/jersey/grizzly/connector/HttpMethodTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,85 @@ | ||
/* | ||
* Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved. | ||
* | ||
* This program and the accompanying materials are made available under the | ||
* terms of the Eclipse Public License v. 2.0, which is available at | ||
* http://www.eclipse.org/legal/epl-2.0. | ||
* | ||
* This Source Code may also be made available under the following Secondary | ||
* Licenses when the conditions for such availability set forth in the | ||
* Eclipse Public License v. 2.0 are satisfied: GNU General Public License, | ||
* version 2 with the GNU Classpath Exception, which is available at | ||
* https://www.gnu.org/software/classpath/license.html. | ||
* | ||
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 | ||
*/ | ||
|
||
package org.glassfish.jersey.grizzly.connector; | ||
|
||
import org.glassfish.jersey.client.ClientConfig; | ||
import org.glassfish.jersey.server.ResourceConfig; | ||
import org.glassfish.jersey.test.JerseyTest; | ||
import org.junit.Test; | ||
|
||
import javax.ws.rs.GET; | ||
import javax.ws.rs.Path; | ||
import javax.ws.rs.client.Client; | ||
import javax.ws.rs.client.ClientBuilder; | ||
import javax.ws.rs.client.Entity; | ||
import javax.ws.rs.client.WebTarget; | ||
import javax.ws.rs.core.Application; | ||
import javax.ws.rs.core.Response; | ||
|
||
import static org.junit.Assert.assertEquals; | ||
import static org.junit.Assert.assertTrue; | ||
|
||
/** | ||
* Tests the Http methods. | ||
*/ | ||
public class HttpMethodTest extends JerseyTest { | ||
|
||
@Override | ||
protected Application configure() { | ||
return new ResourceConfig(HttpMethodResource.class); | ||
} | ||
|
||
protected Client createClient() { | ||
ClientConfig cc = new ClientConfig(); | ||
cc.connectorProvider(new GrizzlyConnectorProvider()); | ||
return ClientBuilder.newClient(cc); | ||
} | ||
|
||
private WebTarget getWebTarget(final Client client) { | ||
return client.target(getBaseUri()).path("test"); | ||
} | ||
|
||
private WebTarget getWebTarget() { | ||
return getWebTarget(createClient()); | ||
} | ||
|
||
@Path("/test") | ||
public static class HttpMethodResource { | ||
@GET | ||
public String get() { | ||
return "GET"; | ||
} | ||
} | ||
|
||
@Test | ||
public void testOptionsWithEntity() { | ||
WebTarget r = getWebTarget(); | ||
Response response = r.request().build("OPTIONS", Entity.text("OPTIONS")).invoke(); | ||
assertEquals(200, response.getStatus()); | ||
response.close(); | ||
} | ||
|
||
@Test | ||
public void testGet() { | ||
WebTarget r = getWebTarget(); | ||
assertEquals("GET", r.request().get(String.class)); | ||
|
||
Response cr = r.request().get(); | ||
assertTrue(cr.hasEntity()); | ||
cr.close(); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
85 changes: 85 additions & 0 deletions
85
...ectors/jdk-connector/src/test/java/org/glassfish/jersey/jdk/connector/HttpMethodTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,85 @@ | ||
/* | ||
* Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved. | ||
* | ||
* This program and the accompanying materials are made available under the | ||
* terms of the Eclipse Public License v. 2.0, which is available at | ||
* http://www.eclipse.org/legal/epl-2.0. | ||
* | ||
* This Source Code may also be made available under the following Secondary | ||
* Licenses when the conditions for such availability set forth in the | ||
* Eclipse Public License v. 2.0 are satisfied: GNU General Public License, | ||
* version 2 with the GNU Classpath Exception, which is available at | ||
* https://www.gnu.org/software/classpath/license.html. | ||
* | ||
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 | ||
*/ | ||
|
||
package org.glassfish.jersey.jdk.connector; | ||
|
||
import org.glassfish.jersey.client.ClientConfig; | ||
import org.glassfish.jersey.server.ResourceConfig; | ||
import org.glassfish.jersey.test.JerseyTest; | ||
import org.junit.Test; | ||
|
||
import javax.ws.rs.GET; | ||
import javax.ws.rs.Path; | ||
import javax.ws.rs.client.Client; | ||
import javax.ws.rs.client.ClientBuilder; | ||
import javax.ws.rs.client.Entity; | ||
import javax.ws.rs.client.WebTarget; | ||
import javax.ws.rs.core.Application; | ||
import javax.ws.rs.core.Response; | ||
|
||
import static org.junit.Assert.assertEquals; | ||
import static org.junit.Assert.assertTrue; | ||
|
||
/** | ||
* Tests the Http methods. | ||
*/ | ||
public class HttpMethodTest extends JerseyTest { | ||
|
||
@Override | ||
protected Application configure() { | ||
return new ResourceConfig(HttpMethodResource.class); | ||
} | ||
|
||
protected Client createClient() { | ||
ClientConfig cc = new ClientConfig(); | ||
cc.connectorProvider(new JdkConnectorProvider()); | ||
return ClientBuilder.newClient(cc); | ||
} | ||
|
||
private WebTarget getWebTarget(final Client client) { | ||
return client.target(getBaseUri()).path("test"); | ||
} | ||
|
||
private WebTarget getWebTarget() { | ||
return getWebTarget(createClient()); | ||
} | ||
|
||
@Path("/test") | ||
public static class HttpMethodResource { | ||
@GET | ||
public String get() { | ||
return "GET"; | ||
} | ||
} | ||
|
||
@Test | ||
public void testOptionsWithEntity() { | ||
WebTarget r = getWebTarget(); | ||
Response response = r.request().build("OPTIONS", Entity.text("OPTIONS")).invoke(); | ||
assertEquals(200, response.getStatus()); | ||
response.close(); | ||
} | ||
|
||
@Test | ||
public void testGet() { | ||
WebTarget r = getWebTarget(); | ||
assertEquals("GET", r.request().get(String.class)); | ||
|
||
Response cr = r.request().get(); | ||
assertTrue(cr.hasEntity()); | ||
cr.close(); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters