(#117) Moved classes to sub-packages

rocket-3 · Nov 7, 2021 · 85841f6 · 85841f6
1 parent 2a4f433
commit 85841f6
Show file tree

Hide file tree

Showing 52 changed files with 110 additions and 121 deletions.
diff --git a/src/main/java/org/fusionsoft/database/dbdfile/DbdFileOfSnapshotObjects.java b/src/main/java/org/fusionsoft/database/dbdfile/DbdFileOfSnapshotObjects.java
@@ -16,8 +16,8 @@
 package org.fusionsoft.database.dbdfile;
 
 import org.fusionsoft.database.mapping.dbd.DbdInfoMapping;
-import org.fusionsoft.database.mapping.dbd.DbdRootMappingOfSnapshotObjects;
 import org.fusionsoft.database.mapping.dbd.DbdServerEntry;
+import org.fusionsoft.database.mapping.dbd.ofobjects.DbdRootMappingOfSnapshotObjects;
 import org.fusionsoft.database.snapshot.Objects;
 
 /**

diff --git a/src/main/java/org/fusionsoft/database/mapping/dbd/DbdTableColumnsSequenceOf.java b/src/main/java/org/fusionsoft/database/mapping/dbd/DbdTableColumnsSequenceOf.java
diff --git a/...base/mapping/dbd/DbdRootMappingBuilt.java → ...apping/dbd/built/DbdRootMappingBuilt.java b/...base/mapping/dbd/DbdRootMappingBuilt.java → ...apping/dbd/built/DbdRootMappingBuilt.java
@@ -13,9 +13,14 @@
  * See the License for the specific language governing permissions
  * and limitations under the License.
  */
-package org.fusionsoft.database.mapping.dbd;
+package org.fusionsoft.database.mapping.dbd.built;
 
 import org.cactoos.map.MapEntry;
+import org.fusionsoft.database.mapping.dbd.DbdInfoMapping;
+import org.fusionsoft.database.mapping.dbd.DbdRootMapping;
+import org.fusionsoft.database.mapping.dbd.DbdServersMapping;
+import org.fusionsoft.database.mapping.dbd.TextOfDbdDefaultJsonSchemaRef;
+import org.fusionsoft.database.mapping.dbd.ofobjects.DbdSchemasMappingOfObjects;
 import org.fusionsoft.database.mapping.entries.ScalarEntry;
 import org.fusionsoft.database.mapping.fields.DbdRootFields;
 import org.fusionsoft.database.snapshot.Objects;

diff --git a/.../dbd/DbdServerMappingWithCredentials.java → ...uilt/DbdServerMappingWithCredentials.java b/.../dbd/DbdServerMappingWithCredentials.java → ...uilt/DbdServerMappingWithCredentials.java
@@ -13,10 +13,11 @@
  * See the License for the specific language governing permissions
  * and limitations under the License.
  */
-package org.fusionsoft.database.mapping.dbd;
+package org.fusionsoft.database.mapping.dbd.built;
 
 import org.cactoos.Text;
 import org.cactoos.text.TextOfScalar;
+import org.fusionsoft.database.mapping.dbd.DbdServerMapping;
 import org.fusionsoft.database.mapping.entries.ScalarEntry;
 import org.fusionsoft.database.mapping.fields.DbdServerFields;
 import org.fusionsoft.lib.ci.credentials.Credentials;

diff --git a/...ase/mapping/dbd/SimpleDbdInfoMapping.java → ...pping/dbd/built/SimpleDbdInfoMapping.java b/...ase/mapping/dbd/SimpleDbdInfoMapping.java → ...pping/dbd/built/SimpleDbdInfoMapping.java
@@ -13,10 +13,11 @@
  * See the License for the specific language governing permissions
  * and limitations under the License.
  */
-package org.fusionsoft.database.mapping.dbd;
+package org.fusionsoft.database.mapping.dbd.built;
 
 import org.cactoos.Text;
 import org.cactoos.text.TextOf;
+import org.fusionsoft.database.mapping.dbd.DbdInfoMapping;
 import org.fusionsoft.database.mapping.entries.ScalarEntry;
 import org.fusionsoft.database.mapping.fields.DbdInfoFields;
 import org.fusionsoft.lib.text.JsonEmptyText;

diff --git a/.../mapping/dbd/DbdInfoMappingOfDbdFile.java → ...bd/extracted/DbdInfoMappingOfDbdFile.java b/.../mapping/dbd/DbdInfoMappingOfDbdFile.java → ...bd/extracted/DbdInfoMappingOfDbdFile.java
@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions
  * and limitations under the License.
  */
-package org.fusionsoft.database.mapping.dbd;
+package org.fusionsoft.database.mapping.dbd.extracted;
 
 import org.fusionsoft.database.DbdFile;
+import org.fusionsoft.database.mapping.dbd.DbdInfoMapping;
 import org.fusionsoft.database.mapping.fields.DbdRootFields;
 import org.fusionsoft.lib.yaml.YamlMappingOfPath;
 

diff --git a/.../mapping/dbd/DbdServerEntryOfDbdFile.java → ...bd/extracted/DbdServerEntryOfDbdFile.java b/.../mapping/dbd/DbdServerEntryOfDbdFile.java → ...bd/extracted/DbdServerEntryOfDbdFile.java
@@ -13,10 +13,11 @@
  * See the License for the specific language governing permissions
  * and limitations under the License.
  */
-package org.fusionsoft.database.mapping.dbd;
+package org.fusionsoft.database.mapping.dbd.extracted;
 
 import org.cactoos.Text;
 import org.fusionsoft.database.DbdFile;
+import org.fusionsoft.database.mapping.dbd.DbdServerEntry;
 
 /**
  * The type of DbdServerMapping that can be constructed of {@link DbdFile}.

diff --git a/...apping/dbd/DbdServerMappingOfDbdFile.java → .../extracted/DbdServerMappingOfDbdFile.java b/...apping/dbd/DbdServerMappingOfDbdFile.java → .../extracted/DbdServerMappingOfDbdFile.java
@@ -13,10 +13,11 @@
  * See the License for the specific language governing permissions
  * and limitations under the License.
  */
-package org.fusionsoft.database.mapping.dbd;
+package org.fusionsoft.database.mapping.dbd.extracted;
 
 import org.cactoos.Text;
 import org.fusionsoft.database.DbdFile;
+import org.fusionsoft.database.mapping.dbd.DbdServerMapping;
 import org.fusionsoft.database.mapping.fields.DbdRootFields;
 import org.fusionsoft.lib.yaml.YamlMappingOfPath;
 

diff --git a/.../dbd/DbdRootMappingOfSnapshotObjects.java → ...ects/DbdRootMappingOfSnapshotObjects.java b/.../dbd/DbdRootMappingOfSnapshotObjects.java → ...ects/DbdRootMappingOfSnapshotObjects.java
@@ -13,9 +13,13 @@
  * See the License for the specific language governing permissions
  * and limitations under the License.
  */
-package org.fusionsoft.database.mapping.dbd;
+package org.fusionsoft.database.mapping.dbd.ofobjects;
 
 import org.cactoos.iterable.IterableOf;
+import org.fusionsoft.database.mapping.dbd.DbdInfoMapping;
+import org.fusionsoft.database.mapping.dbd.DbdServerEntry;
+import org.fusionsoft.database.mapping.dbd.DbdServersMapping;
+import org.fusionsoft.database.mapping.dbd.built.DbdRootMappingBuilt;
 import org.fusionsoft.database.snapshot.Objects;
 
 /**

diff --git a/...apping/dbd/DbdSchemaMappingOfObjects.java → .../ofobjects/DbdSchemaMappingOfObjects.java b/...apping/dbd/DbdSchemaMappingOfObjects.java → .../ofobjects/DbdSchemaMappingOfObjects.java
@@ -13,13 +13,14 @@
  * See the License for the specific language governing permissions
  * and limitations under the License.
  */
-package org.fusionsoft.database.mapping.dbd;
+package org.fusionsoft.database.mapping.dbd.ofobjects;
 
 import com.amihaiemil.eoyaml.YamlNode;
 import org.cactoos.iterable.IterableOf;
 import org.cactoos.iterable.Joined;
 import org.cactoos.map.MapEntry;
 import org.fusionsoft.database.mapping.MappingOfRepresentative;
+import org.fusionsoft.database.mapping.dbd.DbdSchemaMapping;
 import org.fusionsoft.database.mapping.fields.DbdSchemaFields;
 import org.fusionsoft.database.snapshot.DbObject;
 import org.fusionsoft.database.snapshot.Objects;
@@ -73,6 +74,15 @@ public DbdSchemaMappingOfObjects(
                                     schema
                                 )
                             )
