diff --git a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/extractors/ColumnWithSerialTypeExtractor.java b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/extractors/ColumnWithSerialTypeExtractor.java index fea37325..dda7a0fa 100644 --- a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/extractors/ColumnWithSerialTypeExtractor.java +++ b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/extractors/ColumnWithSerialTypeExtractor.java @@ -11,10 +11,10 @@ package io.github.mfvanek.pg.checks.extractors; import io.github.mfvanek.pg.common.maintenance.ResultSetExtractor; -import io.github.mfvanek.pg.model.PgContext; import io.github.mfvanek.pg.model.column.Column; import io.github.mfvanek.pg.model.column.ColumnWithSerialType; import io.github.mfvanek.pg.model.column.SerialType; +import io.github.mfvanek.pg.model.context.PgContext; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/AbstractCheckOnHost.java b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/AbstractCheckOnHost.java index c9738a8a..b011aa45 100644 --- a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/AbstractCheckOnHost.java +++ b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/AbstractCheckOnHost.java @@ -17,8 +17,8 @@ import io.github.mfvanek.pg.common.maintenance.ResultSetExtractor; import io.github.mfvanek.pg.connection.PgConnection; import io.github.mfvanek.pg.connection.PgHost; -import io.github.mfvanek.pg.model.DbObject; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; +import io.github.mfvanek.pg.model.dbobject.DbObject; import io.github.mfvanek.pg.utils.SqlQueryReader; import java.sql.ResultSet; diff --git a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/BtreeIndexesOnArrayColumnsCheckOnHost.java b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/BtreeIndexesOnArrayColumnsCheckOnHost.java index 1bc94bd1..9ed1b103 100644 --- a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/BtreeIndexesOnArrayColumnsCheckOnHost.java +++ b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/BtreeIndexesOnArrayColumnsCheckOnHost.java @@ -13,7 +13,7 @@ import io.github.mfvanek.pg.checks.extractors.IndexWithSingleColumnExtractor; import io.github.mfvanek.pg.common.maintenance.Diagnostic; import io.github.mfvanek.pg.connection.PgConnection; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.index.IndexWithColumns; import java.util.List; diff --git a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/ColumnsWithJsonTypeCheckOnHost.java b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/ColumnsWithJsonTypeCheckOnHost.java index 52151c78..de6fe9ca 100644 --- a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/ColumnsWithJsonTypeCheckOnHost.java +++ b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/ColumnsWithJsonTypeCheckOnHost.java @@ -13,8 +13,8 @@ import io.github.mfvanek.pg.checks.extractors.ColumnExtractor; import io.github.mfvanek.pg.common.maintenance.Diagnostic; import io.github.mfvanek.pg.connection.PgConnection; -import io.github.mfvanek.pg.model.PgContext; import io.github.mfvanek.pg.model.column.Column; +import io.github.mfvanek.pg.model.context.PgContext; import java.util.List; import javax.annotation.Nonnull; diff --git a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/ColumnsWithSerialTypesCheckOnHost.java b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/ColumnsWithSerialTypesCheckOnHost.java index bda112c8..c13c4e0e 100644 --- a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/ColumnsWithSerialTypesCheckOnHost.java +++ b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/ColumnsWithSerialTypesCheckOnHost.java @@ -13,8 +13,8 @@ import io.github.mfvanek.pg.checks.extractors.ColumnWithSerialTypeExtractor; import io.github.mfvanek.pg.common.maintenance.Diagnostic; import io.github.mfvanek.pg.connection.PgConnection; -import io.github.mfvanek.pg.model.PgContext; import io.github.mfvanek.pg.model.column.ColumnWithSerialType; +import io.github.mfvanek.pg.model.context.PgContext; import java.util.List; import javax.annotation.Nonnull; diff --git a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/ColumnsWithoutDescriptionCheckOnHost.java b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/ColumnsWithoutDescriptionCheckOnHost.java index de99409f..0821fa07 100644 --- a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/ColumnsWithoutDescriptionCheckOnHost.java +++ b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/ColumnsWithoutDescriptionCheckOnHost.java @@ -13,8 +13,8 @@ import io.github.mfvanek.pg.checks.extractors.ColumnExtractor; import io.github.mfvanek.pg.common.maintenance.Diagnostic; import io.github.mfvanek.pg.connection.PgConnection; -import io.github.mfvanek.pg.model.PgContext; import io.github.mfvanek.pg.model.column.Column; +import io.github.mfvanek.pg.model.context.PgContext; import java.util.List; import javax.annotation.Nonnull; diff --git a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/DuplicatedForeignKeysCheckOnHost.java b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/DuplicatedForeignKeysCheckOnHost.java index 3231fe8f..123d53a0 100644 --- a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/DuplicatedForeignKeysCheckOnHost.java +++ b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/DuplicatedForeignKeysCheckOnHost.java @@ -13,8 +13,8 @@ import io.github.mfvanek.pg.checks.extractors.DuplicatedForeignKeysExtractor; import io.github.mfvanek.pg.common.maintenance.Diagnostic; import io.github.mfvanek.pg.connection.PgConnection; -import io.github.mfvanek.pg.model.PgContext; import io.github.mfvanek.pg.model.constraint.DuplicatedForeignKeys; +import io.github.mfvanek.pg.model.context.PgContext; import java.util.List; import javax.annotation.Nonnull; diff --git a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/DuplicatedIndexesCheckOnHost.java b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/DuplicatedIndexesCheckOnHost.java index 76b039ad..bd04e6e1 100644 --- a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/DuplicatedIndexesCheckOnHost.java +++ b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/DuplicatedIndexesCheckOnHost.java @@ -12,7 +12,7 @@ import io.github.mfvanek.pg.common.maintenance.Diagnostic; import io.github.mfvanek.pg.connection.PgConnection; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.index.DuplicatedIndexes; import java.util.List; diff --git a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/ForeignKeysNotCoveredWithIndexCheckOnHost.java b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/ForeignKeysNotCoveredWithIndexCheckOnHost.java index c34bb50b..b40aacc4 100644 --- a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/ForeignKeysNotCoveredWithIndexCheckOnHost.java +++ b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/ForeignKeysNotCoveredWithIndexCheckOnHost.java @@ -13,8 +13,8 @@ import io.github.mfvanek.pg.checks.extractors.ForeignKeyExtractor; import io.github.mfvanek.pg.common.maintenance.Diagnostic; import io.github.mfvanek.pg.connection.PgConnection; -import io.github.mfvanek.pg.model.PgContext; import io.github.mfvanek.pg.model.constraint.ForeignKey; +import io.github.mfvanek.pg.model.context.PgContext; import java.util.List; import javax.annotation.Nonnull; diff --git a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/ForeignKeysWithUnmatchedColumnTypeCheckOnHost.java b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/ForeignKeysWithUnmatchedColumnTypeCheckOnHost.java index 0ba16eb1..40b64165 100644 --- a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/ForeignKeysWithUnmatchedColumnTypeCheckOnHost.java +++ b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/ForeignKeysWithUnmatchedColumnTypeCheckOnHost.java @@ -13,8 +13,8 @@ import io.github.mfvanek.pg.checks.extractors.ForeignKeyExtractor; import io.github.mfvanek.pg.common.maintenance.Diagnostic; import io.github.mfvanek.pg.connection.PgConnection; -import io.github.mfvanek.pg.model.PgContext; import io.github.mfvanek.pg.model.constraint.ForeignKey; +import io.github.mfvanek.pg.model.context.PgContext; import java.util.List; import javax.annotation.Nonnull; diff --git a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/FunctionsWithoutDescriptionCheckOnHost.java b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/FunctionsWithoutDescriptionCheckOnHost.java index 41aaaafa..87caad23 100644 --- a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/FunctionsWithoutDescriptionCheckOnHost.java +++ b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/FunctionsWithoutDescriptionCheckOnHost.java @@ -12,7 +12,7 @@ import io.github.mfvanek.pg.common.maintenance.Diagnostic; import io.github.mfvanek.pg.connection.PgConnection; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.function.StoredFunction; import java.util.List; diff --git a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/IndexesWithBloatCheckOnHost.java b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/IndexesWithBloatCheckOnHost.java index 90442298..fae652aa 100644 --- a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/IndexesWithBloatCheckOnHost.java +++ b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/IndexesWithBloatCheckOnHost.java @@ -12,7 +12,7 @@ import io.github.mfvanek.pg.common.maintenance.Diagnostic; import io.github.mfvanek.pg.connection.PgConnection; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.index.IndexWithBloat; import java.util.List; diff --git a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/IndexesWithBooleanCheckOnHost.java b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/IndexesWithBooleanCheckOnHost.java index f6494995..58b063f8 100644 --- a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/IndexesWithBooleanCheckOnHost.java +++ b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/IndexesWithBooleanCheckOnHost.java @@ -13,7 +13,7 @@ import io.github.mfvanek.pg.checks.extractors.IndexWithSingleColumnExtractor; import io.github.mfvanek.pg.common.maintenance.Diagnostic; import io.github.mfvanek.pg.connection.PgConnection; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.index.IndexWithColumns; import java.util.List; diff --git a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/IndexesWithNullValuesCheckOnHost.java b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/IndexesWithNullValuesCheckOnHost.java index cc262d92..8c0efea8 100644 --- a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/IndexesWithNullValuesCheckOnHost.java +++ b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/IndexesWithNullValuesCheckOnHost.java @@ -12,7 +12,7 @@ import io.github.mfvanek.pg.common.maintenance.Diagnostic; import io.github.mfvanek.pg.connection.PgConnection; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.index.IndexWithNulls; import java.util.List; diff --git a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/IntersectedForeignKeysCheckOnHost.java b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/IntersectedForeignKeysCheckOnHost.java index 1b86b66b..b5888707 100644 --- a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/IntersectedForeignKeysCheckOnHost.java +++ b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/IntersectedForeignKeysCheckOnHost.java @@ -13,8 +13,8 @@ import io.github.mfvanek.pg.checks.extractors.DuplicatedForeignKeysExtractor; import io.github.mfvanek.pg.common.maintenance.Diagnostic; import io.github.mfvanek.pg.connection.PgConnection; -import io.github.mfvanek.pg.model.PgContext; import io.github.mfvanek.pg.model.constraint.DuplicatedForeignKeys; +import io.github.mfvanek.pg.model.context.PgContext; import java.util.List; import javax.annotation.Nonnull; diff --git a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/IntersectedIndexesCheckOnHost.java b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/IntersectedIndexesCheckOnHost.java index 2ea1e6ce..1345a8b4 100644 --- a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/IntersectedIndexesCheckOnHost.java +++ b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/IntersectedIndexesCheckOnHost.java @@ -12,7 +12,7 @@ import io.github.mfvanek.pg.common.maintenance.Diagnostic; import io.github.mfvanek.pg.connection.PgConnection; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.index.DuplicatedIndexes; import java.util.List; diff --git a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/InvalidIndexesCheckOnHost.java b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/InvalidIndexesCheckOnHost.java index 5790cb59..21961d24 100644 --- a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/InvalidIndexesCheckOnHost.java +++ b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/InvalidIndexesCheckOnHost.java @@ -12,7 +12,7 @@ import io.github.mfvanek.pg.common.maintenance.Diagnostic; import io.github.mfvanek.pg.connection.PgConnection; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.index.Index; import java.util.List; diff --git a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/NotValidConstraintsCheckOnHost.java b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/NotValidConstraintsCheckOnHost.java index 5b4b874f..514a8a33 100644 --- a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/NotValidConstraintsCheckOnHost.java +++ b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/NotValidConstraintsCheckOnHost.java @@ -12,9 +12,9 @@ import io.github.mfvanek.pg.common.maintenance.Diagnostic; import io.github.mfvanek.pg.connection.PgConnection; -import io.github.mfvanek.pg.model.PgContext; import io.github.mfvanek.pg.model.constraint.Constraint; import io.github.mfvanek.pg.model.constraint.ConstraintType; +import io.github.mfvanek.pg.model.context.PgContext; import java.util.List; import javax.annotation.Nonnull; diff --git a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/PossibleObjectNameOverflowCheckOnHost.java b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/PossibleObjectNameOverflowCheckOnHost.java index b5fa23c2..48905534 100644 --- a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/PossibleObjectNameOverflowCheckOnHost.java +++ b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/PossibleObjectNameOverflowCheckOnHost.java @@ -12,8 +12,8 @@ import io.github.mfvanek.pg.common.maintenance.Diagnostic; import io.github.mfvanek.pg.connection.PgConnection; -import io.github.mfvanek.pg.model.PgContext; -import io.github.mfvanek.pg.model.object.AnyObject; +import io.github.mfvanek.pg.model.context.PgContext; +import io.github.mfvanek.pg.model.dbobject.AnyObject; import java.util.List; import javax.annotation.Nonnull; diff --git a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/PrimaryKeysWithSerialTypesCheckOnHost.java b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/PrimaryKeysWithSerialTypesCheckOnHost.java index fafa155a..b4930993 100644 --- a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/PrimaryKeysWithSerialTypesCheckOnHost.java +++ b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/PrimaryKeysWithSerialTypesCheckOnHost.java @@ -13,8 +13,8 @@ import io.github.mfvanek.pg.checks.extractors.ColumnWithSerialTypeExtractor; import io.github.mfvanek.pg.common.maintenance.Diagnostic; import io.github.mfvanek.pg.connection.PgConnection; -import io.github.mfvanek.pg.model.PgContext; import io.github.mfvanek.pg.model.column.ColumnWithSerialType; +import io.github.mfvanek.pg.model.context.PgContext; import java.util.List; import javax.annotation.Nonnull; diff --git a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/SequenceOverflowCheckOnHost.java b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/SequenceOverflowCheckOnHost.java index 08288a53..2edf9a1a 100644 --- a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/SequenceOverflowCheckOnHost.java +++ b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/SequenceOverflowCheckOnHost.java @@ -12,7 +12,7 @@ import io.github.mfvanek.pg.common.maintenance.Diagnostic; import io.github.mfvanek.pg.connection.PgConnection; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.sequence.SequenceState; import java.util.List; diff --git a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/TablesNotLinkedToOthersCheckOnHost.java b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/TablesNotLinkedToOthersCheckOnHost.java index 42c8a965..b8ac1659 100644 --- a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/TablesNotLinkedToOthersCheckOnHost.java +++ b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/TablesNotLinkedToOthersCheckOnHost.java @@ -13,7 +13,7 @@ import io.github.mfvanek.pg.checks.extractors.TableExtractor; import io.github.mfvanek.pg.common.maintenance.Diagnostic; import io.github.mfvanek.pg.connection.PgConnection; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.table.Table; import java.util.List; diff --git a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/TablesWithBloatCheckOnHost.java b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/TablesWithBloatCheckOnHost.java index 6f528b5b..87cfc27f 100644 --- a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/TablesWithBloatCheckOnHost.java +++ b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/TablesWithBloatCheckOnHost.java @@ -12,7 +12,7 @@ import io.github.mfvanek.pg.common.maintenance.Diagnostic; import io.github.mfvanek.pg.connection.PgConnection; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.table.TableWithBloat; import java.util.List; diff --git a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/TablesWithMissingIndexesCheckOnHost.java b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/TablesWithMissingIndexesCheckOnHost.java index 1eb64e5e..ca5734f2 100644 --- a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/TablesWithMissingIndexesCheckOnHost.java +++ b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/TablesWithMissingIndexesCheckOnHost.java @@ -12,7 +12,7 @@ import io.github.mfvanek.pg.common.maintenance.Diagnostic; import io.github.mfvanek.pg.connection.PgConnection; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.table.TableWithMissingIndex; import java.util.List; diff --git a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/TablesWithoutDescriptionCheckOnHost.java b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/TablesWithoutDescriptionCheckOnHost.java index 31f6070b..ddbb11aa 100644 --- a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/TablesWithoutDescriptionCheckOnHost.java +++ b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/TablesWithoutDescriptionCheckOnHost.java @@ -13,7 +13,7 @@ import io.github.mfvanek.pg.checks.extractors.TableExtractor; import io.github.mfvanek.pg.common.maintenance.Diagnostic; import io.github.mfvanek.pg.connection.PgConnection; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.table.Table; import java.util.List; diff --git a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/TablesWithoutPrimaryKeyCheckOnHost.java b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/TablesWithoutPrimaryKeyCheckOnHost.java index 842b0319..c64dc63b 100644 --- a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/TablesWithoutPrimaryKeyCheckOnHost.java +++ b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/TablesWithoutPrimaryKeyCheckOnHost.java @@ -13,7 +13,7 @@ import io.github.mfvanek.pg.checks.extractors.TableExtractor; import io.github.mfvanek.pg.common.maintenance.Diagnostic; import io.github.mfvanek.pg.connection.PgConnection; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.table.Table; import java.util.List; diff --git a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/UnusedIndexesCheckOnHost.java b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/UnusedIndexesCheckOnHost.java index 43448432..25bcfb6f 100644 --- a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/UnusedIndexesCheckOnHost.java +++ b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/checks/host/UnusedIndexesCheckOnHost.java @@ -12,7 +12,7 @@ import io.github.mfvanek.pg.common.maintenance.Diagnostic; import io.github.mfvanek.pg.connection.PgConnection; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.index.UnusedIndex; import java.util.List; diff --git a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/common/maintenance/DatabaseCheckOnHost.java b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/common/maintenance/DatabaseCheckOnHost.java index fb41ad67..5f6ee277 100644 --- a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/common/maintenance/DatabaseCheckOnHost.java +++ b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/common/maintenance/DatabaseCheckOnHost.java @@ -11,8 +11,8 @@ package io.github.mfvanek.pg.common.maintenance; import io.github.mfvanek.pg.connection.HostAware; -import io.github.mfvanek.pg.model.DbObject; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; +import io.github.mfvanek.pg.model.dbobject.DbObject; import java.util.List; import java.util.function.Predicate; diff --git a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/common/maintenance/QueryExecutor.java b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/common/maintenance/QueryExecutor.java index fc85a96c..80d6a9e4 100644 --- a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/common/maintenance/QueryExecutor.java +++ b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/common/maintenance/QueryExecutor.java @@ -11,8 +11,8 @@ package io.github.mfvanek.pg.common.maintenance; import io.github.mfvanek.pg.connection.PgConnection; -import io.github.mfvanek.pg.model.DbObject; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; +import io.github.mfvanek.pg.model.dbobject.DbObject; import java.sql.ResultSet; import java.util.List; diff --git a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/common/maintenance/RawTypeAware.java b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/common/maintenance/RawTypeAware.java index ae387def..030c62a3 100644 --- a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/common/maintenance/RawTypeAware.java +++ b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/common/maintenance/RawTypeAware.java @@ -10,7 +10,7 @@ package io.github.mfvanek.pg.common.maintenance; -import io.github.mfvanek.pg.model.DbObject; +import io.github.mfvanek.pg.model.dbobject.DbObject; import javax.annotation.Nonnull; diff --git a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/utils/QueryExecutors.java b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/utils/QueryExecutors.java index 1f5be523..7737c4ec 100644 --- a/pg-index-health-core/src/main/java/io/github/mfvanek/pg/utils/QueryExecutors.java +++ b/pg-index-health-core/src/main/java/io/github/mfvanek/pg/utils/QueryExecutors.java @@ -13,7 +13,7 @@ import io.github.mfvanek.pg.common.maintenance.ResultSetExtractor; import io.github.mfvanek.pg.connection.PgConnection; import io.github.mfvanek.pg.connection.PgSqlException; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/AbstractCheckOnHostTest.java b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/AbstractCheckOnHostTest.java index 60d46ce6..679443b7 100644 --- a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/AbstractCheckOnHostTest.java +++ b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/AbstractCheckOnHostTest.java @@ -11,7 +11,7 @@ package io.github.mfvanek.pg.checks.host; import io.github.mfvanek.pg.connection.PgSqlException; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.index.IndexWithNulls; import io.github.mfvanek.pg.support.DatabaseAwareTestBase; import org.junit.jupiter.params.ParameterizedTest; diff --git a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/BtreeIndexesOnArrayColumnsCheckOnHostTest.java b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/BtreeIndexesOnArrayColumnsCheckOnHostTest.java index 5a3489ae..1b1d78da 100644 --- a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/BtreeIndexesOnArrayColumnsCheckOnHostTest.java +++ b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/BtreeIndexesOnArrayColumnsCheckOnHostTest.java @@ -12,8 +12,8 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnHost; import io.github.mfvanek.pg.common.maintenance.Diagnostic; -import io.github.mfvanek.pg.model.PgContext; import io.github.mfvanek.pg.model.column.Column; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.index.IndexWithColumns; import io.github.mfvanek.pg.model.predicates.SkipTablesByNamePredicate; import io.github.mfvanek.pg.support.DatabaseAwareTestBase; diff --git a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/ColumnsWithJsonTypeCheckOnHostTest.java b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/ColumnsWithJsonTypeCheckOnHostTest.java index 1bb9bb97..69dfd5c2 100644 --- a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/ColumnsWithJsonTypeCheckOnHostTest.java +++ b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/ColumnsWithJsonTypeCheckOnHostTest.java @@ -12,8 +12,8 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnHost; import io.github.mfvanek.pg.common.maintenance.Diagnostic; -import io.github.mfvanek.pg.model.PgContext; import io.github.mfvanek.pg.model.column.Column; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.predicates.SkipTablesByNamePredicate; import io.github.mfvanek.pg.support.DatabaseAwareTestBase; import org.junit.jupiter.api.Test; diff --git a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/ColumnsWithSerialTypesCheckOnHostTest.java b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/ColumnsWithSerialTypesCheckOnHostTest.java index 706db5aa..6b2cac9d 100644 --- a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/ColumnsWithSerialTypesCheckOnHostTest.java +++ b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/ColumnsWithSerialTypesCheckOnHostTest.java @@ -12,9 +12,9 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnHost; import io.github.mfvanek.pg.common.maintenance.Diagnostic; -import io.github.mfvanek.pg.model.PgContext; import io.github.mfvanek.pg.model.column.Column; import io.github.mfvanek.pg.model.column.ColumnWithSerialType; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.predicates.SkipBySequenceNamePredicate; import io.github.mfvanek.pg.model.predicates.SkipTablesByNamePredicate; import io.github.mfvanek.pg.support.DatabaseAwareTestBase; diff --git a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/ColumnsWithoutDescriptionCheckOnHostTest.java b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/ColumnsWithoutDescriptionCheckOnHostTest.java index 83517157..ebb34696 100644 --- a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/ColumnsWithoutDescriptionCheckOnHostTest.java +++ b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/ColumnsWithoutDescriptionCheckOnHostTest.java @@ -12,8 +12,8 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnHost; import io.github.mfvanek.pg.common.maintenance.Diagnostic; -import io.github.mfvanek.pg.model.PgContext; import io.github.mfvanek.pg.model.column.Column; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.predicates.SkipTablesByNamePredicate; import io.github.mfvanek.pg.support.DatabaseAwareTestBase; import io.github.mfvanek.pg.support.DatabasePopulator; diff --git a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/DuplicatedForeignKeysCheckOnHostTest.java b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/DuplicatedForeignKeysCheckOnHostTest.java index 2fc4ee64..3e7d2f71 100644 --- a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/DuplicatedForeignKeysCheckOnHostTest.java +++ b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/DuplicatedForeignKeysCheckOnHostTest.java @@ -12,10 +12,10 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnHost; import io.github.mfvanek.pg.common.maintenance.Diagnostic; -import io.github.mfvanek.pg.model.PgContext; import io.github.mfvanek.pg.model.column.Column; import io.github.mfvanek.pg.model.constraint.DuplicatedForeignKeys; import io.github.mfvanek.pg.model.constraint.ForeignKey; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.predicates.SkipTablesByNamePredicate; import io.github.mfvanek.pg.support.DatabaseAwareTestBase; import org.junit.jupiter.api.Test; diff --git a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/DuplicatedIndexesCheckOnHostTest.java b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/DuplicatedIndexesCheckOnHostTest.java index dedd0445..732dfeb5 100644 --- a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/DuplicatedIndexesCheckOnHostTest.java +++ b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/DuplicatedIndexesCheckOnHostTest.java @@ -12,7 +12,7 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnHost; import io.github.mfvanek.pg.common.maintenance.Diagnostic; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.index.DuplicatedIndexes; import io.github.mfvanek.pg.model.index.IndexWithSize; import io.github.mfvanek.pg.model.predicates.SkipIndexesByNamePredicate; diff --git a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/ForeignKeysNotCoveredWithIndexCheckOnHostTest.java b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/ForeignKeysNotCoveredWithIndexCheckOnHostTest.java index b3fdf93b..74f9e042 100644 --- a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/ForeignKeysNotCoveredWithIndexCheckOnHostTest.java +++ b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/ForeignKeysNotCoveredWithIndexCheckOnHostTest.java @@ -12,9 +12,9 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnHost; import io.github.mfvanek.pg.common.maintenance.Diagnostic; -import io.github.mfvanek.pg.model.PgContext; import io.github.mfvanek.pg.model.column.Column; import io.github.mfvanek.pg.model.constraint.ForeignKey; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.predicates.SkipTablesByNamePredicate; import io.github.mfvanek.pg.support.DatabaseAwareTestBase; import org.junit.jupiter.api.Test; diff --git a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/ForeignKeysWithUnmatchedColumnTypeCheckOnHostTest.java b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/ForeignKeysWithUnmatchedColumnTypeCheckOnHostTest.java index 8cc036da..8916fe6f 100644 --- a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/ForeignKeysWithUnmatchedColumnTypeCheckOnHostTest.java +++ b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/ForeignKeysWithUnmatchedColumnTypeCheckOnHostTest.java @@ -12,9 +12,9 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnHost; import io.github.mfvanek.pg.common.maintenance.Diagnostic; -import io.github.mfvanek.pg.model.PgContext; import io.github.mfvanek.pg.model.column.Column; import io.github.mfvanek.pg.model.constraint.ForeignKey; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.predicates.SkipTablesByNamePredicate; import io.github.mfvanek.pg.support.DatabaseAwareTestBase; import org.junit.jupiter.api.Test; diff --git a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/FunctionsWithoutDescriptionCheckOnHostTest.java b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/FunctionsWithoutDescriptionCheckOnHostTest.java index 9586effa..8c03e327 100644 --- a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/FunctionsWithoutDescriptionCheckOnHostTest.java +++ b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/FunctionsWithoutDescriptionCheckOnHostTest.java @@ -12,7 +12,7 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnHost; import io.github.mfvanek.pg.common.maintenance.Diagnostic; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.function.StoredFunction; import io.github.mfvanek.pg.model.predicates.SkipDbObjectsByNamePredicate; import io.github.mfvanek.pg.support.DatabaseAwareTestBase; diff --git a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/IndexesWithBloatCheckOnHostTest.java b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/IndexesWithBloatCheckOnHostTest.java index 77fee322..5cd350e1 100644 --- a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/IndexesWithBloatCheckOnHostTest.java +++ b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/IndexesWithBloatCheckOnHostTest.java @@ -12,7 +12,7 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnHost; import io.github.mfvanek.pg.common.maintenance.Diagnostic; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.index.IndexWithBloat; import io.github.mfvanek.pg.model.predicates.SkipBloatUnderThresholdPredicate; import io.github.mfvanek.pg.model.predicates.SkipIndexesByNamePredicate; diff --git a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/IndexesWithBooleanCheckOnHostTest.java b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/IndexesWithBooleanCheckOnHostTest.java index ba3d5280..73e79015 100644 --- a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/IndexesWithBooleanCheckOnHostTest.java +++ b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/IndexesWithBooleanCheckOnHostTest.java @@ -12,8 +12,8 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnHost; import io.github.mfvanek.pg.common.maintenance.Diagnostic; -import io.github.mfvanek.pg.model.PgContext; import io.github.mfvanek.pg.model.column.Column; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.index.IndexWithColumns; import io.github.mfvanek.pg.model.predicates.SkipIndexesByNamePredicate; import io.github.mfvanek.pg.model.predicates.SkipTablesByNamePredicate; diff --git a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/IndexesWithNullValuesCheckOnHostTest.java b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/IndexesWithNullValuesCheckOnHostTest.java index c4630a08..9e5ac04a 100644 --- a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/IndexesWithNullValuesCheckOnHostTest.java +++ b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/IndexesWithNullValuesCheckOnHostTest.java @@ -12,7 +12,7 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnHost; import io.github.mfvanek.pg.common.maintenance.Diagnostic; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.index.IndexWithNulls; import io.github.mfvanek.pg.model.predicates.SkipIndexesByNamePredicate; import io.github.mfvanek.pg.model.predicates.SkipTablesByNamePredicate; diff --git a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/IntersectedForeignKeysCheckOnHostTest.java b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/IntersectedForeignKeysCheckOnHostTest.java index ae7a1758..9700fa31 100644 --- a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/IntersectedForeignKeysCheckOnHostTest.java +++ b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/IntersectedForeignKeysCheckOnHostTest.java @@ -12,10 +12,10 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnHost; import io.github.mfvanek.pg.common.maintenance.Diagnostic; -import io.github.mfvanek.pg.model.PgContext; import io.github.mfvanek.pg.model.column.Column; import io.github.mfvanek.pg.model.constraint.DuplicatedForeignKeys; import io.github.mfvanek.pg.model.constraint.ForeignKey; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.predicates.SkipTablesByNamePredicate; import io.github.mfvanek.pg.support.DatabaseAwareTestBase; import org.junit.jupiter.api.Test; diff --git a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/IntersectedIndexesCheckOnHostTest.java b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/IntersectedIndexesCheckOnHostTest.java index 755c5dc0..d3adf4d8 100644 --- a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/IntersectedIndexesCheckOnHostTest.java +++ b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/IntersectedIndexesCheckOnHostTest.java @@ -12,7 +12,7 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnHost; import io.github.mfvanek.pg.common.maintenance.Diagnostic; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.index.DuplicatedIndexes; import io.github.mfvanek.pg.model.index.IndexWithSize; import io.github.mfvanek.pg.model.predicates.SkipIndexesByNamePredicate; diff --git a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/InvalidIndexesCheckOnHostTest.java b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/InvalidIndexesCheckOnHostTest.java index 870ed907..93bc7876 100644 --- a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/InvalidIndexesCheckOnHostTest.java +++ b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/InvalidIndexesCheckOnHostTest.java @@ -12,7 +12,7 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnHost; import io.github.mfvanek.pg.common.maintenance.Diagnostic; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.index.Index; import io.github.mfvanek.pg.model.predicates.SkipIndexesByNamePredicate; import io.github.mfvanek.pg.model.predicates.SkipTablesByNamePredicate; diff --git a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/NotValidConstraintsCheckOnHostTest.java b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/NotValidConstraintsCheckOnHostTest.java index fa5367aa..617e3a91 100644 --- a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/NotValidConstraintsCheckOnHostTest.java +++ b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/NotValidConstraintsCheckOnHostTest.java @@ -12,9 +12,9 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnHost; import io.github.mfvanek.pg.common.maintenance.Diagnostic; -import io.github.mfvanek.pg.model.PgContext; import io.github.mfvanek.pg.model.constraint.Constraint; import io.github.mfvanek.pg.model.constraint.ConstraintType; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.predicates.SkipTablesByNamePredicate; import io.github.mfvanek.pg.support.DatabaseAwareTestBase; import io.github.mfvanek.pg.support.ExecuteUtils; diff --git a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/PossibleObjectNameOverflowCheckOnHostTest.java b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/PossibleObjectNameOverflowCheckOnHostTest.java index 997b367e..239cf658 100644 --- a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/PossibleObjectNameOverflowCheckOnHostTest.java +++ b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/PossibleObjectNameOverflowCheckOnHostTest.java @@ -12,9 +12,9 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnHost; import io.github.mfvanek.pg.common.maintenance.Diagnostic; -import io.github.mfvanek.pg.model.PgContext; -import io.github.mfvanek.pg.model.object.AnyObject; -import io.github.mfvanek.pg.model.object.PgObjectType; +import io.github.mfvanek.pg.model.context.PgContext; +import io.github.mfvanek.pg.model.dbobject.AnyObject; +import io.github.mfvanek.pg.model.dbobject.PgObjectType; import io.github.mfvanek.pg.model.predicates.SkipDbObjectsByNamePredicate; import io.github.mfvanek.pg.support.DatabaseAwareTestBase; import org.junit.jupiter.api.Test; diff --git a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/PrimaryKeysWithSerialTypesCheckOnHostTest.java b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/PrimaryKeysWithSerialTypesCheckOnHostTest.java index 6180f5fd..7b8445f6 100644 --- a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/PrimaryKeysWithSerialTypesCheckOnHostTest.java +++ b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/PrimaryKeysWithSerialTypesCheckOnHostTest.java @@ -12,10 +12,10 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnHost; import io.github.mfvanek.pg.common.maintenance.Diagnostic; -import io.github.mfvanek.pg.model.PgContext; import io.github.mfvanek.pg.model.column.Column; import io.github.mfvanek.pg.model.column.ColumnWithSerialType; import io.github.mfvanek.pg.model.column.SerialType; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.predicates.SkipBySequenceNamePredicate; import io.github.mfvanek.pg.model.predicates.SkipTablesByNamePredicate; import io.github.mfvanek.pg.support.DatabaseAwareTestBase; diff --git a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/SequenceOverflowCheckOnHostTest.java b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/SequenceOverflowCheckOnHostTest.java index 5a9f5042..ed81aba9 100644 --- a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/SequenceOverflowCheckOnHostTest.java +++ b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/SequenceOverflowCheckOnHostTest.java @@ -12,7 +12,7 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnHost; import io.github.mfvanek.pg.common.maintenance.Diagnostic; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.predicates.SkipBySequenceNamePredicate; import io.github.mfvanek.pg.model.sequence.SequenceState; import io.github.mfvanek.pg.support.DatabaseAwareTestBase; diff --git a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/TablesNotLinkedToOthersCheckOnHostTest.java b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/TablesNotLinkedToOthersCheckOnHostTest.java index 452d16b8..5ad98ca3 100644 --- a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/TablesNotLinkedToOthersCheckOnHostTest.java +++ b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/TablesNotLinkedToOthersCheckOnHostTest.java @@ -12,7 +12,7 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnHost; import io.github.mfvanek.pg.common.maintenance.Diagnostic; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.predicates.SkipTablesByNamePredicate; import io.github.mfvanek.pg.model.table.Table; import io.github.mfvanek.pg.support.DatabaseAwareTestBase; diff --git a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/TablesWithBloatCheckOnHostTest.java b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/TablesWithBloatCheckOnHostTest.java index 43d27837..5be0d885 100644 --- a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/TablesWithBloatCheckOnHostTest.java +++ b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/TablesWithBloatCheckOnHostTest.java @@ -12,7 +12,7 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnHost; import io.github.mfvanek.pg.common.maintenance.Diagnostic; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.predicates.SkipBloatUnderThresholdPredicate; import io.github.mfvanek.pg.model.predicates.SkipTablesByNamePredicate; import io.github.mfvanek.pg.model.table.TableWithBloat; diff --git a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/TablesWithMissingIndexesCheckOnHostTest.java b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/TablesWithMissingIndexesCheckOnHostTest.java index 78a77972..2986a3c1 100644 --- a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/TablesWithMissingIndexesCheckOnHostTest.java +++ b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/TablesWithMissingIndexesCheckOnHostTest.java @@ -12,7 +12,7 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnHost; import io.github.mfvanek.pg.common.maintenance.Diagnostic; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.predicates.SkipSmallTablesPredicate; import io.github.mfvanek.pg.model.predicates.SkipTablesByNamePredicate; import io.github.mfvanek.pg.model.table.TableWithMissingIndex; diff --git a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/TablesWithoutDescriptionCheckOnHostTest.java b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/TablesWithoutDescriptionCheckOnHostTest.java index 52e38b74..f19704bb 100644 --- a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/TablesWithoutDescriptionCheckOnHostTest.java +++ b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/TablesWithoutDescriptionCheckOnHostTest.java @@ -12,7 +12,7 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnHost; import io.github.mfvanek.pg.common.maintenance.Diagnostic; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.predicates.SkipSmallTablesPredicate; import io.github.mfvanek.pg.model.predicates.SkipTablesByNamePredicate; import io.github.mfvanek.pg.model.table.Table; diff --git a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/TablesWithoutPrimaryKeyCheckOnHostTest.java b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/TablesWithoutPrimaryKeyCheckOnHostTest.java index 37a10947..2a34adb0 100644 --- a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/TablesWithoutPrimaryKeyCheckOnHostTest.java +++ b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/TablesWithoutPrimaryKeyCheckOnHostTest.java @@ -12,7 +12,7 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnHost; import io.github.mfvanek.pg.common.maintenance.Diagnostic; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.predicates.SkipTablesByNamePredicate; import io.github.mfvanek.pg.model.table.Table; import io.github.mfvanek.pg.support.DatabaseAwareTestBase; diff --git a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/UnusedIndexesCheckOnHostTest.java b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/UnusedIndexesCheckOnHostTest.java index aa401397..0db91680 100644 --- a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/UnusedIndexesCheckOnHostTest.java +++ b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/checks/host/UnusedIndexesCheckOnHostTest.java @@ -12,7 +12,7 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnHost; import io.github.mfvanek.pg.common.maintenance.Diagnostic; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.index.UnusedIndex; import io.github.mfvanek.pg.model.predicates.SkipDbObjectsByNamePredicate; import io.github.mfvanek.pg.model.predicates.SkipIndexesByNamePredicate; diff --git a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/settings/maintenance/ConfigurationMaintenanceOnHostImplTest.java b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/settings/maintenance/ConfigurationMaintenanceOnHostImplTest.java index ef899d59..6fa112d7 100644 --- a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/settings/maintenance/ConfigurationMaintenanceOnHostImplTest.java +++ b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/settings/maintenance/ConfigurationMaintenanceOnHostImplTest.java @@ -11,12 +11,12 @@ package io.github.mfvanek.pg.settings.maintenance; import io.github.mfvanek.pg.connection.PgSqlException; -import io.github.mfvanek.pg.model.MemoryUnit; import io.github.mfvanek.pg.settings.ImportantParam; import io.github.mfvanek.pg.settings.PgParam; import io.github.mfvanek.pg.settings.PgParamImpl; import io.github.mfvanek.pg.settings.ServerSpecification; import io.github.mfvanek.pg.support.DatabaseAwareTestBase; +import io.github.mfvanek.pg.units.MemoryUnit; import org.junit.jupiter.api.Test; import java.sql.SQLException; diff --git a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/statistics/maintenance/StatisticsMaintenanceOnHostImplTest.java b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/statistics/maintenance/StatisticsMaintenanceOnHostImplTest.java index c44aa916..4e425d4a 100644 --- a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/statistics/maintenance/StatisticsMaintenanceOnHostImplTest.java +++ b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/statistics/maintenance/StatisticsMaintenanceOnHostImplTest.java @@ -10,7 +10,7 @@ package io.github.mfvanek.pg.statistics.maintenance; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.support.StatisticsAwareTestBase; import io.github.mfvanek.pg.utils.ClockHolder; import org.junit.jupiter.api.Test; diff --git a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/support/AbstractCheckOnHostAssert.java b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/support/AbstractCheckOnHostAssert.java index c13d3bea..b4544d6f 100644 --- a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/support/AbstractCheckOnHostAssert.java +++ b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/support/AbstractCheckOnHostAssert.java @@ -13,8 +13,8 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnHost; import io.github.mfvanek.pg.common.maintenance.Diagnostic; import io.github.mfvanek.pg.connection.PgHost; -import io.github.mfvanek.pg.model.DbObject; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; +import io.github.mfvanek.pg.model.dbobject.DbObject; import org.assertj.core.api.AbstractAssert; import org.assertj.core.api.Assertions; import org.assertj.core.api.ListAssert; diff --git a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/utils/QueryExecutorsTest.java b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/utils/QueryExecutorsTest.java index e526ccd9..5e424b9e 100644 --- a/pg-index-health-core/src/test/java/io/github/mfvanek/pg/utils/QueryExecutorsTest.java +++ b/pg-index-health-core/src/test/java/io/github/mfvanek/pg/utils/QueryExecutorsTest.java @@ -14,7 +14,7 @@ import io.github.mfvanek.pg.connection.PgConnectionImpl; import io.github.mfvanek.pg.connection.PgHostImpl; import io.github.mfvanek.pg.connection.PgSqlException; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.support.DatabaseAwareTestBase; import io.github.mfvanek.pg.support.TestUtils; import org.junit.jupiter.api.Test; diff --git a/pg-index-health-core/src/testFixtures/java/io/github/mfvanek/pg/support/DatabaseAwareTestBase.java b/pg-index-health-core/src/testFixtures/java/io/github/mfvanek/pg/support/DatabaseAwareTestBase.java index 9f37b952..0c05d7a1 100644 --- a/pg-index-health-core/src/testFixtures/java/io/github/mfvanek/pg/support/DatabaseAwareTestBase.java +++ b/pg-index-health-core/src/testFixtures/java/io/github/mfvanek/pg/support/DatabaseAwareTestBase.java @@ -17,7 +17,7 @@ import io.github.mfvanek.pg.connection.PgConnectionImpl; import io.github.mfvanek.pg.connection.PgHost; import io.github.mfvanek.pg.connection.PgHostImpl; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.testing.PostgreSqlContainerWrapper; import java.util.function.Consumer; diff --git a/pg-index-health-core/src/testFixtures/java/io/github/mfvanek/pg/support/SchemaNameHolder.java b/pg-index-health-core/src/testFixtures/java/io/github/mfvanek/pg/support/SchemaNameHolder.java index 14283ad9..0d1a84fa 100644 --- a/pg-index-health-core/src/testFixtures/java/io/github/mfvanek/pg/support/SchemaNameHolder.java +++ b/pg-index-health-core/src/testFixtures/java/io/github/mfvanek/pg/support/SchemaNameHolder.java @@ -13,7 +13,7 @@ import java.util.concurrent.atomic.AtomicReference; import javax.annotation.Nonnull; -import static io.github.mfvanek.pg.model.PgContext.DEFAULT_SCHEMA_NAME; +import static io.github.mfvanek.pg.model.context.PgContext.DEFAULT_SCHEMA_NAME; public final class SchemaNameHolder implements AutoCloseable { diff --git a/pg-index-health-core/src/testFixtures/java/io/github/mfvanek/pg/support/StatisticsAwareTestBase.java b/pg-index-health-core/src/testFixtures/java/io/github/mfvanek/pg/support/StatisticsAwareTestBase.java index 7a35d65f..e15370f5 100644 --- a/pg-index-health-core/src/testFixtures/java/io/github/mfvanek/pg/support/StatisticsAwareTestBase.java +++ b/pg-index-health-core/src/testFixtures/java/io/github/mfvanek/pg/support/StatisticsAwareTestBase.java @@ -11,7 +11,7 @@ package io.github.mfvanek.pg.support; import io.github.mfvanek.pg.connection.PgSqlException; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/pg-index-health-logger/src/main/java/io/github/mfvanek/pg/common/health/logger/AbstractHealthLogger.java b/pg-index-health-logger/src/main/java/io/github/mfvanek/pg/common/health/logger/AbstractHealthLogger.java index 4bb869c2..e5c42fe8 100644 --- a/pg-index-health-logger/src/main/java/io/github/mfvanek/pg/common/health/logger/AbstractHealthLogger.java +++ b/pg-index-health-logger/src/main/java/io/github/mfvanek/pg/common/health/logger/AbstractHealthLogger.java @@ -16,13 +16,14 @@ import io.github.mfvanek.pg.connection.ConnectionCredentials; import io.github.mfvanek.pg.connection.HighAvailabilityPgConnection; import io.github.mfvanek.pg.connection.HighAvailabilityPgConnectionFactory; -import io.github.mfvanek.pg.model.DbObject; -import io.github.mfvanek.pg.model.PgContext; import io.github.mfvanek.pg.model.column.Column; import io.github.mfvanek.pg.model.column.ColumnWithSerialType; import io.github.mfvanek.pg.model.constraint.Constraint; import io.github.mfvanek.pg.model.constraint.DuplicatedForeignKeys; import io.github.mfvanek.pg.model.constraint.ForeignKey; +import io.github.mfvanek.pg.model.context.PgContext; +import io.github.mfvanek.pg.model.dbobject.AnyObject; +import io.github.mfvanek.pg.model.dbobject.DbObject; import io.github.mfvanek.pg.model.function.StoredFunction; import io.github.mfvanek.pg.model.index.DuplicatedIndexes; import io.github.mfvanek.pg.model.index.Index; @@ -30,7 +31,6 @@ import io.github.mfvanek.pg.model.index.IndexWithColumns; import io.github.mfvanek.pg.model.index.IndexWithNulls; import io.github.mfvanek.pg.model.index.UnusedIndex; -import io.github.mfvanek.pg.model.object.AnyObject; import io.github.mfvanek.pg.model.predicates.SkipBloatUnderThresholdPredicate; import io.github.mfvanek.pg.model.predicates.SkipIndexesByNamePredicate; import io.github.mfvanek.pg.model.predicates.SkipSmallIndexesPredicate; diff --git a/pg-index-health-logger/src/main/java/io/github/mfvanek/pg/common/health/logger/ExclusionsBuilder.java b/pg-index-health-logger/src/main/java/io/github/mfvanek/pg/common/health/logger/ExclusionsBuilder.java index db145fe1..91c3f7db 100644 --- a/pg-index-health-logger/src/main/java/io/github/mfvanek/pg/common/health/logger/ExclusionsBuilder.java +++ b/pg-index-health-logger/src/main/java/io/github/mfvanek/pg/common/health/logger/ExclusionsBuilder.java @@ -10,8 +10,8 @@ package io.github.mfvanek.pg.common.health.logger; -import io.github.mfvanek.pg.model.MemoryUnit; import io.github.mfvanek.pg.model.validation.Validators; +import io.github.mfvanek.pg.units.MemoryUnit; import java.util.Objects; import javax.annotation.Nonnull; diff --git a/pg-index-health-logger/src/main/java/io/github/mfvanek/pg/common/health/logger/HealthLogger.java b/pg-index-health-logger/src/main/java/io/github/mfvanek/pg/common/health/logger/HealthLogger.java index b5b11b61..a379c5eb 100644 --- a/pg-index-health-logger/src/main/java/io/github/mfvanek/pg/common/health/logger/HealthLogger.java +++ b/pg-index-health-logger/src/main/java/io/github/mfvanek/pg/common/health/logger/HealthLogger.java @@ -10,7 +10,7 @@ package io.github.mfvanek.pg.common.health.logger; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import java.util.List; import javax.annotation.Nonnull; diff --git a/pg-index-health-logger/src/main/java/io/github/mfvanek/pg/common/maintenance/DatabaseChecks.java b/pg-index-health-logger/src/main/java/io/github/mfvanek/pg/common/maintenance/DatabaseChecks.java index 6b2277e9..36f6780a 100644 --- a/pg-index-health-logger/src/main/java/io/github/mfvanek/pg/common/maintenance/DatabaseChecks.java +++ b/pg-index-health-logger/src/main/java/io/github/mfvanek/pg/common/maintenance/DatabaseChecks.java @@ -36,7 +36,7 @@ import io.github.mfvanek.pg.checks.cluster.TablesWithoutPrimaryKeyCheckOnCluster; import io.github.mfvanek.pg.checks.cluster.UnusedIndexesCheckOnCluster; import io.github.mfvanek.pg.connection.HighAvailabilityPgConnection; -import io.github.mfvanek.pg.model.DbObject; +import io.github.mfvanek.pg.model.dbobject.DbObject; import java.util.List; import java.util.Locale; diff --git a/pg-index-health-logger/src/test/java/io/github/mfvanek/pg/common/health/logger/ExclusionsTest.java b/pg-index-health-logger/src/test/java/io/github/mfvanek/pg/common/health/logger/ExclusionsTest.java index 6a4f9d9b..719aaafd 100644 --- a/pg-index-health-logger/src/test/java/io/github/mfvanek/pg/common/health/logger/ExclusionsTest.java +++ b/pg-index-health-logger/src/test/java/io/github/mfvanek/pg/common/health/logger/ExclusionsTest.java @@ -10,7 +10,7 @@ package io.github.mfvanek.pg.common.health.logger; -import io.github.mfvanek.pg.model.MemoryUnit; +import io.github.mfvanek.pg.units.MemoryUnit; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/pg-index-health-logger/src/test/java/io/github/mfvanek/pg/common/health/logger/HealthLoggerTest.java b/pg-index-health-logger/src/test/java/io/github/mfvanek/pg/common/health/logger/HealthLoggerTest.java index cdf39dca..a5d04a75 100644 --- a/pg-index-health-logger/src/test/java/io/github/mfvanek/pg/common/health/logger/HealthLoggerTest.java +++ b/pg-index-health-logger/src/test/java/io/github/mfvanek/pg/common/health/logger/HealthLoggerTest.java @@ -12,7 +12,7 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseChecks; import io.github.mfvanek.pg.common.maintenance.Diagnostic; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.utils.ClockHolder; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/pg-index-health-logger/src/test/java/io/github/mfvanek/pg/common/health/logger/HealthLoggerTestBase.java b/pg-index-health-logger/src/test/java/io/github/mfvanek/pg/common/health/logger/HealthLoggerTestBase.java index d6e248d1..b1db3753 100644 --- a/pg-index-health-logger/src/test/java/io/github/mfvanek/pg/common/health/logger/HealthLoggerTestBase.java +++ b/pg-index-health-logger/src/test/java/io/github/mfvanek/pg/common/health/logger/HealthLoggerTestBase.java @@ -15,7 +15,7 @@ import io.github.mfvanek.pg.connection.HighAvailabilityPgConnectionFactoryImpl; import io.github.mfvanek.pg.connection.PgConnectionFactoryImpl; import io.github.mfvanek.pg.connection.PrimaryHostDeterminerImpl; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.support.DatabaseConfigurer; import io.github.mfvanek.pg.support.StatisticsAwareTestBase; import org.junit.jupiter.api.Test; diff --git a/pg-index-health-logger/src/test/java/io/github/mfvanek/pg/common/maintenance/DatabaseChecksTest.java b/pg-index-health-logger/src/test/java/io/github/mfvanek/pg/common/maintenance/DatabaseChecksTest.java index 35534b90..b4d610ae 100644 --- a/pg-index-health-logger/src/test/java/io/github/mfvanek/pg/common/maintenance/DatabaseChecksTest.java +++ b/pg-index-health-logger/src/test/java/io/github/mfvanek/pg/common/maintenance/DatabaseChecksTest.java @@ -11,8 +11,8 @@ package io.github.mfvanek.pg.common.maintenance; import de.thetaphi.forbiddenapis.SuppressForbidden; -import io.github.mfvanek.pg.model.DbObject; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; +import io.github.mfvanek.pg.model.dbobject.DbObject; import io.github.mfvanek.pg.model.index.Index; import io.github.mfvanek.pg.model.table.Table; import io.github.mfvanek.pg.support.DatabaseAwareTestBase; diff --git a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/BloatAware.java b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/bloat/BloatAware.java similarity index 94% rename from pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/BloatAware.java rename to pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/bloat/BloatAware.java index 3e1932a2..c1eb8a70 100644 --- a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/BloatAware.java +++ b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/bloat/BloatAware.java @@ -8,7 +8,7 @@ * Licensed under the Apache License 2.0 */ -package io.github.mfvanek.pg.model; +package io.github.mfvanek.pg.model.bloat; /** * Allows getting information about bloat in database. diff --git a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/column/Column.java b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/column/Column.java index 659f0dbd..5c07e8c6 100644 --- a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/column/Column.java +++ b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/column/Column.java @@ -10,8 +10,8 @@ package io.github.mfvanek.pg.model.column; -import io.github.mfvanek.pg.model.DbObject; -import io.github.mfvanek.pg.model.object.PgObjectType; +import io.github.mfvanek.pg.model.dbobject.DbObject; +import io.github.mfvanek.pg.model.dbobject.PgObjectType; import io.github.mfvanek.pg.model.validation.Validators; import java.util.Objects; diff --git a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/column/ColumnWithSerialType.java b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/column/ColumnWithSerialType.java index 74958c2f..d5914cba 100644 --- a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/column/ColumnWithSerialType.java +++ b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/column/ColumnWithSerialType.java @@ -10,8 +10,8 @@ package io.github.mfvanek.pg.model.column; -import io.github.mfvanek.pg.model.DbObject; -import io.github.mfvanek.pg.model.object.PgObjectType; +import io.github.mfvanek.pg.model.dbobject.DbObject; +import io.github.mfvanek.pg.model.dbobject.PgObjectType; import io.github.mfvanek.pg.model.sequence.SequenceNameAware; import io.github.mfvanek.pg.model.validation.Validators; diff --git a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/constraint/Constraint.java b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/constraint/Constraint.java index c2541213..da551771 100644 --- a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/constraint/Constraint.java +++ b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/constraint/Constraint.java @@ -10,8 +10,8 @@ package io.github.mfvanek.pg.model.constraint; -import io.github.mfvanek.pg.model.DbObject; -import io.github.mfvanek.pg.model.object.PgObjectType; +import io.github.mfvanek.pg.model.dbobject.DbObject; +import io.github.mfvanek.pg.model.dbobject.PgObjectType; import io.github.mfvanek.pg.model.table.TableNameAware; import io.github.mfvanek.pg.model.validation.Validators; diff --git a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/constraint/DuplicatedForeignKeys.java b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/constraint/DuplicatedForeignKeys.java index 30984d52..b0f00bbc 100644 --- a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/constraint/DuplicatedForeignKeys.java +++ b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/constraint/DuplicatedForeignKeys.java @@ -10,9 +10,9 @@ package io.github.mfvanek.pg.model.constraint; -import io.github.mfvanek.pg.model.DbObject; +import io.github.mfvanek.pg.model.dbobject.DbObject; +import io.github.mfvanek.pg.model.dbobject.PgObjectType; import io.github.mfvanek.pg.model.index.utils.DuplicatedIndexesParser; -import io.github.mfvanek.pg.model.object.PgObjectType; import io.github.mfvanek.pg.model.table.TableNameAware; import io.github.mfvanek.pg.model.validation.Validators; diff --git a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/PgContext.java b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/context/PgContext.java similarity index 90% rename from pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/PgContext.java rename to pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/context/PgContext.java index 08b79490..c649c594 100644 --- a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/PgContext.java +++ b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/context/PgContext.java @@ -8,7 +8,7 @@ * Licensed under the Apache License 2.0 */ -package io.github.mfvanek.pg.model; +package io.github.mfvanek.pg.model.context; import io.github.mfvanek.pg.model.validation.Validators; @@ -112,22 +112,6 @@ public String enrichWithSchema(@Nonnull final String objectName) { return enrichWithSchemaIfNeed(objectName); } - /** - * Complement the given sequence name with the specified schema name if it is necessary. - * - * @param sequenceName given sequence name - * @return sequence name with schema for all schemas - * @see #enrichWithSchema - * @deprecated This method has been replaced by {@link #enrichWithSchema} - */ - @Deprecated(since = "0.13.3", forRemoval = true) - @Nonnull - public String enrichSequenceWithSchema(@Nonnull final String sequenceName) { - Validators.notBlank(sequenceName, "sequenceName"); - - return enrichWithSchemaIfNeed(sequenceName); - } - @Nonnull private String enrichWithSchemaIfNeed(@Nonnull final String objectName) { final String prefix = schemaName + "."; diff --git a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/object/AnyObject.java b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/dbobject/AnyObject.java similarity index 97% rename from pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/object/AnyObject.java rename to pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/dbobject/AnyObject.java index ca6b3b54..8e8d0859 100644 --- a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/object/AnyObject.java +++ b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/dbobject/AnyObject.java @@ -8,9 +8,8 @@ * Licensed under the Apache License 2.0 */ -package io.github.mfvanek.pg.model.object; +package io.github.mfvanek.pg.model.dbobject; -import io.github.mfvanek.pg.model.DbObject; import io.github.mfvanek.pg.model.validation.Validators; import java.util.Objects; diff --git a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/DbObject.java b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/dbobject/DbObject.java similarity index 89% rename from pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/DbObject.java rename to pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/dbobject/DbObject.java index 4f3fc7bf..9eecf059 100644 --- a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/DbObject.java +++ b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/dbobject/DbObject.java @@ -8,9 +8,7 @@ * Licensed under the Apache License 2.0 */ -package io.github.mfvanek.pg.model; - -import io.github.mfvanek.pg.model.object.PgObjectType; +package io.github.mfvanek.pg.model.dbobject; import javax.annotation.Nonnull; diff --git a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/object/PgObjectType.java b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/dbobject/PgObjectType.java similarity index 98% rename from pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/object/PgObjectType.java rename to pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/dbobject/PgObjectType.java index 58a77311..d0cf1fa4 100644 --- a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/object/PgObjectType.java +++ b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/dbobject/PgObjectType.java @@ -8,7 +8,7 @@ * Licensed under the Apache License 2.0 */ -package io.github.mfvanek.pg.model.object; +package io.github.mfvanek.pg.model.dbobject; import io.github.mfvanek.pg.model.constraint.ConstraintType; diff --git a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/function/StoredFunction.java b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/function/StoredFunction.java index 8d922a14..0ecd51c0 100644 --- a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/function/StoredFunction.java +++ b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/function/StoredFunction.java @@ -10,8 +10,8 @@ package io.github.mfvanek.pg.model.function; -import io.github.mfvanek.pg.model.DbObject; -import io.github.mfvanek.pg.model.object.PgObjectType; +import io.github.mfvanek.pg.model.dbobject.DbObject; +import io.github.mfvanek.pg.model.dbobject.PgObjectType; import io.github.mfvanek.pg.model.validation.Validators; import java.util.Objects; diff --git a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/index/DuplicatedIndexes.java b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/index/DuplicatedIndexes.java index d452242c..9620945c 100644 --- a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/index/DuplicatedIndexes.java +++ b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/index/DuplicatedIndexes.java @@ -10,9 +10,9 @@ package io.github.mfvanek.pg.model.index; -import io.github.mfvanek.pg.model.DbObject; +import io.github.mfvanek.pg.model.dbobject.DbObject; +import io.github.mfvanek.pg.model.dbobject.PgObjectType; import io.github.mfvanek.pg.model.index.utils.DuplicatedIndexesParser; -import io.github.mfvanek.pg.model.object.PgObjectType; import io.github.mfvanek.pg.model.table.TableNameAware; import io.github.mfvanek.pg.model.validation.Validators; diff --git a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/index/Index.java b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/index/Index.java index b93c195a..7bc6d032 100644 --- a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/index/Index.java +++ b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/index/Index.java @@ -10,8 +10,8 @@ package io.github.mfvanek.pg.model.index; -import io.github.mfvanek.pg.model.DbObject; -import io.github.mfvanek.pg.model.object.PgObjectType; +import io.github.mfvanek.pg.model.dbobject.DbObject; +import io.github.mfvanek.pg.model.dbobject.PgObjectType; import io.github.mfvanek.pg.model.table.TableNameAware; import io.github.mfvanek.pg.model.validation.Validators; diff --git a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/index/IndexBloatAware.java b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/index/IndexBloatAware.java deleted file mode 100644 index 3cb61c24..00000000 --- a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/index/IndexBloatAware.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (c) 2019-2024. Ivan Vakhrushev and others. - * https://github.com/mfvanek/pg-index-health - * - * This file is a part of "pg-index-health" - a Java library for - * analyzing and maintaining indexes health in PostgreSQL databases. - * - * Licensed under the Apache License 2.0 - */ - -package io.github.mfvanek.pg.model.index; - -import io.github.mfvanek.pg.model.BloatAware; - -/** - * Allows getting information about index bloat. - * - * @author Ivan Vakhrushev - * @see BloatAware - * @since 0.6.0 - */ -public interface IndexBloatAware extends BloatAware, IndexSizeAware { - -} diff --git a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/index/IndexWithBloat.java b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/index/IndexWithBloat.java index 59617abe..43ccbee7 100644 --- a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/index/IndexWithBloat.java +++ b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/index/IndexWithBloat.java @@ -10,6 +10,7 @@ package io.github.mfvanek.pg.model.index; +import io.github.mfvanek.pg.model.bloat.BloatAware; import io.github.mfvanek.pg.model.validation.Validators; import javax.annotation.Nonnull; @@ -21,7 +22,7 @@ * @author Ivan Vakhrushev */ @Immutable -public class IndexWithBloat extends IndexWithSize implements IndexBloatAware { +public class IndexWithBloat extends IndexWithSize implements BloatAware { private final long bloatSizeInBytes; private final double bloatPercentage; diff --git a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/index/utils/DuplicatedIndexesParser.java b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/index/utils/DuplicatedIndexesParser.java index 4bd6a3f1..679b5997 100644 --- a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/index/utils/DuplicatedIndexesParser.java +++ b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/index/utils/DuplicatedIndexesParser.java @@ -10,7 +10,7 @@ package io.github.mfvanek.pg.model.index.utils; -import io.github.mfvanek.pg.model.DbObject; +import io.github.mfvanek.pg.model.dbobject.DbObject; import io.github.mfvanek.pg.model.table.TableNameAware; import io.github.mfvanek.pg.model.validation.Validators; diff --git a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/predicates/AbstractFilterBySize.java b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/predicates/AbstractFilterBySize.java index b6078b32..ea71d1a6 100644 --- a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/predicates/AbstractFilterBySize.java +++ b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/predicates/AbstractFilterBySize.java @@ -10,7 +10,7 @@ package io.github.mfvanek.pg.model.predicates; -import io.github.mfvanek.pg.model.DbObject; +import io.github.mfvanek.pg.model.dbobject.DbObject; import io.github.mfvanek.pg.model.validation.Validators; import java.util.function.Predicate; diff --git a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/predicates/AbstractSkipTablesPredicate.java b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/predicates/AbstractSkipTablesPredicate.java index fe45b5b8..792e1065 100644 --- a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/predicates/AbstractSkipTablesPredicate.java +++ b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/predicates/AbstractSkipTablesPredicate.java @@ -10,8 +10,8 @@ package io.github.mfvanek.pg.model.predicates; -import io.github.mfvanek.pg.model.DbObject; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; +import io.github.mfvanek.pg.model.dbobject.DbObject; import io.github.mfvanek.pg.model.table.TableNameAware; import io.github.mfvanek.pg.model.validation.Validators; diff --git a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/predicates/SkipBloatUnderThresholdPredicate.java b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/predicates/SkipBloatUnderThresholdPredicate.java index 0f36a43c..05b53f51 100644 --- a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/predicates/SkipBloatUnderThresholdPredicate.java +++ b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/predicates/SkipBloatUnderThresholdPredicate.java @@ -10,8 +10,8 @@ package io.github.mfvanek.pg.model.predicates; -import io.github.mfvanek.pg.model.BloatAware; -import io.github.mfvanek.pg.model.DbObject; +import io.github.mfvanek.pg.model.bloat.BloatAware; +import io.github.mfvanek.pg.model.dbobject.DbObject; import io.github.mfvanek.pg.model.validation.Validators; import java.util.function.Predicate; diff --git a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/predicates/SkipBySequenceNamePredicate.java b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/predicates/SkipBySequenceNamePredicate.java index 4dbac0d5..a9258f79 100644 --- a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/predicates/SkipBySequenceNamePredicate.java +++ b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/predicates/SkipBySequenceNamePredicate.java @@ -10,8 +10,8 @@ package io.github.mfvanek.pg.model.predicates; -import io.github.mfvanek.pg.model.DbObject; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; +import io.github.mfvanek.pg.model.dbobject.DbObject; import io.github.mfvanek.pg.model.sequence.SequenceNameAware; import java.util.Collection; diff --git a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/predicates/SkipDbObjectsByNamePredicate.java b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/predicates/SkipDbObjectsByNamePredicate.java index 591c2a26..53cc8f1e 100644 --- a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/predicates/SkipDbObjectsByNamePredicate.java +++ b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/predicates/SkipDbObjectsByNamePredicate.java @@ -10,7 +10,7 @@ package io.github.mfvanek.pg.model.predicates; -import io.github.mfvanek.pg.model.DbObject; +import io.github.mfvanek.pg.model.dbobject.DbObject; import java.util.Collection; import java.util.Locale; diff --git a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/predicates/SkipFlywayTablesPredicate.java b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/predicates/SkipFlywayTablesPredicate.java index d0089965..171cc677 100644 --- a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/predicates/SkipFlywayTablesPredicate.java +++ b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/predicates/SkipFlywayTablesPredicate.java @@ -10,8 +10,8 @@ package io.github.mfvanek.pg.model.predicates; -import io.github.mfvanek.pg.model.DbObject; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; +import io.github.mfvanek.pg.model.dbobject.DbObject; import java.util.Set; import java.util.function.Predicate; diff --git a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/predicates/SkipIndexesByNamePredicate.java b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/predicates/SkipIndexesByNamePredicate.java index eb230e84..d8aee6f1 100644 --- a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/predicates/SkipIndexesByNamePredicate.java +++ b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/predicates/SkipIndexesByNamePredicate.java @@ -10,8 +10,8 @@ package io.github.mfvanek.pg.model.predicates; -import io.github.mfvanek.pg.model.DbObject; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; +import io.github.mfvanek.pg.model.dbobject.DbObject; import io.github.mfvanek.pg.model.index.Index; import io.github.mfvanek.pg.model.index.IndexNameAware; import io.github.mfvanek.pg.model.index.IndexesAware; diff --git a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/predicates/SkipLiquibaseTablesPredicate.java b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/predicates/SkipLiquibaseTablesPredicate.java index cb0ba399..9ce63d63 100644 --- a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/predicates/SkipLiquibaseTablesPredicate.java +++ b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/predicates/SkipLiquibaseTablesPredicate.java @@ -10,8 +10,8 @@ package io.github.mfvanek.pg.model.predicates; -import io.github.mfvanek.pg.model.DbObject; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; +import io.github.mfvanek.pg.model.dbobject.DbObject; import java.util.Set; import java.util.function.Predicate; diff --git a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/predicates/SkipSmallIndexesPredicate.java b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/predicates/SkipSmallIndexesPredicate.java index 0956d689..443a3572 100644 --- a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/predicates/SkipSmallIndexesPredicate.java +++ b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/predicates/SkipSmallIndexesPredicate.java @@ -10,7 +10,7 @@ package io.github.mfvanek.pg.model.predicates; -import io.github.mfvanek.pg.model.DbObject; +import io.github.mfvanek.pg.model.dbobject.DbObject; import io.github.mfvanek.pg.model.index.IndexSizeAware; import java.util.function.Predicate; diff --git a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/predicates/SkipSmallTablesPredicate.java b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/predicates/SkipSmallTablesPredicate.java index 1f563624..7e435a5c 100644 --- a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/predicates/SkipSmallTablesPredicate.java +++ b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/predicates/SkipSmallTablesPredicate.java @@ -10,7 +10,7 @@ package io.github.mfvanek.pg.model.predicates; -import io.github.mfvanek.pg.model.DbObject; +import io.github.mfvanek.pg.model.dbobject.DbObject; import io.github.mfvanek.pg.model.table.TableSizeAware; import java.util.function.Predicate; diff --git a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/predicates/SkipTablesByNamePredicate.java b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/predicates/SkipTablesByNamePredicate.java index 2aed17dd..32a019d6 100644 --- a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/predicates/SkipTablesByNamePredicate.java +++ b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/predicates/SkipTablesByNamePredicate.java @@ -10,8 +10,8 @@ package io.github.mfvanek.pg.model.predicates; -import io.github.mfvanek.pg.model.DbObject; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; +import io.github.mfvanek.pg.model.dbobject.DbObject; import java.util.Collection; import java.util.function.Predicate; diff --git a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/sequence/SequenceState.java b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/sequence/SequenceState.java index bcf0366a..3db68d6d 100644 --- a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/sequence/SequenceState.java +++ b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/sequence/SequenceState.java @@ -10,8 +10,8 @@ package io.github.mfvanek.pg.model.sequence; -import io.github.mfvanek.pg.model.DbObject; -import io.github.mfvanek.pg.model.object.PgObjectType; +import io.github.mfvanek.pg.model.dbobject.DbObject; +import io.github.mfvanek.pg.model.dbobject.PgObjectType; import io.github.mfvanek.pg.model.validation.Validators; import java.util.Objects; diff --git a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/table/AbstractTableAware.java b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/table/AbstractTableAware.java index 419833d3..503d06eb 100644 --- a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/table/AbstractTableAware.java +++ b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/table/AbstractTableAware.java @@ -10,8 +10,8 @@ package io.github.mfvanek.pg.model.table; -import io.github.mfvanek.pg.model.DbObject; -import io.github.mfvanek.pg.model.object.PgObjectType; +import io.github.mfvanek.pg.model.dbobject.DbObject; +import io.github.mfvanek.pg.model.dbobject.PgObjectType; import java.util.Objects; import javax.annotation.Nonnull; diff --git a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/table/Table.java b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/table/Table.java index f0f64935..35f4b6cb 100644 --- a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/table/Table.java +++ b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/table/Table.java @@ -10,8 +10,8 @@ package io.github.mfvanek.pg.model.table; -import io.github.mfvanek.pg.model.DbObject; -import io.github.mfvanek.pg.model.object.PgObjectType; +import io.github.mfvanek.pg.model.dbobject.DbObject; +import io.github.mfvanek.pg.model.dbobject.PgObjectType; import io.github.mfvanek.pg.model.validation.Validators; import java.util.Objects; diff --git a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/table/TableBloatAware.java b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/table/TableBloatAware.java deleted file mode 100644 index 45daddef..00000000 --- a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/table/TableBloatAware.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (c) 2019-2024. Ivan Vakhrushev and others. - * https://github.com/mfvanek/pg-index-health - * - * This file is a part of "pg-index-health" - a Java library for - * analyzing and maintaining indexes health in PostgreSQL databases. - * - * Licensed under the Apache License 2.0 - */ - -package io.github.mfvanek.pg.model.table; - -import io.github.mfvanek.pg.model.BloatAware; - -/** - * Allows getting information about table bloat. - * - * @author Ivan Vakhrushev - * @see BloatAware - * @since 0.6.0 - */ -public interface TableBloatAware extends BloatAware, TableSizeAware { - -} diff --git a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/table/TableWithBloat.java b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/table/TableWithBloat.java index 0e881cd2..b9d290ca 100644 --- a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/table/TableWithBloat.java +++ b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/table/TableWithBloat.java @@ -10,6 +10,7 @@ package io.github.mfvanek.pg.model.table; +import io.github.mfvanek.pg.model.bloat.BloatAware; import io.github.mfvanek.pg.model.validation.Validators; import java.util.Objects; @@ -22,7 +23,7 @@ * @author Ivan Vakhrushev */ @Immutable -public class TableWithBloat extends AbstractTableAware implements TableBloatAware, Comparable { +public class TableWithBloat extends AbstractTableAware implements BloatAware, Comparable { private final long bloatSizeInBytes; private final double bloatPercentage; diff --git a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/validation/Validators.java b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/validation/Validators.java index e480d6b8..a7de5a4c 100644 --- a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/validation/Validators.java +++ b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/validation/Validators.java @@ -10,7 +10,7 @@ package io.github.mfvanek.pg.model.validation; -import io.github.mfvanek.pg.model.DbObject; +import io.github.mfvanek.pg.model.dbobject.DbObject; import io.github.mfvanek.pg.model.table.TableNameAware; import java.util.List; diff --git a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/settings/ServerSpecificationBuilder.java b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/settings/ServerSpecificationBuilder.java index 293f9090..d56e808f 100644 --- a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/settings/ServerSpecificationBuilder.java +++ b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/settings/ServerSpecificationBuilder.java @@ -10,8 +10,8 @@ package io.github.mfvanek.pg.settings; -import io.github.mfvanek.pg.model.MemoryUnit; import io.github.mfvanek.pg.model.validation.Validators; +import io.github.mfvanek.pg.units.MemoryUnit; import javax.annotation.Nonnull; diff --git a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/MemoryUnit.java b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/units/MemoryUnit.java similarity index 97% rename from pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/MemoryUnit.java rename to pg-index-health-model/src/main/java/io/github/mfvanek/pg/units/MemoryUnit.java index 665548d1..9f958468 100644 --- a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/MemoryUnit.java +++ b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/units/MemoryUnit.java @@ -8,7 +8,7 @@ * Licensed under the Apache License 2.0 */ -package io.github.mfvanek.pg.model; +package io.github.mfvanek.pg.units; import java.util.Objects; import javax.annotation.Nonnull; diff --git a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/column/ColumnTest.java b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/column/ColumnTest.java index 6fc5e659..e597cc80 100644 --- a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/column/ColumnTest.java +++ b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/column/ColumnTest.java @@ -10,7 +10,7 @@ package io.github.mfvanek.pg.model.column; -import io.github.mfvanek.pg.model.object.PgObjectType; +import io.github.mfvanek.pg.model.dbobject.PgObjectType; import nl.jqno.equalsverifier.EqualsVerifier; import org.junit.jupiter.api.Test; diff --git a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/column/ColumnWithSerialTypeTest.java b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/column/ColumnWithSerialTypeTest.java index 8b689526..34907516 100644 --- a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/column/ColumnWithSerialTypeTest.java +++ b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/column/ColumnWithSerialTypeTest.java @@ -10,7 +10,7 @@ package io.github.mfvanek.pg.model.column; -import io.github.mfvanek.pg.model.object.PgObjectType; +import io.github.mfvanek.pg.model.dbobject.PgObjectType; import nl.jqno.equalsverifier.EqualsVerifier; import org.junit.jupiter.api.Test; diff --git a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/constraint/ConstraintTest.java b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/constraint/ConstraintTest.java index b0e9639a..42b9b6e8 100644 --- a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/constraint/ConstraintTest.java +++ b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/constraint/ConstraintTest.java @@ -10,7 +10,7 @@ package io.github.mfvanek.pg.model.constraint; -import io.github.mfvanek.pg.model.object.PgObjectType; +import io.github.mfvanek.pg.model.dbobject.PgObjectType; import nl.jqno.equalsverifier.EqualsVerifier; import org.junit.jupiter.api.Test; diff --git a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/constraint/DuplicatedForeignKeysTest.java b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/constraint/DuplicatedForeignKeysTest.java index a2443ceb..4c051332 100644 --- a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/constraint/DuplicatedForeignKeysTest.java +++ b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/constraint/DuplicatedForeignKeysTest.java @@ -10,7 +10,7 @@ package io.github.mfvanek.pg.model.constraint; -import io.github.mfvanek.pg.model.object.PgObjectType; +import io.github.mfvanek.pg.model.dbobject.PgObjectType; import nl.jqno.equalsverifier.EqualsVerifier; import org.junit.jupiter.api.Test; diff --git a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/constraint/ForeignKeyTest.java b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/constraint/ForeignKeyTest.java index 5c0e5bff..a50791e1 100644 --- a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/constraint/ForeignKeyTest.java +++ b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/constraint/ForeignKeyTest.java @@ -11,7 +11,7 @@ package io.github.mfvanek.pg.model.constraint; import io.github.mfvanek.pg.model.column.Column; -import io.github.mfvanek.pg.model.object.PgObjectType; +import io.github.mfvanek.pg.model.dbobject.PgObjectType; import nl.jqno.equalsverifier.EqualsVerifier; import org.junit.jupiter.api.Test; diff --git a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/PgContextTest.java b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/context/PgContextTest.java similarity index 80% rename from pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/PgContextTest.java rename to pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/context/PgContextTest.java index 21955088..33e6bfdf 100644 --- a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/PgContextTest.java +++ b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/context/PgContextTest.java @@ -8,7 +8,7 @@ * Licensed under the Apache License 2.0 */ -package io.github.mfvanek.pg.model; +package io.github.mfvanek.pg.model.context; import org.junit.jupiter.api.Test; @@ -93,13 +93,6 @@ void complementWithCustomSchema() { .isEqualTo("test.table2"); assertThat(pgContext.enrichWithSchema("TEST.table2")) .isEqualTo("TEST.table2"); - - assertThat(pgContext.enrichSequenceWithSchema("id_seq")) - .isEqualTo("test.id_seq"); - assertThat(pgContext.enrichSequenceWithSchema("test.id_seq")) - .isEqualTo("test.id_seq"); - assertThat(pgContext.enrichSequenceWithSchema("TEST.id_seq")) - .isEqualTo("TEST.id_seq"); } @Test @@ -113,13 +106,6 @@ void complementWithPublicSchema() { .isEqualTo("public.table2"); assertThat(pgContext.enrichWithSchema("PUBLIC.table2")) .isEqualTo("PUBLIC.table2"); - - assertThat(pgContext.enrichSequenceWithSchema("id_seq")) - .isEqualTo("public.id_seq"); - assertThat(pgContext.enrichSequenceWithSchema("public.id_seq")) - .isEqualTo("public.id_seq"); - assertThat(pgContext.enrichSequenceWithSchema("PUBLIC.id_seq")) - .isEqualTo("PUBLIC.id_seq"); } @SuppressWarnings("ConstantConditions") @@ -135,15 +121,5 @@ void complementWithSchemaWithInvalidArguments() { assertThatThrownBy(() -> pgContext.enrichWithSchema(" ")) .isInstanceOf(IllegalArgumentException.class) .hasMessage("objectName cannot be blank"); - - assertThatThrownBy(() -> pgContext.enrichSequenceWithSchema(null)) - .isInstanceOf(NullPointerException.class) - .hasMessage("sequenceName cannot be null"); - assertThatThrownBy(() -> pgContext.enrichSequenceWithSchema("")) - .isInstanceOf(IllegalArgumentException.class) - .hasMessage("sequenceName cannot be blank"); - assertThatThrownBy(() -> pgContext.enrichSequenceWithSchema(" ")) - .isInstanceOf(IllegalArgumentException.class) - .hasMessage("sequenceName cannot be blank"); } } diff --git a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/object/AnyObjectTest.java b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/dbobject/AnyObjectTest.java similarity index 98% rename from pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/object/AnyObjectTest.java rename to pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/dbobject/AnyObjectTest.java index 2b004444..3f25c9a2 100644 --- a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/object/AnyObjectTest.java +++ b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/dbobject/AnyObjectTest.java @@ -8,7 +8,7 @@ * Licensed under the Apache License 2.0 */ -package io.github.mfvanek.pg.model.object; +package io.github.mfvanek.pg.model.dbobject; import nl.jqno.equalsverifier.EqualsVerifier; import org.junit.jupiter.api.Test; diff --git a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/object/PgObjectTypeTest.java b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/dbobject/PgObjectTypeTest.java similarity index 96% rename from pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/object/PgObjectTypeTest.java rename to pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/dbobject/PgObjectTypeTest.java index 2e24c75a..1965d4dd 100644 --- a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/object/PgObjectTypeTest.java +++ b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/dbobject/PgObjectTypeTest.java @@ -8,7 +8,7 @@ * Licensed under the Apache License 2.0 */ -package io.github.mfvanek.pg.model.object; +package io.github.mfvanek.pg.model.dbobject; import org.junit.jupiter.api.Test; diff --git a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/function/StoredFunctionTest.java b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/function/StoredFunctionTest.java index 534bdcb6..b4eb9129 100644 --- a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/function/StoredFunctionTest.java +++ b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/function/StoredFunctionTest.java @@ -10,7 +10,7 @@ package io.github.mfvanek.pg.model.function; -import io.github.mfvanek.pg.model.object.PgObjectType; +import io.github.mfvanek.pg.model.dbobject.PgObjectType; import nl.jqno.equalsverifier.EqualsVerifier; import org.junit.jupiter.api.Test; diff --git a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/index/DuplicatedIndexesTest.java b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/index/DuplicatedIndexesTest.java index 4855e21a..03609f23 100644 --- a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/index/DuplicatedIndexesTest.java +++ b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/index/DuplicatedIndexesTest.java @@ -10,7 +10,7 @@ package io.github.mfvanek.pg.model.index; -import io.github.mfvanek.pg.model.object.PgObjectType; +import io.github.mfvanek.pg.model.dbobject.PgObjectType; import nl.jqno.equalsverifier.EqualsVerifier; import org.junit.jupiter.api.Test; diff --git a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/index/IndexTest.java b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/index/IndexTest.java index 63db4fce..02c95979 100644 --- a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/index/IndexTest.java +++ b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/index/IndexTest.java @@ -10,7 +10,7 @@ package io.github.mfvanek.pg.model.index; -import io.github.mfvanek.pg.model.object.PgObjectType; +import io.github.mfvanek.pg.model.dbobject.PgObjectType; import nl.jqno.equalsverifier.EqualsVerifier; import org.junit.jupiter.api.Test; diff --git a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/index/IndexWithBloatTest.java b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/index/IndexWithBloatTest.java index 530fe8d5..e8332fca 100644 --- a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/index/IndexWithBloatTest.java +++ b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/index/IndexWithBloatTest.java @@ -10,7 +10,7 @@ package io.github.mfvanek.pg.model.index; -import io.github.mfvanek.pg.model.object.PgObjectType; +import io.github.mfvanek.pg.model.dbobject.PgObjectType; import nl.jqno.equalsverifier.EqualsVerifier; import org.junit.jupiter.api.Test; diff --git a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/index/IndexWithColumnsTest.java b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/index/IndexWithColumnsTest.java index fbbb6bed..f8a6d068 100644 --- a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/index/IndexWithColumnsTest.java +++ b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/index/IndexWithColumnsTest.java @@ -11,7 +11,7 @@ package io.github.mfvanek.pg.model.index; import io.github.mfvanek.pg.model.column.Column; -import io.github.mfvanek.pg.model.object.PgObjectType; +import io.github.mfvanek.pg.model.dbobject.PgObjectType; import nl.jqno.equalsverifier.EqualsVerifier; import org.junit.jupiter.api.Test; diff --git a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/index/IndexWithNullsTest.java b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/index/IndexWithNullsTest.java index 2da757a0..dacee0d2 100644 --- a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/index/IndexWithNullsTest.java +++ b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/index/IndexWithNullsTest.java @@ -11,7 +11,7 @@ package io.github.mfvanek.pg.model.index; import io.github.mfvanek.pg.model.column.Column; -import io.github.mfvanek.pg.model.object.PgObjectType; +import io.github.mfvanek.pg.model.dbobject.PgObjectType; import nl.jqno.equalsverifier.EqualsVerifier; import org.junit.jupiter.api.Test; diff --git a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/index/IndexWithSizeTest.java b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/index/IndexWithSizeTest.java index 4fb9fafa..349be939 100644 --- a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/index/IndexWithSizeTest.java +++ b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/index/IndexWithSizeTest.java @@ -10,7 +10,7 @@ package io.github.mfvanek.pg.model.index; -import io.github.mfvanek.pg.model.object.PgObjectType; +import io.github.mfvanek.pg.model.dbobject.PgObjectType; import nl.jqno.equalsverifier.EqualsVerifier; import org.junit.jupiter.api.Test; diff --git a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/index/UnusedIndexTest.java b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/index/UnusedIndexTest.java index e15b53e0..075e1071 100644 --- a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/index/UnusedIndexTest.java +++ b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/index/UnusedIndexTest.java @@ -10,7 +10,7 @@ package io.github.mfvanek.pg.model.index; -import io.github.mfvanek.pg.model.object.PgObjectType; +import io.github.mfvanek.pg.model.dbobject.PgObjectType; import nl.jqno.equalsverifier.EqualsVerifier; import org.junit.jupiter.api.Test; diff --git a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/predicates/AbstractSkipTablesPredicateTest.java b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/predicates/AbstractSkipTablesPredicateTest.java index 50f2e695..9128ffe2 100644 --- a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/predicates/AbstractSkipTablesPredicateTest.java +++ b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/predicates/AbstractSkipTablesPredicateTest.java @@ -10,8 +10,8 @@ package io.github.mfvanek.pg.model.predicates; -import io.github.mfvanek.pg.model.DbObject; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; +import io.github.mfvanek.pg.model.dbobject.DbObject; import io.github.mfvanek.pg.model.table.Table; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/predicates/SkipBySequenceNamePredicateTest.java b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/predicates/SkipBySequenceNamePredicateTest.java index 02585e44..8f47a683 100644 --- a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/predicates/SkipBySequenceNamePredicateTest.java +++ b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/predicates/SkipBySequenceNamePredicateTest.java @@ -10,9 +10,9 @@ package io.github.mfvanek.pg.model.predicates; -import io.github.mfvanek.pg.model.PgContext; import io.github.mfvanek.pg.model.column.Column; import io.github.mfvanek.pg.model.column.ColumnWithSerialType; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.sequence.SequenceState; import io.github.mfvanek.pg.model.table.Table; import org.junit.jupiter.api.Test; diff --git a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/predicates/SkipFlywayTablesPredicateTest.java b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/predicates/SkipFlywayTablesPredicateTest.java index 7604cd64..f4eda1b0 100644 --- a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/predicates/SkipFlywayTablesPredicateTest.java +++ b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/predicates/SkipFlywayTablesPredicateTest.java @@ -10,8 +10,8 @@ package io.github.mfvanek.pg.model.predicates; -import io.github.mfvanek.pg.model.DbObject; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; +import io.github.mfvanek.pg.model.dbobject.DbObject; import io.github.mfvanek.pg.model.index.Index; import io.github.mfvanek.pg.model.sequence.SequenceState; import io.github.mfvanek.pg.model.table.Table; diff --git a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/predicates/SkipIndexesByNamePredicateTest.java b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/predicates/SkipIndexesByNamePredicateTest.java index 76827b2b..edaf5a35 100644 --- a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/predicates/SkipIndexesByNamePredicateTest.java +++ b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/predicates/SkipIndexesByNamePredicateTest.java @@ -10,9 +10,9 @@ package io.github.mfvanek.pg.model.predicates; -import io.github.mfvanek.pg.model.PgContext; import io.github.mfvanek.pg.model.column.Column; import io.github.mfvanek.pg.model.column.ColumnWithSerialType; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.index.DuplicatedIndexes; import io.github.mfvanek.pg.model.index.Index; import io.github.mfvanek.pg.model.index.IndexWithSize; diff --git a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/predicates/SkipLiquibaseTablesPredicateTest.java b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/predicates/SkipLiquibaseTablesPredicateTest.java index 28d7d976..41acbe47 100644 --- a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/predicates/SkipLiquibaseTablesPredicateTest.java +++ b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/predicates/SkipLiquibaseTablesPredicateTest.java @@ -10,8 +10,8 @@ package io.github.mfvanek.pg.model.predicates; -import io.github.mfvanek.pg.model.DbObject; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; +import io.github.mfvanek.pg.model.dbobject.DbObject; import io.github.mfvanek.pg.model.index.Index; import io.github.mfvanek.pg.model.sequence.SequenceState; import io.github.mfvanek.pg.model.table.Table; diff --git a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/predicates/SkipTablesByNamePredicateTest.java b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/predicates/SkipTablesByNamePredicateTest.java index a8425063..bb251a73 100644 --- a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/predicates/SkipTablesByNamePredicateTest.java +++ b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/predicates/SkipTablesByNamePredicateTest.java @@ -10,7 +10,7 @@ package io.github.mfvanek.pg.model.predicates; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.index.Index; import io.github.mfvanek.pg.model.sequence.SequenceState; import io.github.mfvanek.pg.model.table.Table; diff --git a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/sequence/SequenceStateTest.java b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/sequence/SequenceStateTest.java index 901b037c..aaa45b25 100644 --- a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/sequence/SequenceStateTest.java +++ b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/sequence/SequenceStateTest.java @@ -10,7 +10,7 @@ package io.github.mfvanek.pg.model.sequence; -import io.github.mfvanek.pg.model.object.PgObjectType; +import io.github.mfvanek.pg.model.dbobject.PgObjectType; import nl.jqno.equalsverifier.EqualsVerifier; import org.junit.jupiter.api.Test; diff --git a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/table/TableTest.java b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/table/TableTest.java index 594546d3..5595eb12 100644 --- a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/table/TableTest.java +++ b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/table/TableTest.java @@ -10,7 +10,7 @@ package io.github.mfvanek.pg.model.table; -import io.github.mfvanek.pg.model.object.PgObjectType; +import io.github.mfvanek.pg.model.dbobject.PgObjectType; import nl.jqno.equalsverifier.EqualsVerifier; import org.junit.jupiter.api.Test; diff --git a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/table/TableWithBloatTest.java b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/table/TableWithBloatTest.java index ea09de56..cb1c3c9b 100644 --- a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/table/TableWithBloatTest.java +++ b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/table/TableWithBloatTest.java @@ -10,7 +10,7 @@ package io.github.mfvanek.pg.model.table; -import io.github.mfvanek.pg.model.object.PgObjectType; +import io.github.mfvanek.pg.model.dbobject.PgObjectType; import nl.jqno.equalsverifier.EqualsVerifier; import org.junit.jupiter.api.Test; diff --git a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/table/TableWithMissingIndexTest.java b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/table/TableWithMissingIndexTest.java index cb700585..659e0c65 100644 --- a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/table/TableWithMissingIndexTest.java +++ b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/table/TableWithMissingIndexTest.java @@ -10,7 +10,7 @@ package io.github.mfvanek.pg.model.table; -import io.github.mfvanek.pg.model.object.PgObjectType; +import io.github.mfvanek.pg.model.dbobject.PgObjectType; import nl.jqno.equalsverifier.EqualsVerifier; import org.junit.jupiter.api.Test; diff --git a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/settings/ServerSpecificationBuilderTest.java b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/settings/ServerSpecificationBuilderTest.java index 1a91d850..9d13bb78 100644 --- a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/settings/ServerSpecificationBuilderTest.java +++ b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/settings/ServerSpecificationBuilderTest.java @@ -10,7 +10,7 @@ package io.github.mfvanek.pg.settings; -import io.github.mfvanek.pg.model.MemoryUnit; +import io.github.mfvanek.pg.units.MemoryUnit; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/settings/ServerSpecificationTest.java b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/settings/ServerSpecificationTest.java index f0ca5874..c2341cd7 100644 --- a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/settings/ServerSpecificationTest.java +++ b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/settings/ServerSpecificationTest.java @@ -10,7 +10,7 @@ package io.github.mfvanek.pg.settings; -import io.github.mfvanek.pg.model.MemoryUnit; +import io.github.mfvanek.pg.units.MemoryUnit; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/MemoryUnitTest.java b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/units/MemoryUnitTest.java similarity index 95% rename from pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/MemoryUnitTest.java rename to pg-index-health-model/src/test/java/io/github/mfvanek/pg/units/MemoryUnitTest.java index bde8dd50..57a89043 100644 --- a/pg-index-health-model/src/test/java/io/github/mfvanek/pg/model/MemoryUnitTest.java +++ b/pg-index-health-model/src/test/java/io/github/mfvanek/pg/units/MemoryUnitTest.java @@ -8,7 +8,7 @@ * Licensed under the Apache License 2.0 */ -package io.github.mfvanek.pg.model; +package io.github.mfvanek.pg.units; import org.junit.jupiter.api.Test; diff --git a/pg-index-health-testing/src/main/java/io/github/mfvanek/pg/testing/PostgreSqlClusterWrapper.java b/pg-index-health-testing/src/main/java/io/github/mfvanek/pg/testing/PostgreSqlClusterWrapper.java index 1133495b..66370f43 100644 --- a/pg-index-health-testing/src/main/java/io/github/mfvanek/pg/testing/PostgreSqlClusterWrapper.java +++ b/pg-index-health-testing/src/main/java/io/github/mfvanek/pg/testing/PostgreSqlClusterWrapper.java @@ -11,8 +11,8 @@ package io.github.mfvanek.pg.testing; import io.github.mfvanek.pg.connection.PgUrlParser; -import io.github.mfvanek.pg.model.MemoryUnit; import io.github.mfvanek.pg.testing.annotations.ExcludeFromJacocoGeneratedReport; +import io.github.mfvanek.pg.units.MemoryUnit; import org.apache.commons.dbcp2.BasicDataSource; import org.awaitility.Awaitility; import org.slf4j.Logger; diff --git a/pg-index-health-testing/src/main/java/io/github/mfvanek/pg/testing/PostgreSqlContainerWrapper.java b/pg-index-health-testing/src/main/java/io/github/mfvanek/pg/testing/PostgreSqlContainerWrapper.java index 6f33e55e..70224121 100644 --- a/pg-index-health-testing/src/main/java/io/github/mfvanek/pg/testing/PostgreSqlContainerWrapper.java +++ b/pg-index-health-testing/src/main/java/io/github/mfvanek/pg/testing/PostgreSqlContainerWrapper.java @@ -10,9 +10,9 @@ package io.github.mfvanek.pg.testing; -import io.github.mfvanek.pg.model.MemoryUnit; import io.github.mfvanek.pg.settings.ImportantParam; import io.github.mfvanek.pg.testing.annotations.ExcludeFromJacocoGeneratedReport; +import io.github.mfvanek.pg.units.MemoryUnit; import org.apache.commons.dbcp2.BasicDataSource; import org.testcontainers.containers.PostgreSQLContainer; import org.testcontainers.containers.wait.strategy.Wait; diff --git a/pg-index-health-testing/src/test/java/io/github/mfvanek/pg/testing/PostgresBitnamiRepmgrContainerTest.java b/pg-index-health-testing/src/test/java/io/github/mfvanek/pg/testing/PostgresBitnamiRepmgrContainerTest.java index 0bf7a892..153b6da8 100644 --- a/pg-index-health-testing/src/test/java/io/github/mfvanek/pg/testing/PostgresBitnamiRepmgrContainerTest.java +++ b/pg-index-health-testing/src/test/java/io/github/mfvanek/pg/testing/PostgresBitnamiRepmgrContainerTest.java @@ -10,7 +10,7 @@ package io.github.mfvanek.pg.testing; -import io.github.mfvanek.pg.model.MemoryUnit; +import io.github.mfvanek.pg.units.MemoryUnit; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; import org.testcontainers.containers.Network; diff --git a/pg-index-health/src/main/java/io/github/mfvanek/pg/checks/cluster/AbstractCheckOnCluster.java b/pg-index-health/src/main/java/io/github/mfvanek/pg/checks/cluster/AbstractCheckOnCluster.java index f877201f..9f113ad8 100644 --- a/pg-index-health/src/main/java/io/github/mfvanek/pg/checks/cluster/AbstractCheckOnCluster.java +++ b/pg-index-health/src/main/java/io/github/mfvanek/pg/checks/cluster/AbstractCheckOnCluster.java @@ -16,8 +16,8 @@ import io.github.mfvanek.pg.connection.HighAvailabilityPgConnection; import io.github.mfvanek.pg.connection.PgConnection; import io.github.mfvanek.pg.connection.PgHost; -import io.github.mfvanek.pg.model.DbObject; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; +import io.github.mfvanek.pg.model.dbobject.DbObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/pg-index-health/src/main/java/io/github/mfvanek/pg/checks/cluster/PossibleObjectNameOverflowCheckOnCluster.java b/pg-index-health/src/main/java/io/github/mfvanek/pg/checks/cluster/PossibleObjectNameOverflowCheckOnCluster.java index fb13b321..82cb5e79 100644 --- a/pg-index-health/src/main/java/io/github/mfvanek/pg/checks/cluster/PossibleObjectNameOverflowCheckOnCluster.java +++ b/pg-index-health/src/main/java/io/github/mfvanek/pg/checks/cluster/PossibleObjectNameOverflowCheckOnCluster.java @@ -12,7 +12,7 @@ import io.github.mfvanek.pg.checks.host.PossibleObjectNameOverflowCheckOnHost; import io.github.mfvanek.pg.connection.HighAvailabilityPgConnection; -import io.github.mfvanek.pg.model.object.AnyObject; +import io.github.mfvanek.pg.model.dbobject.AnyObject; import javax.annotation.Nonnull; diff --git a/pg-index-health/src/main/java/io/github/mfvanek/pg/common/maintenance/DatabaseCheckOnCluster.java b/pg-index-health/src/main/java/io/github/mfvanek/pg/common/maintenance/DatabaseCheckOnCluster.java index 810201bc..521396f0 100644 --- a/pg-index-health/src/main/java/io/github/mfvanek/pg/common/maintenance/DatabaseCheckOnCluster.java +++ b/pg-index-health/src/main/java/io/github/mfvanek/pg/common/maintenance/DatabaseCheckOnCluster.java @@ -10,8 +10,8 @@ package io.github.mfvanek.pg.common.maintenance; -import io.github.mfvanek.pg.model.DbObject; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; +import io.github.mfvanek.pg.model.dbobject.DbObject; import java.util.Collection; import java.util.List; diff --git a/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/AbstractCheckOnClusterTest.java b/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/AbstractCheckOnClusterTest.java index 9a3553a4..a106fdb7 100644 --- a/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/AbstractCheckOnClusterTest.java +++ b/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/AbstractCheckOnClusterTest.java @@ -12,7 +12,7 @@ import io.github.mfvanek.pg.checks.host.UnusedIndexesCheckOnHost; import io.github.mfvanek.pg.connection.HighAvailabilityPgConnection; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.index.IndexWithNulls; import io.github.mfvanek.pg.model.index.UnusedIndex; import io.github.mfvanek.pg.support.DatabaseAwareTestBase; diff --git a/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/BtreeIndexesOnArrayColumnsCheckOnClusterTest.java b/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/BtreeIndexesOnArrayColumnsCheckOnClusterTest.java index ed1a4179..ccad906b 100644 --- a/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/BtreeIndexesOnArrayColumnsCheckOnClusterTest.java +++ b/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/BtreeIndexesOnArrayColumnsCheckOnClusterTest.java @@ -12,8 +12,8 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnCluster; import io.github.mfvanek.pg.common.maintenance.Diagnostic; -import io.github.mfvanek.pg.model.PgContext; import io.github.mfvanek.pg.model.column.Column; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.index.IndexWithColumns; import io.github.mfvanek.pg.model.predicates.SkipTablesByNamePredicate; import io.github.mfvanek.pg.support.DatabaseAwareTestBase; diff --git a/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/ColumnsWithJsonTypeCheckOnClusterTest.java b/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/ColumnsWithJsonTypeCheckOnClusterTest.java index d30a29d2..25204b86 100644 --- a/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/ColumnsWithJsonTypeCheckOnClusterTest.java +++ b/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/ColumnsWithJsonTypeCheckOnClusterTest.java @@ -12,8 +12,8 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnCluster; import io.github.mfvanek.pg.common.maintenance.Diagnostic; -import io.github.mfvanek.pg.model.PgContext; import io.github.mfvanek.pg.model.column.Column; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.predicates.SkipTablesByNamePredicate; import io.github.mfvanek.pg.support.DatabaseAwareTestBase; import org.junit.jupiter.api.Test; diff --git a/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/ColumnsWithSerialTypesCheckOnClusterTest.java b/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/ColumnsWithSerialTypesCheckOnClusterTest.java index cd678dff..529fad76 100644 --- a/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/ColumnsWithSerialTypesCheckOnClusterTest.java +++ b/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/ColumnsWithSerialTypesCheckOnClusterTest.java @@ -12,9 +12,9 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnCluster; import io.github.mfvanek.pg.common.maintenance.Diagnostic; -import io.github.mfvanek.pg.model.PgContext; import io.github.mfvanek.pg.model.column.Column; import io.github.mfvanek.pg.model.column.ColumnWithSerialType; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.predicates.SkipBySequenceNamePredicate; import io.github.mfvanek.pg.model.predicates.SkipTablesByNamePredicate; import io.github.mfvanek.pg.support.DatabaseAwareTestBase; diff --git a/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/ColumnsWithoutDescriptionCheckOnClusterTest.java b/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/ColumnsWithoutDescriptionCheckOnClusterTest.java index 37949077..ac4bf153 100644 --- a/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/ColumnsWithoutDescriptionCheckOnClusterTest.java +++ b/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/ColumnsWithoutDescriptionCheckOnClusterTest.java @@ -12,8 +12,8 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnCluster; import io.github.mfvanek.pg.common.maintenance.Diagnostic; -import io.github.mfvanek.pg.model.PgContext; import io.github.mfvanek.pg.model.column.Column; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.predicates.SkipTablesByNamePredicate; import io.github.mfvanek.pg.support.DatabaseAwareTestBase; import io.github.mfvanek.pg.support.DatabasePopulator; diff --git a/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/DuplicatedForeignKeysCheckOnClusterTest.java b/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/DuplicatedForeignKeysCheckOnClusterTest.java index ca45db3d..2128f775 100644 --- a/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/DuplicatedForeignKeysCheckOnClusterTest.java +++ b/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/DuplicatedForeignKeysCheckOnClusterTest.java @@ -12,10 +12,10 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnCluster; import io.github.mfvanek.pg.common.maintenance.Diagnostic; -import io.github.mfvanek.pg.model.PgContext; import io.github.mfvanek.pg.model.column.Column; import io.github.mfvanek.pg.model.constraint.DuplicatedForeignKeys; import io.github.mfvanek.pg.model.constraint.ForeignKey; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.predicates.SkipTablesByNamePredicate; import io.github.mfvanek.pg.support.DatabaseAwareTestBase; import org.junit.jupiter.api.Test; diff --git a/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/DuplicatedIndexesCheckOnClusterTest.java b/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/DuplicatedIndexesCheckOnClusterTest.java index e4aad161..015c8829 100644 --- a/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/DuplicatedIndexesCheckOnClusterTest.java +++ b/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/DuplicatedIndexesCheckOnClusterTest.java @@ -12,7 +12,7 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnCluster; import io.github.mfvanek.pg.common.maintenance.Diagnostic; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.index.DuplicatedIndexes; import io.github.mfvanek.pg.model.index.IndexWithSize; import io.github.mfvanek.pg.model.predicates.SkipIndexesByNamePredicate; diff --git a/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/ForeignKeysNotCoveredWithIndexCheckOnClusterTest.java b/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/ForeignKeysNotCoveredWithIndexCheckOnClusterTest.java index 0bbec82b..a1778fd5 100644 --- a/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/ForeignKeysNotCoveredWithIndexCheckOnClusterTest.java +++ b/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/ForeignKeysNotCoveredWithIndexCheckOnClusterTest.java @@ -12,9 +12,9 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnCluster; import io.github.mfvanek.pg.common.maintenance.Diagnostic; -import io.github.mfvanek.pg.model.PgContext; import io.github.mfvanek.pg.model.column.Column; import io.github.mfvanek.pg.model.constraint.ForeignKey; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.predicates.SkipTablesByNamePredicate; import io.github.mfvanek.pg.support.DatabaseAwareTestBase; import org.junit.jupiter.api.Test; diff --git a/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/ForeignKeysWithUnmatchedColumnTypeCheckOnClusterTest.java b/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/ForeignKeysWithUnmatchedColumnTypeCheckOnClusterTest.java index 318a5189..f6cbfeb8 100644 --- a/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/ForeignKeysWithUnmatchedColumnTypeCheckOnClusterTest.java +++ b/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/ForeignKeysWithUnmatchedColumnTypeCheckOnClusterTest.java @@ -12,9 +12,9 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnCluster; import io.github.mfvanek.pg.common.maintenance.Diagnostic; -import io.github.mfvanek.pg.model.PgContext; import io.github.mfvanek.pg.model.column.Column; import io.github.mfvanek.pg.model.constraint.ForeignKey; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.predicates.SkipTablesByNamePredicate; import io.github.mfvanek.pg.support.DatabaseAwareTestBase; import org.junit.jupiter.api.Test; diff --git a/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/FunctionsWithoutDescriptionCheckOnClusterTest.java b/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/FunctionsWithoutDescriptionCheckOnClusterTest.java index 06d37a3c..34d03fd4 100644 --- a/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/FunctionsWithoutDescriptionCheckOnClusterTest.java +++ b/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/FunctionsWithoutDescriptionCheckOnClusterTest.java @@ -12,7 +12,7 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnCluster; import io.github.mfvanek.pg.common.maintenance.Diagnostic; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.function.StoredFunction; import io.github.mfvanek.pg.model.predicates.SkipDbObjectsByNamePredicate; import io.github.mfvanek.pg.support.DatabaseAwareTestBase; diff --git a/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/IndexesWithBloatCheckOnClusterTest.java b/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/IndexesWithBloatCheckOnClusterTest.java index b68b547a..1a3ed32f 100644 --- a/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/IndexesWithBloatCheckOnClusterTest.java +++ b/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/IndexesWithBloatCheckOnClusterTest.java @@ -12,7 +12,7 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnCluster; import io.github.mfvanek.pg.common.maintenance.Diagnostic; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.index.IndexWithBloat; import io.github.mfvanek.pg.model.predicates.SkipBloatUnderThresholdPredicate; import io.github.mfvanek.pg.model.predicates.SkipIndexesByNamePredicate; diff --git a/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/IndexesWithBooleanCheckOnClusterTest.java b/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/IndexesWithBooleanCheckOnClusterTest.java index 6c1a9fda..82dab62d 100644 --- a/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/IndexesWithBooleanCheckOnClusterTest.java +++ b/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/IndexesWithBooleanCheckOnClusterTest.java @@ -12,8 +12,8 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnCluster; import io.github.mfvanek.pg.common.maintenance.Diagnostic; -import io.github.mfvanek.pg.model.PgContext; import io.github.mfvanek.pg.model.column.Column; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.index.IndexWithColumns; import io.github.mfvanek.pg.model.predicates.SkipIndexesByNamePredicate; import io.github.mfvanek.pg.model.predicates.SkipTablesByNamePredicate; diff --git a/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/IndexesWithNullValuesCheckOnClusterTest.java b/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/IndexesWithNullValuesCheckOnClusterTest.java index 3ad209a9..d88d5fc9 100644 --- a/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/IndexesWithNullValuesCheckOnClusterTest.java +++ b/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/IndexesWithNullValuesCheckOnClusterTest.java @@ -12,7 +12,7 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnCluster; import io.github.mfvanek.pg.common.maintenance.Diagnostic; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.index.IndexWithNulls; import io.github.mfvanek.pg.model.predicates.SkipIndexesByNamePredicate; import io.github.mfvanek.pg.model.predicates.SkipTablesByNamePredicate; diff --git a/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/IntersectedForeignKeysCheckOnClusterTest.java b/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/IntersectedForeignKeysCheckOnClusterTest.java index 2f17d606..37fcf936 100644 --- a/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/IntersectedForeignKeysCheckOnClusterTest.java +++ b/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/IntersectedForeignKeysCheckOnClusterTest.java @@ -12,10 +12,10 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnCluster; import io.github.mfvanek.pg.common.maintenance.Diagnostic; -import io.github.mfvanek.pg.model.PgContext; import io.github.mfvanek.pg.model.column.Column; import io.github.mfvanek.pg.model.constraint.DuplicatedForeignKeys; import io.github.mfvanek.pg.model.constraint.ForeignKey; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.predicates.SkipTablesByNamePredicate; import io.github.mfvanek.pg.support.DatabaseAwareTestBase; import org.junit.jupiter.api.Test; diff --git a/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/IntersectedIndexesCheckOnClusterTest.java b/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/IntersectedIndexesCheckOnClusterTest.java index ce6a7885..1f37443a 100644 --- a/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/IntersectedIndexesCheckOnClusterTest.java +++ b/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/IntersectedIndexesCheckOnClusterTest.java @@ -12,7 +12,7 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnCluster; import io.github.mfvanek.pg.common.maintenance.Diagnostic; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.index.DuplicatedIndexes; import io.github.mfvanek.pg.model.index.IndexWithSize; import io.github.mfvanek.pg.model.predicates.SkipIndexesByNamePredicate; diff --git a/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/InvalidIndexesCheckOnClusterTest.java b/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/InvalidIndexesCheckOnClusterTest.java index 815ef5a2..5f3c520b 100644 --- a/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/InvalidIndexesCheckOnClusterTest.java +++ b/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/InvalidIndexesCheckOnClusterTest.java @@ -12,7 +12,7 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnCluster; import io.github.mfvanek.pg.common.maintenance.Diagnostic; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.index.Index; import io.github.mfvanek.pg.model.predicates.SkipIndexesByNamePredicate; import io.github.mfvanek.pg.model.predicates.SkipTablesByNamePredicate; diff --git a/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/NotValidConstraintsCheckOnClusterTest.java b/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/NotValidConstraintsCheckOnClusterTest.java index 78297638..5a2b6942 100644 --- a/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/NotValidConstraintsCheckOnClusterTest.java +++ b/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/NotValidConstraintsCheckOnClusterTest.java @@ -12,9 +12,9 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnCluster; import io.github.mfvanek.pg.common.maintenance.Diagnostic; -import io.github.mfvanek.pg.model.PgContext; import io.github.mfvanek.pg.model.constraint.Constraint; import io.github.mfvanek.pg.model.constraint.ConstraintType; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.predicates.SkipTablesByNamePredicate; import io.github.mfvanek.pg.support.DatabaseAwareTestBase; import io.github.mfvanek.pg.support.ExecuteUtils; diff --git a/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/PossibleObjectNameOverflowCheckOnClusterTest.java b/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/PossibleObjectNameOverflowCheckOnClusterTest.java index ba0f4908..05a76d25 100644 --- a/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/PossibleObjectNameOverflowCheckOnClusterTest.java +++ b/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/PossibleObjectNameOverflowCheckOnClusterTest.java @@ -12,9 +12,9 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnCluster; import io.github.mfvanek.pg.common.maintenance.Diagnostic; -import io.github.mfvanek.pg.model.PgContext; -import io.github.mfvanek.pg.model.object.AnyObject; -import io.github.mfvanek.pg.model.object.PgObjectType; +import io.github.mfvanek.pg.model.context.PgContext; +import io.github.mfvanek.pg.model.dbobject.AnyObject; +import io.github.mfvanek.pg.model.dbobject.PgObjectType; import io.github.mfvanek.pg.model.predicates.SkipDbObjectsByNamePredicate; import io.github.mfvanek.pg.support.DatabaseAwareTestBase; import org.junit.jupiter.api.Test; diff --git a/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/PrimaryKeysWithSerialTypesCheckOnClusterTest.java b/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/PrimaryKeysWithSerialTypesCheckOnClusterTest.java index 551ddda5..fecbe846 100644 --- a/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/PrimaryKeysWithSerialTypesCheckOnClusterTest.java +++ b/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/PrimaryKeysWithSerialTypesCheckOnClusterTest.java @@ -12,10 +12,10 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnCluster; import io.github.mfvanek.pg.common.maintenance.Diagnostic; -import io.github.mfvanek.pg.model.PgContext; import io.github.mfvanek.pg.model.column.Column; import io.github.mfvanek.pg.model.column.ColumnWithSerialType; import io.github.mfvanek.pg.model.column.SerialType; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.predicates.SkipBySequenceNamePredicate; import io.github.mfvanek.pg.model.predicates.SkipTablesByNamePredicate; import io.github.mfvanek.pg.support.DatabaseAwareTestBase; diff --git a/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/SequenceOverflowCheckOnClusterTest.java b/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/SequenceOverflowCheckOnClusterTest.java index 958e0ece..9c5460c7 100644 --- a/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/SequenceOverflowCheckOnClusterTest.java +++ b/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/SequenceOverflowCheckOnClusterTest.java @@ -12,7 +12,7 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnCluster; import io.github.mfvanek.pg.common.maintenance.Diagnostic; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.predicates.SkipBySequenceNamePredicate; import io.github.mfvanek.pg.model.sequence.SequenceState; import io.github.mfvanek.pg.support.DatabaseAwareTestBase; diff --git a/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/TablesNotLinkedToOthersCheckOnClusterTest.java b/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/TablesNotLinkedToOthersCheckOnClusterTest.java index 1e295b9e..1179c4fe 100644 --- a/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/TablesNotLinkedToOthersCheckOnClusterTest.java +++ b/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/TablesNotLinkedToOthersCheckOnClusterTest.java @@ -12,7 +12,7 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnCluster; import io.github.mfvanek.pg.common.maintenance.Diagnostic; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.predicates.SkipTablesByNamePredicate; import io.github.mfvanek.pg.model.table.Table; import io.github.mfvanek.pg.support.DatabaseAwareTestBase; diff --git a/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/TablesWithBloatCheckOnClusterTest.java b/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/TablesWithBloatCheckOnClusterTest.java index 8cace23a..975af0be 100644 --- a/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/TablesWithBloatCheckOnClusterTest.java +++ b/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/TablesWithBloatCheckOnClusterTest.java @@ -12,7 +12,7 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnCluster; import io.github.mfvanek.pg.common.maintenance.Diagnostic; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.predicates.SkipBloatUnderThresholdPredicate; import io.github.mfvanek.pg.model.predicates.SkipTablesByNamePredicate; import io.github.mfvanek.pg.model.table.TableWithBloat; diff --git a/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/TablesWithMissingIndexesCheckOnClusterTest.java b/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/TablesWithMissingIndexesCheckOnClusterTest.java index 0bbef44d..394556df 100644 --- a/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/TablesWithMissingIndexesCheckOnClusterTest.java +++ b/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/TablesWithMissingIndexesCheckOnClusterTest.java @@ -12,7 +12,7 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnCluster; import io.github.mfvanek.pg.common.maintenance.Diagnostic; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.predicates.SkipSmallTablesPredicate; import io.github.mfvanek.pg.model.predicates.SkipTablesByNamePredicate; import io.github.mfvanek.pg.model.table.TableWithMissingIndex; diff --git a/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/TablesWithoutDescriptionCheckOnClusterTest.java b/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/TablesWithoutDescriptionCheckOnClusterTest.java index 1fc46586..54fda2a8 100644 --- a/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/TablesWithoutDescriptionCheckOnClusterTest.java +++ b/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/TablesWithoutDescriptionCheckOnClusterTest.java @@ -12,7 +12,7 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnCluster; import io.github.mfvanek.pg.common.maintenance.Diagnostic; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.predicates.SkipSmallTablesPredicate; import io.github.mfvanek.pg.model.predicates.SkipTablesByNamePredicate; import io.github.mfvanek.pg.model.table.Table; diff --git a/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/TablesWithoutPrimaryKeyCheckOnClusterTest.java b/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/TablesWithoutPrimaryKeyCheckOnClusterTest.java index 09e1d244..5ced905a 100644 --- a/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/TablesWithoutPrimaryKeyCheckOnClusterTest.java +++ b/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/TablesWithoutPrimaryKeyCheckOnClusterTest.java @@ -12,7 +12,7 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnCluster; import io.github.mfvanek.pg.common.maintenance.Diagnostic; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.predicates.SkipTablesByNamePredicate; import io.github.mfvanek.pg.model.table.Table; import io.github.mfvanek.pg.support.DatabaseAwareTestBase; diff --git a/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/UnusedIndexesCheckOnClusterTest.java b/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/UnusedIndexesCheckOnClusterTest.java index f6ead534..b62323ed 100644 --- a/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/UnusedIndexesCheckOnClusterTest.java +++ b/pg-index-health/src/test/java/io/github/mfvanek/pg/checks/cluster/UnusedIndexesCheckOnClusterTest.java @@ -12,7 +12,7 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnCluster; import io.github.mfvanek.pg.common.maintenance.Diagnostic; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.index.UnusedIndex; import io.github.mfvanek.pg.model.predicates.SkipDbObjectsByNamePredicate; import io.github.mfvanek.pg.model.predicates.SkipIndexesByNamePredicate; diff --git a/pg-index-health/src/test/java/io/github/mfvanek/pg/common/maintenance/DatabaseCheckOnClusterTest.java b/pg-index-health/src/test/java/io/github/mfvanek/pg/common/maintenance/DatabaseCheckOnClusterTest.java index 563d3b19..8d1971d1 100644 --- a/pg-index-health/src/test/java/io/github/mfvanek/pg/common/maintenance/DatabaseCheckOnClusterTest.java +++ b/pg-index-health/src/test/java/io/github/mfvanek/pg/common/maintenance/DatabaseCheckOnClusterTest.java @@ -10,7 +10,7 @@ package io.github.mfvanek.pg.common.maintenance; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.model.table.Table; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/pg-index-health/src/test/java/io/github/mfvanek/pg/common/management/DatabaseManagementImplTest.java b/pg-index-health/src/test/java/io/github/mfvanek/pg/common/management/DatabaseManagementImplTest.java index b74db2a6..63c3dcc2 100644 --- a/pg-index-health/src/test/java/io/github/mfvanek/pg/common/management/DatabaseManagementImplTest.java +++ b/pg-index-health/src/test/java/io/github/mfvanek/pg/common/management/DatabaseManagementImplTest.java @@ -10,14 +10,14 @@ package io.github.mfvanek.pg.common.management; -import io.github.mfvanek.pg.model.MemoryUnit; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; import io.github.mfvanek.pg.settings.ImportantParam; import io.github.mfvanek.pg.settings.PgParam; import io.github.mfvanek.pg.settings.ServerSpecification; import io.github.mfvanek.pg.settings.maintenance.ConfigurationMaintenanceOnHostImpl; import io.github.mfvanek.pg.statistics.maintenance.StatisticsMaintenanceOnHostImpl; import io.github.mfvanek.pg.support.StatisticsAwareTestBase; +import io.github.mfvanek.pg.units.MemoryUnit; import io.github.mfvanek.pg.utils.ClockHolder; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; diff --git a/pg-index-health/src/test/java/io/github/mfvanek/pg/support/AbstractCheckOnClusterAssert.java b/pg-index-health/src/test/java/io/github/mfvanek/pg/support/AbstractCheckOnClusterAssert.java index f5c20345..f693aad0 100644 --- a/pg-index-health/src/test/java/io/github/mfvanek/pg/support/AbstractCheckOnClusterAssert.java +++ b/pg-index-health/src/test/java/io/github/mfvanek/pg/support/AbstractCheckOnClusterAssert.java @@ -12,8 +12,8 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnCluster; import io.github.mfvanek.pg.common.maintenance.Diagnostic; -import io.github.mfvanek.pg.model.DbObject; -import io.github.mfvanek.pg.model.PgContext; +import io.github.mfvanek.pg.model.context.PgContext; +import io.github.mfvanek.pg.model.dbobject.DbObject; import org.assertj.core.api.AbstractAssert; import org.assertj.core.api.Assertions; import org.assertj.core.api.ListAssert; diff --git a/spring-boot-integration/kotlin-demo-app/src/test/kotlin/io/github/mfvanek/pg/spring/postgres/kt/PostgresDemoApplicationKtTest.kt b/spring-boot-integration/kotlin-demo-app/src/test/kotlin/io/github/mfvanek/pg/spring/postgres/kt/PostgresDemoApplicationKtTest.kt index c91c0950..7369d22b 100644 --- a/spring-boot-integration/kotlin-demo-app/src/test/kotlin/io/github/mfvanek/pg/spring/postgres/kt/PostgresDemoApplicationKtTest.kt +++ b/spring-boot-integration/kotlin-demo-app/src/test/kotlin/io/github/mfvanek/pg/spring/postgres/kt/PostgresDemoApplicationKtTest.kt @@ -14,7 +14,7 @@ import com.zaxxer.hikari.HikariDataSource import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnHost import io.github.mfvanek.pg.common.maintenance.Diagnostic import io.github.mfvanek.pg.connection.PgConnection -import io.github.mfvanek.pg.model.DbObject +import io.github.mfvanek.pg.model.dbobject.DbObject import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import org.springframework.beans.factory.annotation.Autowired diff --git a/spring-boot-integration/postgres-demo-app/src/test/java/io/github/mfvanek/pg/spring/postgres/PostgresDemoApplicationTest.java b/spring-boot-integration/postgres-demo-app/src/test/java/io/github/mfvanek/pg/spring/postgres/PostgresDemoApplicationTest.java index 72c21220..a73edc5a 100644 --- a/spring-boot-integration/postgres-demo-app/src/test/java/io/github/mfvanek/pg/spring/postgres/PostgresDemoApplicationTest.java +++ b/spring-boot-integration/postgres-demo-app/src/test/java/io/github/mfvanek/pg/spring/postgres/PostgresDemoApplicationTest.java @@ -14,7 +14,7 @@ import io.github.mfvanek.pg.common.maintenance.DatabaseCheckOnHost; import io.github.mfvanek.pg.common.maintenance.Diagnostic; import io.github.mfvanek.pg.connection.PgConnection; -import io.github.mfvanek.pg.model.DbObject; +import io.github.mfvanek.pg.model.dbobject.DbObject; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest;