Merge pull request #291 from mfvanek/feature/update-pgih-0.14.4

Update pg-index-health version
mfvanek · Dec 21, 2024 · dd234a8 · dd234a8
2 parents 0480b55 + 2906d26
commit dd234a8
Show file tree

Hide file tree

Showing 25 changed files with 54 additions and 54 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 
 allprojects {
     group = "io.github.mfvanek"
-    version = "0.14.3"
+    version = "0.14.4"
 
     repositories {
         mavenLocal()

diff --git a/buildSrc/src/main/kotlin/pg-index-health-demo.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/pg-index-health-demo.java-conventions.gradle.kts
@@ -22,22 +22,22 @@ configurations.configureEach {
 }
 
 dependencies {
-    implementation(platform("io.github.mfvanek:pg-index-health-bom:0.14.3"))
+    implementation(platform("io.github.mfvanek:pg-index-health-bom:0.14.4"))
     implementation(platform("org.testcontainers:testcontainers-bom:1.20.4"))
 
     implementation("com.google.code.findbugs:jsr305:3.0.2")
     implementation("org.postgresql:postgresql:42.7.4")
 
-    testImplementation(platform("org.junit:junit-bom:5.11.3"))
-    testImplementation(platform("org.assertj:assertj-bom:3.26.3"))
+    testImplementation(platform("org.junit:junit-bom:5.11.4"))
+    testImplementation(platform("org.assertj:assertj-bom:3.27.0"))
 
     errorprone("com.google.errorprone:error_prone_core:2.36.0")
     errorprone("jp.skypencil.errorprone.slf4j:errorprone-slf4j:0.1.28")
 
     spotbugsSlf4j("org.slf4j:slf4j-simple:2.0.16")
     spotbugsPlugins("jp.skypencil.findbugs.slf4j:bug-pattern:1.5.0")
     spotbugsPlugins("com.h3xstream.findsecbugs:findsecbugs-plugin:1.13.0")
-    spotbugsPlugins("com.mebigfatguy.sb-contrib:sb-contrib:7.6.8")
+    spotbugsPlugins("com.mebigfatguy.sb-contrib:sb-contrib:7.6.9")
 }
 
 tasks.withType<JavaCompile>().configureEach {

diff --git a/config/spotbugs/exclude.xml b/config/spotbugs/exclude.xml
@@ -9,11 +9,11 @@
     </Match>
     <Match>
         <Bug pattern="MDM_THREAD_YIELD"/>
-        <Class name="io.github.mfvanek.pg.index.health.demo.utils.StatisticsCollector"/>
+        <Class name="io.github.mfvanek.pg.index.health.demo.without.spring.utils.StatisticsCollector"/>
     </Match>
     <Match>
         <Bug pattern="SIL_SQL_IN_LOOP"/>
-        <Class name="io.github.mfvanek.pg.index.health.demo.utils.MigrationsGenerator"/>
+        <Class name="io.github.mfvanek.pg.index.health.demo.without.spring.utils.MigrationsGenerator"/>
     </Match>
     <Match>
         <Bug pattern="PRMC_POSSIBLY_REDUNDANT_METHOD_CALLS,SIL_SQL_IN_LOOP"/>

diff --git a/pg-index-health-demo-without-spring/build.gradle.kts b/pg-index-health-demo-without-spring/build.gradle.kts
@@ -18,7 +18,7 @@ dependencies {
     implementation("org.apache.commons:commons-dbcp2:2.13.0")
     implementation("org.testcontainers:testcontainers")
     implementation("org.testcontainers:postgresql")
-    implementation("ch.qos.logback:logback-classic:1.5.12")
+    implementation("ch.qos.logback:logback-classic:1.5.14")
 
     testImplementation("org.junit.jupiter:junit-jupiter-api")
     testImplementation("org.junit.jupiter:junit-jupiter-params")

diff --git a/...dex/health/demo/ConfigurationDemoApp.java → .../without/spring/ConfigurationDemoApp.java b/...dex/health/demo/ConfigurationDemoApp.java → .../without/spring/ConfigurationDemoApp.java
@@ -5,10 +5,10 @@
  * Licensed under the Apache License 2.0
  */
 
-package io.github.mfvanek.pg.index.health.demo;
+package io.github.mfvanek.pg.index.health.demo.without.spring;
 
-import io.github.mfvanek.pg.index.health.demo.utils.ConfigurationCollector;
-import io.github.mfvanek.pg.index.health.demo.utils.Consts;
+import io.github.mfvanek.pg.index.health.demo.without.spring.utils.ConfigurationCollector;
+import io.github.mfvanek.pg.index.health.demo.without.spring.utils.Consts;
 import io.github.mfvanek.pg.testing.PostgreSqlContainerWrapper;
 import lombok.SneakyThrows;
 import lombok.experimental.UtilityClass;

diff --git a/...mfvanek/pg/index/health/demo/DemoApp.java → ...x/health/demo/without/spring/DemoApp.java b/...mfvanek/pg/index/health/demo/DemoApp.java → ...x/health/demo/without/spring/DemoApp.java
@@ -5,17 +5,17 @@
  * Licensed under the Apache License 2.0
  */
 
-package io.github.mfvanek.pg.index.health.demo;
+package io.github.mfvanek.pg.index.health.demo.without.spring;
 
 import io.github.mfvanek.pg.connection.PrimaryHostDeterminerImpl;
 import io.github.mfvanek.pg.connection.factory.ConnectionCredentials;
 import io.github.mfvanek.pg.connection.factory.HighAvailabilityPgConnectionFactory;
 import io.github.mfvanek.pg.connection.factory.HighAvailabilityPgConnectionFactoryImpl;
 import io.github.mfvanek.pg.connection.factory.PgConnectionFactoryImpl;
-import io.github.mfvanek.pg.index.health.demo.utils.Consts;
-import io.github.mfvanek.pg.index.health.demo.utils.HealthDataCollector;
-import io.github.mfvanek.pg.index.health.demo.utils.MigrationRunner;
-import io.github.mfvanek.pg.index.health.demo.utils.MigrationsGenerator;
+import io.github.mfvanek.pg.index.health.demo.without.spring.utils.Consts;
+import io.github.mfvanek.pg.index.health.demo.without.spring.utils.HealthDataCollector;
+import io.github.mfvanek.pg.index.health.demo.without.spring.utils.MigrationRunner;
+import io.github.mfvanek.pg.index.health.demo.without.spring.utils.MigrationsGenerator;
 import io.github.mfvanek.pg.model.constraint.ForeignKey;
 import io.github.mfvanek.pg.testing.PostgreSqlContainerWrapper;
 import lombok.SneakyThrows;

diff --git a/.../index/health/demo/StatisticsDemoApp.java → ...emo/without/spring/StatisticsDemoApp.java b/.../index/health/demo/StatisticsDemoApp.java → ...emo/without/spring/StatisticsDemoApp.java
@@ -5,10 +5,10 @@
  * Licensed under the Apache License 2.0
  */
 
-package io.github.mfvanek.pg.index.health.demo;
+package io.github.mfvanek.pg.index.health.demo.without.spring;
 
-import io.github.mfvanek.pg.index.health.demo.utils.Consts;
-import io.github.mfvanek.pg.index.health.demo.utils.StatisticsCollector;
+import io.github.mfvanek.pg.index.health.demo.without.spring.utils.Consts;
+import io.github.mfvanek.pg.index.health.demo.without.spring.utils.StatisticsCollector;
 import io.github.mfvanek.pg.testing.PostgreSqlContainerWrapper;
 import lombok.SneakyThrows;
 import lombok.experimental.UtilityClass;

diff --git a/...th/demo/utils/ConfigurationCollector.java → .../spring/utils/ConfigurationCollector.java b/...th/demo/utils/ConfigurationCollector.java → .../spring/utils/ConfigurationCollector.java
@@ -5,7 +5,7 @@
  * Licensed under the Apache License 2.0
  */
 
-package io.github.mfvanek.pg.index.health.demo.utils;
+package io.github.mfvanek.pg.index.health.demo.without.spring.utils;
 
 import io.github.mfvanek.pg.connection.HighAvailabilityPgConnection;
 import io.github.mfvanek.pg.connection.HighAvailabilityPgConnectionImpl;

diff --git a/...ek/pg/index/health/demo/utils/Consts.java → ...lth/demo/without/spring/utils/Consts.java b/...ek/pg/index/health/demo/utils/Consts.java → ...lth/demo/without/spring/utils/Consts.java
@@ -5,7 +5,7 @@
  * Licensed under the Apache License 2.0
  */
 
-package io.github.mfvanek.pg.index.health.demo.utils;
+package io.github.mfvanek.pg.index.health.demo.without.spring.utils;
 
 import lombok.experimental.UtilityClass;
 

diff --git a/...ealth/demo/utils/HealthDataCollector.java → ...out/spring/utils/HealthDataCollector.java b/...ealth/demo/utils/HealthDataCollector.java → ...out/spring/utils/HealthDataCollector.java
@@ -5,7 +5,7 @@
  * Licensed under the Apache License 2.0
  */
 
-package io.github.mfvanek.pg.index.health.demo.utils;
+package io.github.mfvanek.pg.index.health.demo.without.spring.utils;
 
 import io.github.mfvanek.pg.connection.factory.ConnectionCredentials;
 import io.github.mfvanek.pg.connection.factory.HighAvailabilityPgConnectionFactory;

diff --git a/...ex/health/demo/utils/MigrationRunner.java → ...without/spring/utils/MigrationRunner.java b/...ex/health/demo/utils/MigrationRunner.java → ...without/spring/utils/MigrationRunner.java
@@ -5,7 +5,7 @@
  * Licensed under the Apache License 2.0
  */
 
-package io.github.mfvanek.pg.index.health.demo.utils;
+package io.github.mfvanek.pg.index.health.demo.without.spring.utils;
 
 import liquibase.Liquibase;
 import liquibase.Scope;

diff --git a/...ealth/demo/utils/MigrationsGenerator.java → ...out/spring/utils/MigrationsGenerator.java b/...ealth/demo/utils/MigrationsGenerator.java → ...out/spring/utils/MigrationsGenerator.java
@@ -5,7 +5,7 @@
  * Licensed under the Apache License 2.0
  */
 
-package io.github.mfvanek.pg.index.health.demo.utils;
+package io.github.mfvanek.pg.index.health.demo.without.spring.utils;
 
 import io.github.mfvanek.pg.connection.HighAvailabilityPgConnection;
 import io.github.mfvanek.pg.connection.factory.ConnectionCredentials;

diff --git a/...ealth/demo/utils/StatisticsCollector.java → ...out/spring/utils/StatisticsCollector.java b/...ealth/demo/utils/StatisticsCollector.java → ...out/spring/utils/StatisticsCollector.java
@@ -5,7 +5,7 @@
  * Licensed under the Apache License 2.0
  */
 
-package io.github.mfvanek.pg.index.health.demo.utils;
+package io.github.mfvanek.pg.index.health.demo.without.spring.utils;
 
 import io.github.mfvanek.pg.connection.HighAvailabilityPgConnection;
 import io.github.mfvanek.pg.connection.HighAvailabilityPgConnectionImpl;

diff --git a/...health/demo/ConfigurationDemoAppTest.java → ...hout/spring/ConfigurationDemoAppTest.java b/...health/demo/ConfigurationDemoAppTest.java → ...hout/spring/ConfigurationDemoAppTest.java
@@ -5,10 +5,10 @@
  * Licensed under the Apache License 2.0
  */
 
-package io.github.mfvanek.pg.index.health.demo;
+package io.github.mfvanek.pg.index.health.demo.without.spring;
 
-import io.github.mfvanek.pg.index.health.demo.support.LogsAwareTestBase;
-import io.github.mfvanek.pg.index.health.demo.utils.ConfigurationCollector;
+import io.github.mfvanek.pg.index.health.demo.without.spring.support.LogsAwareTestBase;
+import io.github.mfvanek.pg.index.health.demo.without.spring.utils.ConfigurationCollector;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 

diff --git a/...x/health/demo/IndexesMaintenanceTest.java → .../DatabaseStructureStaticAnalysisTest.java b/...x/health/demo/IndexesMaintenanceTest.java → .../DatabaseStructureStaticAnalysisTest.java
@@ -5,7 +5,7 @@
  * Licensed under the Apache License 2.0
  */
 
-package io.github.mfvanek.pg.index.health.demo;
+package io.github.mfvanek.pg.index.health.demo.without.spring;
 
 import io.github.mfvanek.pg.connection.PgConnection;
 import io.github.mfvanek.pg.connection.PgConnectionImpl;
@@ -33,7 +33,7 @@
 import io.github.mfvanek.pg.core.checks.host.TablesNotLinkedToOthersCheckOnHost;
 import io.github.mfvanek.pg.core.checks.host.TablesWithoutDescriptionCheckOnHost;
 import io.github.mfvanek.pg.core.checks.host.TablesWithoutPrimaryKeyCheckOnHost;
-import io.github.mfvanek.pg.index.health.demo.support.DatabaseAwareTestBase;
+import io.github.mfvanek.pg.index.health.demo.without.spring.support.DatabaseAwareTestBase;
 import io.github.mfvanek.pg.model.column.Column;
 import io.github.mfvanek.pg.model.column.ColumnWithSerialType;
 import io.github.mfvanek.pg.model.constraint.Constraint;
@@ -66,7 +66,7 @@
 import static org.assertj.core.api.InstanceOfAssertFactories.list;
 
 @SuppressWarnings({"checkstyle:ClassDataAbstractionCoupling", "checkstyle:ClassFanOutComplexity"})
-class IndexesMaintenanceTest extends DatabaseAwareTestBase {
+class DatabaseStructureStaticAnalysisTest extends DatabaseAwareTestBase {
 
     private static final int SKIPPED_CHECKS_COUNT = 4; // indexes with bloat, tables with bloat, unused indexes, tables with missing indexes
     private static final String BUYER_TABLE = "demo.buyer";
@@ -77,7 +77,7 @@ class IndexesMaintenanceTest extends DatabaseAwareTestBase {
     private final PgContext ctx = PgContext.of("demo");
     private final List<DatabaseCheckOnHost<? extends DbObject>> checks;
 
-    IndexesMaintenanceTest() {
+    DatabaseStructureStaticAnalysisTest() {
         final PgConnection pgConnection = PgConnectionImpl.of(getDataSource(), getHost());
         this.checks = List.of(
             new InvalidIndexesCheckOnHost(pgConnection),

diff --git a/...nek/pg/index/health/demo/DemoAppTest.java → ...alth/demo/without/spring/DemoAppTest.java b/...nek/pg/index/health/demo/DemoAppTest.java → ...alth/demo/without/spring/DemoAppTest.java
@@ -5,12 +5,12 @@
  * Licensed under the Apache License 2.0
  */
 
-package io.github.mfvanek.pg.index.health.demo;
+package io.github.mfvanek.pg.index.health.demo.without.spring;
 
 import io.github.mfvanek.pg.core.checks.common.Diagnostic;
-import io.github.mfvanek.pg.index.health.demo.support.LogsAwareTestBase;
-import io.github.mfvanek.pg.index.health.demo.utils.HealthDataCollector;
-import io.github.mfvanek.pg.index.health.demo.utils.MigrationRunner;
+import io.github.mfvanek.pg.index.health.demo.without.spring.support.LogsAwareTestBase;
+import io.github.mfvanek.pg.index.health.demo.without.spring.utils.HealthDataCollector;
+import io.github.mfvanek.pg.index.health.demo.without.spring.utils.MigrationRunner;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 

diff --git a/...vanek/pg/index/health/demo/JsonbTest.java → ...health/demo/without/spring/JsonbTest.java b/...vanek/pg/index/health/demo/JsonbTest.java → ...health/demo/without/spring/JsonbTest.java
@@ -5,9 +5,9 @@
  * Licensed under the Apache License 2.0
  */
 
-package io.github.mfvanek.pg.index.health.demo;
+package io.github.mfvanek.pg.index.health.demo.without.spring;
 
-import io.github.mfvanek.pg.index.health.demo.support.DatabaseAwareTestBase;
+import io.github.mfvanek.pg.index.health.demo.without.spring.support.DatabaseAwareTestBase;
 import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.Test;
 import org.postgresql.util.PGobject;

diff --git a/...ex/health/demo/StatisticsDemoAppTest.java → ...without/spring/StatisticsDemoAppTest.java b/...ex/health/demo/StatisticsDemoAppTest.java → ...without/spring/StatisticsDemoAppTest.java
@@ -5,10 +5,10 @@
  * Licensed under the Apache License 2.0
  */
 
-package io.github.mfvanek.pg.index.health.demo;
+package io.github.mfvanek.pg.index.health.demo.without.spring;
 
-import io.github.mfvanek.pg.index.health.demo.support.LogsAwareTestBase;
-import io.github.mfvanek.pg.index.health.demo.utils.StatisticsCollector;
+import io.github.mfvanek.pg.index.health.demo.without.spring.support.LogsAwareTestBase;
+import io.github.mfvanek.pg.index.health.demo.without.spring.utils.StatisticsCollector;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 

diff --git a/...h/demo/support/DatabaseAwareTestBase.java → ...spring/support/DatabaseAwareTestBase.java b/...h/demo/support/DatabaseAwareTestBase.java → ...spring/support/DatabaseAwareTestBase.java
@@ -5,7 +5,7 @@
  * Licensed under the Apache License 2.0
  */
 
-package io.github.mfvanek.pg.index.health.demo.support;
+package io.github.mfvanek.pg.index.health.demo.without.spring.support;
 
 import io.github.mfvanek.pg.connection.PrimaryHostDeterminerImpl;
 import io.github.mfvanek.pg.connection.factory.ConnectionCredentials;
@@ -14,8 +14,8 @@
 import io.github.mfvanek.pg.connection.factory.PgConnectionFactoryImpl;
 import io.github.mfvanek.pg.connection.host.PgHost;
 import io.github.mfvanek.pg.connection.host.PgHostImpl;
-import io.github.mfvanek.pg.index.health.demo.utils.Consts;
-import io.github.mfvanek.pg.index.health.demo.utils.MigrationRunner;
+import io.github.mfvanek.pg.index.health.demo.without.spring.utils.Consts;
+import io.github.mfvanek.pg.index.health.demo.without.spring.utils.MigrationRunner;
 import io.github.mfvanek.pg.testing.PostgreSqlContainerWrapper;
 import org.junit.jupiter.api.BeforeAll;
 

diff --git a/...ealth/demo/support/LogsAwareTestBase.java → ...out/spring/support/LogsAwareTestBase.java b/...ealth/demo/support/LogsAwareTestBase.java → ...out/spring/support/LogsAwareTestBase.java
@@ -5,7 +5,7 @@
  * Licensed under the Apache License 2.0
  */
 
-package io.github.mfvanek.pg.index.health.demo.support;
+package io.github.mfvanek.pg.index.health.demo.without.spring.support;
 
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.Logger;

diff --git a/...emo/utils/ConfigurationCollectorTest.java → ...ing/utils/ConfigurationCollectorTest.java b/...emo/utils/ConfigurationCollectorTest.java → ...ing/utils/ConfigurationCollectorTest.java
@@ -5,9 +5,9 @@
  * Licensed under the Apache License 2.0
  */
 
-package io.github.mfvanek.pg.index.health.demo.utils;
+package io.github.mfvanek.pg.index.health.demo.without.spring.utils;
 
-import io.github.mfvanek.pg.index.health.demo.support.DatabaseAwareTestBase;
+import io.github.mfvanek.pg.index.health.demo.without.spring.support.DatabaseAwareTestBase;
 import io.github.mfvanek.pg.model.settings.PgParamImpl;
 import org.junit.jupiter.api.Test;
 

diff --git a/...h/demo/utils/HealthDataCollectorTest.java → ...spring/utils/HealthDataCollectorTest.java b/...h/demo/utils/HealthDataCollectorTest.java → ...spring/utils/HealthDataCollectorTest.java
@@ -5,11 +5,11 @@
  * Licensed under the Apache License 2.0
  */
 
-package io.github.mfvanek.pg.index.health.demo.utils;
+package io.github.mfvanek.pg.index.health.demo.without.spring.utils;
 
 import io.github.mfvanek.pg.core.checks.common.Diagnostic;
 import io.github.mfvanek.pg.core.utils.ClockHolder;
-import io.github.mfvanek.pg.index.health.demo.support.DatabaseAwareTestBase;
+import io.github.mfvanek.pg.index.health.demo.without.spring.support.DatabaseAwareTestBase;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;

diff --git a/...h/demo/utils/MigrationsGeneratorTest.java → ...spring/utils/MigrationsGeneratorTest.java b/...h/demo/utils/MigrationsGeneratorTest.java → ...spring/utils/MigrationsGeneratorTest.java
@@ -5,9 +5,9 @@
  * Licensed under the Apache License 2.0
  */
 
-package io.github.mfvanek.pg.index.health.demo.utils;
+package io.github.mfvanek.pg.index.health.demo.without.spring.utils;
 
-import io.github.mfvanek.pg.index.health.demo.support.DatabaseAwareTestBase;
+import io.github.mfvanek.pg.index.health.demo.without.spring.support.DatabaseAwareTestBase;
 import io.github.mfvanek.pg.model.constraint.ForeignKey;
 import lombok.SneakyThrows;
 import org.junit.jupiter.api.AfterAll;

diff --git a/...h/demo/utils/StatisticsCollectorTest.java → ...spring/utils/StatisticsCollectorTest.java b/...h/demo/utils/StatisticsCollectorTest.java → ...spring/utils/StatisticsCollectorTest.java
@@ -5,10 +5,10 @@
  * Licensed under the Apache License 2.0
  */
 
-package io.github.mfvanek.pg.index.health.demo.utils;
+package io.github.mfvanek.pg.index.health.demo.without.spring.utils;
 
 import io.github.mfvanek.pg.core.utils.ClockHolder;
-import io.github.mfvanek.pg.index.health.demo.support.DatabaseAwareTestBase;
+import io.github.mfvanek.pg.index.health.demo.without.spring.support.DatabaseAwareTestBase;
 import org.junit.jupiter.api.Test;
 
 import java.time.Clock;

diff --git a/...x/health/demo/IndexesMaintenanceTest.java → .../DatabaseStructureStaticAnalysisTest.java b/...x/health/demo/IndexesMaintenanceTest.java → .../DatabaseStructureStaticAnalysisTest.java
@@ -38,7 +38,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.InstanceOfAssertFactories.list;
 
-class IndexesMaintenanceTest extends BasePgIndexHealthDemoSpringBootTest {
+class DatabaseStructureStaticAnalysisTest extends BasePgIndexHealthDemoSpringBootTest {
 
     private static final String BUYER_TABLE = "demo.buyer";
     private static final String ORDER_ITEM_TABLE = "demo.order_item";