+                        ),
+                        new IterableOf<>(
+                            new MapEntry<>(
+                                DbdSchemaFields.DOMAINS,
+                                new DbdDomainsMappingOfObjects(
+                                    objects,
+                                    schema
+                                )
+                            )
                         )
                     )
                 )

diff --git a/...pping/dbd/DbdSchemasMappingOfObjects.java → ...ofobjects/DbdSchemasMappingOfObjects.java b/...pping/dbd/DbdSchemasMappingOfObjects.java → ...ofobjects/DbdSchemasMappingOfObjects.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions
  * and limitations under the License.
  */
-package org.fusionsoft.database.mapping.dbd;
+package org.fusionsoft.database.mapping.dbd.ofobjects;
 
 import org.fusionsoft.database.mapping.entries.UnwrapEntriesOfObjects;
 import org.fusionsoft.database.snapshot.Objects;

diff --git a/...ping/dbd/DbdSequenceMappingOfObjects.java → ...fobjects/DbdSequenceMappingOfObjects.java b/...ping/dbd/DbdSequenceMappingOfObjects.java → ...fobjects/DbdSequenceMappingOfObjects.java
@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions
  * and limitations under the License.
  */
-package org.fusionsoft.database.mapping.dbd;
+package org.fusionsoft.database.mapping.dbd.ofobjects;
 
 import org.fusionsoft.database.mapping.MappingOfRepresentative;
