Skip to content

Commit

Permalink
minor cleanups
Browse files Browse the repository at this point in the history
  • Loading branch information
andreaTP committed Apr 1, 2021
1 parent ae80f8c commit e642d5c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1085,9 +1085,7 @@ private String getPatchDiff(String namespace, String customResourceName, Map<Str

JsonNode newone = JsonDiff.asJson(PatchUtils.patchMapper().valueToTree(oldObject), PatchUtils.patchMapper().valueToTree(customResource));

String patch = objectMapper.writeValueAsString(newone);

return patch;
return objectMapper.writeValueAsString(newone);
}

private DeleteOptions fetchDeleteOptions(boolean cascading, String propagationPolicy) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,7 @@ void testEditCR() throws IOException {
Map<String, Object> res = rawCustomResourceOperations.edit(jsonString);

// Then
assertNotEquals(res, null);
assertNotEquals(null, res);
}

private void assertRequestCaptured(ArgumentCaptor<Request> captor, String url, String method) {
Expand Down

0 comments on commit e642d5c

Please sign in to comment.