Skip to content

Added patch to throw exception in afterExecute and beforeExecute #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Added patch to throw exception in afterExecute and beforeExecute #41

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e307e73
Added patch to throw exception in afterExecute and beforeExecute parts
nottocode-dks Oct 10, 2020
48a79c6
moved common code to util class
nottocode-dks Oct 25, 2020
b20cfec
added tests
nottocode-dks Nov 3, 2020
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
8 changes: 8 additions & 0 deletions src/main/java/com/flipkart/databuilderframework/engine/DataBuilderExecutionListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,12 @@ default void postProcessing(DataFlowInstance dataFlowInstance,
default boolean shouldThrowException() {
return false;
}

default boolean shouldThrowExceptionInBeforeExecute() {
return false;
}

default boolean shouldThrowExceptionInAfterExecute() {
return false;
}
}
4 changes: 3 additions & 1 deletion src/main/java/com/flipkart/databuilderframework/engine/DataBuilderFrameworkException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ public static enum ErrorCode {
NO_BUILDER_FOUND_FOR_NAME,
INSTANTIATION_FAILURE,
BUILDER_RESOLUTION_CONFLICT_FOR_DATA,
BUILDER_EXECUTION_ERROR
BUILDER_EXECUTION_ERROR,
BUILDER_PRE_EXECUTION_ERROR,
BUILDER_POST_EXECUTION_ERROR
}

private final ErrorCode errorCode;
Expand Down
14 changes: 12 additions & 2 deletions src/main/java/com/flipkart/databuilderframework/engine/MultiThreadedDataFlowExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,12 @@ public DataContainer call() throws Exception {
try {
listener.beforeExecute(dataBuilderContext, dataFlowInstance, builderMeta, dataDelta, responseData);
} catch (Throwable t) {
logger.error("Error running pre-execution execution listener: ", t);
final String errorMessage = "Error running pre-execution execution listener: ";
logger.error(errorMessage, t);
if (listener.shouldThrowExceptionInBeforeExecute()) {
throw new DataBuilderFrameworkException(DataBuilderFrameworkException.ErrorCode.BUILDER_PRE_EXECUTION_ERROR,
errorMessage + t.getMessage(), t);
}
}
}
try {
Expand All @@ -236,7 +241,12 @@ public DataContainer call() throws Exception {
try {
listener.afterExecute(dataBuilderContext, dataFlowInstance, builderMeta, dataDelta, responseData, response);
} catch (Throwable t) {
logger.error("Error running post-execution listener: ", t);
final String errorMessage = "Error running post-execution execution listener: ";
logger.error(errorMessage, t);
if (listener.shouldThrowExceptionInAfterExecute()) {
throw new DataBuilderFrameworkException(DataBuilderFrameworkException.ErrorCode.BUILDER_POST_EXECUTION_ERROR,
errorMessage + t.getMessage(), t);
}
}
}
if(null != response) {
Expand Down
14 changes: 12 additions & 2 deletions ...java/com/flipkart/databuilderframework/engine/OptimizedMultiThreadedDataFlowExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,12 @@ public DataContainer call() throws Exception {
try {
listener.beforeExecute(dataBuilderContext, dataFlowInstance, builderMeta, dataDelta, responseData);
} catch (Throwable t) {
logger.error("Error running pre-execution execution listener: ", t);
final String errorMessage = "Error running pre-execution execution listener: ";
logger.error(errorMessage, t);
if (listener.shouldThrowExceptionInBeforeExecute()) {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Exact same code is getting repeated at three places. Create a method like, handleExceptionInBeforeExecute() in utils and use that at all the places.
Same can be done for afterExecute as well.

throw new DataBuilderFrameworkException(DataBuilderFrameworkException.ErrorCode.BUILDER_PRE_EXECUTION_ERROR,
errorMessage + t.getMessage(), t);
}
}
}
try {
Expand All @@ -255,7 +260,12 @@ public DataContainer call() throws Exception {
try {
listener.afterExecute(dataBuilderContext, dataFlowInstance, builderMeta, dataDelta, responseData, response);
} catch (Throwable t) {
logger.error("Error running post-execution listener: ", t);
final String errorMessage = "Error running post-execution execution listener: ";
logger.error(errorMessage, t);
if (listener.shouldThrowExceptionInAfterExecute()) {
throw new DataBuilderFrameworkException(DataBuilderFrameworkException.ErrorCode.BUILDER_POST_EXECUTION_ERROR,
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add test cases for both the changes

errorMessage + t.getMessage(), t);
}
}
}
if(null != response) {
Expand Down
15 changes: 12 additions & 3 deletions src/main/java/com/flipkart/databuilderframework/engine/SimpleDataFlowExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,12 @@ protected DataExecutionResponse run(DataBuilderContext dataBuilderContext,
try {
listener.beforeExecute(dataBuilderContext, dataFlowInstance, builderMeta, dataDelta, responseData);
} catch (Throwable t) {
logger.error("Error running pre-execution execution listener: ", t);
final String errorMessage = "Error running pre-execution execution listener: ";
logger.error(errorMessage, t);
if (listener.shouldThrowExceptionInBeforeExecute()) {
throw new DataBuilderFrameworkException(DataBuilderFrameworkException.ErrorCode.BUILDER_PRE_EXECUTION_ERROR,
errorMessage + t.getMessage(), t);
}
}
}
try {
Expand All @@ -86,13 +91,17 @@ protected DataExecutionResponse run(DataBuilderContext dataBuilderContext,
newlyGeneratedData.add(response.getData());
}
}
//logger.debug("Ran " + builderMeta.getName());
processedBuilders.add(builderMeta);
for (DataBuilderExecutionListener listener : dataBuilderExecutionListener) {
try {
listener.afterExecute(dataBuilderContext, dataFlowInstance, builderMeta, dataDelta, responseData, response);
} catch (Throwable t) {
logger.error("Error running post-execution listener: ", t);
final String errorMessage = "Error running post-execution execution listener: ";
logger.error(errorMessage, t);
if (listener.shouldThrowExceptionInAfterExecute()) {
throw new DataBuilderFrameworkException(DataBuilderFrameworkException.ErrorCode.BUILDER_POST_EXECUTION_ERROR,
errorMessage + t.getMessage(), t);
}
}
}

Expand Down