+import org.fusionsoft.database.mapping.dbd.DbdSequenceMapping;
 import org.fusionsoft.database.snapshot.DbObject;
 import org.fusionsoft.database.snapshot.Objects;
 

diff --git a/...ing/dbd/DbdSequencesMappingOfObjects.java → ...objects/DbdSequencesMappingOfObjects.java b/...ing/dbd/DbdSequencesMappingOfObjects.java → ...objects/DbdSequencesMappingOfObjects.java
@@ -13,8 +13,9 @@
  * See the License for the specific language governing permissions
  * and limitations under the License.
  */
-package org.fusionsoft.database.mapping.dbd;
+package org.fusionsoft.database.mapping.dbd.ofobjects;
 
+import org.fusionsoft.database.mapping.dbd.DbdSequenceMapping;
 import org.fusionsoft.database.mapping.entries.UnwrapEntriesOfObjects;
 import org.fusionsoft.database.snapshot.DbObject;
 import org.fusionsoft.database.snapshot.Objects;

diff --git a/...mapping/dbd/DbdTableMappingOfObjects.java → ...d/ofobjects/DbdTableMappingOfObjects.java b/...mapping/dbd/DbdTableMappingOfObjects.java → ...d/ofobjects/DbdTableMappingOfObjects.java
@@ -13,9 +13,13 @@
  * See the License for the specific language governing permissions
  * and limitations under the License.
  */
-package org.fusionsoft.database.mapping.dbd;
+package org.fusionsoft.database.mapping.dbd.ofobjects;
 
 import org.fusionsoft.database.mapping.MappingOfRepresentative;
+import org.fusionsoft.database.mapping.dbd.DbdConstraintMapping;
+import org.fusionsoft.database.mapping.dbd.DbdIndexMapping;
+import org.fusionsoft.database.mapping.dbd.DbdTableMapping;
+import org.fusionsoft.database.mapping.dbd.DbdTriggerMapping;
 import org.fusionsoft.database.mapping.entries.UnwrapEntriesOfObjects;
 import org.fusionsoft.database.snapshot.DbObject;
 import org.fusionsoft.database.snapshot.Objects;

diff --git a/.../dbd/DbdTableMappingWithChildObjects.java → ...ects/DbdTableMappingWithChildObjects.java b/.../dbd/DbdTableMappingWithChildObjects.java → ...ects/DbdTableMappingWithChildObjects.java
@@ -13,13 +13,17 @@
  * See the License for the specific language governing permissions
  * and limitations under the License.
  */
-package org.fusionsoft.database.mapping.dbd;
+package org.fusionsoft.database.mapping.dbd.ofobjects;
 
 import com.amihaiemil.eoyaml.YamlNode;
 import org.cactoos.Text;
 import org.cactoos.iterable.IterableOf;
 import org.cactoos.iterable.Joined;
 import org.cactoos.map.MapEntry;
+import org.fusionsoft.database.mapping.dbd.DbdConstraintMapping;
+import org.fusionsoft.database.mapping.dbd.DbdIndexMapping;
+import org.fusionsoft.database.mapping.dbd.DbdTableMapping;
+import org.fusionsoft.database.mapping.dbd.DbdTriggerMapping;
 import org.fusionsoft.database.mapping.entries.EntriesWithKeys;
 import org.fusionsoft.database.mapping.entries.EntriesWithoutKeys;
 import org.fusionsoft.database.mapping.fields.DbdTableFields;

