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 462c6fc REST refactoring.
462c6fc is described below
commit 462c6fc40c0f1b8db521834748864f3ada23774d
Author: JamesBognar <[email protected]>
AuthorDate: Wed Feb 17 10:14:58 2021 -0500
REST refactoring.
---
.../java/org/apache/juneau/rest/client/RestClient.java | 2 +-
.../org/apache/juneau/rest/client/RestResponse.java | 4 ++--
.../client/assertion/FluentResponseBodyAssertion.java | 13 +------------
.../assertion/FluentResponseHeaderAssertion.java | 13 +------------
.../FluentResponseStatusLineAssertion.java} | 18 ++++++++++--------
5 files changed, 15 insertions(+), 35 deletions(-)
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
index 81cb4eb..9c801f5 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
@@ -518,7 +518,7 @@ import org.apache.juneau.utils.*;
* <li class='jm'><c>{@link RestResponse#getStatusLine()
getStatusLine()} <jk>returns</jk> {@link StatusLine}</c>
* <li class='jm'><c>{@link RestResponse#getStatusCode()
getStatusCode()} <jk>returns</jk> <jk>int</jk></c>
* <li class='jm'><c>{@link RestResponse#getReasonPhrase()
getReasonPhrase()} <jk>returns</jk> String</c>
- * <li class='jm'><c>{@link RestResponse#assertStatus()
assertStatus()} <jk>returns</jk> {@link ResponseStatusLineAssertion}</c>
+ * <li class='jm'><c>{@link RestResponse#assertStatus()
assertStatus()} <jk>returns</jk> {@link FluentResponseStatusLineAssertion}</c>
* </ul>
* </ul>
*
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestResponse.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestResponse.java
index 1c1a4bf..49efccd 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestResponse.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestResponse.java
@@ -177,8 +177,8 @@ public class RestResponse implements HttpResponse {
* @return A new fluent assertion object.
* @throws RestCallException If REST call failed.
*/
- public ResponseStatusLineAssertion assertStatus() throws
RestCallException {
- return new ResponseStatusLineAssertion(getStatusLine(), this);
+ public FluentResponseStatusLineAssertion<RestResponse> assertStatus()
throws RestCallException {
+ return new FluentResponseStatusLineAssertion<>(getStatusLine(),
this);
}
/**
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/assertion/FluentResponseBodyAssertion.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/assertion/FluentResponseBodyAssertion.java
index d113748..e1f798d 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/assertion/FluentResponseBodyAssertion.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/assertion/FluentResponseBodyAssertion.java
@@ -35,18 +35,7 @@ public class FluentResponseBodyAssertion<R> extends
FluentAssertion<R> {
* @param returns The object to return after the test.
*/
public FluentResponseBodyAssertion(ResponseBody value, R returns) {
- this(null, value, returns);
- }
-
- /**
- * Constructor.
- *
- * @param creator The assertion that created this assertion.
- * @param value The object being tested.
- * @param returns The object to return after the test.
- */
- public FluentResponseBodyAssertion(Assertion creator, ResponseBody
value, R returns) {
- super(creator, returns);
+ super(null, returns);
this.value = value;
}
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/assertion/FluentResponseHeaderAssertion.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/assertion/FluentResponseHeaderAssertion.java
index 2a2c6cc..558d942 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/assertion/FluentResponseHeaderAssertion.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/assertion/FluentResponseHeaderAssertion.java
@@ -33,18 +33,7 @@ public class FluentResponseHeaderAssertion<R> extends
FluentBaseAssertion<String
* @param returns The object to return after the test.
*/
public FluentResponseHeaderAssertion(ResponseHeader value, R returns) {
- this(null, value, returns);
- }
-
- /**
- * Constructor.
- *
- * @param creator The assertion that created this assertion.
- * @param value The object being tested.
- * @param returns The object to return after the test.
- */
- public FluentResponseHeaderAssertion(Assertion creator, ResponseHeader
value, R returns) {
- super(creator, value.getValue(), returns);
+ super(null, value.getValue(), returns);
this.value = value;
}
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseStatusLineAssertion.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/assertion/FluentResponseStatusLineAssertion.java
similarity index 88%
rename from
juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseStatusLineAssertion.java
rename to
juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/assertion/FluentResponseStatusLineAssertion.java
index c6ef99e..a622f5a 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseStatusLineAssertion.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/assertion/FluentResponseStatusLineAssertion.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.rest.client;
+package org.apache.juneau.rest.client.assertion;
import org.apache.http.*;
import org.apache.juneau.assertions.*;
@@ -26,8 +26,10 @@ import org.apache.juneau.assertions.*;
* .run()
* .assertStatus().code().isAny(200,404);
* </p>
+ *
+ * @param <R> The return type.
*/
-public class ResponseStatusLineAssertion extends FluentAssertion<RestResponse>
{
+public class FluentResponseStatusLineAssertion<R> extends FluentAssertion<R> {
private final StatusLine statusLine;
@@ -37,7 +39,7 @@ public class ResponseStatusLineAssertion extends
FluentAssertion<RestResponse> {
* @param statusLine The response status line.
* @param returns The object to return after the test.
*/
- public ResponseStatusLineAssertion(StatusLine statusLine, RestResponse
returns) {
+ public FluentResponseStatusLineAssertion(StatusLine statusLine, R
returns) {
super(null, returns);
this.statusLine = statusLine;
}
@@ -47,7 +49,7 @@ public class ResponseStatusLineAssertion extends
FluentAssertion<RestResponse> {
*
* @return An assertion against the status code on the response status
object.
*/
- public FluentIntegerAssertion<RestResponse> code() {
+ public FluentIntegerAssertion<R> code() {
return new FluentIntegerAssertion<>(this,
statusLine.getStatusCode(), returns());
}
@@ -56,7 +58,7 @@ public class ResponseStatusLineAssertion extends
FluentAssertion<RestResponse> {
*
* @return An assertion against the reason phrase on the response
status object.
*/
- public FluentStringAssertion<RestResponse> reason() {
+ public FluentStringAssertion<R> reason() {
return new FluentStringAssertion<>(this,
statusLine.getReasonPhrase(), returns());
}
@@ -65,7 +67,7 @@ public class ResponseStatusLineAssertion extends
FluentAssertion<RestResponse> {
*
* @return An assertion against the protocol on the response status
object.
*/
- public FluentStringAssertion<RestResponse> protocol() {
+ public FluentStringAssertion<R> protocol() {
return new FluentStringAssertion<>(this,
statusLine.getProtocolVersion().getProtocol(), returns());
}
@@ -74,7 +76,7 @@ public class ResponseStatusLineAssertion extends
FluentAssertion<RestResponse> {
*
* @return An assertion against the protocol major version on the
response status object.
*/
- public FluentIntegerAssertion<RestResponse> major() {
+ public FluentIntegerAssertion<R> major() {
return new FluentIntegerAssertion<>(this,
statusLine.getProtocolVersion().getMajor(), returns());
}
@@ -83,7 +85,7 @@ public class ResponseStatusLineAssertion extends
FluentAssertion<RestResponse> {
*
* @return An assertion against the protocol minor version on the
response status object.
*/
- public FluentIntegerAssertion<RestResponse> minor() {
+ public FluentIntegerAssertion<R> minor() {
return new FluentIntegerAssertion<>(this,
statusLine.getProtocolVersion().getMinor(), returns());
}
}
