Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ public EventMessageResponse execute(ModelContext modelContext, EventMessages msg
break;
case 2:
parameters = new Object[]{rawJsonEvent};
response.setHandled(true);
returnsValue = false;
break;
case 3:
Expand All @@ -89,7 +88,6 @@ public EventMessageResponse execute(ModelContext modelContext, EventMessages msg
default:
parameters = new Object[]{};
returnsValue = false;
response.setHandled(true);
break;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ protected EventMessageResponse dispatchEvent(EventMessages eventMessages, String
throw e;
}

if (!response.isHandled()) {
if (response.hasFailed()) {
logger.info("dispatchEventmessages - messages not handled with success: " + response.getErrorMessage());
} else {
logger.debug("dispatchEventmessages - message handled with success");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public String handleRequest(Map<String, Object> stringObjectMap, Context context
return "";
}

if (!response.isHandled()) {
if (response.hasFailed()) {
//Throw exception in order to mark the message as not processed.
logger.error(String.format("Messages were not handled. Error: %s", response.getErrorMessage()));
throw new RuntimeException(response.getErrorMessage());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public SQSBatchResponse handleRequest(SQSEvent sqsEvent, Context context) {

try {
EventMessageResponse response = dispatchEvent(msgs, Helper.toJSONString(sqsEvent));
wasHandled = response.isHandled();
wasHandled = !response.hasFailed();
errorMessage = response.getErrorMessage();
} catch (Exception e) {
errorMessage = "HandleRequest execution error";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@
import com.fasterxml.jackson.annotation.JsonProperty;

public class EventMessageResponse {
@JsonProperty("Handled")
private boolean handled = false;
@JsonProperty("HandleFailure")
private boolean hasFailed = false;

@JsonProperty("ErrorMessage")
private String errorMessage = "";

public boolean isHandled() {
return handled;
public boolean hasFailed() {
return hasFailed;
}

public void setHandled(boolean handled) {
this.handled = handled;
public void setAsFailed(boolean hasFailed) {
this.hasFailed = hasFailed;
}

public String getErrorMessage() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,21 +30,21 @@ private Map<String, Object> createEvent() {
public void simpleEvent() throws Exception {
LambdaEventBridgeHandler handler = new LambdaEventBridgeHandler(SIMPLE_HANDLER);
String result = handler.handleRequest(createEvent(), new MockContext());
Assert.assertEquals("{\"Handled\":true,\"ErrorMessage\":\"\"}", result);
Assert.assertEquals("{\"HandleFailure\":false,\"ErrorMessage\":\"\"}", result);
}

@Test
public void simpleEventRaw() throws Exception {
LambdaEventBridgeHandler handler = new LambdaEventBridgeHandler(SIMPLE_RAW_HANDLER);
String result = handler.handleRequest(createEvent(), new MockContext());
Assert.assertEquals("{\"Handled\":true,\"ErrorMessage\":\"\"}", result);
Assert.assertEquals("{\"HandleFailure\":false,\"ErrorMessage\":\"\"}", result);
}

@Test
public void simpleEventNoParms() throws Exception {
LambdaEventBridgeHandler handler = new LambdaEventBridgeHandler(handlesimplenoparmsevent.class.getName());
String result = handler.handleRequest(createEvent(), new MockContext());
Assert.assertEquals("{\"Handled\":true,\"ErrorMessage\":\"\"}", result);
Assert.assertEquals("{\"HandleFailure\":false,\"ErrorMessage\":\"\"}", result);
}


Expand Down
Loading