POC Version 3.5.2: Adds Summary Stats REST Endpoints & Updates Depend…

…encies (#239) * Interim commit prior to repository migration * Interim commit of senzing-poc-rest-api.yaml. This adds summary statistic functions. * Changes to support REST API for data mart summary calls * - Added onlyLoadedSources query parameter to applicable endpoints with default value of true - Changed entities page responses to include more than entity ID (includes records and entity name and counts) - Changed relations page responses to include same entity details instead of only entity ID's * Updated to data-mart-replicator version 1.1.0 * Sweeping changes to spec version 3.5.2 to support summary statistics * Updated BuildInfo.java to reflect spec version 3.5.2 * Updated CHANGELOG.md and pom.xml for version 3.5.2 release * Updated Dockerfile for version 3.5.2 release * Updated senzing-api-server to version 3.5.10 * Fixed typo in CHANGELOG.md
senzing-garage · Mar 7, 2024 · 563849a · 563849a
1 parent 5f324d6
commit 563849a
Show file tree

Hide file tree

Showing 64 changed files with 11,843 additions and 441 deletions.
diff --git a/.gitignore b/.gitignore
@@ -72,3 +72,5 @@ target-v*
 
 # VS Code
 .vscode/
+eclipse-formatter.xml
+
diff --git a/.project b/.project
@@ -5,8 +5,20 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
 	<filteredResources>
 		<filter>

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,49 @@ 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).
 
+## [3.5.2] - 2024-03-06
+
+### Changed in 3.5.2
+
+- Added Data Mart Statistics service endpoints:
+  - `GET /statistics/summary`
+  - `GET /statistics/summary/data-sources/{dataSourceCode}`
+  - `GET /statistics/summary/data-sources/{dataSourceCode}/vs/{vsDataSourceCode}`
+  - `GET /statistics/summary/data-sources/{dataSourceCode}/vs/{vsDataSourceCode}/matches`
+  - `GET /statistics/summary/data-sources/{dataSourceCode}/vs/{vsDataSourceCode}/ambiguous-matches`
+  - `GET /statistics/summary/data-sources/{dataSourceCode}/vs/{vsDataSourceCode}/possible-matches`
+  - `GET /statistics/summary/data-sources/{dataSourceCode}/vs/{vsDataSourceCode}/possible-relations`
+  - `GET /statistics/summary/data-sources/{dataSourceCode}/vs/{vsDataSourceCode}/disclosed-relations`
+  - `GET /statistics/summary/data-sources/{dataSourceCode}/vs/{vsDataSourceCode}/matches/entities`
+  - `GET /statistics/summary/data-sources/{dataSourceCode}/vs/{vsDataSourceCode}/ambiguous-matches/entities`
+  - `GET /statistics/summary/data-sources/{dataSourceCode}/vs/{vsDataSourceCode}/ambiguous-matches/relations`
+  - `GET /statistics/summary/data-sources/{dataSourceCode}/vs/{vsDataSourceCode}/possible-matches/entities`
+  - `GET /statistics/summary/data-sources/{dataSourceCode}/vs/{vsDataSourceCode}/possible-matches/relations`
+  - `GET /statistics/summary/data-sources/{dataSourceCode}/vs/{vsDataSourceCode}/possible-relations/entities`
+  - `GET /statistics/summary/data-sources/{dataSourceCode}/vs/{vsDataSourceCode}/possible-relations/relations`
+  - `GET /statistics/summary/data-sources/{dataSourceCode}/vs/{vsDataSourceCode}/disclosed-relations/entities`
+  - `GET /statistics/summary/data-sources/{dataSourceCode}/vs/{vsDataSourceCode}/disclosed-relations/relations`
+  - `GET /statistics/loaded/data-sources/{dataSourceCode}/entities`
+- Added supporting classes and interfaces to `com.senzing.poc.model` package to support new endpoints
+- Added `SummaryStatsServices.java` to support new endpoints
+- Updated POC REST API Specification version to 3.5.2
+- Updated `BuildInfo.java` to reflect new specification version
+- Renamed `SzMatchType` to `SzRelationType` since it only dealt with types of relationships
+- Updated dependencies:
+  - Updated `senzing-commons` to version `3.2.0`
+  - Updated Jetty dependencies to version `9.4.54.v20240208`
+  - Updated Jackson dependencies to version `2.16.1`
+  - Updated `junit-jupiter` to version `5.10.2`
+  - Updated `icu4j` to version `74.2`
+  - Updated `sqs` to version `2.24.12`
+  - Updated `kafka-clients` to version `3.7.0`
+  - Updated SLF4J dependencies to version `2.0.12`
+  - Updated `org.glassfish/javax.annotation` to `jakarta.annotation-api` version `2.1.1`
+  - Updated Spring dependencies to version `5.3.32`
+  - Updated `maven-surefire-plugin` to version `3.2.5`
+  - Updated `maven-compiler-plugin` to version `3.12.1`
+  - Updated `maven-shade-plugin` to version `3.5.2`
+
 ## [3.5.1] - 2023-12-15
 
 ### Changed in 3.5.1

