This repository has been archived by the owner on Jul 23, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 26
Add a workflow task that uses JDBC #379
Merged
openshift-merge-robot
merged 1 commit into
rhdhorchestrator:main
from
ydayagi:flpath215
May 31, 2023
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 14 additions & 0 deletions
14
prebuilt-tasks/src/main/java/com/redhat/parodos/tasks/jdbc/JdbcService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
package com.redhat.parodos.tasks.jdbc; | ||
|
||
import java.util.List; | ||
import java.util.Map; | ||
|
||
interface JdbcService { | ||
|
||
List<Map<String, Object>> query(String url, String statement); | ||
|
||
void update(String url, String statement); | ||
|
||
void execute(String url, String statement); | ||
|
||
} |
34 changes: 34 additions & 0 deletions
34
prebuilt-tasks/src/main/java/com/redhat/parodos/tasks/jdbc/JdbcServiceImpl.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
package com.redhat.parodos.tasks.jdbc; | ||
|
||
import java.util.List; | ||
import java.util.Map; | ||
|
||
import org.springframework.jdbc.core.ColumnMapRowMapper; | ||
import org.springframework.jdbc.core.JdbcTemplate; | ||
import org.springframework.jdbc.datasource.DriverManagerDataSource; | ||
|
||
class JdbcServiceImpl implements JdbcService { | ||
|
||
@Override | ||
public List<Map<String, Object>> query(String url, String statement) { | ||
return createJdbcTemplate(url).query(statement, new ColumnMapRowMapper()); | ||
} | ||
|
||
@Override | ||
public void update(String url, String statement) { | ||
createJdbcTemplate(url).update(statement); | ||
} | ||
|
||
@Override | ||
public void execute(String url, String statement) { | ||
createJdbcTemplate(url).execute(statement); | ||
} | ||
|
||
private JdbcTemplate createJdbcTemplate(String url) { | ||
DriverManagerDataSource dataSource = new DriverManagerDataSource(); | ||
dataSource.setUrl(url); | ||
|
||
return new JdbcTemplate(dataSource); | ||
} | ||
|
||
} |
98 changes: 98 additions & 0 deletions
98
prebuilt-tasks/src/main/java/com/redhat/parodos/tasks/jdbc/JdbcWorkFlowTask.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,98 @@ | ||
package com.redhat.parodos.tasks.jdbc; | ||
|
||
import java.util.Arrays; | ||
import java.util.LinkedList; | ||
import java.util.List; | ||
import java.util.Map; | ||
|
||
import com.fasterxml.jackson.core.JsonProcessingException; | ||
import com.fasterxml.jackson.databind.ObjectMapper; | ||
import com.redhat.parodos.workflow.exception.MissingParameterException; | ||
import com.redhat.parodos.workflow.parameter.WorkParameter; | ||
import com.redhat.parodos.workflow.parameter.WorkParameterType; | ||
import com.redhat.parodos.workflow.task.BaseWorkFlowTask; | ||
import com.redhat.parodos.workflow.task.enums.WorkFlowTaskOutput; | ||
import com.redhat.parodos.workflows.work.DefaultWorkReport; | ||
import com.redhat.parodos.workflows.work.WorkContext; | ||
import com.redhat.parodos.workflows.work.WorkReport; | ||
import com.redhat.parodos.workflows.work.WorkStatus; | ||
import lombok.NonNull; | ||
import lombok.extern.slf4j.Slf4j; | ||
|
||
@Slf4j | ||
public class JdbcWorkFlowTask extends BaseWorkFlowTask { | ||
|
||
enum OperationType { | ||
|
||
QUERY, UPDATE, EXECUTE | ||
masayag marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
} | ||
|
||
private JdbcService service; | ||
|
||
public JdbcWorkFlowTask() { | ||
this.service = new JdbcServiceImpl(); | ||
} | ||
|
||
JdbcWorkFlowTask(String beanName, JdbcService service) { | ||
this.setBeanName(beanName); | ||
this.service = service; | ||
} | ||
|
||
@Override | ||
public @NonNull List<WorkParameter> getWorkFlowTaskParameters() { | ||
LinkedList<WorkParameter> params = new LinkedList<>(); | ||
params.add(WorkParameter.builder().key("url").type(WorkParameterType.TEXT).optional(false).description( | ||
"JDBC URL. E.g. jdbc:postgresql://localhost:5432/service?user=service&password=service123&ssl=true&sslmode=verify-full") | ||
.build()); | ||
params.add(WorkParameter.builder().key("operation").type(WorkParameterType.TEXT).optional(false).description( | ||
"Type of operation this statement is performing. One of " + Arrays.toString(OperationType.values())) | ||
.build()); | ||
params.add(WorkParameter.builder().key("statement").type(WorkParameterType.TEXT).optional(false) | ||
.description("The database statement to execute. E.g. 'select * from table'").build()); | ||
params.add(WorkParameter.builder().key("result-ctx-key").type(WorkParameterType.TEXT).optional(true) | ||
.description("In query operation the result is stored in WorkContext with the provided key").build()); | ||
return params; | ||
} | ||
|
||
@Override | ||
public @NonNull List<WorkFlowTaskOutput> getWorkFlowTaskOutputs() { | ||
return List.of(WorkFlowTaskOutput.OTHER); | ||
} | ||
|
||
@Override | ||
public WorkReport execute(WorkContext workContext) { | ||
String url = ""; | ||
try { | ||
url = getRequiredParameterValue("url"); | ||
String operation = getRequiredParameterValue("operation"); | ||
String statement = getRequiredParameterValue("statement"); | ||
String resultCtxKey = getOptionalParameterValue("result-ctx-key", ""); | ||
|
||
OperationType operationType = OperationType.valueOf(operation.toUpperCase()); | ||
|
||
switch (operationType) { | ||
|
||
case QUERY -> { | ||
List<Map<String, Object>> result = this.service.query(url, statement); | ||
if (!resultCtxKey.isEmpty()) { | ||
workContext.put(resultCtxKey, new ObjectMapper().writeValueAsString(result)); | ||
masayag marked this conversation as resolved.
Show resolved
Hide resolved
|
||
} | ||
masayag marked this conversation as resolved.
Show resolved
Hide resolved
|
||
} | ||
case UPDATE -> { | ||
this.service.update(url, statement); | ||
} | ||
case EXECUTE -> { | ||
this.service.execute(url, statement); | ||
} | ||
} | ||
} | ||
catch (MissingParameterException | JsonProcessingException e) { | ||
log.error("Jdbc task failed for URL " + url, e); | ||
return new DefaultWorkReport(WorkStatus.FAILED, workContext, e); | ||
} | ||
|
||
return new DefaultWorkReport(WorkStatus.COMPLETED, workContext); | ||
} | ||
|
||
} |
22 changes: 22 additions & 0 deletions
22
prebuilt-tasks/src/main/java/com/redhat/parodos/tasks/jdbc/README.md
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
# JDBC WorkFlow task | ||
|
||
## Motivation | ||
Provide a task that can be used for CRUD operations via JDBC | ||
|
||
## Input | ||
- URL - a JDBC URL that has all required connection properties. E.g. jdbc:postgresql://localhost:5432/service?user=service&password=service123&ssl=true&sslmode=verify-full. | ||
- Statement - the textual message/request/query that is passed to the JDBC driver. E.g. "select * from items". | ||
- Operation type - operations are divided into 3 types. Execute is for statements such as 'drop table', 'create user'. Update is for statements such as insert, update, delete records (e.g. rows in table). Query is for retrieving records/items/info. E.g. SQL select. | ||
- Context key for result - the context key where result of query operation is stored. | ||
|
||
## Result | ||
A failure to perform the operation will result in failed task execution. Only operation of type query returns a result. The result is stored with the context key that is passed as input. The result is a JSON representation of the result set. | ||
|
||
## Configuration | ||
The task uses the JDBC driver specified in the URL. E.g. mysql. In order to load the driver you need to add it as a maven dependency. E.g. | ||
``` | ||
<dependency> | ||
<groupId>mysql</groupId> | ||
<artifactId>mysql-connector-java</artifactId> | ||
<scope>runtime</scope> | ||
</dependency> |
83 changes: 83 additions & 0 deletions
83
prebuilt-tasks/src/test/java/com/redhat/parodos/tasks/jdbc/JdbcWorkFlowTaskTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,83 @@ | ||
package com.redhat.parodos.tasks.jdbc; | ||
|
||
import java.util.HashMap; | ||
import java.util.List; | ||
import java.util.Map; | ||
|
||
import com.redhat.parodos.workflow.context.WorkContextDelegate; | ||
import com.redhat.parodos.workflow.exception.MissingParameterException; | ||
import com.redhat.parodos.workflows.work.WorkContext; | ||
import com.redhat.parodos.workflows.work.WorkReport; | ||
import com.redhat.parodos.workflows.work.WorkStatus; | ||
import org.junit.Test; | ||
|
||
import static org.junit.Assert.assertEquals; | ||
import static org.mockito.ArgumentMatchers.any; | ||
import static org.mockito.Mockito.doReturn; | ||
import static org.mockito.Mockito.mock; | ||
import static org.mockito.Mockito.times; | ||
import static org.mockito.Mockito.verify; | ||
|
||
public class JdbcWorkFlowTaskTest { | ||
|
||
private final JdbcService service = mock(JdbcService.class); | ||
|
||
private final JdbcWorkFlowTask task = new JdbcWorkFlowTask("Test", service); | ||
|
||
@Test | ||
public void missingArgs() { | ||
WorkContext ctx = createWorkContext(null); | ||
task.preExecute(ctx); | ||
WorkReport result = task.execute(ctx); | ||
assertEquals(WorkStatus.FAILED, result.getStatus()); | ||
assertEquals(MissingParameterException.class, result.getError().getClass()); | ||
} | ||
|
||
@Test | ||
public void query() { | ||
WorkContext ctx = createWorkContext(JdbcWorkFlowTask.OperationType.QUERY.name()); | ||
List<Map<String, Object>> resultSet = List.of(Map.of("name", "value")); | ||
String resultJson = "[{\"name\":\"value\"}]"; | ||
doReturn(resultSet).when(service).query(any(), any()); | ||
task.preExecute(ctx); | ||
WorkReport result = task.execute(ctx); | ||
assertEquals(WorkStatus.COMPLETED, result.getStatus()); | ||
assertEquals(resultJson, ctx.get("thekey")); | ||
} | ||
|
||
@Test | ||
public void update() { | ||
WorkContext ctx = createWorkContext(JdbcWorkFlowTask.OperationType.UPDATE.name()); | ||
task.preExecute(ctx); | ||
WorkReport result = task.execute(ctx); | ||
assertEquals(WorkStatus.COMPLETED, result.getStatus()); | ||
verify(service, times(1)).update("theurl", "thestatement"); | ||
} | ||
|
||
@Test | ||
public void execute() { | ||
WorkContext ctx = createWorkContext(JdbcWorkFlowTask.OperationType.EXECUTE.name()); | ||
task.preExecute(ctx); | ||
WorkReport result = task.execute(ctx); | ||
assertEquals(WorkStatus.COMPLETED, result.getStatus()); | ||
verify(service, times(1)).execute("theurl", "thestatement"); | ||
} | ||
|
||
private WorkContext createWorkContext(String operation) { | ||
WorkContext ctx = new WorkContext(); | ||
HashMap<String, String> map = new HashMap<>(); | ||
map.put("url", "theurl"); | ||
|
||
if (operation != null) { | ||
map.put("operation", operation); | ||
} | ||
|
||
map.put("statement", "thestatement"); | ||
map.put("result-ctx-key", "thekey"); | ||
|
||
WorkContextDelegate.write(ctx, WorkContextDelegate.ProcessType.WORKFLOW_TASK_EXECUTION, task.getName(), | ||
WorkContextDelegate.Resource.ARGUMENTS, map); | ||
return ctx; | ||
} | ||
|
||
} |
27 changes: 27 additions & 0 deletions
27
workflow-examples/src/main/java/com/redhat/parodos/examples/JdbcWorkFlowConfiguration.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
package com.redhat.parodos.examples; | ||
|
||
import com.redhat.parodos.tasks.jdbc.JdbcWorkFlowTask; | ||
import com.redhat.parodos.workflow.annotation.Infrastructure; | ||
import com.redhat.parodos.workflows.workflow.SequentialFlow; | ||
import com.redhat.parodos.workflows.workflow.WorkFlow; | ||
|
||
import org.springframework.context.annotation.Bean; | ||
import org.springframework.context.annotation.Configuration; | ||
import org.springframework.context.annotation.Profile; | ||
|
||
@Configuration | ||
@Profile("jdbc") | ||
public class JdbcWorkFlowConfiguration { | ||
|
||
@Bean | ||
JdbcWorkFlowTask jdbcTask() { | ||
return new JdbcWorkFlowTask(); | ||
} | ||
|
||
@Bean | ||
@Infrastructure | ||
WorkFlow jdbcWorkFlow(JdbcWorkFlowTask jdbcTask) { | ||
return SequentialFlow.Builder.aNewSequentialFlow().named("jdbcWorkFlow").execute(jdbcTask).build(); | ||
} | ||
|
||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
pls add doc comments to the interface and methods.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
what do u mean by doc comments?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
javadoc, but based on the incremental approach, let's skip this in this PR.