Move healthcheck database table checker into microservices-framework

CJSCommonPlatform · Jun 16, 2022 · f767cb1 · f767cb1
1 parent 49944da
commit f767cb1
Show file tree

Hide file tree

Showing 17 changed files with 15 additions and 231 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,10 @@ on [Keep a CHANGELOG](http://keepachangelog.com/). This project adheres to
 
 ## [Unreleased]
 
+## [11.0.0-M19] - 2022-06-16
+### Changed
+- Moved healthcheck database table checker into microservices-framework
+
 ## [11.0.0-M18] - 2022-06-08
 ### Changed
 - Update framework.version to 11.0.0-M16

diff --git a/healthchecks/pom.xml b/healthchecks/pom.xml
@@ -58,16 +58,5 @@
             <artifactId>hamcrest-library</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>uk.gov.justice.services</groupId>
-            <artifactId>test-utils-framework-persistence</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>uk.gov.justice.event-store</groupId>
-            <artifactId>event-repository-liquibase</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>
diff --git a/...hecks/src/main/java/uk/gov/justice/services/healthcheck/database/DatabaseTableLister.java b/...hecks/src/main/java/uk/gov/justice/services/healthcheck/database/DatabaseTableLister.java
diff --git a/healthchecks/src/main/java/uk/gov/justice/services/healthcheck/database/TableChecker.java b/healthchecks/src/main/java/uk/gov/justice/services/healthcheck/database/TableChecker.java
diff --git a/...src/main/java/uk/gov/justice/services/healthcheck/healthchecks/EventStoreHealthcheck.java b/...src/main/java/uk/gov/justice/services/healthcheck/healthchecks/EventStoreHealthcheck.java
@@ -7,7 +7,7 @@
 import uk.gov.justice.services.eventsourcing.source.core.EventStoreDataSourceProvider;
 import uk.gov.justice.services.healthcheck.api.Healthcheck;
 import uk.gov.justice.services.healthcheck.api.HealthcheckResult;
-import uk.gov.justice.services.healthcheck.database.TableChecker;
+import uk.gov.justice.services.healthcheck.utils.database.TableChecker;
 
 import java.sql.SQLException;
 import java.util.List;

diff --git a/.../src/main/java/uk/gov/justice/services/healthcheck/healthchecks/FileStoreHealthcheck.java b/.../src/main/java/uk/gov/justice/services/healthcheck/healthchecks/FileStoreHealthcheck.java
@@ -8,7 +8,7 @@
 import uk.gov.justice.services.fileservice.repository.DataSourceProvider;
 import uk.gov.justice.services.healthcheck.api.Healthcheck;
 import uk.gov.justice.services.healthcheck.api.HealthcheckResult;
-import uk.gov.justice.services.healthcheck.database.TableChecker;
+import uk.gov.justice.services.healthcheck.utils.database.TableChecker;
 
 import java.sql.SQLException;
 import java.util.List;

diff --git a/...s/src/main/java/uk/gov/justice/services/healthcheck/healthchecks/JobStoreHealthcheck.java b/...s/src/main/java/uk/gov/justice/services/healthcheck/healthchecks/JobStoreHealthcheck.java
@@ -6,7 +6,7 @@
 
 import uk.gov.justice.services.healthcheck.api.Healthcheck;
 import uk.gov.justice.services.healthcheck.api.HealthcheckResult;
-import uk.gov.justice.services.healthcheck.database.TableChecker;
+import uk.gov.justice.services.healthcheck.utils.database.TableChecker;
 import uk.gov.moj.cpp.jobstore.persistence.JdbcJobStoreDataSourceProvider;
 
 import java.sql.SQLException;

diff --git a/...main/java/uk/gov/justice/services/healthcheck/healthchecks/SystemDatabaseHealthcheck.java b/...main/java/uk/gov/justice/services/healthcheck/healthchecks/SystemDatabaseHealthcheck.java
@@ -6,7 +6,7 @@
 
 import uk.gov.justice.services.healthcheck.api.Healthcheck;
 import uk.gov.justice.services.healthcheck.api.HealthcheckResult;
-import uk.gov.justice.services.healthcheck.database.TableChecker;
+import uk.gov.justice.services.healthcheck.utils.database.TableChecker;
 import uk.gov.justice.services.jdbc.persistence.SystemJdbcDataSourceProvider;
 
 import java.sql.SQLException;

diff --git a/.../src/main/java/uk/gov/justice/services/healthcheck/healthchecks/ViewStoreHealthcheck.java b/.../src/main/java/uk/gov/justice/services/healthcheck/healthchecks/ViewStoreHealthcheck.java
@@ -6,7 +6,7 @@
 
 import uk.gov.justice.services.healthcheck.api.Healthcheck;
 import uk.gov.justice.services.healthcheck.api.HealthcheckResult;
-import uk.gov.justice.services.healthcheck.database.TableChecker;
+import uk.gov.justice.services.healthcheck.utils.database.TableChecker;
 import uk.gov.justice.services.jdbc.persistence.ViewStoreJdbcDataSourceProvider;
 
 import java.sql.SQLException;

diff --git a/...cks/src/test/java/uk/gov/justice/services/healthcheck/database/DatabaseTableListerIT.java b/...cks/src/test/java/uk/gov/justice/services/healthcheck/database/DatabaseTableListerIT.java
diff --git a/...thchecks/src/test/java/uk/gov/justice/services/healthcheck/database/TableCheckerTest.java b/...thchecks/src/test/java/uk/gov/justice/services/healthcheck/database/TableCheckerTest.java
diff --git a/...test/java/uk/gov/justice/services/healthcheck/healthchecks/EventStoreHealthcheckTest.java b/...test/java/uk/gov/justice/services/healthcheck/healthchecks/EventStoreHealthcheckTest.java
@@ -10,7 +10,7 @@
 
 import uk.gov.justice.services.eventsourcing.source.core.EventStoreDataSourceProvider;
 import uk.gov.justice.services.healthcheck.api.HealthcheckResult;
-import uk.gov.justice.services.healthcheck.database.TableChecker;
+import uk.gov.justice.services.healthcheck.utils.database.TableChecker;
 
 import java.sql.SQLException;
 

diff --git a/.../test/java/uk/gov/justice/services/healthcheck/healthchecks/FileStoreHealthcheckTest.java b/.../test/java/uk/gov/justice/services/healthcheck/healthchecks/FileStoreHealthcheckTest.java
@@ -11,7 +11,7 @@
 import uk.gov.justice.services.fileservice.api.FileServiceException;
 import uk.gov.justice.services.fileservice.repository.DataSourceProvider;
 import uk.gov.justice.services.healthcheck.api.HealthcheckResult;
-import uk.gov.justice.services.healthcheck.database.TableChecker;
+import uk.gov.justice.services.healthcheck.utils.database.TableChecker;
 
 import javax.sql.DataSource;
 

diff --git a/...c/test/java/uk/gov/justice/services/healthcheck/healthchecks/JobStoreHealthcheckTest.java b/...c/test/java/uk/gov/justice/services/healthcheck/healthchecks/JobStoreHealthcheckTest.java
@@ -9,7 +9,7 @@
 import static uk.gov.justice.services.healthcheck.healthchecks.JobStoreHealthcheck.JOB_STORE_TABLE_NAMES;
 
 import uk.gov.justice.services.healthcheck.api.HealthcheckResult;
-import uk.gov.justice.services.healthcheck.database.TableChecker;
+import uk.gov.justice.services.healthcheck.utils.database.TableChecker;
 import uk.gov.moj.cpp.jobstore.persistence.JdbcJobStoreDataSourceProvider;
 
 import java.sql.SQLException;

diff --git a/.../java/uk/gov/justice/services/healthcheck/healthchecks/SystemDatabaseHealthcheckTest.java b/.../java/uk/gov/justice/services/healthcheck/healthchecks/SystemDatabaseHealthcheckTest.java
@@ -9,7 +9,7 @@
 import static uk.gov.justice.services.healthcheck.healthchecks.SystemDatabaseHealthcheck.SYSTEM_DATABASE_TABLE_NAMES;
 
 import uk.gov.justice.services.healthcheck.api.HealthcheckResult;
-import uk.gov.justice.services.healthcheck.database.TableChecker;
+import uk.gov.justice.services.healthcheck.utils.database.TableChecker;
 import uk.gov.justice.services.jdbc.persistence.SystemJdbcDataSourceProvider;
 
 import java.sql.SQLException;

diff --git a/.../test/java/uk/gov/justice/services/healthcheck/healthchecks/ViewStoreHealthcheckTest.java b/.../test/java/uk/gov/justice/services/healthcheck/healthchecks/ViewStoreHealthcheckTest.java
@@ -9,7 +9,7 @@
 import static uk.gov.justice.services.healthcheck.healthchecks.ViewStoreHealthcheck.VIEW_STORE_TABLE_NAMES;
 
 import uk.gov.justice.services.healthcheck.api.HealthcheckResult;
-import uk.gov.justice.services.healthcheck.database.TableChecker;
+import uk.gov.justice.services.healthcheck.utils.database.TableChecker;
 import uk.gov.justice.services.jdbc.persistence.ViewStoreJdbcDataSourceProvider;
 
 import java.sql.SQLException;

diff --git a/pom.xml b/pom.xml
@@ -39,7 +39,7 @@
 
     <properties>
         <cpp.repo.name>event-store</cpp.repo.name>
-        <framework.version>11.0.0-M16</framework.version>
+        <framework.version>11.0.0-M17</framework.version>
     </properties>
 
     <dependencyManagement>