diff --git a/Dockerfile b/Dockerfile
@@ -11,7 +11,7 @@ ENV REFRESHED_AT=2023-11-14
 
 LABEL Name="senzing/senzing-poc-server-builder" \
       Maintainer="[email protected]" \
-      Version="3.5.1"
+      Version="3.5.2"
 
 # Set environment variables.
 
@@ -51,7 +51,7 @@ ENV REFRESHED_AT=2023-11-14
 
 LABEL Name="senzing/senzing-poc-server" \
       Maintainer="[email protected]" \
-      Version="3.5.1"
+      Version="3.5.2"
 
 HEALTHCHECK CMD ["/app/healthcheck.sh"]
 

diff --git a/data-mart-replicator b/data-mart-replicator
diff --git a/pom.xml b/pom.xml
@@ -4,29 +4,29 @@
   <groupId>com.senzing</groupId>
   <artifactId>senzing-poc-server</artifactId>
   <packaging>jar</packaging>
-  <version>3.5.1</version>
+  <version>3.5.2</version>
   <name>senzing-poc-server</name>
   <url>http://maven.apache.org</url>
   <dependencies>
     <dependency>
       <groupId>com.senzing</groupId>
-      <artifactId>senzing-api-server</artifactId>
-      <version>[3.5.9, 3.999.999]</version>
+      <artifactId>senzing-commons</artifactId>
+      <version>[3.2.0, 3.999.999]</version>
     </dependency>
     <dependency>
       <groupId>com.senzing</groupId>
-      <artifactId>senzing-commons</artifactId>
-      <version>[3.1.4, 3.999.999]</version>
+      <artifactId>senzing-api-server</artifactId>
+      <version>[3.5.10, 3.999.999]</version>
     </dependency>
     <dependency>
       <groupId>com.senzing</groupId>
       <artifactId>senzing-listener</artifactId>
-      <version>0.5.3</version>
+      <version>0.5.5</version>
     </dependency>
     <dependency>
       <groupId>com.senzing</groupId>
       <artifactId>data-mart-replicator</artifactId>
-      <version>1.0.0</version>
+      <version>1.1.0</version>
     </dependency>    
     <dependency>
      <groupId>org.xerial</groupId>
@@ -36,53 +36,53 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-server</artifactId>
-      <version>9.4.53.v20231009</version>
+      <version>9.4.54.v20240208</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-servlet</artifactId>
-      <version>9.4.53.v20231009</version>
+      <version>9.4.54.v20240208</version>
     </dependency>
     <!-- https://mvnrepository.com/artifact/org.eclipse.jetty/jetty-servlets -->
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-servlets</artifactId>
-      <version>9.4.53.v20231009</version>
+      <version>9.4.54.v20240208</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-rewrite</artifactId>
-      <version>9.4.53.v20231009</version>
+      <version>9.4.54.v20240208</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-proxy</artifactId>
-      <version>9.4.53.v20231009</version>
+      <version>9.4.54.v20240208</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
       <artifactId>websocket-server</artifactId>
-      <version>9.4.53.v20231009</version>
+      <version>9.4.54.v20240208</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
       <artifactId>websocket-common</artifactId>
