Skip to content

Commit

Permalink
Fix merge conflicts
Browse files Browse the repository at this point in the history
Signed-off-by: Craig Perkins <cwperx@amazon.com>
  • Loading branch information
cwperks committed Apr 22, 2023
1 parent 3b4b91b commit d90d065
Showing 1 changed file with 0 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,6 @@ public RestSendToExtensionAction(

List<Route> restActionsAsRoutes = new ArrayList<>();
for (String restAction : restActionsRequest.getRestActions()) {
RestRequest.Method method;
String path;
Optional<String> name = Optional.empty();
try {
String[] parts = restAction.split(" ");
Expand All @@ -104,8 +102,6 @@ public RestSendToExtensionAction(
if (parts.length > 2) {
name = Optional.of(parts[2].trim());
}
method = RestRequest.Method.valueOf(restAction.substring(0, delim));
path = pathPrefix + restAction.substring(delim).trim();
} catch (IndexOutOfBoundsException | IllegalArgumentException e) {
throw new IllegalArgumentException(restAction + " does not begin with a valid REST method");
}
Expand Down

0 comments on commit d90d065

Please sign in to comment.