diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 0000000..d9eb513 --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,13 @@ +{ + "recommendations": [ + "redhat.java", + "redhat.vscode-xml", + "redhat.vscode-yaml", + "vscjava.vscode-maven", + "vscjava.vscode-java-dependency", + "vscjava.vscode-java-test", + "vscjava.vscode-java-debug", + "esbenp.prettier-vscode", + ] + } + \ No newline at end of file diff --git a/.vscode/formatting.xml b/.vscode/formatting.xml new file mode 100644 index 0000000..43f7e6f --- /dev/null +++ b/.vscode/formatting.xml @@ -0,0 +1,382 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/Workspace.java b/traqtor-aio/src/main/java/link/pagan/traqtor/Workspace.java index e350346..6236dd5 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/Workspace.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/Workspace.java @@ -3,22 +3,19 @@ package link.pagan.traqtor; import link.pagan.traqtor.project.Project; import link.pagan.traqtor.outdated.util.Name; -/** - * - * @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} - */ +/** @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} */ class Workspace { - public Workspace name(String... parts) { + public Workspace name (String... parts) { return name(Name.of(parts)); } - public Workspace name(Name name) { + public Workspace name (Name name) { return this; } - public Workspace projects(Project... project) { + public Workspace projects (Project... project) { return this; } - + } 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 index 058b74b..30637ba 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/project/Project.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/project/Project.java @@ -4,13 +4,14 @@ import link.pagan.traqtor.outdated.util.Name; public class Project { - public Project name(String... parts) { + public Project name (String... parts) { return name(Name.of(parts)); } - - public Project name(Name name) { + + public Project name (Name name) { return this; } + } diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/project/backend/mapping/JavaBackendMapping.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/backend/mapping/JavaBackendMapping.java index f0052e0..687164b 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/project/backend/mapping/JavaBackendMapping.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/project/backend/mapping/JavaBackendMapping.java @@ -5,15 +5,12 @@ 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; - -/** - * - * @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} - */ +/** @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} */ public class JavaBackendMapping extends BackendMapping { - public JavaBackendMapping() { + public JavaBackendMapping () { super("Java", new HashMap() { + private static final long serialVersionUID = 1L; { put(MappingSchemaImpl.NULLABLE_BOOLEAN, "Boolean"); @@ -42,6 +39,7 @@ public class JavaBackendMapping extends BackendMapping { put(MappingSchemaImpl.TIME, "Time"); put(MappingSchemaImpl.TIMESTAMP, "Timestamp"); } + }); } diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/Database.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/Database.java index dcfac95..1e5853c 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/Database.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/Database.java @@ -1,24 +1,22 @@ package link.pagan.traqtor.project.database; -/** - * - * @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} - */ +/** @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} */ public class Database { - public static DatabaseProject project() { + public static DatabaseProject project () { return new DatabaseProject(); } - - public static DatabaseSchema schema() { + + public static DatabaseSchema schema () { return new DatabaseSchema(); } - public static DatabaseTable table() { + public static DatabaseTable table () { return new DatabaseTable(); } - public static DatabaseColumn column() { + public static DatabaseColumn column () { return new DatabaseColumn(); } + } diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/DatabaseColumn.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/DatabaseColumn.java index 11d4f87..9516cf8 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/DatabaseColumn.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/DatabaseColumn.java @@ -5,10 +5,7 @@ */ package link.pagan.traqtor.project.database; -/** - * - * @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} - */ +/** @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} */ public class DatabaseColumn { - + } diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/DatabaseProject.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/DatabaseProject.java index 2a88595..b393dca 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/DatabaseProject.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/DatabaseProject.java @@ -4,32 +4,28 @@ import link.pagan.traqtor.project.universe.UniverseProject; import link.pagan.traqtor.project.Project; import link.pagan.traqtor.outdated.util.Name; -/** - * - * @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} - */ +/** @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} */ public class DatabaseProject extends Project { - DatabaseProject() { - } + DatabaseProject () {} @Override - public DatabaseProject name(String... parts) { + public DatabaseProject name (String... parts) { super.name(parts); return this; } @Override - public DatabaseProject name(Name name) { + public DatabaseProject name (Name name) { super.name(name); return this; } - public DatabaseProject addSchema(DatabaseSchema name) { + public DatabaseProject addSchema (DatabaseSchema name) { return this; } - public DatabaseProject universes(UniverseProject... universes) { + public DatabaseProject universes (UniverseProject... universes) { return this; } diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/DatabaseSchema.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/DatabaseSchema.java index 1c61339..8cd225f 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/DatabaseSchema.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/DatabaseSchema.java @@ -7,29 +7,23 @@ package link.pagan.traqtor.project.database; import link.pagan.traqtor.outdated.util.Name; -/** - * - * @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} - */ +/** @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} */ public class DatabaseSchema { - DatabaseSchema() { - } + DatabaseSchema () {} - public DatabaseSchema name(String... parts) { + public DatabaseSchema name (String... parts) { return name(Name.of(parts)); } - - public DatabaseSchema name(Name name) { - + + public DatabaseSchema name (Name name) { + return this; } - public DatabaseSchema tables(DatabaseTable... tables) { - + 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 index 4cdb149..19cc4c6 100644 --- 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 @@ -1,13 +1,10 @@ package link.pagan.traqtor.project.database; -/** - * - * @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} - */ +/** @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} */ public class DatabaseTable { - public DatabaseTable columns(DatabaseColumn... columns) { + public DatabaseTable columns (DatabaseColumn... columns) { return this; } - + } diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/mapping/DatabaseAdapter.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/mapping/DatabaseAdapter.java index 715865a..bd81ef8 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/mapping/DatabaseAdapter.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/mapping/DatabaseAdapter.java @@ -4,21 +4,16 @@ import link.pagan.traqtor.outdated.util.Name; import link.pagan.traqtor.outdated.util.Named; import link.pagan.traqtor.outdated.util.Registrable; -/** - * - * @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} - */ +/** @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} */ public abstract class DatabaseAdapter implements Named, Registrable { private final Name name; - protected DatabaseAdapter(Name name) { + protected DatabaseAdapter (Name name) { this.name = name; } @Override - public Name getName() { - return name; - } - + public Name getName () { return name; } + } diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/mapping/DatabaseMapping.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/mapping/DatabaseMapping.java index ddd6e37..b0636bb 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/mapping/DatabaseMapping.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/mapping/DatabaseMapping.java @@ -4,13 +4,10 @@ import java.util.HashMap; import link.pagan.traqtor.outdated.schema.data.mapping.Mapping; import link.pagan.traqtor.outdated.schema.data.mapping.MappingEntry; -/** - * - * @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} - */ +/** @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} */ public class DatabaseMapping extends Mapping { - public DatabaseMapping(String name, HashMap mapping) { + public DatabaseMapping (String name, HashMap mapping) { super(name, mapping); } diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/mapping/DatabaseNamingScheme.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/mapping/DatabaseNamingScheme.java index 08976a1..caf3faf 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/mapping/DatabaseNamingScheme.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/mapping/DatabaseNamingScheme.java @@ -5,10 +5,7 @@ */ package link.pagan.traqtor.project.database.mapping; -/** - * - * @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} - */ +/** @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} */ public interface DatabaseNamingScheme { - + } diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/mapping/impl/PostgresDatabaseAdapter.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/mapping/impl/PostgresDatabaseAdapter.java index 93f1bf6..f7bc720 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/mapping/impl/PostgresDatabaseAdapter.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/mapping/impl/PostgresDatabaseAdapter.java @@ -8,30 +8,25 @@ package link.pagan.traqtor.project.database.mapping.impl; import link.pagan.traqtor.project.database.mapping.DatabaseAdapter; import link.pagan.traqtor.outdated.util.Name; -/** - * - * @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} - */ +/** @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} */ public class PostgresDatabaseAdapter extends DatabaseAdapter { - + private static final Name NAME = Name.of("traqtor", "basic", "db", "postgres"); - public PostgresDatabaseAdapter() { + public PostgresDatabaseAdapter () { super(NAME); } -// @Override -// public Map register() { -// return new HashMap(){ -// private static final long serialVersionUID = 1L; -// { -// put(NAME, new PostgresDatabaseAdapter()); -// }}; -// } + // @Override + // public Map register() { + // return new HashMap(){ + // private static final long serialVersionUID = 1L; + // { + // put(NAME, new PostgresDatabaseAdapter()); + // }}; + // } @Override - public Name getName() { - return NAME; - } + public Name getName () { return NAME; } } diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/mapping/impl/PostgresDatabaseMapping.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/mapping/impl/PostgresDatabaseMapping.java index afca1c7..03819f2 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/mapping/impl/PostgresDatabaseMapping.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/project/database/mapping/impl/PostgresDatabaseMapping.java @@ -5,14 +5,12 @@ 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; -/** - * - * @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} - */ +/** @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} */ public class PostgresDatabaseMapping extends DatabaseMapping { - public PostgresDatabaseMapping() { + public PostgresDatabaseMapping () { super("PostgreSQL", new HashMap() { + private static final long serialVersionUID = 1L; { put(MappingSchemaImpl.NULLABLE_BOOLEAN, "boolean"); @@ -41,6 +39,7 @@ public class PostgresDatabaseMapping extends DatabaseMapping { put(MappingSchemaImpl.TIME, "time"); put(MappingSchemaImpl.TIMESTAMP, "timestamp"); } + }); } diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/project/frontend/mapping/JavaScriptFrontendMapping.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/frontend/mapping/JavaScriptFrontendMapping.java index 0960035..f5f5c40 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/project/frontend/mapping/JavaScriptFrontendMapping.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/project/frontend/mapping/JavaScriptFrontendMapping.java @@ -5,14 +5,12 @@ 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; -/** - * - * @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} - */ +/** @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} */ public class JavaScriptFrontendMapping extends FrontendMapping { - public JavaScriptFrontendMapping() { + public JavaScriptFrontendMapping () { super("JavaScript", new HashMap() { + private static final long serialVersionUID = 1L; { put(MappingSchemaImpl.NULLABLE_BOOLEAN, "Boolean"); @@ -41,6 +39,7 @@ public class JavaScriptFrontendMapping extends FrontendMapping { put(MappingSchemaImpl.TIME, "Date"); put(MappingSchemaImpl.TIMESTAMP, "Date"); } + }); } diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/Universe.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/Universe.java index 8c3999d..beebf92 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/Universe.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/Universe.java @@ -8,33 +8,31 @@ import link.pagan.traqtor.project.universe.link.ManyToManyLink; import link.pagan.traqtor.project.universe.link.OneToManyLink; import link.pagan.traqtor.project.universe.link.OneToOneLink; -/** - * - * @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} - */ +/** @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} */ public class Universe { - public static UniverseProject project() { + public static UniverseProject project () { return new UniverseProject(); } - public static Atom atom() { + public static Atom atom () { return Element.atom(); } - public static Isotope isotope() { + public static Isotope isotope () { return Element.isotope(); } - public static OneToOneLink linkOneToOne() { + public static OneToOneLink linkOneToOne () { return Link.oneToOne(); } - public static OneToManyLink linkOneToMany() { + public static OneToManyLink linkOneToMany () { return Link.oneToMany(); } - public static ManyToManyLink linkManyToMany() { + public static ManyToManyLink linkManyToMany () { return Link.manyToMany(); } + } diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/UniverseProject.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/UniverseProject.java index 501ea09..4d0f38a 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/UniverseProject.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/UniverseProject.java @@ -8,30 +8,29 @@ import link.pagan.traqtor.project.universe.element.Element; public class UniverseProject extends Project { - UniverseProject() { - } + UniverseProject () {} @Override - public UniverseProject name(String... parts) { + public UniverseProject name (String... parts) { super.name(parts); return this; } @Override - public UniverseProject name(Name name) { + public UniverseProject name (Name name) { super.name(name); return this; } - public UniverseProject schemas(DatatypeSchema... schemas) { + public UniverseProject schemas (DatatypeSchema... schemas) { return this; } - public UniverseProject elements(Element... element) { + public UniverseProject elements (Element... element) { return this; } - public UniverseProject links(Link... link) { + public UniverseProject links (Link... link) { return this; } diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/element/Atom.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/element/Atom.java index 00210c4..233153c 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/element/Atom.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/element/Atom.java @@ -6,17 +6,16 @@ import link.pagan.traqtor.outdated.util.Name; public class Atom extends Element { - Atom() { - } + Atom () {} @Override - public Atom name(Name name) { + public Atom name (Name name) { super.name(name); return this; } @Override - public Atom particles(List> particles) { + public Atom particles (List> particles) { super.particles(particles); return this; } diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/element/Element.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/element/Element.java index b6ae4fa..24d283e 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/element/Element.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/element/Element.java @@ -7,29 +7,29 @@ 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){ + public Element name (String... parts) { + return name(Name.of(parts)); + } + + public Element name (Name name) { - return this; - } + return this; + } @SafeVarargs - public final Element particles(Particle... particles) { + public final Element particles (Particle... particles) { return particles(Arrays.asList(particles)); - } - - public Element particles(List> particles) { + } - return this; - } + public Element particles (List> particles) { + + return this; + } public static Atom atom () { return new Atom(); } - + public static Isotope isotope () { return new Isotope(); } diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/element/Isotope.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/element/Isotope.java index 8d8193c..429a375 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/element/Isotope.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/element/Isotope.java @@ -6,24 +6,23 @@ import link.pagan.traqtor.outdated.util.Name; public class Isotope extends Element { - Isotope() { - } - + Isotope () {} + Element base; - + @Override - public Isotope name(Name name) { + public Isotope name (Name name) { super.name(name); return this; } @Override - public Isotope particles(List> particles) { + public Isotope particles (List> particles) { super.particles(particles); return this; } - public Isotope base(Element base) { + public Isotope base (Element base) { this.base = base; return this; } diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/element/Particle.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/element/Particle.java index d34f445..0ae0414 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/element/Particle.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/element/Particle.java @@ -7,14 +7,17 @@ import link.pagan.traqtor.project.universe.schema.Constraint; import link.pagan.traqtor.project.universe.schema.DataType; import link.pagan.traqtor.outdated.util.Name; -public class Particle { +public class Particle { final DataType type; + Name name; + String description; + final List> constraints; - public Particle(DataType type) { + public Particle (DataType type) { this.type = type; this.constraints = new ArrayList<>(); } @@ -23,27 +26,28 @@ public class Particle { public final Particle constraints (Constraint... args) { return constraints(Arrays.asList(args)); } - + public Particle constraints (List> args) { this.constraints.addAll(args); return this; } - - public Particle name(String... parts) { + + public Particle name (String... parts) { return name(Name.of(parts)); } - - public Particle name(Name name) { + + public Particle name (Name name) { return this; } - public Particle description(String description) { + public Particle description (String description) { return this; } - public Particle optional() { + public Particle optional () { 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 index 723348f..6c10c07 100644 --- 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 @@ -5,39 +5,39 @@ import link.pagan.traqtor.outdated.util.Name; public abstract class Link { - public Link from(Element element) { + public Link from (Element element) { return this; } - public Link to(Element element) { + public Link to (Element element) { return this; } - public Link fromName(Name name) { + public Link fromName (Name name) { return this; } - public Link fromName(String... parts) { + public Link fromName (String... parts) { return fromName(Name.of(parts)); } - public Link toName(Name name) { + public Link toName (Name name) { return this; } - public Link toName(String... parts) { + public Link toName (String... parts) { return toName(Name.of(parts)); } - public static OneToOneLink oneToOne() { + public static OneToOneLink oneToOne () { return new OneToOneLink(); } - public static OneToManyLink oneToMany() { + public static OneToManyLink oneToMany () { return new OneToManyLink(); } - public static ManyToManyLink manyToMany() { + 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 index 0ca856b..520631f 100644 --- 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 @@ -5,41 +5,40 @@ import link.pagan.traqtor.project.universe.element.Element; public class ManyToManyLink extends Link { - ManyToManyLink() { - } + ManyToManyLink () {} @Override - public ManyToManyLink from(Element element) { + public ManyToManyLink from (Element element) { super.from(element); return this; } @Override - public ManyToManyLink to(Element element) { + public ManyToManyLink to (Element element) { super.to(element); return this; } @Override - public ManyToManyLink fromName(Name name) { + public ManyToManyLink fromName (Name name) { super.fromName(name); return this; } @Override - public ManyToManyLink fromName(String... parts) { + public ManyToManyLink fromName (String... parts) { super.fromName(parts); return this; } @Override - public ManyToManyLink toName(Name name) { + public ManyToManyLink toName (Name name) { super.toName(name); return this; } @Override - public ManyToManyLink toName(String... parts) { + public ManyToManyLink toName (String... parts) { super.toName(parts); return this; } diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/link/OneToManyLink.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/link/OneToManyLink.java index 1e907ab..2fed7c8 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/link/OneToManyLink.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/link/OneToManyLink.java @@ -5,54 +5,54 @@ import link.pagan.traqtor.project.universe.element.Element; public class OneToManyLink extends Link { - OneToManyLink() { - } + OneToManyLink () {} @Override - public OneToManyLink from(Element element) { - super.from(element); + public OneToManyLink from (Element element) { + super.from(element); return this; } @Override - public OneToManyLink to(Element element) { - super.to(element); + public OneToManyLink to (Element element) { + super.to(element); return this; } @Override - public OneToManyLink fromName(Name name) { + public OneToManyLink fromName (Name name) { super.fromName(name); return this; } - + @Override - public OneToManyLink fromName(String... parts) { + public OneToManyLink fromName (String... parts) { super.fromName(parts); return this; } @Override - public OneToManyLink toName(Name name) { + public OneToManyLink toName (Name name) { super.toName(name); return this; } - + @Override - public OneToManyLink toName(String... parts) { + public OneToManyLink toName (String... parts) { super.toName(parts); return this; } - public OneToManyLink more(int count) { + public OneToManyLink more (int count) { return this; } - public OneToManyLink less(int count) { + public OneToManyLink less (int count) { return this; } - public OneToManyLink exact(int count) { + public OneToManyLink exact (int count) { return this; } + } diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/link/OneToOneLink.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/link/OneToOneLink.java index c4613e4..5d99ecb 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/link/OneToOneLink.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/link/OneToOneLink.java @@ -5,46 +5,46 @@ import link.pagan.traqtor.project.universe.element.Element; public class OneToOneLink extends Link { - OneToOneLink() { - } + OneToOneLink () {} @Override - public OneToOneLink from(Element element) { - super.from(element); + public OneToOneLink from (Element element) { + super.from(element); return this; } @Override - public OneToOneLink to(Element element) { - super.to(element); + public OneToOneLink to (Element element) { + super.to(element); return this; } @Override - public OneToOneLink fromName(Name name) { + public OneToOneLink fromName (Name name) { super.fromName(name); return this; } - + @Override - public OneToOneLink fromName(String... parts) { + public OneToOneLink fromName (String... parts) { super.fromName(parts); return this; } @Override - public OneToOneLink toName(Name name) { + public OneToOneLink toName (Name name) { super.toName(name); return this; } - + @Override - public OneToOneLink toName(String... parts) { + public OneToOneLink toName (String... parts) { super.toName(parts); return this; } - public OneToOneLink mandatory() { + public OneToOneLink mandatory () { return this; } + } diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/Constraint.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/Constraint.java index beec21a..0c22bbd 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/Constraint.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/Constraint.java @@ -1,10 +1,7 @@ package link.pagan.traqtor.project.universe.schema; -/** - * - * @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} - * @param type to which this constraint is applicable - */ +/** @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} + * @param type to which this constraint is applicable */ public class Constraint { } diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/DataType.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/DataType.java index 116953f..b8a80a1 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/DataType.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/DataType.java @@ -7,23 +7,14 @@ public abstract class DataType { final List> typeConstraints; - public DataType(List> typeConstraints) { + public DataType (List> typeConstraints) { this.typeConstraints = typeConstraints; } - + private String name; -// protected DataType (){ -// } - -// public DataType(String name) { -// this.name = name; -// } + public String getName () { return name; } + + public abstract Particle particle (); - public String getName() { - return name; - } - - public abstract Particle particle(); - } diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/DatatypeSchema.java b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/DatatypeSchema.java index 676fa96..d0eb697 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/DatatypeSchema.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/project/universe/schema/DatatypeSchema.java @@ -5,10 +5,7 @@ */ package link.pagan.traqtor.project.universe.schema; -/** - * - * @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} - */ +/** @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} */ public abstract class DatatypeSchema { - + } diff --git a/traqtor-aio/src/main/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 index 61e1fb2..554f135 100644 --- a/traqtor-aio/src/main/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 @@ -9,7 +9,7 @@ public class LiteralDataTypeSchema extends DatatypeSchema { public final StringDataType STRING = StringDataType.instance(); - public static LiteralDataTypeSchema instance() { + public static LiteralDataTypeSchema instance () { return instance; } diff --git a/traqtor-aio/src/main/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 index 52cc4b2..0dc9827 100644 --- a/traqtor-aio/src/main/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 @@ -7,10 +7,11 @@ import link.pagan.traqtor.project.universe.schema.impl.data.logic.BooleanDataTyp public class LogicDatatypeSchema extends DatatypeSchema { private static final LogicDatatypeSchema instance = new LogicDatatypeSchema(); - + public final LogicDataType BOOLEAN = BooleanDataType.instance(); - public static LogicDatatypeSchema instance() { + public static LogicDatatypeSchema instance () { return instance; } + } diff --git a/traqtor-aio/src/main/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 index 91eb538..da291e0 100644 --- a/traqtor-aio/src/main/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 @@ -13,16 +13,20 @@ import link.pagan.traqtor.project.universe.schema.impl.data.numeric.real.FloatDa public class NumericDatatypeSchema extends DatatypeSchema { private static final NumericDatatypeSchema instance = new NumericDatatypeSchema(); - + public final IntegerDataType BYTE = ByteDataType.instance(); + public final IntegerDataType SHORT = ShortDataType.instance(); + public final IntegerDataType INTEGER = IntDataType.instance(); + public final IntegerDataType LONG = LongDataType.instance(); public final RationalDataType FLOAT = FloatDataType.instance(); + public final RationalDataType DOUBLE = DoubleDataType.instance(); - - public static NumericDatatypeSchema instance() { + + public static NumericDatatypeSchema instance () { return instance; } diff --git a/traqtor-aio/src/main/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 index e6b9471..75babd2 100644 --- a/traqtor-aio/src/main/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 @@ -9,12 +9,15 @@ import link.pagan.traqtor.project.universe.schema.impl.data.temporal.TimestampDa public class TemporalDatatypeSchema extends DatatypeSchema { private static final TemporalDatatypeSchema instance = new TemporalDatatypeSchema(); - + public final TemporalDataType DATE = DateDataType.instance(); + public final TemporalDataType TIME = TimeDataType.instance(); + public final TemporalDataType TIMESTAMP = TimestampDataType.instance(); - public static TemporalDatatypeSchema instance() { + public static TemporalDatatypeSchema instance () { return instance; } + } diff --git a/traqtor-aio/src/main/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 index 6fc18b0..0d6760e 100644 --- a/traqtor-aio/src/main/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 @@ -5,17 +5,14 @@ import link.pagan.traqtor.project.universe.element.Particle; 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 >} - */ +/** @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} */ public abstract class LiteralDataType extends DataType { - public LiteralDataType(List> typeConstraints) { + public LiteralDataType (List> typeConstraints) { super(typeConstraints); } @Override - public abstract Particle particle(); - + public abstract Particle particle (); + } diff --git a/traqtor-aio/src/main/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 index 0b54569..6e2c094 100644 --- a/traqtor-aio/src/main/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 @@ -5,17 +5,14 @@ import link.pagan.traqtor.project.universe.element.Particle; 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 >} - */ +/** @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} */ public abstract class LogicDataType extends DataType { - public LogicDataType(List> typeConstraints) { + public LogicDataType (List> typeConstraints) { super(typeConstraints); } @Override - public abstract Particle particle(); - + public abstract Particle particle (); + } diff --git a/traqtor-aio/src/main/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 index 9c89634..c849506 100644 --- a/traqtor-aio/src/main/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 @@ -5,17 +5,14 @@ import link.pagan.traqtor.project.universe.element.Particle; 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 >} - */ +/** @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} */ public abstract class NumericDataType extends DataType { - public NumericDataType(List> typeConstraints) { + public NumericDataType (List> typeConstraints) { super(typeConstraints); } @Override - public abstract Particle particle(); - + public abstract Particle particle (); + } diff --git a/traqtor-aio/src/main/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 index 05d37ff..a228e1a 100644 --- a/traqtor-aio/src/main/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 @@ -5,17 +5,14 @@ import link.pagan.traqtor.project.universe.element.Particle; 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 >} - */ +/** @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} */ public abstract class TemporalDataType extends DataType { - public TemporalDataType(List> typeConstraints) { + public TemporalDataType (List> typeConstraints) { super(typeConstraints); } @Override - public abstract Particle particle(); - + public abstract Particle particle (); + } diff --git a/traqtor-aio/src/main/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 index 2b0aaa4..d690080 100644 --- a/traqtor-aio/src/main/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,6 +1,5 @@ package link.pagan.traqtor.project.universe.schema.impl.data.literal; - import java.util.ArrayList; import link.pagan.traqtor.project.universe.element.Particle; @@ -9,36 +8,33 @@ import link.pagan.traqtor.project.universe.schema.impl.data.literal.constraints. import link.pagan.traqtor.project.universe.schema.impl.data.literal.constraints.LiteralMinConstraint; import link.pagan.traqtor.project.universe.schema.impl.data.literal.constraints.LiteralRegExpConstraint; -/** - * - * @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} - */ +/** @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} */ public class StringDataType extends LiteralDataType { private static final StringDataType instance = new StringDataType(); - public static StringDataType instance() { + public static StringDataType instance () { return instance; } - private StringDataType() { + private StringDataType () { super(new ArrayList<>()); } @Override - public Particle particle() { + public Particle particle () { return new Particle(this); } - public LiteralMinConstraint min(long min) { + public LiteralMinConstraint min (long min) { return new LiteralMinConstraint(min); } - public LiteralMaxConstraint max(long max) { + public LiteralMaxConstraint max (long max) { return new LiteralMaxConstraint(max); } - public LiteralRegExpConstraint regExp(String regExp) { + public LiteralRegExpConstraint regExp (String regExp) { return new LiteralRegExpConstraint(regExp); } diff --git a/traqtor-aio/src/main/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 index fd5a02a..843f3af 100644 --- a/traqtor-aio/src/main/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 @@ -3,16 +3,13 @@ package link.pagan.traqtor.project.universe.schema.impl.data.literal.constraints import link.pagan.traqtor.project.universe.schema.Constraint; import link.pagan.traqtor.project.universe.schema.impl.data.literal.StringDataType; -/** - * - * @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} - */ +/** @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} */ public class LiteralMaxConstraint extends Constraint { long max; - public LiteralMaxConstraint(long max) { + public LiteralMaxConstraint (long max) { this.max = max; } - + } diff --git a/traqtor-aio/src/main/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 index 8323d18..4ff38e1 100644 --- a/traqtor-aio/src/main/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 @@ -3,15 +3,12 @@ package link.pagan.traqtor.project.universe.schema.impl.data.literal.constraints import link.pagan.traqtor.project.universe.schema.Constraint; import link.pagan.traqtor.project.universe.schema.impl.data.literal.StringDataType; -/** - * - * @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} - */ +/** @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} */ public class LiteralMinConstraint extends Constraint { long min; - public LiteralMinConstraint(long min) { + public LiteralMinConstraint (long min) { this.min = min; } diff --git a/traqtor-aio/src/main/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 index 5c7208e..1cbe946 100644 --- a/traqtor-aio/src/main/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 @@ -3,15 +3,12 @@ package link.pagan.traqtor.project.universe.schema.impl.data.literal.constraints import link.pagan.traqtor.project.universe.schema.Constraint; import link.pagan.traqtor.project.universe.schema.impl.data.literal.StringDataType; -/** - * - * @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} - */ +/** @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} */ public class LiteralRegExpConstraint extends Constraint { String regExp; - public LiteralRegExpConstraint(String regExp) { + public LiteralRegExpConstraint (String regExp) { this.regExp = regExp; } diff --git a/traqtor-aio/src/main/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 index ba0bb16..1be3c4e 100644 --- a/traqtor-aio/src/main/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,29 +1,25 @@ package link.pagan.traqtor.project.universe.schema.impl.data.logic; - import java.util.ArrayList; import link.pagan.traqtor.project.universe.element.Particle; import link.pagan.traqtor.project.universe.schema.impl.data.LogicDataType; -/** - * - * @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} - */ +/** @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} */ public class BooleanDataType extends LogicDataType { private static final BooleanDataType instance = new BooleanDataType(); - public static BooleanDataType instance() { + public static BooleanDataType instance () { return instance; } - private BooleanDataType() { + private BooleanDataType () { super(new ArrayList<>()); } @Override - public Particle particle() { + public Particle particle () { return new Particle(this); } diff --git a/traqtor-aio/src/main/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 index 805ab01..fae52f0 100644 --- a/traqtor-aio/src/main/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 @@ -8,24 +8,21 @@ import link.pagan.traqtor.project.universe.schema.impl.data.NumericDataType; import link.pagan.traqtor.project.universe.schema.impl.data.numeric.integer.constraints.IntegerMaxConstraint; import link.pagan.traqtor.project.universe.schema.impl.data.numeric.integer.constraints.IntegerMinConstraint; -/** - * - * @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} - */ +/** @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} */ public abstract class IntegerDataType extends NumericDataType { - public IntegerDataType(List> typeConstraints) { + public IntegerDataType (List> typeConstraints) { super(typeConstraints); } @Override - public abstract Particle particle(); + public abstract Particle particle (); - public IntegerMinConstraint min(long min) { + public IntegerMinConstraint min (long min) { return new IntegerMinConstraint(min); } - public IntegerMaxConstraint max(long max) { + public IntegerMaxConstraint max (long max) { return new IntegerMaxConstraint(max); } diff --git a/traqtor-aio/src/main/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 index 0d76ea7..97a49e5 100644 --- a/traqtor-aio/src/main/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 @@ -8,24 +8,21 @@ import link.pagan.traqtor.project.universe.schema.impl.data.NumericDataType; import link.pagan.traqtor.project.universe.schema.impl.data.numeric.real.constraints.RationalMaxConstraint; import link.pagan.traqtor.project.universe.schema.impl.data.numeric.real.constraints.RationalMinConstraint; -/** - * - * @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} - */ +/** @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} */ public abstract class RationalDataType extends NumericDataType { - public RationalDataType(List> typeConstraints) { + public RationalDataType (List> typeConstraints) { super(typeConstraints); } @Override - public abstract Particle particle(); + public abstract Particle particle (); - public RationalMinConstraint min(double min) { + public RationalMinConstraint min (double min) { return new RationalMinConstraint(min); } - public RationalMaxConstraint max(double max) { + public RationalMaxConstraint max (double max) { return new RationalMaxConstraint(max); } diff --git a/traqtor-aio/src/main/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 index f773d58..53a7858 100644 --- a/traqtor-aio/src/main/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 @@ -6,31 +6,30 @@ import link.pagan.traqtor.project.universe.schema.impl.data.numeric.IntegerDataT import link.pagan.traqtor.project.universe.schema.impl.data.numeric.integer.constraints.IntegerMaxConstraint; import link.pagan.traqtor.project.universe.schema.impl.data.numeric.integer.constraints.IntegerMinConstraint; -/** - * - * @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} - */ +/** @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} */ public class ByteDataType extends IntegerDataType { private static final ByteDataType instance = new ByteDataType(); - public static ByteDataType instance() { + public static ByteDataType instance () { return instance; } - private ByteDataType() { + private ByteDataType () { super(new ArrayList<>() { + private static final long serialVersionUID = 1L; { add(new IntegerMaxConstraint(Byte.MAX_VALUE)); add(new IntegerMinConstraint(Byte.MIN_VALUE)); } + }); } @Override - public Particle particle() { + public Particle particle () { return new Particle(this); } diff --git a/traqtor-aio/src/main/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 index 1a1f8eb..d6704d7 100644 --- a/traqtor-aio/src/main/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 @@ -6,31 +6,30 @@ import link.pagan.traqtor.project.universe.schema.impl.data.numeric.IntegerDataT import link.pagan.traqtor.project.universe.schema.impl.data.numeric.integer.constraints.IntegerMaxConstraint; import link.pagan.traqtor.project.universe.schema.impl.data.numeric.integer.constraints.IntegerMinConstraint; -/** - * - * @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} - */ +/** @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} */ public class IntDataType extends IntegerDataType { private static final IntDataType instance = new IntDataType(); - public static IntDataType instance() { + public static IntDataType instance () { return instance; } - private IntDataType() { + private IntDataType () { super(new ArrayList<>() { + private static final long serialVersionUID = 1L; { add(new IntegerMaxConstraint(Integer.MAX_VALUE)); add(new IntegerMinConstraint(Integer.MIN_VALUE)); } + }); } @Override - public Particle particle() { + public Particle particle () { return new Particle(this); } diff --git a/traqtor-aio/src/main/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 index 03de74f..fcf5a6c 100644 --- a/traqtor-aio/src/main/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 @@ -6,31 +6,30 @@ import link.pagan.traqtor.project.universe.schema.impl.data.numeric.IntegerDataT import link.pagan.traqtor.project.universe.schema.impl.data.numeric.integer.constraints.IntegerMaxConstraint; import link.pagan.traqtor.project.universe.schema.impl.data.numeric.integer.constraints.IntegerMinConstraint; -/** - * - * @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} - */ +/** @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} */ public class LongDataType extends IntegerDataType { private static final LongDataType instance = new LongDataType(); - public static LongDataType instance() { + public static LongDataType instance () { return instance; } - private LongDataType() { + private LongDataType () { super(new ArrayList<>() { + private static final long serialVersionUID = 1L; { add(new IntegerMaxConstraint(Long.MAX_VALUE)); add(new IntegerMinConstraint(Long.MIN_VALUE)); } + }); } @Override - public Particle particle() { + public Particle particle () { return new Particle(this); } diff --git a/traqtor-aio/src/main/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 index 01838ef..3a9a089 100644 --- a/traqtor-aio/src/main/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 @@ -6,31 +6,30 @@ import link.pagan.traqtor.project.universe.schema.impl.data.numeric.IntegerDataT import link.pagan.traqtor.project.universe.schema.impl.data.numeric.integer.constraints.IntegerMaxConstraint; import link.pagan.traqtor.project.universe.schema.impl.data.numeric.integer.constraints.IntegerMinConstraint; -/** - * - * @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} - */ +/** @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} */ public class ShortDataType extends IntegerDataType { private static final ShortDataType instance = new ShortDataType(); - public static ShortDataType instance() { + public static ShortDataType instance () { return instance; } - private ShortDataType() { + private ShortDataType () { super(new ArrayList<>() { + private static final long serialVersionUID = 1L; { add(new IntegerMaxConstraint(Short.MAX_VALUE)); add(new IntegerMinConstraint(Short.MIN_VALUE)); } + }); } @Override - public Particle particle() { + public Particle particle () { return new Particle(this); } diff --git a/traqtor-aio/src/main/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 index 64697c2..de46c58 100644 --- a/traqtor-aio/src/main/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 @@ -3,16 +3,13 @@ package link.pagan.traqtor.project.universe.schema.impl.data.numeric.integer.con import link.pagan.traqtor.project.universe.schema.Constraint; import link.pagan.traqtor.project.universe.schema.impl.data.numeric.IntegerDataType; -/** - * - * @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} - */ +/** @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} */ public class IntegerMaxConstraint extends Constraint { - + long max; - public IntegerMaxConstraint(long max) { + public IntegerMaxConstraint (long max) { this.max = max; } - + } diff --git a/traqtor-aio/src/main/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 index 02effa9..f606ca2 100644 --- a/traqtor-aio/src/main/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 @@ -3,16 +3,13 @@ package link.pagan.traqtor.project.universe.schema.impl.data.numeric.integer.con import link.pagan.traqtor.project.universe.schema.Constraint; import link.pagan.traqtor.project.universe.schema.impl.data.numeric.IntegerDataType; -/** - * - * @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} - */ +/** @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} */ public class IntegerMinConstraint extends Constraint { - + long min; - public IntegerMinConstraint(long min) { + public IntegerMinConstraint (long min) { this.min = min; } - + } diff --git a/traqtor-aio/src/main/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 index 8463caa..f342bb2 100644 --- a/traqtor-aio/src/main/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 @@ -6,31 +6,30 @@ import link.pagan.traqtor.project.universe.schema.impl.data.numeric.RationalData import link.pagan.traqtor.project.universe.schema.impl.data.numeric.real.constraints.RationalMaxConstraint; import link.pagan.traqtor.project.universe.schema.impl.data.numeric.real.constraints.RationalMinConstraint; -/** - * - * @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} - */ +/** @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} */ public class DoubleDataType extends RationalDataType { private static final DoubleDataType instance = new DoubleDataType(); - public static DoubleDataType instance() { + public static DoubleDataType instance () { return instance; } - private DoubleDataType() { + private DoubleDataType () { super(new ArrayList<>() { + private static final long serialVersionUID = 1L; { add(new RationalMaxConstraint(Double.MAX_VALUE)); add(new RationalMinConstraint(Double.MIN_VALUE)); } + }); } @Override - public Particle particle() { + public Particle particle () { return new Particle(this); } diff --git a/traqtor-aio/src/main/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 index e329504..6576c98 100644 --- a/traqtor-aio/src/main/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 @@ -6,31 +6,30 @@ import link.pagan.traqtor.project.universe.schema.impl.data.numeric.RationalData import link.pagan.traqtor.project.universe.schema.impl.data.numeric.real.constraints.RationalMaxConstraint; import link.pagan.traqtor.project.universe.schema.impl.data.numeric.real.constraints.RationalMinConstraint; -/** - * - * @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} - */ +/** @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} */ public class FloatDataType extends RationalDataType { private static final FloatDataType instance = new FloatDataType(); - public static FloatDataType instance() { + public static FloatDataType instance () { return instance; } - private FloatDataType() { + private FloatDataType () { super(new ArrayList<>() { + private static final long serialVersionUID = 1L; { add(new RationalMaxConstraint(Float.MAX_VALUE)); add(new RationalMinConstraint(Float.MIN_VALUE)); } + }); } @Override - public Particle particle() { + public Particle particle () { return new Particle(this); } diff --git a/traqtor-aio/src/main/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 index 09abf74..f8501f3 100644 --- a/traqtor-aio/src/main/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 @@ -3,16 +3,13 @@ package link.pagan.traqtor.project.universe.schema.impl.data.numeric.real.constr import link.pagan.traqtor.project.universe.schema.Constraint; import link.pagan.traqtor.project.universe.schema.impl.data.numeric.RationalDataType; -/** - * - * @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} - */ +/** @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} */ public class RationalMaxConstraint extends Constraint { - + double max; - public RationalMaxConstraint(double max) { + public RationalMaxConstraint (double max) { this.max = max; } - + } diff --git a/traqtor-aio/src/main/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 index 34091f5..e13a1b8 100644 --- a/traqtor-aio/src/main/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 @@ -3,16 +3,13 @@ package link.pagan.traqtor.project.universe.schema.impl.data.numeric.real.constr import link.pagan.traqtor.project.universe.schema.Constraint; import link.pagan.traqtor.project.universe.schema.impl.data.numeric.RationalDataType; -/** - * - * @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} - */ +/** @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} */ public class RationalMinConstraint extends Constraint { - + double min; - public RationalMinConstraint(double min) { + public RationalMinConstraint (double min) { this.min = min; } - + } diff --git a/traqtor-aio/src/main/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 index 715b8a8..f777d7a 100644 --- a/traqtor-aio/src/main/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 @@ -4,24 +4,21 @@ import java.util.ArrayList; import link.pagan.traqtor.project.universe.element.Particle; import link.pagan.traqtor.project.universe.schema.impl.data.TemporalDataType; -/** - * - * @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} - */ +/** @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} */ public class DateDataType extends TemporalDataType { private static final DateDataType instance = new DateDataType(); - public static DateDataType instance() { + public static DateDataType instance () { return instance; } - private DateDataType() { + private DateDataType () { super(new ArrayList<>()); } @Override - public Particle particle() { + public Particle particle () { return new Particle(this); } diff --git a/traqtor-aio/src/main/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 index b9604af..e40cc71 100644 --- a/traqtor-aio/src/main/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 @@ -4,24 +4,21 @@ import java.util.ArrayList; import link.pagan.traqtor.project.universe.element.Particle; import link.pagan.traqtor.project.universe.schema.impl.data.TemporalDataType; -/** - * - * @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} - */ +/** @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} */ public class TimeDataType extends TemporalDataType { private static final TimeDataType instance = new TimeDataType(); - public static TimeDataType instance() { + public static TimeDataType instance () { return instance; } - private TimeDataType() { + private TimeDataType () { super(new ArrayList<>()); } @Override - public Particle particle() { + public Particle particle () { return new Particle(this); } diff --git a/traqtor-aio/src/main/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 index 67f0347..191bdb5 100644 --- a/traqtor-aio/src/main/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 @@ -4,24 +4,21 @@ import java.util.ArrayList; import link.pagan.traqtor.project.universe.element.Particle; import link.pagan.traqtor.project.universe.schema.impl.data.TemporalDataType; -/** - * - * @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} - */ +/** @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} */ public class TimestampDataType extends TemporalDataType { private static final TimestampDataType instance = new TimestampDataType(); - public static TimestampDataType instance() { + public static TimestampDataType instance () { return instance; } - private TimestampDataType() { + private TimestampDataType () { super(new ArrayList<>()); } @Override - public Particle particle() { + public Particle particle () { return new Particle(this); } 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 2e2dd06..1233c5d 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 @@ -2,10 +2,10 @@ package link.pagan.traqtor.util; public class Name { - Name(String... string) { - } + Name (String... string) {} - public static Name of (String ... parts) { + public static Name of (String... parts) { return new Name(parts); } + } diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/util/RegExpHelper.java b/traqtor-aio/src/main/java/link/pagan/traqtor/util/RegExpHelper.java index 2b44842..aa70f3c 100644 --- a/traqtor-aio/src/main/java/link/pagan/traqtor/util/RegExpHelper.java +++ b/traqtor-aio/src/main/java/link/pagan/traqtor/util/RegExpHelper.java @@ -1,20 +1,22 @@ package link.pagan.traqtor.util; -/** - * - * @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} - */ +/** @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} */ public class RegExpHelper { - + public static final String URL = "^(https?|ftp|file)://[-a-zA-Z0-9+&@#/%?=~_|!:,.;]*[-a-zA-Z0-9+&@#/%=~_|]"; + public static final String EMAIL = "(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|\"(?:[\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x21\\x23-\\x5b\\x5d-\\x7f]|\\\\[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f])*\")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x21-\\x5a\\x53-\\x7f]|\\\\[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f])+)\\])"; + public static final String IP = "(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)"; + public static final String PHONE = "\\+(9[976]\\d|8[987530]\\d|6[987]\\d|5[90]\\d|42\\d|3[875]\\d|2[98654321]\\d|9[8543210]|8[6421]|6[6543210]|5[87654321]|4[987654310]|3[9643210]|2[70]|7|1)\\d{1,14}$"; + public static final String PHONE_RU = "^((\\+7|7|8)+([0-9]){10})$"; + public static final String PHONE_US = "1?\\W*([2-9][0-8][0-9])\\W*([2-9][0-9]{2})\\W*([0-9]{4})(\\se?x?t?(\\d*))?"; + public static final String PHONE_DE = "/^([\\+][0-9]{1,3}[ \\.\\-])?([\\(]{1}[0-9]{1,6}[\\)])?([0-9 \\.\\-\\/]{3,20})((x|ext|extension)[ ]?[0-9]{1,4})?$/"; + public static final String PHONE_UK = "^(?:(?:\\(?(?:0(?:0|11)\\)?[\\s-]?\\(?|\\+)44\\)?[\\s-]?(?:\\(?0\\)?[\\s-]?)?)|(?:\\(?0))(?:(?:\\d{5}\\)?[\\s-]?\\d{4,5})|(?:\\d{4}\\)?[\\s-]?(?:\\d{5}|\\d{3}[\\s-]?\\d{3}))|(?:\\d{3}\\)?[\\s-]?\\d{3}[\\s-]?\\d{3,4})|(?:\\d{2}\\)?[\\s-]?\\d{4}[\\s-]?\\d{4}))(?:[\\s-]?(?:x|ext\\.?|\\#)\\d{3,4})?$"; - - - + } 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 fe40f95..597c842 100644 --- a/traqtor-aio/src/test/java/link/pagan/traqtor/EndToEndTest.java +++ b/traqtor-aio/src/test/java/link/pagan/traqtor/EndToEndTest.java @@ -5,6 +5,7 @@ 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.project.universe.element.Element; +import link.pagan.traqtor.project.universe.element.Particle; import link.pagan.traqtor.project.universe.link.Link; import link.pagan.traqtor.project.universe.schema.impl.LiteralDataTypeSchema; import link.pagan.traqtor.project.universe.schema.impl.LogicDatatypeSchema; @@ -19,182 +20,130 @@ import org.junit.jupiter.api.Test; public class EndToEndTest { @Test - void endToEndTest() { + void endToEndTest () { LiteralDataTypeSchema LITERAL = LiteralDataTypeSchema.instance(); LogicDatatypeSchema LOGIC = LogicDatatypeSchema.instance(); NumericDatatypeSchema NUMERIC = NumericDatatypeSchema.instance(); TemporalDatatypeSchema TEMPORAL = TemporalDatatypeSchema.instance(); StringDataType STRING = LITERAL.STRING; -// LogicDataType BOOLEAN = LOGIC.BOOLEAN; -// IntegerDataType BYTE = NUMERIC.BYTE; -// IntegerDataType SHORT = NUMERIC.SHORT; + // LogicDataType BOOLEAN = LOGIC.BOOLEAN; + // IntegerDataType BYTE = NUMERIC.BYTE; + // IntegerDataType SHORT = NUMERIC.SHORT; IntegerDataType INTEGER = NUMERIC.INTEGER; -// IntegerDataType LONG = NUMERIC.LONG; + // IntegerDataType LONG = NUMERIC.LONG; RationalDataType FLOAT = NUMERIC.FLOAT; RationalDataType DOUBLE = NUMERIC.DOUBLE; -// TemporalDataType DATE = TEMPORAL.DATE; -// TemporalDataType TIME = TEMPORAL.TIME; -// TemporalDataType TIMESTAMP = TEMPORAL.TIMESTAMP; + // TemporalDataType DATE = TEMPORAL.DATE; + // TemporalDataType TIME = TEMPORAL.TIME; + // TemporalDataType TIMESTAMP = TEMPORAL.TIMESTAMP; + + Particle accountEmail = STRING.particle() + .name("email") + .description("email as main identifier for an account") + .constraints(STRING.min(4), STRING.max(512), STRING.regExp(RegExpHelper.EMAIL)); + Particle accountPhone = STRING.particle() + .name("phone") + .description("alternative identifier for an account") + .optional() + .constraints(STRING.min(10), STRING.max(32), STRING.regExp(RegExpHelper.PHONE)); Element account = Universe.atom() - .name("account") - .particles( - STRING.particle() - .name("email") - .description("email as main identifier for an account") - .constraints( - STRING.min(4), - STRING.max(512), - STRING.regExp(RegExpHelper.EMAIL) - ), - STRING.particle() - .name("phone") - .description("alternative identifier for an account") - .optional() - .constraints( - STRING.min(10), - STRING.max(32), - STRING.regExp(RegExpHelper.PHONE) - ) - ); + .name("account") + .particles(accountEmail, accountPhone); Element accountDetails = Universe.atom() - .name("account", "details") - .particles( - STRING.particle() - .name("last", "name") - .description("last name of user") - .constraints( - STRING.max(64), - STRING.min(1) - ), - STRING.particle() - .name("first", "name") - .description("first name of user") - .optional() - .constraints( - STRING.max(64), - STRING.min(1) - ), - INTEGER.particle() - .name("age") - .description("age of user owning an account") - .constraints( - INTEGER.min(18), - INTEGER.max(65) - ) - ); + .name("account", "details") + .particles(STRING.particle() + .name("last", "name") + .description("last name of user") + .constraints(STRING.max(64), STRING.min(1)), STRING.particle() + .name("first", "name") + .description("first name of user") + .optional() + .constraints(STRING.max(64), STRING.min(1)), INTEGER.particle() + .name("age") + .description("age of user owning an account") + .constraints(INTEGER.min(18), INTEGER.max(65))); Element male = Universe.isotope() - .base(account) - .name("male") - .particles( - DOUBLE.particle() - .name("length") - .description("penis length") - .constraints( - DOUBLE.min(0), - DOUBLE.max(40) - ) - ); + .base(account) + .name("male") + .particles(DOUBLE.particle() + .name("length") + .description("penis length") + .constraints(DOUBLE.min(0), DOUBLE.max(40))); Element female = Universe.isotope() - .base(account) - .name("female") - .particles( - FLOAT.particle() - .name("depth") - .description("vagina depth") - .constraints( - DOUBLE.min(0), - DOUBLE.max(40) - ) - ); + .base(account) + .name("female") + .particles(FLOAT.particle() + .name("depth") + .description("vagina depth") + .constraints(DOUBLE.min(0), DOUBLE.max(40))); Element position = Universe.atom() - .name("position") - .particles( - STRING.particle() - .name("title") - .description("position name") - .constraints( - STRING.max(255), - STRING.min(3) - ) - ); + .name("position") + .particles(STRING.particle() + .name("title") + .description("position name") + .constraints(STRING.max(255), STRING.min(3))); Element militaryId = Universe.atom() - .name("military", "id") - .particles( - STRING.particle() - .name("number") - .description("military id number") - .constraints( - STRING.max(11), - STRING.min(11) - ) - ); + .name("military", "id") + .particles(STRING.particle() + .name("number") + .description("military id number") + .constraints(STRING.max(11), STRING.min(11))); Element profile = Universe.atom() - .name(("profile") - ); + .name(("profile")); UniverseProject baseUniverse = Universe.project() - .name("base") - .schemas(LITERAL, LOGIC, NUMERIC, TEMPORAL) - .elements(account, accountDetails, male, female, position, militaryId, profile) - .links(Link.oneToOne() - .from(account) - .fromName("details") - .to(accountDetails) - .toName("account") - .mandatory(), - Universe.linkOneToMany() - .from(account).fromName("profiles") - .to(profile).toName("account") - .more(0), - Universe.linkManyToMany().from(profile) - .fromName("positions") - .to(position).toName("profiles"), - Universe.linkOneToOne() - .from(male).fromName("military", "id") - .to(militaryId).toName("account") - ); + .name("base") + .schemas(LITERAL, LOGIC, NUMERIC, TEMPORAL) + .elements(account, accountDetails, male, female, position, militaryId, profile) + .links(Link.oneToOne() + .from(account) + .fromName("details") + .to(accountDetails) + .toName("account") + .mandatory(), Universe.linkOneToMany() + .from(account) + .fromName("profiles") + .to(profile) + .toName("account") + .more(0), Universe.linkManyToMany() + .from(profile) + .fromName("positions") + .to(position) + .toName("profiles"), Universe.linkOneToOne() + .from(male) + .fromName("military", "id") + .to(militaryId) + .toName("account")); UniverseProject dataUniverse = Universe.project() - .name("data") - .schemas(LITERAL) - .elements(Universe.atom() - .name("organization") - .particles( - STRING.particle() - .name("name") - .description("full name of an organization") - .constraints( - STRING.max(255), - STRING.min(3) - ) - ) - ); + .name("data") + .schemas(LITERAL) + .elements(Universe.atom() + .name("organization") + .particles(STRING.particle() + .name("name") + .description("full name of an organization") + .constraints(STRING.max(255), STRING.min(3)))); DatabaseProject mainDatabase = Database.project() - .name("primary") - .universes(baseUniverse, dataUniverse) - .addSchema(Database.schema() - .name("public") - .tables( - Database.table() - .columns() - ) - ); + .name("primary") + .universes(baseUniverse, dataUniverse) + .addSchema(Database.schema() + .name("public") + .tables(Database.table() + .columns())); new Workspace() - .name("link", "pagan") - .projects(baseUniverse, - dataUniverse, - mainDatabase - ); + .name("link", "pagan") + .projects(baseUniverse, dataUniverse, mainDatabase); } } diff --git a/traqtor.code-workspace b/traqtor.code-workspace index caee811..2d8918a 100644 --- a/traqtor.code-workspace +++ b/traqtor.code-workspace @@ -1,11 +1,39 @@ { - "folders": [ + "folders": [ + { + "path": "." + } + ], + "settings": { + "java.configuration.updateBuildConfiguration": "automatic", + "editor.formatOnSave": true, + "editor.defaultFormatter": "redhat.java", + "editor.rulers": [ + 120 + ], + "workbench.colorCustomizations": { + "editorRuler.foreground": "#AA5C39" + }, + "files.exclude": { + "**/.devt": true, + "config": true, + "v1": true, + "script": true, + "source": true, + }, + "javascript.format.enable": true, + "java.dependency.packagePresentation": "hierarchical", + "java.dependency.showMembers": true, + "java.dependency.syncWithFolderExplorer": false, + "maven.executable.preferMavenWrapper": false, + "java.format.settings.url": ".vscode/formatting.xml", + "java.format.settings.profile": "2pm.tech", + "maven.terminal.favorites": [ { - "path": "." + "alias": "format", + "command": "formatter:format" } - ], - "settings": { - "java.configuration.updateBuildConfiguration": "automatic", - "java.dependency.packagePresentation": "hierarchical" - } -} \ No newline at end of file + ] + } + +}