-      <version>9.4.53.v20231009</version>
+      <version>9.4.54.v20240208</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
       <artifactId>websocket-servlet</artifactId>
-      <version>9.4.53.v20231009</version>
+      <version>9.4.54.v20240208</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
       <artifactId>javax-websocket-server-impl</artifactId>
-      <version>9.4.53.v20231009</version>
+      <version>9.4.54.v20240208</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
       <artifactId>websocket-api</artifactId>
-      <version>9.4.53.v20231009</version>
+      <version>9.4.54.v20240208</version>
     </dependency>
     <dependency>
       <groupId>org.glassfish.jersey.core</groupId>
@@ -133,27 +133,27 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
-      <version>2.15.3</version>
+      <version>2.16.1</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.15.3</version>
+      <version>2.16.1</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
-      <version>2.15.3</version>
+      <version>2.16.1</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.module</groupId>
       <artifactId>jackson-module-jaxb-annotations</artifactId>
-      <version>2.15.3</version>
+      <version>2.16.1</version>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter</artifactId>
-      <version>5.10.1</version>
+      <version>5.10.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -174,7 +174,7 @@
     <dependency>
       <groupId>com.ibm.icu</groupId>
       <artifactId>icu4j</artifactId>
-      <version>74.1</version>
+      <version>74.2</version>
     </dependency>
     <dependency>
       <groupId>org.ini4j</groupId>
@@ -184,22 +184,22 @@
     <dependency>
       <groupId>software.amazon.awssdk</groupId>
       <artifactId>sqs</artifactId>
-      <version>2.20.162</version>
+      <version>2.24.12</version>
     </dependency>
     <dependency>
       <groupId>com.rabbitmq</groupId>
       <artifactId>amqp-client</artifactId>
-      <version>5.18.0</version>
+      <version>5.20.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.kafka</groupId>
       <artifactId>kafka-clients</artifactId>
-      <version>3.6.0</version>
+      <version>3.7.0</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.datatype</groupId>
       <artifactId>jackson-datatype-joda</artifactId>
-      <version>2.15.2</version>
+      <version>2.16.1</version>
     </dependency>
 
     <!-- add dependencies that were present in JDK 8, but optional in JDK 11 -->
@@ -226,33 +226,33 @@
 
     <!-- dependencies needed for generated java client tests -->
     <dependency>
-      <groupId>org.glassfish</groupId>
-      <artifactId>javax.annotation</artifactId>
-      <version>3.1.1</version>
+      <groupId>jakarta.annotation</groupId>
+      <artifactId>jakarta.annotation-api</artifactId>
+      <version>2.1.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
-      <version>[5.3.25,5.9999.9999)</version>
+      <version>[5.3.32,5.9999.9999)</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
-      <version>[5.3.25,5.9999.9999)</version>
+      <version>[5.3.32,5.9999.9999)</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>[5.3.25,5.9999.9999)</version>
+      <version>[5.3.32,5.9999.9999)</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>io.swagger.core.v3</groupId>
       <artifactId>swagger-annotations</artifactId>
-      <version>2.2.15</version>
+      <version>2.2.20</version>
       <scope>test</scope>
     </dependency>
 </dependencies>
@@ -310,7 +310,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>3.1.2</version>
+        <version>3.2.5</version>
         <configuration>
           <jvm>${project.build.directory}/java-wrapper/bin/java-wrapper.bat</jvm>
           <systemPropertyVariables>
@@ -330,7 +330,13 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.11.0</version>
+        <version>3.12.1</version>
+        <configuration>
+          <compilerArgs>
+            <arg>-Xlint:unchecked</arg>
+            <arg>-Xlint:deprecation</arg>
+          </compilerArgs>
+        </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-resources-plugin</artifactId>
@@ -358,7 +364,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.4.1</version>
+        <version>3.5.2</version>
         <configuration>
           <createDependencyReducedPom>false</createDependencyReducedPom>
           <filters>

diff --git a/senzing-api-server b/senzing-api-server
Original file line number	Diff line number	Diff line change
Expand Up		@@ -72,3 +72,5 @@ target-v*

		# VS Code
		.vscode/
		eclipse-formatter.xml
