Skip to content

Commit

Permalink
[boschindego] Fix communication error when smart mowing is disabled (o…
Browse files Browse the repository at this point in the history 
…penhab#13167)

* Fix communication error when no planned next cutting
* Provide targeted handling of missing cutting times

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
  • Loading branch information
@jlaur @psmedley
jlaur authored and psmedley committed Feb 23, 2023
1 parent ce52ddd commit 03a2e8f
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 19 deletions.
54 changes: 37 additions & 17 deletions ....boschindego/src/main/java/org/openhab/binding/boschindego/internal/IndegoController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ public IndegoController(HttpClient httpClient, String username, String password)
* @throws IndegoException if any communication or parsing error occurred
*/
private void authenticate() throws IndegoAuthenticationException, IndegoException {
int status = 0;
try {
Request request = httpClient.newRequest(BASE_URL + "authenticate").method(HttpMethod.POST)
.header(HttpHeader.AUTHORIZATION, basicAuthenticationHeader);
Expand All @@ -119,7 +120,7 @@ private void authenticate() throws IndegoAuthenticationException, IndegoExceptio
}

ContentResponse response = sendRequest(request);
int status = response.getStatus();
status = response.getStatus();
if (status == HttpStatus.UNAUTHORIZED_401) {
throw new IndegoAuthenticationException("Authentication was rejected");
}
Expand All @@ -129,19 +130,20 @@ private void authenticate() throws IndegoAuthenticationException, IndegoExceptio

String jsonResponse = response.getContentAsString();
if (jsonResponse.isEmpty()) {
throw new IndegoInvalidResponseException("No content returned");
throw new IndegoInvalidResponseException("No content returned", status);
}
logger.trace("JSON response: '{}'", jsonResponse);

AuthenticationResponse authenticationResponse = gson.fromJson(jsonResponse, AuthenticationResponse.class);
if (authenticationResponse == null) {
throw new IndegoInvalidResponseException("Response could not be parsed as AuthenticationResponse");
throw new IndegoInvalidResponseException("Response could not be parsed as AuthenticationResponse",
status);
}
session = new IndegoSession(authenticationResponse.contextId, authenticationResponse.serialNumber,
getContextExpirationTimeFromCookie());
logger.debug("Initialized session {}", session);
} catch (JsonParseException e) {
throw new IndegoInvalidResponseException("Error parsing AuthenticationResponse", e);
throw new IndegoInvalidResponseException("Error parsing AuthenticationResponse", e, status);
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
throw new IndegoException(e);
Expand Down Expand Up @@ -224,14 +226,15 @@ private <T> T getRequestWithAuthentication(String path, Class<? extends T> dtoCl
*/
private <T> T getRequest(String path, Class<? extends T> dtoClass)
throws IndegoAuthenticationException, IndegoUnreachableException, IndegoException {
int status = 0;
try {
Request request = httpClient.newRequest(BASE_URL + path).method(HttpMethod.GET).header(CONTEXT_HEADER_NAME,
session.getContextId());
if (logger.isTraceEnabled()) {
logger.trace("GET request for {}", BASE_URL + path);
}
ContentResponse response = sendRequest(request);
int status = response.getStatus();
status = response.getStatus();
if (status == HttpStatus.UNAUTHORIZED_401) {
// This will currently not happen because "WWW-Authenticate" header is missing; see below.
throw new IndegoAuthenticationException("Context rejected");
Expand All @@ -244,18 +247,18 @@ private <T> T getRequest(String path, Class<? extends T> dtoClass)
}
String jsonResponse = response.getContentAsString();
if (jsonResponse.isEmpty()) {
throw new IndegoInvalidResponseException("No content returned");
throw new IndegoInvalidResponseException("No content returned", status);
}
logger.trace("JSON response: '{}'", jsonResponse);

@Nullable
T result = gson.fromJson(jsonResponse, dtoClass);
if (result == null) {
throw new IndegoInvalidResponseException("Parsed response is null");
throw new IndegoInvalidResponseException("Parsed response is null", status);
}
return result;
} catch (JsonParseException e) {
throw new IndegoInvalidResponseException("Error parsing response", e);
throw new IndegoInvalidResponseException("Error parsing response", e, status);
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
throw new IndegoException(e);
Expand Down Expand Up @@ -315,14 +318,15 @@ private RawType getRawRequestWithAuthentication(String path) throws IndegoAuthen
* @throws IndegoException if any communication or parsing error occurred
*/
private RawType getRawRequest(String path) throws IndegoAuthenticationException, IndegoException {
int status = 0;
try {
Request request = httpClient.newRequest(BASE_URL + path).method(HttpMethod.GET).header(CONTEXT_HEADER_NAME,
session.getContextId());
if (logger.isTraceEnabled()) {
logger.trace("GET request for {}", BASE_URL + path);
}
ContentResponse response = sendRequest(request);
int status = response.getStatus();
status = response.getStatus();
if (status == HttpStatus.UNAUTHORIZED_401) {
// This will currently not happen because "WWW-Authenticate" header is missing; see below.
throw new IndegoAuthenticationException("Context rejected");
Expand All @@ -332,17 +336,17 @@ private RawType getRawRequest(String path) throws IndegoAuthenticationException,
}
byte[] data = response.getContent();
if (data == null) {
throw new IndegoInvalidResponseException("No data returned");
throw new IndegoInvalidResponseException("No data returned", status);
}
String contentType = response.getMediaType();
if (contentType == null || contentType.isEmpty()) {
throw new IndegoInvalidResponseException("No content-type returned");
throw new IndegoInvalidResponseException("No content-type returned", status);
}
logger.debug("Media download response: type {}, length {}", contentType, data.length);

return new RawType(data, contentType);
} catch (JsonParseException e) {
throw new IndegoInvalidResponseException("Error parsing response", e);
throw new IndegoInvalidResponseException("Error parsing response", e, status);
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
throw new IndegoException(e);
Expand Down Expand Up @@ -425,7 +429,7 @@ private void putRequest(String path, Object requestDto) throws IndegoAuthenticat
throw new IndegoException("The request failed with error: " + status);
}
} catch (JsonParseException e) {
throw new IndegoInvalidResponseException("Error serializing request", e);
throw new IndegoException("Error serializing request", e);
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
throw new IndegoException(e);
Expand Down Expand Up @@ -643,8 +647,16 @@ public void setPredictiveMoving(final boolean enable) throws IndegoAuthenticatio
* @throws IndegoException if any communication or parsing error occurred
*/
public @Nullable Instant getPredictiveLastCutting() throws IndegoAuthenticationException, IndegoException {
return getRequestWithAuthentication(SERIAL_NUMBER_SUBPATH + this.getSerialNumber() + "/predictive/lastcutting",
PredictiveLastCuttingResponse.class).getLastCutting();
try {
return getRequestWithAuthentication(
SERIAL_NUMBER_SUBPATH + this.getSerialNumber() + "/predictive/lastcutting",
PredictiveLastCuttingResponse.class).getLastCutting();
} catch (IndegoInvalidResponseException e) {
if (e.getHttpStatusCode() == HttpStatus.NO_CONTENT_204) {
return null;
}
throw e;
}
}

/**
Expand All @@ -655,8 +667,16 @@ public void setPredictiveMoving(final boolean enable) throws IndegoAuthenticatio
* @throws IndegoException if any communication or parsing error occurred
*/
public @Nullable Instant getPredictiveNextCutting() throws IndegoAuthenticationException, IndegoException {
return getRequestWithAuthentication(SERIAL_NUMBER_SUBPATH + this.getSerialNumber() + "/predictive/nextcutting",
PredictiveNextCuttingResponse.class).getNextCutting();
try {
return getRequestWithAuthentication(
SERIAL_NUMBER_SUBPATH + this.getSerialNumber() + "/predictive/nextcutting",
PredictiveNextCuttingResponse.class).getNextCutting();
} catch (IndegoInvalidResponseException e) {
if (e.getHttpStatusCode() == HttpStatus.NO_CONTENT_204) {
return null;
}
throw e;
}
}

/**
Expand Down
11 changes: 9 additions & 2 deletions ...a/org/openhab/binding/boschindego/internal/exceptions/IndegoInvalidResponseException.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,19 @@
public class IndegoInvalidResponseException extends IndegoException {

private static final long serialVersionUID = -4236849226899489934L;
private int httpStatusCode = 0;

public IndegoInvalidResponseException(String message) {
public IndegoInvalidResponseException(String message, int httpStatusCode) {
super(message);
this.httpStatusCode = httpStatusCode;
}

public IndegoInvalidResponseException(String message, Throwable cause) {
public IndegoInvalidResponseException(String message, Throwable cause, int httpStatusCode) {
super(message, cause);
this.httpStatusCode = httpStatusCode;
}

public int getHttpStatusCode() {
return httpStatusCode;
}
}

0 comments on commit 03a2e8f

Please sign in to comment.