diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/Workspace.java b/traqtor-aio/src/main/java/link/pagan/traqtor/Workspace.java similarity index 58% rename from traqtor-aio/src/test/java/link/pagan/traqtor/Workspace.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/Workspace.java index 9dca2e9..e350346 100644 --- a/traqtor-aio/src/test/java/link/pagan/traqtor/Workspace.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/Workspace.java @@ -1,12 +1,7 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ package link.pagan.traqtor; import link.pagan.traqtor.project.Project; -import link.pagan.traqtor.util.Name; +import link.pagan.traqtor.outdated.util.Name; /** * @@ -14,6 +9,10 @@ import link.pagan.traqtor.util.Name; */ class Workspace { + public Workspace name(String... parts) { + return name(Name.of(parts)); + } + public Workspace name(Name name) { return this; } diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/R.java b/traqtor-aio/src/main/java/link/pagan/traqtor/generator/R.java deleted file mode 100644 index 489abac..0000000 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/R.java +++ /dev/null @@ -1,30 +0,0 @@ -package link.pagan.traqtor.generator; - -import link.pagan.traqtor.generator.blueprint.database.builder.ColumnBlueprintBuilder; -import link.pagan.traqtor.generator.blueprint.database.builder.DatabaseBlueprintBuilder; -import link.pagan.traqtor.generator.blueprint.database.builder.SchemeBlueprintBuilder; -import link.pagan.traqtor.generator.blueprint.database.builder.TableBlueprintBuilder; - -/** - * - * @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} - */ -public class R { - - public static DatabaseBlueprintBuilder database() { - return new DatabaseBlueprintBuilder(); - } - - public static SchemeBlueprintBuilder schema() { - return new SchemeBlueprintBuilder(); - } - - public static TableBlueprintBuilder table() { - return new TableBlueprintBuilder(); - } - - public static ColumnBlueprintBuilder column() { - return new ColumnBlueprintBuilder(); - } - -} diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/database/builder/DatabaseBlueprintBuilder.java b/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/database/builder/DatabaseBlueprintBuilder.java deleted file mode 100644 index bdc82d1..0000000 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/database/builder/DatabaseBlueprintBuilder.java +++ /dev/null @@ -1,57 +0,0 @@ -package link.pagan.traqtor.generator.blueprint.database.builder; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import link.pagan.traqtor.util.Name; -import link.pagan.traqtor.schema.data.mapping.database.DatabaseAdapter; - -/** - * - * @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} - */ -public class DatabaseBlueprintBuilder { - - private Name name; - private DatabaseAdapter adapter; - private final List schemas; - - public DatabaseBlueprintBuilder() { - this.schemas = new ArrayList(); - } - - public Name name() { - return name; - } - - public DatabaseBlueprintBuilder name(Name name) { - this.name = name; - return this; - } - - public DatabaseAdapter adapter() { - return adapter; - } - - public DatabaseBlueprintBuilder adapter(DatabaseAdapter adapter) { - this.adapter = adapter; - return this; - } - - public DatabaseBlueprintBuilder schemas(SchemeBlueprintBuilder... schemas) { - if (schemas != null) { - Collections.addAll(this.schemas, schemas); - } - return this; - } - - public SchemeBlueprintBuilder scheme(Name name) { - for (SchemeBlueprintBuilder sbb : schemas) { - if (sbb.name().equals(name)) { - return sbb; - } - } - return null; - } - -} diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/_api/BinaryCommand.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/_api/BinaryCommand.java similarity index 93% rename from traqtor-aio/src/main/java/link/pagan/traqtor/_api/BinaryCommand.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/_api/BinaryCommand.java index 1c0e990..f84db3c 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/_api/BinaryCommand.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/_api/BinaryCommand.java @@ -1,3 +1,5 @@ +package link.pagan.traqtor.outdated._api; + // package link.pagan.traqtor._api; // import link.pagan.traqtor._api.result.CommandExecResult; diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/_api/Commanded.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/_api/Commanded.java similarity index 73% rename from traqtor-aio/src/main/java/link/pagan/traqtor/_api/Commanded.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/_api/Commanded.java index 3852bb7..e7adae6 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/_api/Commanded.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/_api/Commanded.java @@ -1,4 +1,4 @@ -package link.pagan.traqtor._api; +package link.pagan.traqtor.outdated._api; /** * diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/_api/Executor.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/_api/Executor.java similarity index 94% rename from traqtor-aio/src/main/java/link/pagan/traqtor/_api/Executor.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/_api/Executor.java index 663b137..6353118 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/_api/Executor.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/_api/Executor.java @@ -1,3 +1,5 @@ +package link.pagan.traqtor.outdated._api; + //package link.pagan.traqtor._api; // //import link.pagan.traqtor._api.result.CommandExecResult; diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/_api/UnaryCommand.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/_api/UnaryCommand.java similarity index 86% rename from traqtor-aio/src/main/java/link/pagan/traqtor/_api/UnaryCommand.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/_api/UnaryCommand.java index 6a9f99a..394a025 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/_api/UnaryCommand.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/_api/UnaryCommand.java @@ -1,8 +1,8 @@ -package link.pagan.traqtor._api; +package link.pagan.traqtor.outdated._api; -import link.pagan.traqtor._api.result.CommandExecResult; -import link.pagan.traqtor._api.result.message.CommandExecMessage; -import link.pagan.traqtor._api.result.message.CommandExecMessageStatus; +import link.pagan.traqtor.outdated._api.result.CommandExecResult; +import link.pagan.traqtor.outdated._api.result.message.CommandExecMessage; +import link.pagan.traqtor.outdated._api.result.message.CommandExecMessageStatus; /** * diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/_api/result/CommandExecResult.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/_api/result/CommandExecResult.java similarity index 87% rename from traqtor-aio/src/main/java/link/pagan/traqtor/_api/result/CommandExecResult.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/_api/result/CommandExecResult.java index 68e9db2..ae02ad1 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/_api/result/CommandExecResult.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/_api/result/CommandExecResult.java @@ -1,7 +1,7 @@ -package link.pagan.traqtor._api.result; +package link.pagan.traqtor.outdated._api.result; import java.util.ArrayList; -import link.pagan.traqtor._api.result.message.CommandExecMessage; +import link.pagan.traqtor.outdated._api.result.message.CommandExecMessage; /** * diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/_api/result/CommandExecResultStatus.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/_api/result/CommandExecResultStatus.java similarity index 89% rename from traqtor-aio/src/main/java/link/pagan/traqtor/_api/result/CommandExecResultStatus.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/_api/result/CommandExecResultStatus.java index 72a82ac..e4c648d 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/_api/result/CommandExecResultStatus.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/_api/result/CommandExecResultStatus.java @@ -1,4 +1,4 @@ -package link.pagan.traqtor._api.result; +package link.pagan.traqtor.outdated._api.result; /** * diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/_api/result/message/CommandExecMessage.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/_api/result/message/CommandExecMessage.java similarity index 91% rename from traqtor-aio/src/main/java/link/pagan/traqtor/_api/result/message/CommandExecMessage.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/_api/result/message/CommandExecMessage.java index da8fb75..3973783 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/_api/result/message/CommandExecMessage.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/_api/result/message/CommandExecMessage.java @@ -1,4 +1,4 @@ -package link.pagan.traqtor._api.result.message; +package link.pagan.traqtor.outdated._api.result.message; /** * diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/_api/result/message/CommandExecMessageStatus.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/_api/result/message/CommandExecMessageStatus.java similarity index 89% rename from traqtor-aio/src/main/java/link/pagan/traqtor/_api/result/message/CommandExecMessageStatus.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/_api/result/message/CommandExecMessageStatus.java index b947457..b8f9ce0 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/_api/result/message/CommandExecMessageStatus.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/_api/result/message/CommandExecMessageStatus.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package link.pagan.traqtor._api.result.message; +package link.pagan.traqtor.outdated._api.result.message; /** * diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/api/API.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/api/API.java similarity index 92% rename from traqtor-aio/src/main/java/link/pagan/traqtor/api/API.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/api/API.java index 426bc63..4c02dec 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/api/API.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/api/API.java @@ -1,19 +1,19 @@ -package link.pagan.traqtor.api; +package link.pagan.traqtor.outdated.api; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.module.SimpleModule; import java.io.File; import java.io.IOException; import java.util.HashMap; -import link.pagan.traqtor._api.UnaryCommand; -import link.pagan.traqtor._api.result.CommandExecResult; -import link.pagan.traqtor._api.result.message.CommandExecMessage; -import link.pagan.traqtor._api.result.message.CommandExecMessageStatus; -import link.pagan.traqtor.api.project.Project; -import link.pagan.traqtor.api.project.universe.UniverseProject; -import link.pagan.traqtor.api.workspace.Workspace; -import link.pagan.traqtor.schema.data.DataTypeSchema; -import link.pagan.traqtor.util.Name; +import link.pagan.traqtor.outdated._api.UnaryCommand; +import link.pagan.traqtor.outdated._api.result.CommandExecResult; +import link.pagan.traqtor.outdated._api.result.message.CommandExecMessage; +import link.pagan.traqtor.outdated._api.result.message.CommandExecMessageStatus; +import link.pagan.traqtor.outdated.api.project.Project; +import link.pagan.traqtor.outdated.api.project.universe.UniverseProject; +import link.pagan.traqtor.outdated.api.workspace.Workspace; +import link.pagan.traqtor.outdated.schema.data.DataTypeSchema; +import link.pagan.traqtor.outdated.util.Name; /** * diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/api/Traqtor.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/api/Traqtor.java similarity index 68% rename from traqtor-aio/src/main/java/link/pagan/traqtor/api/Traqtor.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/api/Traqtor.java index 2a1ceae..d19af01 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/api/Traqtor.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/api/Traqtor.java @@ -1,15 +1,15 @@ -package link.pagan.traqtor.api; +package link.pagan.traqtor.outdated.api; import java.util.HashMap; import java.util.Map; -import link.pagan.traqtor._api.UnaryCommand; -import link.pagan.traqtor._api.Commanded; -import link.pagan.traqtor._api.result.CommandExecResult; -import link.pagan.traqtor._api.result.CommandExecResultStatus; -import link.pagan.traqtor.api.workspace.Workspace; -import link.pagan.traqtor.schema.basic.data.DataTypeSchemaReferenceImplementation; -import link.pagan.traqtor.schema.data.DataTypeSchema; -import link.pagan.traqtor.util.Name; +import link.pagan.traqtor.outdated._api.UnaryCommand; +import link.pagan.traqtor.outdated._api.Commanded; +import link.pagan.traqtor.outdated._api.result.CommandExecResult; +import link.pagan.traqtor.outdated._api.result.CommandExecResultStatus; +import link.pagan.traqtor.outdated.api.workspace.Workspace; +import link.pagan.traqtor.outdated.schema.basic.data.DataTypeSchemaReferenceImplementation; +import link.pagan.traqtor.outdated.schema.data.DataTypeSchema; +import link.pagan.traqtor.outdated.util.Name; /** * diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/api/project/Project.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/api/project/Project.java similarity index 78% rename from traqtor-aio/src/main/java/link/pagan/traqtor/api/project/Project.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/api/project/Project.java index d238028..68da4a4 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/api/project/Project.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/api/project/Project.java @@ -1,7 +1,7 @@ -package link.pagan.traqtor.api.project; +package link.pagan.traqtor.outdated.api.project; -import link.pagan.traqtor._api.Commanded; -import link.pagan.traqtor.util.Name; +import link.pagan.traqtor.outdated._api.Commanded; +import link.pagan.traqtor.outdated.util.Name; /** * diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/api/project/ProjectType.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/api/project/ProjectType.java similarity index 97% rename from traqtor-aio/src/main/java/link/pagan/traqtor/api/project/ProjectType.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/api/project/ProjectType.java index 89f3c0e..16eeffd 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/api/project/ProjectType.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/api/project/ProjectType.java @@ -1,4 +1,4 @@ -package link.pagan.traqtor.api.project; +package link.pagan.traqtor.outdated.api.project; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/api/project/backend/BackendProject.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/api/project/backend/BackendProject.java similarity index 64% rename from traqtor-aio/src/main/java/link/pagan/traqtor/api/project/backend/BackendProject.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/api/project/backend/BackendProject.java index a867a3b..c02a368 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/api/project/backend/BackendProject.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/api/project/backend/BackendProject.java @@ -3,11 +3,11 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package link.pagan.traqtor.api.project.backend; +package link.pagan.traqtor.outdated.api.project.backend; -import link.pagan.traqtor.api.project.Project; -import link.pagan.traqtor.api.project.ProjectType; -import link.pagan.traqtor.util.Name; +import link.pagan.traqtor.outdated.api.project.Project; +import link.pagan.traqtor.outdated.api.project.ProjectType; +import link.pagan.traqtor.outdated.util.Name; /** * diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/api/project/database/DatabaseProject.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/api/project/database/DatabaseProject.java similarity index 64% rename from traqtor-aio/src/main/java/link/pagan/traqtor/api/project/database/DatabaseProject.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/api/project/database/DatabaseProject.java index 1a233e7..fbd3068 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/api/project/database/DatabaseProject.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/api/project/database/DatabaseProject.java @@ -3,11 +3,11 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package link.pagan.traqtor.api.project.database; +package link.pagan.traqtor.outdated.api.project.database; -import link.pagan.traqtor.api.project.Project; -import link.pagan.traqtor.api.project.ProjectType; -import link.pagan.traqtor.util.Name; +import link.pagan.traqtor.outdated.api.project.Project; +import link.pagan.traqtor.outdated.api.project.ProjectType; +import link.pagan.traqtor.outdated.util.Name; /** * diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/api/project/frontend/FrontendProject.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/api/project/frontend/FrontendProject.java similarity index 64% rename from traqtor-aio/src/main/java/link/pagan/traqtor/api/project/frontend/FrontendProject.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/api/project/frontend/FrontendProject.java index 7289b61..b1b75e8 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/api/project/frontend/FrontendProject.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/api/project/frontend/FrontendProject.java @@ -3,11 +3,11 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package link.pagan.traqtor.api.project.frontend; +package link.pagan.traqtor.outdated.api.project.frontend; -import link.pagan.traqtor.api.project.Project; -import link.pagan.traqtor.api.project.ProjectType; -import link.pagan.traqtor.util.Name; +import link.pagan.traqtor.outdated.api.project.Project; +import link.pagan.traqtor.outdated.api.project.ProjectType; +import link.pagan.traqtor.outdated.util.Name; /** * diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/api/project/universe/UniverseProject.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/api/project/universe/UniverseProject.java similarity index 53% rename from traqtor-aio/src/main/java/link/pagan/traqtor/api/project/universe/UniverseProject.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/api/project/universe/UniverseProject.java index 5351221..ff7e30c 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/api/project/universe/UniverseProject.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/api/project/universe/UniverseProject.java @@ -1,9 +1,9 @@ -package link.pagan.traqtor.api.project.universe; +package link.pagan.traqtor.outdated.api.project.universe; -import link.pagan.traqtor.api.project.Project; -import link.pagan.traqtor.api.project.ProjectType; -import link.pagan.traqtor.schema.data.DataTypeSchema; -import link.pagan.traqtor.util.Name; +import link.pagan.traqtor.outdated.api.project.Project; +import link.pagan.traqtor.outdated.api.project.ProjectType; +import link.pagan.traqtor.outdated.schema.data.DataTypeSchema; +import link.pagan.traqtor.outdated.util.Name; /** * diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/api/workspace/Workspace.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/api/workspace/Workspace.java similarity index 88% rename from traqtor-aio/src/main/java/link/pagan/traqtor/api/workspace/Workspace.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/api/workspace/Workspace.java index fe028b5..8e8c19c 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/api/workspace/Workspace.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/api/workspace/Workspace.java @@ -1,4 +1,4 @@ -package link.pagan.traqtor.api.workspace; +package link.pagan.traqtor.outdated.api.workspace; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -14,15 +14,15 @@ import com.fasterxml.jackson.databind.ser.std.StdSerializer; import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; -import link.pagan.traqtor._api.Commanded; -import link.pagan.traqtor.api.project.Project; -import link.pagan.traqtor.generator.blueprint.universe.AtomBlueprint; -import link.pagan.traqtor.generator.blueprint.universe.LinkBlueprint; -import link.pagan.traqtor.generator.blueprint.universe.LinkType; -import link.pagan.traqtor.generator.blueprint.universe.ParticleBlueprint; -import link.pagan.traqtor.generator.blueprint.universe.UniverseBlueprint; -import link.pagan.traqtor.schema.data.DataTypeSchema; -import link.pagan.traqtor.util.Name; +import link.pagan.traqtor.outdated._api.Commanded; +import link.pagan.traqtor.outdated.api.project.Project; +import link.pagan.traqtor.outdated.generator.blueprint.universe.AtomBlueprint; +import link.pagan.traqtor.outdated.generator.blueprint.universe.LinkBlueprint; +import link.pagan.traqtor.outdated.generator.blueprint.universe.LinkType; +import link.pagan.traqtor.outdated.generator.blueprint.universe.ParticleBlueprint; +import link.pagan.traqtor.outdated.generator.blueprint.universe.UniverseBlueprint; +import link.pagan.traqtor.outdated.schema.data.DataTypeSchema; +import link.pagan.traqtor.outdated.util.Name; /** * diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/framework/data/DatabaseDataObject.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/framework/data/DatabaseDataObject.java similarity index 86% rename from traqtor-aio/src/main/java/link/pagan/traqtor/framework/data/DatabaseDataObject.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/framework/data/DatabaseDataObject.java index e780acf..8010450 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/framework/data/DatabaseDataObject.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/framework/data/DatabaseDataObject.java @@ -1,3 +1,5 @@ +package link.pagan.traqtor.outdated.framework.data; + //package link.pagan.traqtor.framework.data; // //import org.apache.cayenne.BaseDataObject; diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/framework/logic/Registry.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/framework/logic/Registry.java similarity index 85% rename from traqtor-aio/src/main/java/link/pagan/traqtor/framework/logic/Registry.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/framework/logic/Registry.java index c18fcc6..1eef90a 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/framework/logic/Registry.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/framework/logic/Registry.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package link.pagan.traqtor.framework.logic; +package link.pagan.traqtor.outdated.framework.logic; /** * diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/framework/logic/Resource.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/framework/logic/Resource.java similarity index 85% rename from traqtor-aio/src/main/java/link/pagan/traqtor/framework/logic/Resource.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/framework/logic/Resource.java index 945f7fa..75578d7 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/framework/logic/Resource.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/framework/logic/Resource.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package link.pagan.traqtor.framework.logic; +package link.pagan.traqtor.outdated.framework.logic; /** * diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/framework/logic/Service.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/framework/logic/Service.java similarity index 85% rename from traqtor-aio/src/main/java/link/pagan/traqtor/framework/logic/Service.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/framework/logic/Service.java index eee8d1b..61a41b1 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/framework/logic/Service.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/framework/logic/Service.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package link.pagan.traqtor.framework.logic; +package link.pagan.traqtor.outdated.framework.logic; /** * diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/R.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/R.java new file mode 100644 index 0000000..38945f2 --- /dev/null +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/R.java @@ -0,0 +1,30 @@ +package link.pagan.traqtor.outdated.generator; + +import link.pagan.traqtor.outdated.generator.blueprint.database.builder.ColumnBlueprintBuilder; +//import link.pagan.traqtor.outdated.generator.blueprint.database.builder.DatabaseBlueprintBuilder; +import link.pagan.traqtor.outdated.generator.blueprint.database.builder.SchemeBlueprintBuilder; +import link.pagan.traqtor.outdated.generator.blueprint.database.builder.TableBlueprintBuilder; + +/** + * + * @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} + */ +public class R { + +// public static DatabaseBlueprintBuilder database() { +// return new DatabaseBlueprintBuilder(); +// } + + public static SchemeBlueprintBuilder schema() { + return new SchemeBlueprintBuilder(); + } + + public static TableBlueprintBuilder table() { + return new TableBlueprintBuilder(); + } + + public static ColumnBlueprintBuilder column() { + return new ColumnBlueprintBuilder(); + } + +} diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/ProjectBlueprint.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/ProjectBlueprint.java similarity index 81% rename from traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/ProjectBlueprint.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/ProjectBlueprint.java index f3f4118..de8d3c5 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/ProjectBlueprint.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/ProjectBlueprint.java @@ -1,4 +1,4 @@ -package link.pagan.traqtor.generator.blueprint; +package link.pagan.traqtor.outdated.generator.blueprint; /** * diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/backend/BackendBlueprint.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/backend/BackendBlueprint.java similarity index 82% rename from traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/backend/BackendBlueprint.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/backend/BackendBlueprint.java index 04f59d8..eefb1be 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/backend/BackendBlueprint.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/backend/BackendBlueprint.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package link.pagan.traqtor.generator.blueprint.backend; +package link.pagan.traqtor.outdated.generator.blueprint.backend; /** * diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/database/ColumnBlueprint.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/database/ColumnBlueprint.java similarity index 70% rename from traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/database/ColumnBlueprint.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/database/ColumnBlueprint.java index 4efb09f..6d39218 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/database/ColumnBlueprint.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/database/ColumnBlueprint.java @@ -3,10 +3,10 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package link.pagan.traqtor.generator.blueprint.database; +package link.pagan.traqtor.outdated.generator.blueprint.database; -import link.pagan.traqtor.util.Name; -import link.pagan.traqtor.schema.data.DataType; +import link.pagan.traqtor.outdated.util.Name; +import link.pagan.traqtor.outdated.schema.data.DataType; /** diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/database/DatabaseBlueprint.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/database/DatabaseBlueprint.java similarity index 81% rename from traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/database/DatabaseBlueprint.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/database/DatabaseBlueprint.java index f8cebe4..ba8d94a 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/database/DatabaseBlueprint.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/database/DatabaseBlueprint.java @@ -1,4 +1,4 @@ -package link.pagan.traqtor.generator.blueprint.database; +package link.pagan.traqtor.outdated.generator.blueprint.database; /** * diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/database/SchemeBlueprint.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/database/SchemeBlueprint.java similarity index 75% rename from traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/database/SchemeBlueprint.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/database/SchemeBlueprint.java index 3d002b1..d2ff2bc 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/database/SchemeBlueprint.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/database/SchemeBlueprint.java @@ -1,4 +1,4 @@ -package link.pagan.traqtor.generator.blueprint.database; +package link.pagan.traqtor.outdated.generator.blueprint.database; import java.util.ArrayList; diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/database/TableBlueprint.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/database/TableBlueprint.java similarity index 85% rename from traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/database/TableBlueprint.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/database/TableBlueprint.java index 8f695be..1a23fc0 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/database/TableBlueprint.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/database/TableBlueprint.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package link.pagan.traqtor.generator.blueprint.database; +package link.pagan.traqtor.outdated.generator.blueprint.database; import java.util.ArrayList; diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/database/builder/ColumnBlueprintBuilder.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/database/builder/ColumnBlueprintBuilder.java similarity index 74% rename from traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/database/builder/ColumnBlueprintBuilder.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/database/builder/ColumnBlueprintBuilder.java index 6a59da9..3822943 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/database/builder/ColumnBlueprintBuilder.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/database/builder/ColumnBlueprintBuilder.java @@ -1,8 +1,8 @@ -package link.pagan.traqtor.generator.blueprint.database.builder; +package link.pagan.traqtor.outdated.generator.blueprint.database.builder; -import link.pagan.traqtor.generator.blueprint.database.ColumnBlueprint; -import link.pagan.traqtor.util.Name; -import link.pagan.traqtor.schema.data.DataType; +import link.pagan.traqtor.outdated.generator.blueprint.database.ColumnBlueprint; +import link.pagan.traqtor.outdated.util.Name; +import link.pagan.traqtor.outdated.schema.data.DataType; /** * diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/database/builder/DatabaseBlueprintBuilder.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/database/builder/DatabaseBlueprintBuilder.java new file mode 100644 index 0000000..c6e7264 --- /dev/null +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/database/builder/DatabaseBlueprintBuilder.java @@ -0,0 +1,57 @@ +//package link.pagan.traqtor.outdated.generator.blueprint.database.builder; +// +//import java.util.ArrayList; +//import java.util.Collections; +//import java.util.List; +//import link.pagan.traqtor.outdated.util.Name; +////import link.pagan.traqtor.project.database.mapping.DatabaseAdapter; +// +///** +// * +// * @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} +// */ +//public class DatabaseBlueprintBuilder { +// +// private Name name; +// private DatabaseAdapter adapter; +// private final List schemas; +// +// public DatabaseBlueprintBuilder() { +// this.schemas = new ArrayList(); +// } +// +// public Name name() { +// return name; +// } +// +// public DatabaseBlueprintBuilder name(Name name) { +// this.name = name; +// return this; +// } +// +// public DatabaseAdapter adapter() { +// return adapter; +// } +// +// public DatabaseBlueprintBuilder adapter(DatabaseAdapter adapter) { +// this.adapter = adapter; +// return this; +// } +// +// public DatabaseBlueprintBuilder schemas(SchemeBlueprintBuilder... schemas) { +// if (schemas != null) { +// Collections.addAll(this.schemas, schemas); +// } +// return this; +// } +// +// public SchemeBlueprintBuilder scheme(Name name) { +// for (SchemeBlueprintBuilder sbb : schemas) { +// if (sbb.name().equals(name)) { +// return sbb; +// } +// } +// return null; +// } +// +//} diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/database/builder/SchemeBlueprintBuilder.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/database/builder/SchemeBlueprintBuilder.java similarity index 87% rename from traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/database/builder/SchemeBlueprintBuilder.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/database/builder/SchemeBlueprintBuilder.java index c0401dd..b5bdd7e 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/database/builder/SchemeBlueprintBuilder.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/database/builder/SchemeBlueprintBuilder.java @@ -1,9 +1,9 @@ -package link.pagan.traqtor.generator.blueprint.database.builder; +package link.pagan.traqtor.outdated.generator.blueprint.database.builder; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import link.pagan.traqtor.util.Name; +import link.pagan.traqtor.outdated.util.Name; /** * diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/database/builder/TableBlueprintBuilder.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/database/builder/TableBlueprintBuilder.java similarity index 87% rename from traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/database/builder/TableBlueprintBuilder.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/database/builder/TableBlueprintBuilder.java index 2a08b57..02fe5d0 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/database/builder/TableBlueprintBuilder.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/database/builder/TableBlueprintBuilder.java @@ -1,9 +1,9 @@ -package link.pagan.traqtor.generator.blueprint.database.builder; +package link.pagan.traqtor.outdated.generator.blueprint.database.builder; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import link.pagan.traqtor.util.Name; +import link.pagan.traqtor.outdated.util.Name; /** * diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/frontend/FrontendBlueprint.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/frontend/FrontendBlueprint.java similarity index 82% rename from traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/frontend/FrontendBlueprint.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/frontend/FrontendBlueprint.java index 9a85cf9..ab526ac 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/frontend/FrontendBlueprint.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/frontend/FrontendBlueprint.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package link.pagan.traqtor.generator.blueprint.frontend; +package link.pagan.traqtor.outdated.generator.blueprint.frontend; /** * diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/mdl/logic/EndpointBlueprint.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/mdl/logic/EndpointBlueprint.java similarity index 70% rename from traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/mdl/logic/EndpointBlueprint.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/mdl/logic/EndpointBlueprint.java index 7895d9c..db8e005 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/mdl/logic/EndpointBlueprint.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/mdl/logic/EndpointBlueprint.java @@ -3,10 +3,10 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package link.pagan.traqtor.generator.blueprint.mdl.logic; +package link.pagan.traqtor.outdated.generator.blueprint.mdl.logic; import java.util.ArrayList; -import link.pagan.traqtor.generator.blueprint.mdl.security.permission.PermissionBlueprint; +import link.pagan.traqtor.outdated.generator.blueprint.mdl.security.permission.PermissionBlueprint; /** * diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/mdl/logic/RegistryBlueprint.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/mdl/logic/RegistryBlueprint.java similarity index 85% rename from traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/mdl/logic/RegistryBlueprint.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/mdl/logic/RegistryBlueprint.java index db20ab6..9ec8957 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/mdl/logic/RegistryBlueprint.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/mdl/logic/RegistryBlueprint.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package link.pagan.traqtor.generator.blueprint.mdl.logic; +package link.pagan.traqtor.outdated.generator.blueprint.mdl.logic; import java.util.ArrayList; diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/mdl/logic/ResourceBlueprint.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/mdl/logic/ResourceBlueprint.java similarity index 85% rename from traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/mdl/logic/ResourceBlueprint.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/mdl/logic/ResourceBlueprint.java index e65a968..f6c1d1b 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/mdl/logic/ResourceBlueprint.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/mdl/logic/ResourceBlueprint.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package link.pagan.traqtor.generator.blueprint.mdl.logic; +package link.pagan.traqtor.outdated.generator.blueprint.mdl.logic; import java.util.ArrayList; diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/mdl/logic/ServiceBlueprint.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/mdl/logic/ServiceBlueprint.java similarity index 82% rename from traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/mdl/logic/ServiceBlueprint.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/mdl/logic/ServiceBlueprint.java index acc2844..ab6d4f1 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/mdl/logic/ServiceBlueprint.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/mdl/logic/ServiceBlueprint.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package link.pagan.traqtor.generator.blueprint.mdl.logic; +package link.pagan.traqtor.outdated.generator.blueprint.mdl.logic; /** * diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/mdl/security/permission/PermissionBlueprint.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/mdl/security/permission/PermissionBlueprint.java similarity index 80% rename from traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/mdl/security/permission/PermissionBlueprint.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/mdl/security/permission/PermissionBlueprint.java index ee421ad..c2f59b0 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/mdl/security/permission/PermissionBlueprint.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/mdl/security/permission/PermissionBlueprint.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package link.pagan.traqtor.generator.blueprint.mdl.security.permission; +package link.pagan.traqtor.outdated.generator.blueprint.mdl.security.permission; /** * diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/mdl/security/permission/PermissionDomainBlueprint.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/mdl/security/permission/PermissionDomainBlueprint.java similarity index 85% rename from traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/mdl/security/permission/PermissionDomainBlueprint.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/mdl/security/permission/PermissionDomainBlueprint.java index d542853..1c1c296 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/mdl/security/permission/PermissionDomainBlueprint.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/mdl/security/permission/PermissionDomainBlueprint.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package link.pagan.traqtor.generator.blueprint.mdl.security.permission; +package link.pagan.traqtor.outdated.generator.blueprint.mdl.security.permission; import java.util.ArrayList; diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/mdl/security/role/RoleBlueprint.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/mdl/security/role/RoleBlueprint.java similarity index 80% rename from traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/mdl/security/role/RoleBlueprint.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/mdl/security/role/RoleBlueprint.java index b349872..23631d4 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/mdl/security/role/RoleBlueprint.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/mdl/security/role/RoleBlueprint.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package link.pagan.traqtor.generator.blueprint.mdl.security.role; +package link.pagan.traqtor.outdated.generator.blueprint.mdl.security.role; /** * diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/universe/AtomBlueprint.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/universe/AtomBlueprint.java similarity index 92% rename from traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/universe/AtomBlueprint.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/universe/AtomBlueprint.java index 56d2add..428da2b 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/universe/AtomBlueprint.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/universe/AtomBlueprint.java @@ -1,11 +1,11 @@ -package link.pagan.traqtor.generator.blueprint.universe; +package link.pagan.traqtor.outdated.generator.blueprint.universe; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.ser.std.StdSerializer; import java.io.IOException; import java.util.List; -import link.pagan.traqtor.util.Name; +import link.pagan.traqtor.outdated.util.Name; /** * diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/universe/LinkBlueprint.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/universe/LinkBlueprint.java similarity index 94% rename from traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/universe/LinkBlueprint.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/universe/LinkBlueprint.java index 25608ab..a2d0821 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/universe/LinkBlueprint.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/universe/LinkBlueprint.java @@ -1,4 +1,4 @@ -package link.pagan.traqtor.generator.blueprint.universe; +package link.pagan.traqtor.outdated.generator.blueprint.universe; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.SerializerProvider; diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/universe/LinkType.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/universe/LinkType.java similarity index 93% rename from traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/universe/LinkType.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/universe/LinkType.java index bf93c3f..834cbae 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/universe/LinkType.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/universe/LinkType.java @@ -1,4 +1,4 @@ -package link.pagan.traqtor.generator.blueprint.universe; +package link.pagan.traqtor.outdated.generator.blueprint.universe; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.SerializerProvider; diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/universe/ParticleBlueprint.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/universe/ParticleBlueprint.java similarity index 87% rename from traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/universe/ParticleBlueprint.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/universe/ParticleBlueprint.java index 6f25253..6ae56e8 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/universe/ParticleBlueprint.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/universe/ParticleBlueprint.java @@ -1,11 +1,11 @@ -package link.pagan.traqtor.generator.blueprint.universe; +package link.pagan.traqtor.outdated.generator.blueprint.universe; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.ser.std.StdSerializer; import java.io.IOException; -import link.pagan.traqtor.util.Name; -import link.pagan.traqtor.schema.data.DataType; +import link.pagan.traqtor.outdated.util.Name; +import link.pagan.traqtor.outdated.schema.data.DataType; /** * diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/universe/UniverseBlueprint.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/universe/UniverseBlueprint.java similarity index 88% rename from traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/universe/UniverseBlueprint.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/universe/UniverseBlueprint.java index db95a8e..578077b 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/universe/UniverseBlueprint.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/universe/UniverseBlueprint.java @@ -1,12 +1,12 @@ -package link.pagan.traqtor.generator.blueprint.universe; +package link.pagan.traqtor.outdated.generator.blueprint.universe; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.ser.std.StdSerializer; import java.io.IOException; import java.util.List; -import link.pagan.traqtor.generator.blueprint.ProjectBlueprint; -import link.pagan.traqtor.schema.data.DataTypeSchema; +import link.pagan.traqtor.outdated.generator.blueprint.ProjectBlueprint; +import link.pagan.traqtor.outdated.schema.data.DataTypeSchema; /** * diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/universe/build/AtomBlueprintBuilder.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/universe/build/AtomBlueprintBuilder.java similarity index 81% rename from traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/universe/build/AtomBlueprintBuilder.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/universe/build/AtomBlueprintBuilder.java index d26be33..ef14075 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/universe/build/AtomBlueprintBuilder.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/universe/build/AtomBlueprintBuilder.java @@ -1,11 +1,11 @@ -package link.pagan.traqtor.generator.blueprint.universe.build; +package link.pagan.traqtor.outdated.generator.blueprint.universe.build; import java.util.ArrayList; import java.util.Comparator; import java.util.List; -import link.pagan.traqtor.generator.blueprint.universe.AtomBlueprint; -import link.pagan.traqtor.generator.blueprint.universe.ParticleBlueprint; -import link.pagan.traqtor.util.Name; +import link.pagan.traqtor.outdated.generator.blueprint.universe.AtomBlueprint; +import link.pagan.traqtor.outdated.generator.blueprint.universe.ParticleBlueprint; +import link.pagan.traqtor.outdated.util.Name; /** * diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/universe/build/LinkBlueprintBuilder.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/universe/build/LinkBlueprintBuilder.java similarity index 75% rename from traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/universe/build/LinkBlueprintBuilder.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/universe/build/LinkBlueprintBuilder.java index cc9d65b..07f6aa0 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/universe/build/LinkBlueprintBuilder.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/universe/build/LinkBlueprintBuilder.java @@ -1,10 +1,10 @@ -package link.pagan.traqtor.generator.blueprint.universe.build; +package link.pagan.traqtor.outdated.generator.blueprint.universe.build; import java.util.ArrayList; -import link.pagan.traqtor.generator.blueprint.universe.AtomBlueprint; -import link.pagan.traqtor.generator.blueprint.universe.LinkBlueprint; -import link.pagan.traqtor.generator.blueprint.universe.LinkType; -import link.pagan.traqtor.util.Name; +import link.pagan.traqtor.outdated.generator.blueprint.universe.AtomBlueprint; +import link.pagan.traqtor.outdated.generator.blueprint.universe.LinkBlueprint; +import link.pagan.traqtor.outdated.generator.blueprint.universe.LinkType; +import link.pagan.traqtor.outdated.util.Name; /** * diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/universe/build/ParticleBlueprintBuilder.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/universe/build/ParticleBlueprintBuilder.java similarity index 74% rename from traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/universe/build/ParticleBlueprintBuilder.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/universe/build/ParticleBlueprintBuilder.java index 2546c3f..1dc6e2e 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/universe/build/ParticleBlueprintBuilder.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/universe/build/ParticleBlueprintBuilder.java @@ -1,8 +1,8 @@ -package link.pagan.traqtor.generator.blueprint.universe.build; +package link.pagan.traqtor.outdated.generator.blueprint.universe.build; -import link.pagan.traqtor.generator.blueprint.universe.ParticleBlueprint; -import link.pagan.traqtor.util.Name; -import link.pagan.traqtor.schema.data.DataType; +import link.pagan.traqtor.outdated.generator.blueprint.universe.ParticleBlueprint; +import link.pagan.traqtor.outdated.util.Name; +import link.pagan.traqtor.outdated.schema.data.DataType; /** * diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/universe/build/UniverseBlueprintBuilder.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/universe/build/UniverseBlueprintBuilder.java similarity index 80% rename from traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/universe/build/UniverseBlueprintBuilder.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/universe/build/UniverseBlueprintBuilder.java index 4c97a78..3942662 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/generator/blueprint/universe/build/UniverseBlueprintBuilder.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/generator/blueprint/universe/build/UniverseBlueprintBuilder.java @@ -1,13 +1,13 @@ -package link.pagan.traqtor.generator.blueprint.universe.build; +package link.pagan.traqtor.outdated.generator.blueprint.universe.build; import java.util.ArrayList; import java.util.Comparator; import java.util.List; -import link.pagan.traqtor.generator.blueprint.universe.UniverseBlueprint; -import link.pagan.traqtor.generator.blueprint.universe.AtomBlueprint; -import link.pagan.traqtor.generator.blueprint.universe.LinkBlueprint; -import link.pagan.traqtor.schema.data.DataType; -import link.pagan.traqtor.schema.data.DataTypeSchema; +import link.pagan.traqtor.outdated.generator.blueprint.universe.UniverseBlueprint; +import link.pagan.traqtor.outdated.generator.blueprint.universe.AtomBlueprint; +import link.pagan.traqtor.outdated.generator.blueprint.universe.LinkBlueprint; +import link.pagan.traqtor.outdated.schema.data.DataType; +import link.pagan.traqtor.outdated.schema.data.DataTypeSchema; /** * diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/schema/basic/EndpointSchemaImpl.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/schema/basic/EndpointSchemaImpl.java similarity index 75% rename from traqtor-aio/src/main/java/link/pagan/traqtor/schema/basic/EndpointSchemaImpl.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/schema/basic/EndpointSchemaImpl.java index 015e5f3..455c754 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/schema/basic/EndpointSchemaImpl.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/schema/basic/EndpointSchemaImpl.java @@ -3,11 +3,11 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package link.pagan.traqtor.schema.basic; +package link.pagan.traqtor.outdated.schema.basic; import java.util.List; -import link.pagan.traqtor.schema.logic.EndpointSchema; -import link.pagan.traqtor.schema.logic.EndpointTemplate; +import link.pagan.traqtor.outdated.schema.logic.EndpointSchema; +import link.pagan.traqtor.outdated.schema.logic.EndpointTemplate; diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/schema/basic/data/DataTypeSchemaReferenceImplementation.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/schema/basic/data/DataTypeSchemaReferenceImplementation.java similarity index 85% rename from traqtor-aio/src/main/java/link/pagan/traqtor/schema/basic/data/DataTypeSchemaReferenceImplementation.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/schema/basic/data/DataTypeSchemaReferenceImplementation.java index f4a934d..b7470c0 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/schema/basic/data/DataTypeSchemaReferenceImplementation.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/schema/basic/data/DataTypeSchemaReferenceImplementation.java @@ -1,11 +1,11 @@ -package link.pagan.traqtor.schema.basic.data; +package link.pagan.traqtor.outdated.schema.basic.data; import java.util.List; -import link.pagan.traqtor.schema.basic.data.mapping.MappingSchemaImpl; -import link.pagan.traqtor.schema.data.DataType; -import link.pagan.traqtor.schema.data.DataTypeSchema; -import link.pagan.traqtor.schema.data.mapping.MappingSchema; -import link.pagan.traqtor.util.Name; +import link.pagan.traqtor.outdated.schema.basic.data.mapping.MappingSchemaImpl; +import link.pagan.traqtor.outdated.schema.data.DataType; +import link.pagan.traqtor.outdated.schema.data.DataTypeSchema; +import link.pagan.traqtor.outdated.schema.data.mapping.MappingSchema; +import link.pagan.traqtor.outdated.util.Name; /** diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/schema/basic/data/mapping/MappingSchemaImpl.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/schema/basic/data/mapping/MappingSchemaImpl.java similarity index 90% rename from traqtor-aio/src/main/java/link/pagan/traqtor/schema/basic/data/mapping/MappingSchemaImpl.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/schema/basic/data/mapping/MappingSchemaImpl.java index 8a91620..c09e041 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/schema/basic/data/mapping/MappingSchemaImpl.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/schema/basic/data/mapping/MappingSchemaImpl.java @@ -1,10 +1,10 @@ -package link.pagan.traqtor.schema.basic.data.mapping; +package link.pagan.traqtor.outdated.schema.basic.data.mapping; import java.util.List; -import link.pagan.traqtor.schema.basic.data.DataTypeSchemaReferenceImplementation; -import link.pagan.traqtor.schema.data.mapping.MappingEntry; -import link.pagan.traqtor.schema.data.mapping.MappingSchema; -import link.pagan.traqtor.util.Name; +import link.pagan.traqtor.outdated.schema.basic.data.DataTypeSchemaReferenceImplementation; +import link.pagan.traqtor.outdated.schema.data.mapping.MappingEntry; +import link.pagan.traqtor.outdated.schema.data.mapping.MappingSchema; +import link.pagan.traqtor.outdated.util.Name; /** * diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/schema/data/DataType.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/schema/data/DataType.java similarity index 83% rename from traqtor-aio/src/main/java/link/pagan/traqtor/schema/data/DataType.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/schema/data/DataType.java index 7fb971d..e85f2c0 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/schema/data/DataType.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/schema/data/DataType.java @@ -1,4 +1,4 @@ -package link.pagan.traqtor.schema.data; +package link.pagan.traqtor.outdated.schema.data; /** * diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/schema/data/DataTypeSchema.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/schema/data/DataTypeSchema.java similarity index 56% rename from traqtor-aio/src/main/java/link/pagan/traqtor/schema/data/DataTypeSchema.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/schema/data/DataTypeSchema.java index 2a536d3..b167db2 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/schema/data/DataTypeSchema.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/schema/data/DataTypeSchema.java @@ -1,9 +1,9 @@ -package link.pagan.traqtor.schema.data; +package link.pagan.traqtor.outdated.schema.data; -import link.pagan.traqtor.schema.data.mapping.MappingSchema; -import link.pagan.traqtor.util.Named; +import link.pagan.traqtor.outdated.schema.data.mapping.MappingSchema; +import link.pagan.traqtor.outdated.util.Named; import java.util.List; -import link.pagan.traqtor.util.Registrable; +import link.pagan.traqtor.outdated.util.Registrable; /** * diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/schema/data/mapping/Mapping.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/schema/data/mapping/Mapping.java similarity index 89% rename from traqtor-aio/src/main/java/link/pagan/traqtor/schema/data/mapping/Mapping.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/schema/data/mapping/Mapping.java index bbc1a53..2185659 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/schema/data/mapping/Mapping.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/schema/data/mapping/Mapping.java @@ -1,4 +1,4 @@ -package link.pagan.traqtor.schema.data.mapping; +package link.pagan.traqtor.outdated.schema.data.mapping; import java.util.HashMap; diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/schema/data/mapping/MappingEntry.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/schema/data/mapping/MappingEntry.java similarity index 82% rename from traqtor-aio/src/main/java/link/pagan/traqtor/schema/data/mapping/MappingEntry.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/schema/data/mapping/MappingEntry.java index 2751841..9fe0446 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/schema/data/mapping/MappingEntry.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/schema/data/mapping/MappingEntry.java @@ -1,6 +1,6 @@ -package link.pagan.traqtor.schema.data.mapping; +package link.pagan.traqtor.outdated.schema.data.mapping; -import link.pagan.traqtor.schema.data.DataType; +import link.pagan.traqtor.outdated.schema.data.DataType; /** * diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/schema/data/mapping/MappingSchema.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/schema/data/mapping/MappingSchema.java similarity index 66% rename from traqtor-aio/src/main/java/link/pagan/traqtor/schema/data/mapping/MappingSchema.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/schema/data/mapping/MappingSchema.java index 42fd56b..bb3491f 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/schema/data/mapping/MappingSchema.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/schema/data/mapping/MappingSchema.java @@ -1,6 +1,6 @@ -package link.pagan.traqtor.schema.data.mapping; +package link.pagan.traqtor.outdated.schema.data.mapping; -import link.pagan.traqtor.util.Named; +import link.pagan.traqtor.outdated.util.Named; import java.util.List; /** diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/schema/data/mapping/backend/BackendMapping.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/schema/data/mapping/backend/BackendMapping.java similarity index 57% rename from traqtor-aio/src/main/java/link/pagan/traqtor/schema/data/mapping/backend/BackendMapping.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/schema/data/mapping/backend/BackendMapping.java index 87d59e2..cc00092 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/schema/data/mapping/backend/BackendMapping.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/schema/data/mapping/backend/BackendMapping.java @@ -1,8 +1,8 @@ -package link.pagan.traqtor.schema.data.mapping.backend; +package link.pagan.traqtor.outdated.schema.data.mapping.backend; import java.util.HashMap; -import link.pagan.traqtor.schema.data.mapping.Mapping; -import link.pagan.traqtor.schema.data.mapping.MappingEntry; +import link.pagan.traqtor.outdated.schema.data.mapping.Mapping; +import link.pagan.traqtor.outdated.schema.data.mapping.MappingEntry; /** * diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/schema/data/mapping/frontend/FrontendMapping.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/schema/data/mapping/frontend/FrontendMapping.java similarity index 57% rename from traqtor-aio/src/main/java/link/pagan/traqtor/schema/data/mapping/frontend/FrontendMapping.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/schema/data/mapping/frontend/FrontendMapping.java index a461f1c..46fa7d8 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/schema/data/mapping/frontend/FrontendMapping.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/schema/data/mapping/frontend/FrontendMapping.java @@ -1,8 +1,8 @@ -package link.pagan.traqtor.schema.data.mapping.frontend; +package link.pagan.traqtor.outdated.schema.data.mapping.frontend; import java.util.HashMap; -import link.pagan.traqtor.schema.data.mapping.Mapping; -import link.pagan.traqtor.schema.data.mapping.MappingEntry; +import link.pagan.traqtor.outdated.schema.data.mapping.Mapping; +import link.pagan.traqtor.outdated.schema.data.mapping.MappingEntry; /** * diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/schema/logic/EndpointSchema.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/schema/logic/EndpointSchema.java similarity index 88% rename from traqtor-aio/src/main/java/link/pagan/traqtor/schema/logic/EndpointSchema.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/schema/logic/EndpointSchema.java index 0774e7c..d017dbd 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/schema/logic/EndpointSchema.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/schema/logic/EndpointSchema.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package link.pagan.traqtor.schema.logic; +package link.pagan.traqtor.outdated.schema.logic; import java.util.List; diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/schema/logic/EndpointTemplate.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/schema/logic/EndpointTemplate.java similarity index 86% rename from traqtor-aio/src/main/java/link/pagan/traqtor/schema/logic/EndpointTemplate.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/schema/logic/EndpointTemplate.java index 82ec908..56679c4 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/schema/logic/EndpointTemplate.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/schema/logic/EndpointTemplate.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package link.pagan.traqtor.schema.logic; +package link.pagan.traqtor.outdated.schema.logic; /** * diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/util/Name.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/util/Name.java new file mode 100644 index 0000000..de49ec8 --- /dev/null +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/util/Name.java @@ -0,0 +1,135 @@ +package link.pagan.traqtor.outdated.util; + +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.SerializerProvider; +import com.fasterxml.jackson.databind.deser.std.StdDeserializer; +import com.fasterxml.jackson.databind.ser.std.StdSerializer; +import java.io.IOException; +import java.util.Arrays; +import java.util.Comparator; + +/** + * + * @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} + */ +public class Name { + + public static final Comparator COMPARATOR = new Comparator() { + @Override + public int compare(Name a, Name b) { + return a.asDotted().compareTo(b.asDotted()); + } + }; + + String[] parts; + + public Name(String[] parts) { + this.parts = parts; + } + + public static Name of(String... parts) { + if (parts == null) { + throw new NullPointerException("name can not be null"); + } + if (parts.length < 1) { + throw new IllegalArgumentException("name can not be empty"); + } + return new Name(parts); + } + + public String asDotted() { + StringBuilder sb = new StringBuilder(); + for (int i = 0; i < this.parts.length; i++) { + sb.append(parts[i]); + if (i != this.parts.length - 1) { + sb.append('.'); + } + } + return sb.toString(); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null) { + return false; + } + if (getClass() != o.getClass()) { + return false; + } + Name name = (Name) o; + if (name.parts == null) { + return false; + } + if (name.parts.length != this.parts.length) { + return false; + } + for (int i = 0; i < this.parts.length; i++) { + if (!this.parts[i].equals(name.parts[i])) { + return false; + } + } + return true; + } + + @Override + public int hashCode() { + int hash = 7; + hash = 43 * hash + Arrays.deepHashCode(this.parts); + return hash; + } + + public static final class NameSerializer extends StdSerializer { + + private static final long serialVersionUID = 1L; + + public NameSerializer() { + this(null); + } + + public NameSerializer(Class t) { + super(t); + } + + @Override + public void serialize(Name value, JsonGenerator gen, SerializerProvider provider) throws IOException { + gen.writeArray(value.parts, 0, value.parts.length); + } + + } + + public static final class NameDeserializer extends StdDeserializer { + + private static final long serialVersionUID = 1L; + + public NameDeserializer() { + this(null); + } + + public NameDeserializer(Class t) { + super(t); + } + + @Override + public Name deserialize(JsonParser parser, DeserializationContext context) throws IOException, JsonProcessingException { + + JsonNode partArray = parser.getCodec().readTree(parser); + String[] parts = new String[partArray.size()]; + int i = 0; + for (final JsonNode part : partArray) { + parts[i] = part.asText(); + i++; + } + + return new Name(parts); + } + + } + +} diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/util/Named.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/util/Named.java similarity index 77% rename from traqtor-aio/src/main/java/link/pagan/traqtor/util/Named.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/util/Named.java index b95bf5f..b6d2542 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/util/Named.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/util/Named.java @@ -1,4 +1,4 @@ -package link.pagan.traqtor.util; +package link.pagan.traqtor.outdated.util; /** * diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/util/Registrable.java b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/util/Registrable.java similarity index 79% rename from traqtor-aio/src/main/java/link/pagan/traqtor/util/Registrable.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/outdated/util/Registrable.java index c6babf0..ef76c50 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/util/Registrable.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/outdated/util/Registrable.java @@ -1,4 +1,4 @@ -package link.pagan.traqtor.util; +package link.pagan.traqtor.outdated.util; /** * diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/project/Project.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/Project.java new file mode 100644 index 0000000..058b74b --- /dev/null +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/project/Project.java @@ -0,0 +1,16 @@ +package link.pagan.traqtor.project; + +import link.pagan.traqtor.outdated.util.Name; + +public class Project { + + public Project name(String... parts) { + + return name(Name.of(parts)); + } + + public Project name(Name name) { + + return this; + } +} diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/schema/basic/data/mapping/backend/JavaBackendMapping.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/backend/mapping/JavaBackendMapping.java similarity index 82% rename from traqtor-aio/src/main/java/link/pagan/traqtor/schema/basic/data/mapping/backend/JavaBackendMapping.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/project/backend/mapping/JavaBackendMapping.java index 9278d5c..f0052e0 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/schema/basic/data/mapping/backend/JavaBackendMapping.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/project/backend/mapping/JavaBackendMapping.java @@ -1,9 +1,9 @@ -package link.pagan.traqtor.schema.basic.data.mapping.backend; +package link.pagan.traqtor.project.backend.mapping; import java.util.HashMap; -import link.pagan.traqtor.schema.basic.data.mapping.MappingSchemaImpl; -import link.pagan.traqtor.schema.data.mapping.backend.BackendMapping; -import link.pagan.traqtor.schema.data.mapping.MappingEntry; +import link.pagan.traqtor.outdated.schema.basic.data.mapping.MappingSchemaImpl; +import link.pagan.traqtor.outdated.schema.data.mapping.backend.BackendMapping; +import link.pagan.traqtor.outdated.schema.data.mapping.MappingEntry; /** diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/project/database/Database.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/Database.java similarity index 100% rename from traqtor-aio/src/test/java/link/pagan/traqtor/project/database/Database.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/project/database/Database.java diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/project/database/DatabaseColumn.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/DatabaseColumn.java similarity index 100% rename from traqtor-aio/src/test/java/link/pagan/traqtor/project/database/DatabaseColumn.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/project/database/DatabaseColumn.java diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/project/database/DatabaseProject.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/DatabaseProject.java similarity index 79% rename from traqtor-aio/src/test/java/link/pagan/traqtor/project/database/DatabaseProject.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/project/database/DatabaseProject.java index 831cb36..2a88595 100644 --- a/traqtor-aio/src/test/java/link/pagan/traqtor/project/database/DatabaseProject.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/DatabaseProject.java @@ -2,7 +2,7 @@ package link.pagan.traqtor.project.database; import link.pagan.traqtor.project.universe.UniverseProject; import link.pagan.traqtor.project.Project; -import link.pagan.traqtor.util.Name; +import link.pagan.traqtor.outdated.util.Name; /** * @@ -12,7 +12,13 @@ public class DatabaseProject extends Project { DatabaseProject() { } - + + @Override + public DatabaseProject name(String... parts) { + super.name(parts); + return this; + } + @Override public DatabaseProject name(Name name) { super.name(name); @@ -24,7 +30,7 @@ public class DatabaseProject extends Project { } public DatabaseProject universes(UniverseProject... universes) { - + return this; } diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/project/database/DatabaseSchema.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/DatabaseSchema.java similarity index 68% rename from traqtor-aio/src/test/java/link/pagan/traqtor/project/database/DatabaseSchema.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/project/database/DatabaseSchema.java index 5dc3d8b..1c61339 100644 --- a/traqtor-aio/src/test/java/link/pagan/traqtor/project/database/DatabaseSchema.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/DatabaseSchema.java @@ -5,7 +5,7 @@ */ package link.pagan.traqtor.project.database; -import link.pagan.traqtor.util.Name; +import link.pagan.traqtor.outdated.util.Name; /** * @@ -16,12 +16,19 @@ public class DatabaseSchema { DatabaseSchema() { } - + public DatabaseSchema name(String... parts) { + return name(Name.of(parts)); + } public DatabaseSchema name(Name name) { return this; } + + public DatabaseSchema tables(DatabaseTable... tables) { + + return this; + } diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/DatabaseTable.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/DatabaseTable.java new file mode 100644 index 0000000..4cdb149 --- /dev/null +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/DatabaseTable.java @@ -0,0 +1,13 @@ +package link.pagan.traqtor.project.database; + +/** + * + * @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} + */ +public class DatabaseTable { + + public DatabaseTable columns(DatabaseColumn... columns) { + return this; + } + +} diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/schema/data/mapping/database/DatabaseAdapter.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/mapping/DatabaseAdapter.java similarity index 62% rename from traqtor-aio/src/main/java/link/pagan/traqtor/schema/data/mapping/database/DatabaseAdapter.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/project/database/mapping/DatabaseAdapter.java index eac9e3b..715865a 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/schema/data/mapping/database/DatabaseAdapter.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/mapping/DatabaseAdapter.java @@ -1,8 +1,8 @@ -package link.pagan.traqtor.schema.data.mapping.database; +package link.pagan.traqtor.project.database.mapping; -import link.pagan.traqtor.util.Name; -import link.pagan.traqtor.util.Named; -import link.pagan.traqtor.util.Registrable; +import link.pagan.traqtor.outdated.util.Name; +import link.pagan.traqtor.outdated.util.Named; +import link.pagan.traqtor.outdated.util.Registrable; /** * diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/schema/data/mapping/database/DatabaseMapping.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/mapping/DatabaseMapping.java similarity index 59% rename from traqtor-aio/src/main/java/link/pagan/traqtor/schema/data/mapping/database/DatabaseMapping.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/project/database/mapping/DatabaseMapping.java index d82ba5f..ddd6e37 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/schema/data/mapping/database/DatabaseMapping.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/mapping/DatabaseMapping.java @@ -1,8 +1,8 @@ -package link.pagan.traqtor.schema.data.mapping.database; +package link.pagan.traqtor.project.database.mapping; import java.util.HashMap; -import link.pagan.traqtor.schema.data.mapping.Mapping; -import link.pagan.traqtor.schema.data.mapping.MappingEntry; +import link.pagan.traqtor.outdated.schema.data.mapping.Mapping; +import link.pagan.traqtor.outdated.schema.data.mapping.MappingEntry; /** * diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/schema/data/mapping/database/DatabaseNamingScheme.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/mapping/DatabaseNamingScheme.java similarity index 84% rename from traqtor-aio/src/main/java/link/pagan/traqtor/schema/data/mapping/database/DatabaseNamingScheme.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/project/database/mapping/DatabaseNamingScheme.java index f6001c7..08976a1 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/schema/data/mapping/database/DatabaseNamingScheme.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/mapping/DatabaseNamingScheme.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package link.pagan.traqtor.schema.data.mapping.database; +package link.pagan.traqtor.project.database.mapping; /** * diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/schema/basic/data/mapping/database/PostgresDatabaseAdapter.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/mapping/impl/PostgresDatabaseAdapter.java similarity index 81% rename from traqtor-aio/src/main/java/link/pagan/traqtor/schema/basic/data/mapping/database/PostgresDatabaseAdapter.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/project/database/mapping/impl/PostgresDatabaseAdapter.java index 5030bb9..93f1bf6 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/schema/basic/data/mapping/database/PostgresDatabaseAdapter.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/mapping/impl/PostgresDatabaseAdapter.java @@ -3,10 +3,10 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package link.pagan.traqtor.schema.basic.data.mapping.database; +package link.pagan.traqtor.project.database.mapping.impl; -import link.pagan.traqtor.schema.data.mapping.database.DatabaseAdapter; -import link.pagan.traqtor.util.Name; +import link.pagan.traqtor.project.database.mapping.DatabaseAdapter; +import link.pagan.traqtor.outdated.util.Name; /** * diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/schema/basic/data/mapping/database/PostgresDatabaseMapping.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/mapping/impl/PostgresDatabaseMapping.java similarity index 82% rename from traqtor-aio/src/main/java/link/pagan/traqtor/schema/basic/data/mapping/database/PostgresDatabaseMapping.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/project/database/mapping/impl/PostgresDatabaseMapping.java index 5958426..afca1c7 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/schema/basic/data/mapping/database/PostgresDatabaseMapping.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/mapping/impl/PostgresDatabaseMapping.java @@ -1,9 +1,9 @@ -package link.pagan.traqtor.schema.basic.data.mapping.database; +package link.pagan.traqtor.project.database.mapping.impl; import java.util.HashMap; -import link.pagan.traqtor.schema.basic.data.mapping.MappingSchemaImpl; -import link.pagan.traqtor.schema.data.mapping.database.DatabaseMapping; -import link.pagan.traqtor.schema.data.mapping.MappingEntry; +import link.pagan.traqtor.outdated.schema.basic.data.mapping.MappingSchemaImpl; +import link.pagan.traqtor.project.database.mapping.DatabaseMapping; +import link.pagan.traqtor.outdated.schema.data.mapping.MappingEntry; /** * diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/schema/basic/data/mapping/frontend/JavaScriptFrontendMapping.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/frontend/mapping/JavaScriptFrontendMapping.java similarity index 82% rename from traqtor-aio/src/main/java/link/pagan/traqtor/schema/basic/data/mapping/frontend/JavaScriptFrontendMapping.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/project/frontend/mapping/JavaScriptFrontendMapping.java index b3ca18a..0960035 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/schema/basic/data/mapping/frontend/JavaScriptFrontendMapping.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/project/frontend/mapping/JavaScriptFrontendMapping.java @@ -1,9 +1,9 @@ -package link.pagan.traqtor.schema.basic.data.mapping.frontend; +package link.pagan.traqtor.project.frontend.mapping; import java.util.HashMap; -import link.pagan.traqtor.schema.basic.data.mapping.MappingSchemaImpl; -import link.pagan.traqtor.schema.data.mapping.frontend.FrontendMapping; -import link.pagan.traqtor.schema.data.mapping.MappingEntry; +import link.pagan.traqtor.outdated.schema.basic.data.mapping.MappingSchemaImpl; +import link.pagan.traqtor.outdated.schema.data.mapping.frontend.FrontendMapping; +import link.pagan.traqtor.outdated.schema.data.mapping.MappingEntry; /** * diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/Universe.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/Universe.java similarity index 100% rename from traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/Universe.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/Universe.java diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/UniverseProject.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/UniverseProject.java similarity index 52% rename from traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/UniverseProject.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/UniverseProject.java index 46c5355..501ea09 100644 --- a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/UniverseProject.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/UniverseProject.java @@ -2,7 +2,7 @@ package link.pagan.traqtor.project.universe; import link.pagan.traqtor.project.Project; import link.pagan.traqtor.project.universe.schema.DatatypeSchema; -import link.pagan.traqtor.util.Name; +import link.pagan.traqtor.outdated.util.Name; import link.pagan.traqtor.project.universe.link.Link; import link.pagan.traqtor.project.universe.element.Element; @@ -12,18 +12,24 @@ public class UniverseProject extends Project { } @Override - public UniverseProject name(Name name){ - super.name(name); - return this; - } - - public UniverseProject schemas (DatatypeSchema... schemas) { - return this; - } - - public UniverseProject elements (Element... element) { - return this; - } + public UniverseProject name(String... parts) { + super.name(parts); + return this; + } + + @Override + public UniverseProject name(Name name) { + super.name(name); + return this; + } + + public UniverseProject schemas(DatatypeSchema... schemas) { + return this; + } + + public UniverseProject elements(Element... element) { + return this; + } public UniverseProject links(Link... link) { return this; diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/element/Atom.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/element/Atom.java similarity index 89% rename from traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/element/Atom.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/element/Atom.java index 6096e8b..00210c4 100644 --- a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/element/Atom.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/element/Atom.java @@ -2,7 +2,7 @@ package link.pagan.traqtor.project.universe.element; import java.util.List; import link.pagan.traqtor.project.universe.schema.DataType; -import link.pagan.traqtor.util.Name; +import link.pagan.traqtor.outdated.util.Name; public class Atom extends Element { diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/element/Element.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/element/Element.java similarity index 82% rename from traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/element/Element.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/element/Element.java index 3110a65..b6ae4fa 100644 --- a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/element/Element.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/element/Element.java @@ -3,10 +3,14 @@ package link.pagan.traqtor.project.universe.element; import java.util.Arrays; import java.util.List; import link.pagan.traqtor.project.universe.schema.DataType; -import link.pagan.traqtor.util.Name; +import link.pagan.traqtor.outdated.util.Name; public class Element { + public Element name(String... parts){ + return name(Name.of(parts)); + } + public Element name(Name name){ return this; diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/element/Isotope.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/element/Isotope.java similarity index 91% rename from traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/element/Isotope.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/element/Isotope.java index 39b330c..8d8193c 100644 --- a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/element/Isotope.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/element/Isotope.java @@ -2,7 +2,7 @@ package link.pagan.traqtor.project.universe.element; import java.util.List; import link.pagan.traqtor.project.universe.schema.DataType; -import link.pagan.traqtor.util.Name; +import link.pagan.traqtor.outdated.util.Name; public class Isotope extends Element { diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/element/Particle.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/element/Particle.java similarity index 88% rename from traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/element/Particle.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/element/Particle.java index 2af88c6..d34f445 100644 --- a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/element/Particle.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/element/Particle.java @@ -5,7 +5,7 @@ import java.util.Arrays; import java.util.List; import link.pagan.traqtor.project.universe.schema.Constraint; import link.pagan.traqtor.project.universe.schema.DataType; -import link.pagan.traqtor.util.Name; +import link.pagan.traqtor.outdated.util.Name; public class Particle { @@ -29,6 +29,10 @@ public class Particle { return this; } + public Particle name(String... parts) { + return name(Name.of(parts)); + } + public Particle name(Name name) { return this; diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/link/Link.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/link/Link.java new file mode 100644 index 0000000..723348f --- /dev/null +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/link/Link.java @@ -0,0 +1,44 @@ +package link.pagan.traqtor.project.universe.link; + +import link.pagan.traqtor.project.universe.element.Element; +import link.pagan.traqtor.outdated.util.Name; + +public abstract class Link { + + public Link from(Element element) { + return this; + } + + public Link to(Element element) { + return this; + } + + public Link fromName(Name name) { + return this; + } + + public Link fromName(String... parts) { + return fromName(Name.of(parts)); + } + + public Link toName(Name name) { + return this; + } + + public Link toName(String... parts) { + return toName(Name.of(parts)); + } + + public static OneToOneLink oneToOne() { + return new OneToOneLink(); + } + + public static OneToManyLink oneToMany() { + return new OneToManyLink(); + } + + public static ManyToManyLink manyToMany() { + return new ManyToManyLink(); + } + +} diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/link/ManyToManyLink.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/link/ManyToManyLink.java new file mode 100644 index 0000000..0ca856b --- /dev/null +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/link/ManyToManyLink.java @@ -0,0 +1,47 @@ +package link.pagan.traqtor.project.universe.link; + +import link.pagan.traqtor.outdated.util.Name; +import link.pagan.traqtor.project.universe.element.Element; + +public class ManyToManyLink extends Link { + + ManyToManyLink() { + } + + @Override + public ManyToManyLink from(Element element) { + super.from(element); + return this; + } + + @Override + public ManyToManyLink to(Element element) { + super.to(element); + return this; + } + + @Override + public ManyToManyLink fromName(Name name) { + super.fromName(name); + return this; + } + + @Override + public ManyToManyLink fromName(String... parts) { + super.fromName(parts); + return this; + } + + @Override + public ManyToManyLink toName(Name name) { + super.toName(name); + return this; + } + + @Override + public ManyToManyLink toName(String... parts) { + super.toName(parts); + return this; + } + +} diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/link/OneToManyLink.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/link/OneToManyLink.java similarity index 75% rename from traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/link/OneToManyLink.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/link/OneToManyLink.java index 0189745..1e907ab 100644 --- a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/link/OneToManyLink.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/link/OneToManyLink.java @@ -1,6 +1,6 @@ package link.pagan.traqtor.project.universe.link; -import link.pagan.traqtor.util.Name; +import link.pagan.traqtor.outdated.util.Name; import link.pagan.traqtor.project.universe.element.Element; public class OneToManyLink extends Link { @@ -25,12 +25,24 @@ public class OneToManyLink extends Link { super.fromName(name); return this; } + + @Override + public OneToManyLink fromName(String... parts) { + super.fromName(parts); + return this; + } @Override public OneToManyLink toName(Name name) { super.toName(name); return this; } + + @Override + public OneToManyLink toName(String... parts) { + super.toName(parts); + return this; + } public OneToManyLink more(int count) { return this; diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/link/OneToOneLink.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/link/OneToOneLink.java similarity index 71% rename from traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/link/OneToOneLink.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/link/OneToOneLink.java index beddaff..c4613e4 100644 --- a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/link/OneToOneLink.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/link/OneToOneLink.java @@ -1,6 +1,6 @@ package link.pagan.traqtor.project.universe.link; -import link.pagan.traqtor.util.Name; +import link.pagan.traqtor.outdated.util.Name; import link.pagan.traqtor.project.universe.element.Element; public class OneToOneLink extends Link { @@ -25,12 +25,24 @@ public class OneToOneLink extends Link { super.fromName(name); return this; } + + @Override + public OneToOneLink fromName(String... parts) { + super.fromName(parts); + return this; + } @Override public OneToOneLink toName(Name name) { super.toName(name); return this; } + + @Override + public OneToOneLink toName(String... parts) { + super.toName(parts); + return this; + } public OneToOneLink mandatory() { return this; diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/Constraint.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/Constraint.java similarity index 100% rename from traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/Constraint.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/Constraint.java diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/DataType.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/DataType.java similarity index 100% rename from traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/DataType.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/DataType.java diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/DatatypeSchema.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/DatatypeSchema.java similarity index 100% rename from traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/DatatypeSchema.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/DatatypeSchema.java diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/LiteralDataTypeSchema.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/LiteralDataTypeSchema.java similarity index 100% rename from traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/LiteralDataTypeSchema.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/LiteralDataTypeSchema.java diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/LogicDatatypeSchema.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/LogicDatatypeSchema.java similarity index 100% rename from traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/LogicDatatypeSchema.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/LogicDatatypeSchema.java diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/NumericDatatypeSchema.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/NumericDatatypeSchema.java similarity index 100% rename from traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/NumericDatatypeSchema.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/NumericDatatypeSchema.java diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/TemporalDatatypeSchema.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/TemporalDatatypeSchema.java similarity index 100% rename from traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/TemporalDatatypeSchema.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/TemporalDatatypeSchema.java diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/data/LiteralDataType.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/data/LiteralDataType.java similarity index 100% rename from traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/data/LiteralDataType.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/data/LiteralDataType.java diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/data/LogicDataType.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/data/LogicDataType.java similarity index 100% rename from traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/data/LogicDataType.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/data/LogicDataType.java diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/data/NumericDataType.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/data/NumericDataType.java similarity index 100% rename from traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/data/NumericDataType.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/data/NumericDataType.java diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/data/TemporalDataType.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/data/TemporalDataType.java similarity index 100% rename from traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/data/TemporalDataType.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/data/TemporalDataType.java diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/data/literal/StringDataType.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/data/literal/StringDataType.java similarity index 83% rename from traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/data/literal/StringDataType.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/data/literal/StringDataType.java index faac4a1..2b0aaa4 100644 --- a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/data/literal/StringDataType.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/data/literal/StringDataType.java @@ -1,11 +1,10 @@ package link.pagan.traqtor.project.universe.schema.impl.data.literal; -import link.pagan.traqtor.project.universe.schema.impl.data.*; import java.util.ArrayList; import link.pagan.traqtor.project.universe.element.Particle; -import link.pagan.traqtor.project.universe.schema.impl.constraints.NotNullConstraint; +import link.pagan.traqtor.project.universe.schema.impl.data.LiteralDataType; import link.pagan.traqtor.project.universe.schema.impl.data.literal.constraints.LiteralMaxConstraint; import link.pagan.traqtor.project.universe.schema.impl.data.literal.constraints.LiteralMinConstraint; import link.pagan.traqtor.project.universe.schema.impl.data.literal.constraints.LiteralRegExpConstraint; @@ -42,9 +41,5 @@ public class StringDataType extends LiteralDataType { public LiteralRegExpConstraint regExp(String regExp) { return new LiteralRegExpConstraint(regExp); } - - public NotNullConstraint notNull() { - return NotNullConstraint.instance(); - } } diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/data/literal/constraints/LiteralMaxConstraint.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/data/literal/constraints/LiteralMaxConstraint.java similarity index 100% rename from traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/data/literal/constraints/LiteralMaxConstraint.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/data/literal/constraints/LiteralMaxConstraint.java diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/data/literal/constraints/LiteralMinConstraint.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/data/literal/constraints/LiteralMinConstraint.java similarity index 100% rename from traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/data/literal/constraints/LiteralMinConstraint.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/data/literal/constraints/LiteralMinConstraint.java diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/data/literal/constraints/LiteralRegExpConstraint.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/data/literal/constraints/LiteralRegExpConstraint.java similarity index 100% rename from traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/data/literal/constraints/LiteralRegExpConstraint.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/data/literal/constraints/LiteralRegExpConstraint.java diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/data/logic/BooleanDataType.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/data/logic/BooleanDataType.java similarity index 89% rename from traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/data/logic/BooleanDataType.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/data/logic/BooleanDataType.java index 2c91225..ba0bb16 100644 --- a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/data/logic/BooleanDataType.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/data/logic/BooleanDataType.java @@ -1,10 +1,10 @@ package link.pagan.traqtor.project.universe.schema.impl.data.logic; -import link.pagan.traqtor.project.universe.schema.impl.data.*; import java.util.ArrayList; import link.pagan.traqtor.project.universe.element.Particle; +import link.pagan.traqtor.project.universe.schema.impl.data.LogicDataType; /** * diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/data/numeric/IntegerDataType.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/data/numeric/IntegerDataType.java similarity index 100% rename from traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/data/numeric/IntegerDataType.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/data/numeric/IntegerDataType.java diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/data/numeric/RationalDataType.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/data/numeric/RationalDataType.java similarity index 100% rename from traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/data/numeric/RationalDataType.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/data/numeric/RationalDataType.java diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/data/numeric/integer/ByteDataType.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/data/numeric/integer/ByteDataType.java similarity index 100% rename from traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/data/numeric/integer/ByteDataType.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/data/numeric/integer/ByteDataType.java diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/data/numeric/integer/IntDataType.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/data/numeric/integer/IntDataType.java similarity index 100% rename from traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/data/numeric/integer/IntDataType.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/data/numeric/integer/IntDataType.java diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/data/numeric/integer/LongDataType.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/data/numeric/integer/LongDataType.java similarity index 100% rename from traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/data/numeric/integer/LongDataType.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/data/numeric/integer/LongDataType.java diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/data/numeric/integer/ShortDataType.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/data/numeric/integer/ShortDataType.java similarity index 100% rename from traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/data/numeric/integer/ShortDataType.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/data/numeric/integer/ShortDataType.java diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/data/numeric/integer/constraints/IntegerMaxConstraint.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/data/numeric/integer/constraints/IntegerMaxConstraint.java similarity index 100% rename from traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/data/numeric/integer/constraints/IntegerMaxConstraint.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/data/numeric/integer/constraints/IntegerMaxConstraint.java diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/data/numeric/integer/constraints/IntegerMinConstraint.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/data/numeric/integer/constraints/IntegerMinConstraint.java similarity index 100% rename from traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/data/numeric/integer/constraints/IntegerMinConstraint.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/data/numeric/integer/constraints/IntegerMinConstraint.java diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/data/numeric/real/DoubleDataType.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/data/numeric/real/DoubleDataType.java similarity index 100% rename from traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/data/numeric/real/DoubleDataType.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/data/numeric/real/DoubleDataType.java diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/data/numeric/real/FloatDataType.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/data/numeric/real/FloatDataType.java similarity index 100% rename from traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/data/numeric/real/FloatDataType.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/data/numeric/real/FloatDataType.java diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/data/numeric/real/constraints/RationalMaxConstraint.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/data/numeric/real/constraints/RationalMaxConstraint.java similarity index 100% rename from traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/data/numeric/real/constraints/RationalMaxConstraint.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/data/numeric/real/constraints/RationalMaxConstraint.java diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/data/numeric/real/constraints/RationalMinConstraint.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/data/numeric/real/constraints/RationalMinConstraint.java similarity index 100% rename from traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/data/numeric/real/constraints/RationalMinConstraint.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/data/numeric/real/constraints/RationalMinConstraint.java diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/data/temporal/DateDataType.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/data/temporal/DateDataType.java similarity index 88% rename from traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/data/temporal/DateDataType.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/data/temporal/DateDataType.java index 90261ed..715b8a8 100644 --- a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/data/temporal/DateDataType.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/data/temporal/DateDataType.java @@ -1,8 +1,8 @@ package link.pagan.traqtor.project.universe.schema.impl.data.temporal; import java.util.ArrayList; -import link.pagan.traqtor.project.universe.schema.impl.data.*; import link.pagan.traqtor.project.universe.element.Particle; +import link.pagan.traqtor.project.universe.schema.impl.data.TemporalDataType; /** * diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/data/temporal/TimeDataType.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/data/temporal/TimeDataType.java similarity index 88% rename from traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/data/temporal/TimeDataType.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/data/temporal/TimeDataType.java index f840e1c..b9604af 100644 --- a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/data/temporal/TimeDataType.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/data/temporal/TimeDataType.java @@ -1,8 +1,8 @@ package link.pagan.traqtor.project.universe.schema.impl.data.temporal; import java.util.ArrayList; -import link.pagan.traqtor.project.universe.schema.impl.data.*; import link.pagan.traqtor.project.universe.element.Particle; +import link.pagan.traqtor.project.universe.schema.impl.data.TemporalDataType; /** * diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/data/temporal/TimestampDataType.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/data/temporal/TimestampDataType.java similarity index 89% rename from traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/data/temporal/TimestampDataType.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/data/temporal/TimestampDataType.java index 24e953d..67f0347 100644 --- a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/data/temporal/TimestampDataType.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/impl/data/temporal/TimestampDataType.java @@ -1,8 +1,8 @@ package link.pagan.traqtor.project.universe.schema.impl.data.temporal; import java.util.ArrayList; -import link.pagan.traqtor.project.universe.schema.impl.data.*; import link.pagan.traqtor.project.universe.element.Particle; +import link.pagan.traqtor.project.universe.schema.impl.data.TemporalDataType; /** * diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/util/Name.java b/traqtor-aio/src/main/java/link/pagan/traqtor/util/Name.java index 2c2662d..2e2dd06 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/util/Name.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/util/Name.java @@ -1,135 +1,11 @@ package link.pagan.traqtor.util; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.fasterxml.jackson.databind.deser.std.StdDeserializer; -import com.fasterxml.jackson.databind.ser.std.StdSerializer; -import java.io.IOException; -import java.util.Arrays; -import java.util.Comparator; - -/** - * - * @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} - */ public class Name { - public static final Comparator COMPARATOR = new Comparator() { - @Override - public int compare(Name a, Name b) { - return a.asDotted().compareTo(b.asDotted()); - } - }; - - String[] parts; - - public Name(String[] parts) { - this.parts = parts; + Name(String... string) { } - public static Name of(String... parts) { - if (parts == null) { - throw new NullPointerException("name can not be null"); - } - if (parts.length < 1) { - throw new IllegalArgumentException("name can not be empty"); - } + public static Name of (String ... parts) { return new Name(parts); } - - public String asDotted() { - StringBuilder sb = new StringBuilder(); - for (int i = 0; i < this.parts.length; i++) { - sb.append(parts[i]); - if (i != this.parts.length - 1) { - sb.append('.'); - } - } - return sb.toString(); - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null) { - return false; - } - if (getClass() != o.getClass()) { - return false; - } - Name name = (Name) o; - if (name.parts == null) { - return false; - } - if (name.parts.length != this.parts.length) { - return false; - } - for (int i = 0; i < this.parts.length; i++) { - if (!this.parts[i].equals(name.parts[i])) { - return false; - } - } - return true; - } - - @Override - public int hashCode() { - int hash = 7; - hash = 43 * hash + Arrays.deepHashCode(this.parts); - return hash; - } - - public static final class NameSerializer extends StdSerializer { - - private static final long serialVersionUID = 1L; - - public NameSerializer() { - this(null); - } - - public NameSerializer(Class t) { - super(t); - } - - @Override - public void serialize(Name value, JsonGenerator gen, SerializerProvider provider) throws IOException { - gen.writeArray(value.parts, 0, value.parts.length); - } - - } - - public static final class NameDeserializer extends StdDeserializer { - - private static final long serialVersionUID = 1L; - - public NameDeserializer() { - this(null); - } - - public NameDeserializer(Class t) { - super(t); - } - - @Override - public Name deserialize(JsonParser parser, DeserializationContext context) throws IOException, JsonProcessingException { - - JsonNode partArray = parser.getCodec().readTree(parser); - String[] parts = new String[partArray.size()]; - int i = 0; - for (final JsonNode part : partArray) { - parts[i] = part.asText(); - i++; - } - - return new Name(parts); - } - - } - } diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/util/RegExpHelper.java b/traqtor-aio/src/main/java/link/pagan/traqtor/util/RegExpHelper.java similarity index 100% rename from traqtor-aio/src/test/java/link/pagan/traqtor/util/RegExpHelper.java rename to traqtor-aio/src/main/java/link/pagan/traqtor/util/RegExpHelper.java diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/EndToEndTest.java b/traqtor-aio/src/test/java/link/pagan/traqtor/EndToEndTest.java index 447de32..fe40f95 100644 --- a/traqtor-aio/src/test/java/link/pagan/traqtor/EndToEndTest.java +++ b/traqtor-aio/src/test/java/link/pagan/traqtor/EndToEndTest.java @@ -1,8 +1,9 @@ package link.pagan.traqtor; +import link.pagan.traqtor.project.database.Database; +import link.pagan.traqtor.project.database.DatabaseProject; import link.pagan.traqtor.project.universe.UniverseProject; import link.pagan.traqtor.project.universe.Universe; -import link.pagan.traqtor.util.Name; import link.pagan.traqtor.project.universe.element.Element; import link.pagan.traqtor.project.universe.link.Link; import link.pagan.traqtor.project.universe.schema.impl.LiteralDataTypeSchema; @@ -37,10 +38,10 @@ public class EndToEndTest { // TemporalDataType TIMESTAMP = TEMPORAL.TIMESTAMP; Element account = Universe.atom() - .name(Name.of("account")) + .name("account") .particles( STRING.particle() - .name(Name.of("email")) + .name("email") .description("email as main identifier for an account") .constraints( STRING.min(4), @@ -48,7 +49,7 @@ public class EndToEndTest { STRING.regExp(RegExpHelper.EMAIL) ), STRING.particle() - .name(Name.of("phone")) + .name("phone") .description("alternative identifier for an account") .optional() .constraints( @@ -59,17 +60,17 @@ public class EndToEndTest { ); Element accountDetails = Universe.atom() - .name(Name.of("account", "details")) + .name("account", "details") .particles( STRING.particle() - .name(Name.of("last", "name")) + .name("last", "name") .description("last name of user") .constraints( STRING.max(64), STRING.min(1) ), STRING.particle() - .name(Name.of("first", "name")) + .name("first", "name") .description("first name of user") .optional() .constraints( @@ -77,7 +78,7 @@ public class EndToEndTest { STRING.min(1) ), INTEGER.particle() - .name(Name.of("age")) + .name("age") .description("age of user owning an account") .constraints( INTEGER.min(18), @@ -87,10 +88,10 @@ public class EndToEndTest { Element male = Universe.isotope() .base(account) - .name(Name.of("male")) + .name("male") .particles( DOUBLE.particle() - .name(Name.of("length")) + .name("length") .description("penis length") .constraints( DOUBLE.min(0), @@ -100,10 +101,10 @@ public class EndToEndTest { Element female = Universe.isotope() .base(account) - .name(Name.of("female")) + .name("female") .particles( FLOAT.particle() - .name(Name.of("depth")) + .name("depth") .description("vagina depth") .constraints( DOUBLE.min(0), @@ -112,10 +113,10 @@ public class EndToEndTest { ); Element position = Universe.atom() - .name(Name.of("position")) + .name("position") .particles( STRING.particle() - .name(Name.of("title")) + .name("title") .description("position name") .constraints( STRING.max(255), @@ -124,10 +125,10 @@ public class EndToEndTest { ); Element militaryId = Universe.atom() - .name(Name.of("military", "id")) + .name("military", "id") .particles( STRING.particle() - .name(Name.of("number")) + .name("number") .description("military id number") .constraints( STRING.max(11), @@ -136,39 +137,39 @@ public class EndToEndTest { ); Element profile = Universe.atom() - .name((Name.of("profile")) + .name(("profile") ); UniverseProject baseUniverse = Universe.project() - .name(Name.of("base")) + .name("base") .schemas(LITERAL, LOGIC, NUMERIC, TEMPORAL) .elements(account, accountDetails, male, female, position, militaryId, profile) .links(Link.oneToOne() .from(account) - .fromName(Name.of("details")) + .fromName("details") .to(accountDetails) - .toName(Name.of("account")) + .toName("account") .mandatory(), Universe.linkOneToMany() - .from(account).fromName(Name.of("profiles")) - .to(profile).toName(Name.of("account")) + .from(account).fromName("profiles") + .to(profile).toName("account") .more(0), Universe.linkManyToMany().from(profile) - .fromName(Name.of("positions")) - .to(position).toName(Name.of("profiles")), + .fromName("positions") + .to(position).toName("profiles"), Universe.linkOneToOne() - .from(male).fromName(Name.of("military", "id")) - .to(militaryId).toName(Name.of("account")) + .from(male).fromName("military", "id") + .to(militaryId).toName("account") ); UniverseProject dataUniverse = Universe.project() - .name(Name.of("data")) + .name("data") .schemas(LITERAL) .elements(Universe.atom() - .name(Name.of("organization")) + .name("organization") .particles( STRING.particle() - .name(Name.of("name")) + .name("name") .description("full name of an organization") .constraints( STRING.max(255), @@ -177,23 +178,22 @@ public class EndToEndTest { ) ); -// DatabaseProject mainDatabase = Database.project() -// .name(Name.of("primary")) -// .universes(baseUniverse, dataUniverse) -// .addSchema(Database.schema() -// .name(Name.of("public")) -// .tables( -// Database.table() -// .columns()) -// ) // .table("base", "account") -// // .table("base", "account", "details") -// // .table("data", "organization") -// ); + DatabaseProject mainDatabase = Database.project() + .name("primary") + .universes(baseUniverse, dataUniverse) + .addSchema(Database.schema() + .name("public") + .tables( + Database.table() + .columns() + ) + ); + new Workspace() - .name(Name.of("link", "pagan")) + .name("link", "pagan") .projects(baseUniverse, - dataUniverse - // ,mainDatabase + dataUniverse, + mainDatabase ); } diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/project/Project.java b/traqtor-aio/src/test/java/link/pagan/traqtor/project/Project.java deleted file mode 100644 index 69c0242..0000000 --- a/traqtor-aio/src/test/java/link/pagan/traqtor/project/Project.java +++ /dev/null @@ -1,11 +0,0 @@ -package link.pagan.traqtor.project; - -import link.pagan.traqtor.util.Name; - -public class Project { - - public Project name(Name name) { - - return this; - } -} diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/project/database/DatabaseTable.java b/traqtor-aio/src/test/java/link/pagan/traqtor/project/database/DatabaseTable.java deleted file mode 100644 index 2e5b655..0000000 --- a/traqtor-aio/src/test/java/link/pagan/traqtor/project/database/DatabaseTable.java +++ /dev/null @@ -1,15 +0,0 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ -package link.pagan.traqtor.project.database; - -/** - * - * @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} - */ -public class DatabaseTable { - - -} diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/link/Link.java b/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/link/Link.java deleted file mode 100644 index 73f8356..0000000 --- a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/link/Link.java +++ /dev/null @@ -1,37 +0,0 @@ -package link.pagan.traqtor.project.universe.link; - -import link.pagan.traqtor.project.universe.element.Element; -import link.pagan.traqtor.util.Name; - -public abstract class Link { - - public Link from(Element element) { - return this; - } - - public Link to(Element element) { - return this; - } - - public Link fromName(Name name) { - return this; - } - - public Link toName(Name name) { - return this; - } - - public static OneToOneLink oneToOne () { - return new OneToOneLink(); - } - - public static OneToManyLink oneToMany () { - return new OneToManyLink(); - } - - public static ManyToManyLink manyToMany () { - return new ManyToManyLink(); - } - - -} diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/link/ManyToManyLink.java b/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/link/ManyToManyLink.java deleted file mode 100644 index 470eeac..0000000 --- a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/link/ManyToManyLink.java +++ /dev/null @@ -1,31 +0,0 @@ -package link.pagan.traqtor.project.universe.link; - -import link.pagan.traqtor.util.Name; -import link.pagan.traqtor.project.universe.element.Element; - -public class ManyToManyLink extends Link { - - ManyToManyLink() { - } - - public ManyToManyLink from(Element element) { - super.from(element); - return this; - } - - public ManyToManyLink to(Element element) { - super.to(element); - return this; - } - - public ManyToManyLink fromName(Name name) { - super.fromName(name); - return this; - } - - public ManyToManyLink toName(Name name) { - super.toName(name); - return this; - } - -} diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/constraints/NotNullConstraint.java b/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/constraints/NotNullConstraint.java deleted file mode 100644 index 7e530e7..0000000 --- a/traqtor-aio/src/test/java/link/pagan/traqtor/project/universe/schema/impl/constraints/NotNullConstraint.java +++ /dev/null @@ -1,21 +0,0 @@ -package link.pagan.traqtor.project.universe.schema.impl.constraints; - -import link.pagan.traqtor.project.universe.schema.Constraint; -import link.pagan.traqtor.project.universe.schema.DataType; - -/** - * - * @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} - */ -public class NotNullConstraint extends Constraint { - - private static final NotNullConstraint instance = new NotNullConstraint(); - - public static NotNullConstraint instance() { - return instance; - } - - private NotNullConstraint() { - } - -} diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/util/Name.java b/traqtor-aio/src/test/java/link/pagan/traqtor/util/Name.java deleted file mode 100644 index 2e2dd06..0000000 --- a/traqtor-aio/src/test/java/link/pagan/traqtor/util/Name.java +++ /dev/null @@ -1,11 +0,0 @@ -package link.pagan.traqtor.util; - -public class Name { - - Name(String... string) { - } - - public static Name of (String ... parts) { - return new Name(parts); - } -}