diff --git a/...apping/dbd/DbdTablesMappingOfObjects.java → .../ofobjects/DbdTablesMappingOfObjects.java b/...apping/dbd/DbdTablesMappingOfObjects.java → .../ofobjects/DbdTablesMappingOfObjects.java
@@ -13,8 +13,9 @@
  * See the License for the specific language governing permissions
  * and limitations under the License.
  */
-package org.fusionsoft.database.mapping.dbd;
+package org.fusionsoft.database.mapping.dbd.ofobjects;
 
+import org.fusionsoft.database.mapping.dbd.DbdTableMapping;
 import org.fusionsoft.database.mapping.entries.UnwrapEntriesOfObjects;
 import org.fusionsoft.database.snapshot.DbObject;
 import org.fusionsoft.database.snapshot.Objects;

diff --git a/.../mapping/dbd/DbdViewMappingOfObjects.java → ...bd/ofobjects/DbdViewMappingOfObjects.java b/.../mapping/dbd/DbdViewMappingOfObjects.java → ...bd/ofobjects/DbdViewMappingOfObjects.java
@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions
  * and limitations under the License.
  */
-package org.fusionsoft.database.mapping.dbd;
+package org.fusionsoft.database.mapping.dbd.ofobjects;
 
 import org.fusionsoft.database.mapping.MappingOfRepresentative;
+import org.fusionsoft.database.mapping.dbd.DbdViewMapping;
 import org.fusionsoft.database.snapshot.DbObject;
 import org.fusionsoft.database.snapshot.Objects;
 

diff --git a/...mapping/dbd/DbdViewsMappingOfObjects.java → ...d/ofobjects/DbdViewsMappingOfObjects.java b/...mapping/dbd/DbdViewsMappingOfObjects.java → ...d/ofobjects/DbdViewsMappingOfObjects.java
@@ -13,8 +13,9 @@
  * See the License for the specific language governing permissions
  * and limitations under the License.
  */
-package org.fusionsoft.database.mapping.dbd;
+package org.fusionsoft.database.mapping.dbd.ofobjects;
 
+import org.fusionsoft.database.mapping.dbd.DbdViewMapping;
 import org.fusionsoft.database.mapping.entries.UnwrapEntriesOfObjects;
 import org.fusionsoft.database.snapshot.DbObject;
 import org.fusionsoft.database.snapshot.Objects;

diff --git a/...a/org/fusionsoft/database/snapshot/objects/composite/ObjectsFromServerMentionedInDbd.java b/...a/org/fusionsoft/database/snapshot/objects/composite/ObjectsFromServerMentionedInDbd.java
@@ -17,7 +17,7 @@
 
 import org.cactoos.Text;
 import org.fusionsoft.database.DbdFile;
-import org.fusionsoft.database.mapping.dbd.DbdServerEntryOfDbdFile;
+import org.fusionsoft.database.mapping.dbd.extracted.DbdServerEntryOfDbdFile;
 import org.fusionsoft.database.snapshot.Objects;
 import org.fusionsoft.database.snapshot.objects.ObjectsFiltered;
 import org.fusionsoft.database.snapshot.objects.ObjectsOfScalar;

diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/dbms/postgres/PgConstraints.java b/src/main/java/org/fusionsoft/database/snapshot/objects/dbms/postgres/PgConstraints.java
@@ -19,8 +19,8 @@
 import org.fusionsoft.database.snapshot.DbObject;
 import org.fusionsoft.database.snapshot.Objects;
 import org.fusionsoft.database.snapshot.objects.ObjectsOfScalar;
