From 336435b9e4acb17b8bd0e602f796a27ff482d5de Mon Sep 17 00:00:00 2001 From: Paul Spaude Date: Wed, 6 Oct 2021 19:25:54 -0700 Subject: [PATCH] Fix Group Delete Issue --- .../polygon/connector/grouper/rest/GroupProcessor.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/evolveum/polygon/connector/grouper/rest/GroupProcessor.java b/src/main/java/com/evolveum/polygon/connector/grouper/rest/GroupProcessor.java index 5a4d150..9f17643 100644 --- a/src/main/java/com/evolveum/polygon/connector/grouper/rest/GroupProcessor.java +++ b/src/main/java/com/evolveum/polygon/connector/grouper/rest/GroupProcessor.java @@ -65,6 +65,7 @@ public class GroupProcessor extends Processor { private static final String J_RESULT_CODE = "resultCode"; private static final String J_SUCCESS = "success"; private static final String J_WS_ATTRIBUTE_ASSIGN_TYPE = "attributeAssignType"; + private static final String J_WS_GROUP_NOT_FOUND = "GROUP_NOT_FOUND"; private static final String J_WS_SUBJECTS = "wsSubjects"; private static final String J_WS_GROUP = "wsGroup"; @@ -261,10 +262,7 @@ private boolean executeGetMembers(HttpPost request, JSONObject body, ResultsHand addPageNumber(body, pageNumber, shouldPage); final CallResponse callResponse = callRequest(request, body, (statusCode, responseBody) -> { final JSONObject errorResponse = new JSONObject(responseBody); - final JSONObject resultMetadata = (JSONObject) getIfExists(errorResponse, List.of(J_WS_GET_MEMBERS_RESULTS, J_RESULTS), List.of(J_RESULT_METADATA)); - final String resultCode = resultMetadata != null ? getStringOrNull(resultMetadata, J_RESULT_CODE) : null; - boolean notFound = "GROUP_NOT_FOUND".equals(resultCode); - if (notFound) { + if (errorResponse.toString().contains(J_WS_GROUP_NOT_FOUND)) { return CallResponse.error(responseBody); } else { return null;