yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-08-01 21:57:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #2464: PipelineRepository throws NPE when description is updated (#2465)

Browse Source 
* Fix #2464: PipelineRepository throws NPE when description is updated
This commit is contained in:
Vivek Ratnavel Subramanian 2022-01-26 21:45:31 -08:00 committed by GitHub
parent c529465c60
commit aaf1dbede1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 87 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/PipelineRepository.java
View File

@ -344,7 +344,7 @@ public class PipelineRepository extends EntityRepository<Pipeline> {
// Update the task descriptions // Update the task descriptions
for (Task updated : updatedTasks) { for (Task updated : updatedTasks) {
Task stored = origTasks.stream().filter(c -> taskMatch.test(c, updated)).findAny().orElse(null); Task stored = origTasks.stream().filter(c -> taskMatch.test(c, updated)).findAny().orElse(null);
if (stored == null) { // New task added if (stored == null || updated == null) { // New task added
continue; continue;
} }
@ -359,7 +359,9 @@ public class PipelineRepository extends EntityRepository<Pipeline> {
return; return;
} }
// Don't record a change if descriptions are the same // Don't record a change if descriptions are the same
if (!origTask.getDescription().equals(updatedTask.getDescription())) { if (origTask != null
&& ((origTask.getDescription() != null && !origTask.getDescription().equals(updatedTask.getDescription()))
|| updatedTask.getDescription() != null)) {
recordChange( recordChange(
"tasks." + origTask.getName() + ".description", origTask.getDescription(), updatedTask.getDescription()); "tasks." + origTask.getName() + ".description", origTask.getDescription(), updatedTask.getDescription());
} }

87
catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/pipelines/PipelineResourceTest.java
View File

@ -147,7 +147,7 @@ public class PipelineResourceTest extends EntityResourceTest<Pipeline> {
if (expected == null && actual == null) { if (expected == null && actual == null) {
return; return;
} }
if (fieldName.contains("tasks")) { if (fieldName.contains("tasks") && !fieldName.contains(".")) {
List<Task> expectedTasks = (List<Task>) expected; List<Task> expectedTasks = (List<Task>) expected;
List<Task> actualTasks = JsonUtils.readObjects(actual.toString(), Task.class); List<Task> actualTasks = JsonUtils.readObjects(actual.toString(), Task.class);
assertEquals(expectedTasks, actualTasks); assertEquals(expectedTasks, actualTasks);
@ -244,7 +244,7 @@ public class PipelineResourceTest extends EntityResourceTest<Pipeline> {
} }
@Test @Test
void put_PipelineTasksUpdate_200(TestInfo test) throws IOException { void put_PipelineTasksUpdate_200(TestInfo test) throws IOException, URISyntaxException {
CreatePipeline request = create(test).withService(AIRFLOW_REFERENCE).withDescription(null); CreatePipeline request = create(test).withService(AIRFLOW_REFERENCE).withDescription(null);
Pipeline pipeline = createAndCheckEntity(request, adminAuthHeaders()); Pipeline pipeline = createAndCheckEntity(request, adminAuthHeaders());
@ -252,8 +252,87 @@ public class PipelineResourceTest extends EntityResourceTest<Pipeline> {
ChangeDescription change = getChangeDescription(pipeline.getVersion()); ChangeDescription change = getChangeDescription(pipeline.getVersion());
change.getFieldsAdded().add(new FieldChange().withName("description").withNewValue("newDescription")); change.getFieldsAdded().add(new FieldChange().withName("description").withNewValue("newDescription"));
change.getFieldsAdded().add(new FieldChange().withName("tasks").withNewValue(TASKS)); change.getFieldsAdded().add(new FieldChange().withName("tasks").withNewValue(TASKS));
updateAndCheckEntity( pipeline =
request.withDescription("newDescription").withTasks(TASKS), OK, adminAuthHeaders(), MINOR_UPDATE, change); updateAndCheckEntity(
request.withDescription("newDescription").withTasks(TASKS), OK, adminAuthHeaders(), MINOR_UPDATE, change);
// Add a task without description
change = getChangeDescription(pipeline.getVersion());
List<Task> tasks = new ArrayList<>();
Task taskEmptyDesc = new Task().withName("taskEmpty").withTaskUrl(new URI("http://localhost:0"));
tasks.add(taskEmptyDesc);
change.getFieldsAdded().add(new FieldChange().withName("tasks").withNewValue(tasks));
updateAndCheckEntity(request.withTasks(tasks), OK, adminAuthHeaders(), MINOR_UPDATE, change);
}
@Test
void patch_PipelineTasksUpdate_200_ok(TestInfo test) throws IOException, URISyntaxException {
CreatePipeline request = create(test).withService(AIRFLOW_REFERENCE);
Pipeline pipeline = createAndCheckEntity(request, adminAuthHeaders());
String origJson = JsonUtils.pojoToJson(pipeline);
// Add a task without description
ChangeDescription change = getChangeDescription(pipeline.getVersion());
List<Task> tasks = new ArrayList<>();
Task taskEmptyDesc = new Task().withName("taskEmpty").withTaskUrl(new URI("http://localhost:0"));
tasks.add(taskEmptyDesc);
change.getFieldsAdded().add(new FieldChange().withName("tasks").withNewValue(tasks));
change.getFieldsAdded().add(new FieldChange().withName("description").withNewValue("newDescription"));
pipeline.setDescription("newDescription");
pipeline.setTasks(tasks);
pipeline = patchEntityAndCheck(pipeline, origJson, adminAuthHeaders(), MINOR_UPDATE, change);
// add a description to an existing task
origJson = JsonUtils.pojoToJson(pipeline);
change = getChangeDescription(pipeline.getVersion());
List<Task> newTasks = new ArrayList<>();
Task taskWithDesc = taskEmptyDesc.withDescription("taskDescription");
newTasks.add(taskWithDesc);
change
.getFieldsAdded()
.add(new FieldChange().withName("tasks.taskEmpty.description").withNewValue("taskDescription"));
pipeline.setTasks(newTasks);
pipeline = patchEntityAndCheck(pipeline, origJson, adminAuthHeaders(), MINOR_UPDATE, change);
// update the descriptions of pipeline and task
origJson = JsonUtils.pojoToJson(pipeline);
change = getChangeDescription(pipeline.getVersion());
newTasks = new ArrayList<>();
taskWithDesc = taskEmptyDesc.withDescription("newTaskDescription");
newTasks.add(taskWithDesc);
change
.getFieldsUpdated()
.add(
new FieldChange()
.withName("tasks.taskEmpty.description")
.withOldValue("taskDescription")
.withNewValue("newTaskDescription"));
change
.getFieldsUpdated()
.add(new FieldChange().withName("description").withOldValue("newDescription").withNewValue("newDescription2"));
pipeline.setTasks(newTasks);
pipeline.setDescription("newDescription2");
pipeline = patchEntityAndCheck(pipeline, origJson, adminAuthHeaders(), MINOR_UPDATE, change);
// delete task and pipeline description by setting them to null
origJson = JsonUtils.pojoToJson(pipeline);
change = getChangeDescription(pipeline.getVersion());
newTasks = new ArrayList<>();
Task taskWithoutDesc = taskEmptyDesc.withDescription(null);
newTasks.add(taskWithoutDesc);
change
.getFieldsDeleted()
.add(
new FieldChange()
.withName("tasks.taskEmpty.description")
.withOldValue("newTaskDescription")
.withNewValue(null));
change
.getFieldsDeleted()
.add(new FieldChange().withName("description").withOldValue("newDescription2").withNewValue(null));
pipeline.setTasks(newTasks);
pipeline.setDescription(null);
patchEntityAndCheck(pipeline, origJson, adminAuthHeaders(), MINOR_UPDATE, change);
} }
@Test @Test