From e2ba623300d76c463dcebdf3bd1c5eed3b75d931 Mon Sep 17 00:00:00 2001 From: David Randolph Phillips Date: Wed, 23 Oct 2024 11:28:21 -0400 Subject: [PATCH 1/2] [BI-2328] prevent NullPointer Exeption when timestamp is blank --- .../factory/data/OverwrittenData.java | 3 ++- .../middleware/process/ImportTableProcess.java | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/breedinginsight/brapps/importer/services/processors/experiment/appendoverwrite/factory/data/OverwrittenData.java b/src/main/java/org/breedinginsight/brapps/importer/services/processors/experiment/appendoverwrite/factory/data/OverwrittenData.java index 35fceddb3..54a1afe06 100644 --- a/src/main/java/org/breedinginsight/brapps/importer/services/processors/experiment/appendoverwrite/factory/data/OverwrittenData.java +++ b/src/main/java/org/breedinginsight/brapps/importer/services/processors/experiment/appendoverwrite/factory/data/OverwrittenData.java @@ -24,6 +24,7 @@ import com.google.gson.JsonObject; import io.micronaut.context.annotation.Prototype; import io.micronaut.http.HttpStatus; +import org.apache.commons.lang3.StringUtils; import org.brapi.v2.model.pheno.BrAPIObservation; import org.breedinginsight.api.model.v1.response.ValidationError; import org.breedinginsight.brapi.v2.constants.BrAPIAdditionalInfoFields; @@ -181,7 +182,7 @@ private boolean isValueMatched() { } private boolean isTimestampMatched() { - if (timestamp == null) { + if (StringUtils.isBlank(timestamp)) { return observation.getObservationTimeStamp() == null; } else { return observationService.parseDateTime(timestamp).equals(observation.getObservationTimeStamp()); diff --git a/src/main/java/org/breedinginsight/brapps/importer/services/processors/experiment/appendoverwrite/middleware/process/ImportTableProcess.java b/src/main/java/org/breedinginsight/brapps/importer/services/processors/experiment/appendoverwrite/middleware/process/ImportTableProcess.java index 0013f0458..20d6d8f9d 100644 --- a/src/main/java/org/breedinginsight/brapps/importer/services/processors/experiment/appendoverwrite/middleware/process/ImportTableProcess.java +++ b/src/main/java/org/breedinginsight/brapps/importer/services/processors/experiment/appendoverwrite/middleware/process/ImportTableProcess.java @@ -62,6 +62,7 @@ import tech.tablesaw.columns.Column; import javax.inject.Inject; +import java.time.OffsetDateTime; import java.util.*; import java.util.stream.Collectors; @@ -265,7 +266,9 @@ public AppendOverwriteMiddlewareContext process(AppendOverwriteMiddlewareContext BrAPIObservation observation = gson.fromJson(gson.toJson(observationByObsHash.get(observationHash)), BrAPIObservation.class); // Is there a change to the prior data? - if ((!cellData.isBlank() && !cellData.equals(observation.getValue())) || (cell.timestamp != null && !observationService.parseDateTime(cell.timestamp).equals(observation.getObservationTimeStamp()))) { + if ( + isChanged(cellData, observation, cell.timestamp) + ) { // Is prior data protected? /** @@ -380,4 +383,14 @@ public AppendOverwriteMiddlewareContext process(AppendOverwriteMiddlewareContext return this.compensate(context); } } + + private boolean isChanged(String cellData, BrAPIObservation observation, String newTimestamp) { + if (!cellData.isBlank() && !cellData.equals(observation.getValue())){ + return true; + } + if (StringUtils.isBlank(newTimestamp)) { + return (observation.getObservationTimeStamp()!=null); + } + return !observationService.parseDateTime(newTimestamp).equals(observation.getObservationTimeStamp()); + } } From 7630c0203f9aa445ba1080e4cd08fd0868e4e495 Mon Sep 17 00:00:00 2001 From: David Randolph Phillips Date: Wed, 23 Oct 2024 16:08:28 -0400 Subject: [PATCH 2/2] [BI-2359] removed unneeded import statement --- .../appendoverwrite/middleware/process/ImportTableProcess.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/org/breedinginsight/brapps/importer/services/processors/experiment/appendoverwrite/middleware/process/ImportTableProcess.java b/src/main/java/org/breedinginsight/brapps/importer/services/processors/experiment/appendoverwrite/middleware/process/ImportTableProcess.java index 20d6d8f9d..6863cd561 100644 --- a/src/main/java/org/breedinginsight/brapps/importer/services/processors/experiment/appendoverwrite/middleware/process/ImportTableProcess.java +++ b/src/main/java/org/breedinginsight/brapps/importer/services/processors/experiment/appendoverwrite/middleware/process/ImportTableProcess.java @@ -62,7 +62,6 @@ import tech.tablesaw.columns.Column; import javax.inject.Inject; -import java.time.OffsetDateTime; import java.util.*; import java.util.stream.Collectors;