+4 −0		.github/CODEOWNERS
+0 −38		.github/ISSUE_TEMPLATE/bug_report.md
+0 −26		.github/ISSUE_TEMPLATE/documentation_request.md
+0 −17		.github/ISSUE_TEMPLATE/feature_request.md
+9 −0		.github/dependabot.yml
+9 −0		.github/linters/.yaml-lint.yml
+16 −0		.github/workflows/add-labels-standardized.yaml
+13 −0		.github/workflows/add-to-project-app-server-dependabot.yaml
+18 −0		.github/workflows/add-to-project-app-server.yaml
+0 −22		.github/workflows/add-to-project-t-ast.yaml
+0 −23		.github/workflows/add-triage-label.yaml
+0 −35		.github/workflows/identify-customer.yaml
+17 −0		.github/workflows/lint-workflows.yaml
+14 −0		.github/workflows/move-pr-to-done-dependabot.yaml
+20 −0		CHANGELOG.md
+0 −13		PULL_REQUEST_TEMPLATE.md
+12 −0		README.md
+30 −24		pom.xml
+194 −0		src/main/java/com/senzing/datamart/handlers/CrossMatchKey.java
+222 −0		src/main/java/com/senzing/datamart/handlers/CrossRelationKey.java
+736 −463		src/main/java/com/senzing/datamart/handlers/EntityDelta.java
+129 −0		src/main/java/com/senzing/datamart/handlers/MatchPairKey.java
+64 −29		src/main/java/com/senzing/datamart/handlers/RefreshEntityHandler.java
+96 −0		src/main/java/com/senzing/datamart/handlers/RelationshipCounts.java
+194 −0		src/main/java/com/senzing/datamart/handlers/SourceRelationKey.java
+19 −19		src/main/java/com/senzing/datamart/handlers/SourceSummaryReportHandler.java
+14 −12		src/main/java/com/senzing/datamart/model/SzEntity.java
+1 −0		src/main/java/com/senzing/datamart/model/SzMatchType.java
+134 −56		src/main/java/com/senzing/datamart/model/SzRecord.java
+167 −0		src/main/java/com/senzing/datamart/model/SzRecordKey.java
+41 −3		src/main/java/com/senzing/datamart/model/SzRelatedEntity.java
+45 −16		src/main/java/com/senzing/datamart/model/SzRelationship.java
+215 −7		src/main/java/com/senzing/datamart/model/SzReportStatistic.java
+1 −63		src/main/java/com/senzing/datamart/model/SzResolvedEntity.java
+37 −2		src/main/java/com/senzing/datamart/schema/PostgreSQLSchemaBuilder.java
+37 −2		src/main/java/com/senzing/datamart/schema/SQLiteSchemaBuilder.java
+45 −0		verify-data-mart.sql
+3 −1		.github/CODEOWNERS
+0 −38		.github/ISSUE_TEMPLATE/bug_report.md
+0 −26		.github/ISSUE_TEMPLATE/documentation_request.md
+0 −17		.github/ISSUE_TEMPLATE/feature_request.md
+9 −0		.github/linters/.yaml-lint.yml
+0 −27		.github/workflows/add-dependabot-request-to-project-t-ast.yaml
+0 −24		.github/workflows/add-issue-to-project-t-ast.yaml
+16 −0		.github/workflows/add-labels-standardized.yaml
+13 −0		.github/workflows/add-to-project-app-server-dependabot.yaml
+19 −0		.github/workflows/add-to-project-app-server.yaml
+0 −21		.github/workflows/add-triage-label.yaml
+14 −7		.github/workflows/docker-build-container.yaml
+14 −7		.github/workflows/docker-push-containers-to-dockerhub.yaml
+0 −24		.github/workflows/identify-customer.yaml
+17 −0		.github/workflows/lint-workflows.yaml
+14 −0		.github/workflows/move-pr-to-done-dependabot.yaml
+1 −1		.gitmodules
+22 −0		CHANGELOG.md
+2 −2		Dockerfile
+0 −13		PULL_REQUEST_TEMPLATE.md
+58 −46		README.md
+1 −1		app-scripts/README.md
+6 −6		docs/development.md
+3 −3		docs/examples.md
+34 −34		pom.xml