From d65407d2f22cbe288025d4c6dc86def29fb54194 Mon Sep 17 00:00:00 2001 From: "Barry M. Caceres" Date: Fri, 4 Feb 2022 14:40:41 -0800 Subject: [PATCH] Updates for version 1.2.0. Support for senzing-commons-java version 2.0.0 --- CHANGELOG.md | 11 ++++++++++- Dockerfile | 2 +- pom.xml | 4 ++-- senzing-api-server | 2 +- .../senzing/poc/services/BulkDataStreamSupport.java | 10 +++++----- .../senzing/poc/services/EntityStreamServices.java | 12 ++++++------ .../senzing/poc/services/StreamLoadUtilities.java | 4 ++-- 7 files changed, 27 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ffd9291..345cdb6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,13 +6,22 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), [markdownlint](https://dlaa.me/markdownlint/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.2.0] - 2022-02-04 + +### Changed in 1.2.0 + +- Updated to `senzing-api-server` version 2.8.3 for dependency on the release + version 2.x of `senzing-commons-java` +- Changed references to `com.senzing.util.JsonUtils` to + `com.senzing.util.JsonUtilities` + ## [1.1.1] - 2022-01-19 ### Changed in 1.1.1 - Updated to `senzing-api-server` version 2.8.1 to reduce repo size - Updated POC REST API spec to fix bulk-data examples -- Updated spring framework dependencies in `pom.xml` tp address security +- Updated spring framework dependencies in `pom.xml` tp address security vulnerabilities. ## [1.1.0] - 2021-12-01 diff --git a/Dockerfile b/Dockerfile index 31b7178..a2547ff 100644 --- a/Dockerfile +++ b/Dockerfile @@ -45,7 +45,7 @@ ENV REFRESHED_AT=2022-01-06 LABEL Name="senzing/senzing-poc-server" \ Maintainer="support@senzing.com" \ - Version="1.1.1" + Version="1.2.0" HEALTHCHECK CMD ["/app/healthcheck.sh"] diff --git a/pom.xml b/pom.xml index 208d78e..466331c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,14 +4,14 @@ com.senzing senzing-poc-server jar - 1.1.1 + 1.2.0 senzing-poc-server http://maven.apache.org com.senzing senzing-api-server - [2.8.1, 3.0.0-SNAPSHOT) + [2.8.3, 3.0.0-SNAPSHOT) org.xerial diff --git a/senzing-api-server b/senzing-api-server index 78ab45d..9089c25 160000 --- a/senzing-api-server +++ b/senzing-api-server @@ -1 +1 @@ -Subproject commit 78ab45d1dcead4be8d0ff33632dfeec181535db8 +Subproject commit 9089c2519ec11e2f091a803de50475721838a95f diff --git a/src/main/java/com/senzing/poc/services/BulkDataStreamSupport.java b/src/main/java/com/senzing/poc/services/BulkDataStreamSupport.java index 9d55df8..73226c7 100644 --- a/src/main/java/com/senzing/poc/services/BulkDataStreamSupport.java +++ b/src/main/java/com/senzing/poc/services/BulkDataStreamSupport.java @@ -9,7 +9,7 @@ import com.senzing.io.TemporaryDataCache; import com.senzing.poc.server.SzPocProvider; import com.senzing.util.AccessToken; -import com.senzing.util.JsonUtils; +import com.senzing.util.JsonUtilities; import com.senzing.util.LoggingUtilities; import com.senzing.util.Timers; import org.glassfish.jersey.media.multipart.FormDataContentDisposition; @@ -186,20 +186,20 @@ default SzBulkLoadResponse streamLoadBulkRecords( // check if we have a data source and entity type String resolvedDS = (done) ? null - : JsonUtils.getString(record, "DATA_SOURCE"); + : JsonUtilities.getString(record, "DATA_SOURCE"); String resolvedET = (done) ? null - : JsonUtils.getString(record, "ENTITY_TYPE"); + : JsonUtilities.getString(record, "ENTITY_TYPE"); if ((!done) && (resolvedDS == null || resolvedDS.trim().length() == 0 || resolvedET == null || resolvedET.trim().length() == 0)) { debugLog("Incomplete record not set: " - + JsonUtils.toJsonText(record)); + + JsonUtilities.toJsonText(record)); bulkLoadResult.trackIncompleteRecord(resolvedDS, resolvedET); } else { - String recordText = (done) ? null : JsonUtils.toJsonText(record); + String recordText = (done) ? null : JsonUtilities.toJsonText(record); byte[] recordBytes = (done) ? null : recordText.getBytes(UTF_8); int byteCount = (done) ? 0 : recordBytes.length + 3; diff --git a/src/main/java/com/senzing/poc/services/EntityStreamServices.java b/src/main/java/com/senzing/poc/services/EntityStreamServices.java index d5df5eb..65df6a4 100644 --- a/src/main/java/com/senzing/poc/services/EntityStreamServices.java +++ b/src/main/java/com/senzing/poc/services/EntityStreamServices.java @@ -8,7 +8,7 @@ import com.senzing.poc.model.SzQueueInfoResponse; import com.senzing.poc.model.impl.SzQueueInfoResponseImpl; import com.senzing.poc.server.SzPocProvider; -import com.senzing.util.JsonUtils; +import com.senzing.util.JsonUtilities; import com.senzing.util.Timers; import javax.json.Json; @@ -159,8 +159,8 @@ public SzBasicResponse postRecordToLoadQueue( Collections.singletonMap("ENTITY_TYPE", "GENERIC")); // cleanup the record ID and load ID in the JSON text - JsonObject recordJson = JsonUtils.parseJsonObject(recordText); - String jsonRecordId = JsonUtils.getString(recordJson, "RECORD_ID"); + JsonObject recordJson = JsonUtilities.parseJsonObject(recordText); + String jsonRecordId = JsonUtilities.getString(recordJson, "RECORD_ID"); if ((jsonRecordId != null && jsonRecordId.trim().length() == 0) || (loadId != null && loadId.trim().length() > 0)) { @@ -179,7 +179,7 @@ public SzBasicResponse postRecordToLoadQueue( // reconstitute the JSON text recordJson = jsonBuilder.build(); - recordText = JsonUtils.toJsonText(recordJson); + recordText = JsonUtilities.toJsonText(recordJson); } // check that the data source code is valid @@ -262,7 +262,7 @@ public SzBasicResponse putRecordOnLoadQueue( // check if the load ID needs to be added on if (loadId != null && loadId.trim().length() > 0) { - JsonObject recordJson = JsonUtils.parseJsonObject(recordText); + JsonObject recordJson = JsonUtilities.parseJsonObject(recordText); JsonObjectBuilder jsonBuilder = Json.createObjectBuilder(recordJson); jsonBuilder.remove("SOURCE_ID"); @@ -270,7 +270,7 @@ public SzBasicResponse putRecordOnLoadQueue( // reconstitute the JSON text recordJson = jsonBuilder.build(); - recordText = JsonUtils.toJsonText(recordJson); + recordText = JsonUtilities.toJsonText(recordJson); } // check that the data source code is valid diff --git a/src/main/java/com/senzing/poc/services/StreamLoadUtilities.java b/src/main/java/com/senzing/poc/services/StreamLoadUtilities.java index a7bae36..e8fe7fe 100644 --- a/src/main/java/com/senzing/poc/services/StreamLoadUtilities.java +++ b/src/main/java/com/senzing/poc/services/StreamLoadUtilities.java @@ -2,7 +2,7 @@ import com.senzing.api.services.SzMessage; import com.senzing.util.ErrorLogSuppressor; -import com.senzing.util.JsonUtils; +import com.senzing.util.JsonUtilities; import javax.json.JsonObject; import java.util.Date; @@ -43,7 +43,7 @@ public static void logFailedAsyncLoad(Exception e, SzMessage message) { sb.append(": FAILED TO ENQUEUE RECORD FOR LOAD"); try { - JsonObject jsonRecord = JsonUtils.parseJsonObject(record); + JsonObject jsonRecord = JsonUtilities.parseJsonObject(record); String prefix = ": "; String dataSource = jsonRecord.getString("DATA_SOURCE"); String recordId = jsonRecord.getString("RECORD_ID");