Refactor packages in pg-index-health-model (#501)

* Refactor packages in pg-index-health-model

* PgContext#enrichSequenceWithSchema method was deleted

* AnyObject class was moved from io.github.mfvanek.pg.model.object to io.github.mfvanek.pg.model.dbobject (for better compatibility with Kotlin)
PgObjectType enum was moved from io.github.mfvanek.pg.model.object to io.github.mfvanek.pg.model.dbobject (for better compatibility with Kotlin)

* Imports order #1

* Imports order #2

* Imports order #3

* Imports order #4

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;
 

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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;