sonar refactorings

This commit is contained in:
Sven Kubiak
2015-12-10 11:26:58 +01:00
parent fac3ee3737
commit e3e6b5e003

View File

@ -323,7 +323,7 @@ public class JPushover {
* *
* @return JPushoverResponse instance * @return JPushoverResponse instance
*/ */
public JPushoverResponse push() { public final JPushoverResponse push() {
Objects.requireNonNull(this.pushoverToken, "Token is required for a message"); Objects.requireNonNull(this.pushoverToken, "Token is required for a message");
Objects.requireNonNull(this.pushoverUser, "User is required for a message"); Objects.requireNonNull(this.pushoverUser, "User is required for a message");
Objects.requireNonNull(this.pushoverMessage, "Message is required for a message"); Objects.requireNonNull(this.pushoverMessage, "Message is required for a message");
@ -350,14 +350,14 @@ public class JPushover {
.add(Constants.HTML.toString(), this.pushoverHtml ? "1" : "0") .add(Constants.HTML.toString(), this.pushoverHtml ? "1" : "0")
.build(); .build();
JPushoverResponse jPushoverResponse = null; JPushoverResponse jPushoverResponse = new JPushoverResponse().isSuccessful(false);
try { try {
final HttpResponse httpResponse = Request.Post(Constants.MESSAGES_URL.toString()).bodyForm(params, Consts.UTF_8).execute().returnResponse(); final HttpResponse httpResponse = Request.Post(Constants.MESSAGES_URL.toString()).bodyForm(params, Consts.UTF_8).execute().returnResponse();
if (httpResponse != null) { if (httpResponse != null) {
final int status = httpResponse.getStatusLine().getStatusCode(); final int status = httpResponse.getStatusLine().getStatusCode();
jPushoverResponse = new JPushoverResponse() jPushoverResponse
.httpStatus(status) .httpStatus(status)
.response(IOUtils.toString(httpResponse.getEntity().getContent(), Consts.UTF_8)) .response(IOUtils.toString(httpResponse.getEntity().getContent(), Consts.UTF_8))
.isSuccessful((status == HTTP_OK) ? true : false); .isSuccessful((status == HTTP_OK) ? true : false);
@ -366,6 +366,6 @@ public class JPushover {
LOG.error("Failed to send message to pushover", e); LOG.error("Failed to send message to pushover", e);
} }
return (jPushoverResponse == null) ? new JPushoverResponse().isSuccessful(false) : jPushoverResponse; return jPushoverResponse;
} }
} }