This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new 0ae7dba Code cleanup.
0ae7dba is described below
commit 0ae7dba819945894ba0d225bd138cfb5190784cf
Author: JamesBognar <[email protected]>
AuthorDate: Sun Jun 6 17:59:13 2021 -0400
Code cleanup.
---
.../src/main/java/org/apache/juneau/rest/client/RestRequest.java | 2 +-
.../src/main/java/org/apache/juneau/rest/mock/MockRestRequest.java | 4 ++--
.../apache/juneau/rest/client/RestClient_Config_RestClient_Test.java | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
index afae51a..3b7c32a 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
@@ -818,7 +818,7 @@ public class RestRequest extends BeanSession implements
HttpUriRequest, Configur
* @param scheme The new URI host.
* @return This object (for method chaining).
*/
- public RestRequest scheme(String scheme) {
+ public RestRequest uriScheme(String scheme) {
uriBuilder.setScheme(scheme);
return this;
}
diff --git
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestRequest.java
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestRequest.java
index 3c2acc8..99c26de 100644
---
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestRequest.java
+++
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestRequest.java
@@ -221,8 +221,8 @@ public class MockRestRequest extends
org.apache.juneau.rest.client.RestRequest {
* @return This object (for method chaining).
*/
@Override
- public MockRestRequest scheme(String value) {
- super.scheme(value);
+ public MockRestRequest uriScheme(String value) {
+ super.uriScheme(value);
this.scheme = value;
return this;
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_RestClient_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_RestClient_Test.java
index cb6316b..bd431f7 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_RestClient_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_RestClient_Test.java
@@ -515,10 +515,10 @@ public class RestClient_Config_RestClient_Test {
@Test
public void a16_request_uriParts() throws Exception {
- java.net.URI uri =
client().build().get().scheme("http").host("localhost").port(8080).userInfo("foo:bar").uri("/bean").fragment("baz").query("foo","bar").run().assertBody().is("{f:1}").getRequest().getURI();
+ java.net.URI uri =
client().build().get().uriScheme("http").host("localhost").port(8080).userInfo("foo:bar").uri("/bean").fragment("baz").query("foo","bar").run().assertBody().is("{f:1}").getRequest().getURI();
assertEquals("http://foo:bar@localhost:8080/bean?foo=bar#baz",uri.toString());
- uri =
client().build().get().scheme("http").host("localhost").port(8080).userInfo("foo","bar").uri("/bean").fragment("baz").query("foo","bar").run().assertBody().is("{f:1}").getRequest().getURI();
+ uri =
client().build().get().uriScheme("http").host("localhost").port(8080).userInfo("foo","bar").uri("/bean").fragment("baz").query("foo","bar").run().assertBody().is("{f:1}").getRequest().getURI();
assertEquals("http://foo:bar@localhost:8080/bean?foo=bar#baz",uri.toString());
uri =
client().build().get().uri("http://localhost";).uri("http://foo:bar@localhost:8080/bean?foo=bar#baz";).run().assertBody().is("{f:1}").getRequest().getURI();
