From 7438de77ef3115147102932016dac4d5eb6e01fb Mon Sep 17 00:00:00 2001 From: "Edward M. Kagan" Date: Wed, 17 Feb 2021 04:22:55 +0300 Subject: [PATCH] Minor code style fixes --- traqtor-api/pom.xml | 2 +- .../src/main/java/link/pagan/traqtor/api/Traqtor.java | 4 ---- .../generator/blueprint/database/SchemeBlueprint.java | 5 ----- .../blueprint/database/builder/SchemeBlueprintBuilder.java | 2 +- .../blueprint/database/builder/TableBlueprintBuilder.java | 2 +- .../generator/blueprint/frontend/FrontendBlueprint.java | 2 -- .../pagan/traqtor/schema/basic/data/DataTypeSchemaImpl.java | 4 +++- .../basic/data/mapping/database/PostgresDatabaseAdapter.java | 4 +++- .../schema/data/mapping/database/DatabaseMapping.java | 2 -- traqtor.code-workspace | 4 +++- 10 files changed, 12 insertions(+), 19 deletions(-) diff --git a/traqtor-api/pom.xml b/traqtor-api/pom.xml index 1911a8c..9c4c693 100644 --- a/traqtor-api/pom.xml +++ b/traqtor-api/pom.xml @@ -30,7 +30,7 @@ ${project.groupId} - traqtor-schema-basic + traqtor-schema-ref ${project.version} diff --git a/traqtor-api/src/main/java/link/pagan/traqtor/api/Traqtor.java b/traqtor-api/src/main/java/link/pagan/traqtor/api/Traqtor.java index 56e5954..225e78c 100644 --- a/traqtor-api/src/main/java/link/pagan/traqtor/api/Traqtor.java +++ b/traqtor-api/src/main/java/link/pagan/traqtor/api/Traqtor.java @@ -1,11 +1,7 @@ package link.pagan.traqtor.api; import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; import java.io.IOException; -import java.util.logging.Level; -import java.util.logging.Logger; import link.pagan.traqtor._api.Command; import link.pagan.traqtor._api.Executor; import link.pagan.traqtor._api.result.CommandExecResult; diff --git a/traqtor-generator/src/main/java/link/pagan/traqtor/generator/blueprint/database/SchemeBlueprint.java b/traqtor-generator/src/main/java/link/pagan/traqtor/generator/blueprint/database/SchemeBlueprint.java index be693cc..3d002b1 100644 --- a/traqtor-generator/src/main/java/link/pagan/traqtor/generator/blueprint/database/SchemeBlueprint.java +++ b/traqtor-generator/src/main/java/link/pagan/traqtor/generator/blueprint/database/SchemeBlueprint.java @@ -1,8 +1,3 @@ -/* - * 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.generator.blueprint.database; import java.util.ArrayList; diff --git a/traqtor-generator/src/main/java/link/pagan/traqtor/generator/blueprint/database/builder/SchemeBlueprintBuilder.java b/traqtor-generator/src/main/java/link/pagan/traqtor/generator/blueprint/database/builder/SchemeBlueprintBuilder.java index d0ddad5..b60fd86 100644 --- a/traqtor-generator/src/main/java/link/pagan/traqtor/generator/blueprint/database/builder/SchemeBlueprintBuilder.java +++ b/traqtor-generator/src/main/java/link/pagan/traqtor/generator/blueprint/database/builder/SchemeBlueprintBuilder.java @@ -34,7 +34,7 @@ public class SchemeBlueprintBuilder { return this; } - public TableBlueprintBuilder table(String name) { + public TableBlueprintBuilder table(Name name) { for (TableBlueprintBuilder tbb : tables) { if (tbb.name().equals(name)) { return tbb; diff --git a/traqtor-generator/src/main/java/link/pagan/traqtor/generator/blueprint/database/builder/TableBlueprintBuilder.java b/traqtor-generator/src/main/java/link/pagan/traqtor/generator/blueprint/database/builder/TableBlueprintBuilder.java index f4300a9..80cd26b 100644 --- a/traqtor-generator/src/main/java/link/pagan/traqtor/generator/blueprint/database/builder/TableBlueprintBuilder.java +++ b/traqtor-generator/src/main/java/link/pagan/traqtor/generator/blueprint/database/builder/TableBlueprintBuilder.java @@ -34,7 +34,7 @@ public class TableBlueprintBuilder { return this; } - public ColumnBlueprintBuilder column(String name) { + public ColumnBlueprintBuilder column(Name name) { for (ColumnBlueprintBuilder cbb : columns) { if (cbb.name().equals(name)) { return cbb; diff --git a/traqtor-generator/src/main/java/link/pagan/traqtor/generator/blueprint/frontend/FrontendBlueprint.java b/traqtor-generator/src/main/java/link/pagan/traqtor/generator/blueprint/frontend/FrontendBlueprint.java index 90db539..9a85cf9 100644 --- a/traqtor-generator/src/main/java/link/pagan/traqtor/generator/blueprint/frontend/FrontendBlueprint.java +++ b/traqtor-generator/src/main/java/link/pagan/traqtor/generator/blueprint/frontend/FrontendBlueprint.java @@ -5,8 +5,6 @@ */ package link.pagan.traqtor.generator.blueprint.frontend; -import link.pagan.traqtor.generator.blueprint.backend.*; - /** * * @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} diff --git a/traqtor-schema-ref/src/main/java/link/pagan/traqtor/schema/basic/data/DataTypeSchemaImpl.java b/traqtor-schema-ref/src/main/java/link/pagan/traqtor/schema/basic/data/DataTypeSchemaImpl.java index c9a71bb..bfaa2bf 100644 --- a/traqtor-schema-ref/src/main/java/link/pagan/traqtor/schema/basic/data/DataTypeSchemaImpl.java +++ b/traqtor-schema-ref/src/main/java/link/pagan/traqtor/schema/basic/data/DataTypeSchemaImpl.java @@ -55,7 +55,9 @@ public class DataTypeSchemaImpl implements DataTypeSchema { @Override public Map register() { - return new HashMap(){{ + return new HashMap(){ + private static final long serialVersionUID = 1L; + { put(BOOLEAN.getName(), BOOLEAN); put(BYTE.getName(), BYTE); put(SHORT.getName(), SHORT); diff --git a/traqtor-schema-ref/src/main/java/link/pagan/traqtor/schema/basic/data/mapping/database/PostgresDatabaseAdapter.java b/traqtor-schema-ref/src/main/java/link/pagan/traqtor/schema/basic/data/mapping/database/PostgresDatabaseAdapter.java index 48f34c8..7fdc016 100644 --- a/traqtor-schema-ref/src/main/java/link/pagan/traqtor/schema/basic/data/mapping/database/PostgresDatabaseAdapter.java +++ b/traqtor-schema-ref/src/main/java/link/pagan/traqtor/schema/basic/data/mapping/database/PostgresDatabaseAdapter.java @@ -23,7 +23,9 @@ public class PostgresDatabaseAdapter extends DatabaseAdapter { @Override public Map register() { - return new HashMap(){{ + return new HashMap(){ + private static final long serialVersionUID = 1L; + { put(NAME, new PostgresDatabaseAdapter()); }}; } diff --git a/traqtor-schema/src/main/java/link/pagan/traqtor/schema/data/mapping/database/DatabaseMapping.java b/traqtor-schema/src/main/java/link/pagan/traqtor/schema/data/mapping/database/DatabaseMapping.java index 9a1eecf..d82ba5f 100644 --- a/traqtor-schema/src/main/java/link/pagan/traqtor/schema/data/mapping/database/DatabaseMapping.java +++ b/traqtor-schema/src/main/java/link/pagan/traqtor/schema/data/mapping/database/DatabaseMapping.java @@ -2,8 +2,6 @@ package link.pagan.traqtor.schema.data.mapping.database; import java.util.HashMap; import link.pagan.traqtor.schema.data.mapping.Mapping; -import link.pagan.traqtor.schema.data.mapping.Mapping; -import link.pagan.traqtor.schema.data.mapping.MappingEntry; import link.pagan.traqtor.schema.data.mapping.MappingEntry; /** diff --git a/traqtor.code-workspace b/traqtor.code-workspace index 876a149..15c77e1 100644 --- a/traqtor.code-workspace +++ b/traqtor.code-workspace @@ -4,5 +4,7 @@ "path": "." } ], - "settings": {} + "settings": { + "java.configuration.updateBuildConfiguration": "automatic" + } } \ No newline at end of file