-import org.fusionsoft.database.snapshot.objects.dbms.ConstraintOfResultSet;
-import org.fusionsoft.database.snapshot.query.PgConstraintsQuery;
+import org.fusionsoft.database.snapshot.objects.dbms.resultset.ConstraintOfResultSet;
+import org.fusionsoft.database.snapshot.query.pg.PgConstraintsQuery;
 import org.fusionsoft.lib.collection.ListOfResultSet;
 
 /**

diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/dbms/postgres/PgIndexOfResultSet.java b/src/main/java/org/fusionsoft/database/snapshot/objects/dbms/postgres/PgIndexOfResultSet.java
@@ -17,7 +17,7 @@
 
 import java.sql.ResultSet;
 import org.fusionsoft.database.snapshot.objects.dbms.IndexOfResultSet;
-import org.fusionsoft.database.snapshot.query.PgIndexesQuery;
+import org.fusionsoft.database.snapshot.query.pg.PgIndexesQuery;
 
 /**
  * The {@link IndexOfResultSet} with {@link PgIndexesQuery}.

diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/dbms/postgres/PgIndexes.java b/src/main/java/org/fusionsoft/database/snapshot/objects/dbms/postgres/PgIndexes.java
@@ -19,7 +19,7 @@
 import org.fusionsoft.database.snapshot.DbObject;
 import org.fusionsoft.database.snapshot.Objects;
 import org.fusionsoft.database.snapshot.objects.ObjectsOfScalar;
-import org.fusionsoft.database.snapshot.query.PgIndexesQuery;
+import org.fusionsoft.database.snapshot.query.pg.PgIndexesQuery;
 import org.fusionsoft.lib.collection.ListOfResultSet;
 
 /**

diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/dbms/postgres/PgSequences.java b/src/main/java/org/fusionsoft/database/snapshot/objects/dbms/postgres/PgSequences.java
@@ -20,8 +20,8 @@
 import org.fusionsoft.database.snapshot.DbObject;
 import org.fusionsoft.database.snapshot.Objects;
 import org.fusionsoft.database.snapshot.objects.ObjectsOfScalar;
-import org.fusionsoft.database.snapshot.objects.dbms.SequenceOfResultSet;
-import org.fusionsoft.database.snapshot.query.PgSequencesQuery;
+import org.fusionsoft.database.snapshot.objects.dbms.resultset.SequenceOfResultSet;
+import org.fusionsoft.database.snapshot.query.pg.PgSequencesQuery;
 import org.fusionsoft.lib.collection.ListOfResultSet;
 
 /**

diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/dbms/postgres/PgTables.java b/src/main/java/org/fusionsoft/database/snapshot/objects/dbms/postgres/PgTables.java
@@ -20,9 +20,9 @@
 import org.fusionsoft.database.snapshot.Objects;
 import org.fusionsoft.database.snapshot.dbms.DbmsVersionOfConnection;
 import org.fusionsoft.database.snapshot.objects.ObjectsOfScalar;
-import org.fusionsoft.database.snapshot.objects.dbms.TableOfResultSet;
-import org.fusionsoft.database.snapshot.query.PgColumnsQuery;
-import org.fusionsoft.database.snapshot.query.PgTablesQuery;
+import org.fusionsoft.database.snapshot.objects.dbms.resultset.TableOfResultSet;
+import org.fusionsoft.database.snapshot.query.pg.PgColumnsQuery;
+import org.fusionsoft.database.snapshot.query.pg.PgTablesQuery;
 import org.fusionsoft.lib.collection.ListOfResultSet;
 
 /**

diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/dbms/postgres/PgTriggers.java b/src/main/java/org/fusionsoft/database/snapshot/objects/dbms/postgres/PgTriggers.java
@@ -19,8 +19,8 @@
 import org.fusionsoft.database.snapshot.DbObject;
 import org.fusionsoft.database.snapshot.Objects;
 import org.fusionsoft.database.snapshot.objects.ObjectsOfScalar;
-import org.fusionsoft.database.snapshot.objects.dbms.TriggerOfResultSet;
-import org.fusionsoft.database.snapshot.query.PgTriggersQuery;
+import org.fusionsoft.database.snapshot.objects.dbms.resultset.TriggerOfResultSet;
+import org.fusionsoft.database.snapshot.query.pg.PgTriggersQuery;
 import org.fusionsoft.lib.collection.ListOfResultSet;
 
 /**

diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/dbms/postgres/PgViews.java b/src/main/java/org/fusionsoft/database/snapshot/objects/dbms/postgres/PgViews.java
@@ -19,8 +19,8 @@
 import org.fusionsoft.database.snapshot.DbObject;
 import org.fusionsoft.database.snapshot.Objects;
 import org.fusionsoft.database.snapshot.objects.ObjectsOfScalar;
-import org.fusionsoft.database.snapshot.objects.dbms.ViewOfResultSet;
-import org.fusionsoft.database.snapshot.query.PgViewsQuery;
+import org.fusionsoft.database.snapshot.objects.dbms.resultset.ViewOfResultSet;
+import org.fusionsoft.database.snapshot.query.pg.PgViewsQuery;
 import org.fusionsoft.lib.collection.ListOfResultSet;
 
 /**

diff --git a/...t/objects/dbms/ConstraintOfResultSet.java → ...dbms/resultset/ConstraintOfResultSet.java b/...t/objects/dbms/ConstraintOfResultSet.java → ...dbms/resultset/ConstraintOfResultSet.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions
  * and limitations under the License.
  */
-package org.fusionsoft.database.snapshot.objects.dbms;
+package org.fusionsoft.database.snapshot.objects.dbms.resultset;
 
 import java.sql.ResultSet;
 import org.cactoos.Text;