From fa57517110a3084316ddd165aff99b3c238e3233 Mon Sep 17 00:00:00 2001 From: carlos.alberto Date: Wed, 27 Apr 2016 19:13:07 -0300 Subject: [PATCH] Padronizaçãp de dataTypes --- cit-esi-api/src/main/java/br/com/centralit/esi/api/data/model/DataType.java | 16 ++-------------- cit-esi-api/src/main/java/br/com/centralit/esi/api/data/model/DatabaseDomain.java | 18 ++++++++++++++++-- cit-esi-web/src/main/java/br/com/centralit/listener/StartupListenerEsi.java | 99 ++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------- 3 files changed, 58 insertions(+), 75 deletions(-) diff --git a/cit-esi-api/src/main/java/br/com/centralit/esi/api/data/model/DataType.java b/cit-esi-api/src/main/java/br/com/centralit/esi/api/data/model/DataType.java index 197f6ad..1609a2d 100644 --- a/cit-esi-api/src/main/java/br/com/centralit/esi/api/data/model/DataType.java +++ b/cit-esi-api/src/main/java/br/com/centralit/esi/api/data/model/DataType.java @@ -29,10 +29,7 @@ public class DataType extends PersistentObjectAudit { @GeneratedValue(strategy = GenerationType.AUTO) @JsonView({Views.EsiDataObjectListView.class, Views.EsiDataObjectEditView.class}) protected Long id; - - @Column(nullable = false, length=100) - @JsonView({ Views.GenericView.class}) - private String name; + @Column(length=100) @JsonView({ Views.GenericView.class}) @@ -64,8 +61,7 @@ public class DataType extends PersistentObjectAudit { // TODO Auto-generated constructor stub } - public DataType(String name, String description, JavaClassEnum javaClass, Boolean allowSize, Boolean allowGeneratedValue, Boolean allowPrecision, Boolean allowAutoIncrement, Integer width, FormWidget widget) { - this.name = name; + public DataType(String description, JavaClassEnum javaClass, Boolean allowSize, Boolean allowGeneratedValue, Boolean allowPrecision, Boolean allowAutoIncrement, Integer width, FormWidget widget) { this.description = description; this.javaClass = javaClass; this.widget = widget; @@ -89,14 +85,6 @@ public class DataType extends PersistentObjectAudit { return this.id; } - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - public Boolean getAllowSize() { return allowSize; } diff --git a/cit-esi-api/src/main/java/br/com/centralit/esi/api/data/model/DatabaseDomain.java b/cit-esi-api/src/main/java/br/com/centralit/esi/api/data/model/DatabaseDomain.java index 30ca581..9d25115 100644 --- a/cit-esi-api/src/main/java/br/com/centralit/esi/api/data/model/DatabaseDomain.java +++ b/cit-esi-api/src/main/java/br/com/centralit/esi/api/data/model/DatabaseDomain.java @@ -1,5 +1,6 @@ package br.com.centralit.esi.api.data.model; +import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.FetchType; import javax.persistence.GeneratedValue; @@ -25,9 +26,13 @@ public class DatabaseDomain extends PersistentObject { @Id @GeneratedValue(strategy = GenerationType.AUTO) - @JsonView({Views.EsiDataObjectListView.class, Views.EsiDataObjectEditView.class}) + @JsonView({Views.GenericView.class}) protected Long id; + @Column(nullable = false, length=100) + @JsonView({ Views.GenericView.class}) + private String name; + @ManyToOne(fetch = FetchType.LAZY, optional = false) @JsonIgnore private Database database; @@ -40,8 +45,9 @@ public class DatabaseDomain extends PersistentObject { // TODO Auto-generated constructor stub } - public DatabaseDomain(Database database, DataType dataType) { + public DatabaseDomain(Database database, String name, DataType dataType) { this.database = database; + this.name = name; this.dataType = dataType; } @@ -70,4 +76,12 @@ public class DatabaseDomain extends PersistentObject { this.id = id; } + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + } diff --git a/cit-esi-web/src/main/java/br/com/centralit/listener/StartupListenerEsi.java b/cit-esi-web/src/main/java/br/com/centralit/listener/StartupListenerEsi.java index 2281fb0..a2dda2d 100644 --- a/cit-esi-web/src/main/java/br/com/centralit/listener/StartupListenerEsi.java +++ b/cit-esi-web/src/main/java/br/com/centralit/listener/StartupListenerEsi.java @@ -334,83 +334,64 @@ public class StartupListenerEsi extends UtilStartup implements ApplicationListen // name, description, javaClass, allowSize, allowGeneratedValue, allowPrecision, allowAutoIncrement, width, widget - DataType dataType = new DataType("bigint", "bigint (inteiro longo)", JavaClassEnum.BIG_INTEGER, false, true, false, true, 2, widgetInteger); + DataType dataType = new DataType("Inteiro longo", JavaClassEnum.BIG_INTEGER, false, true, false, true, 2, widgetInteger); dataType = dataTypeService.save(dataType); - databaseDomainService.save(new DatabaseDomain(sqlServer, dataType)); - databaseDomainService.save(new DatabaseDomain(mySQL, dataType)); - databaseDomainService.save(new DatabaseDomain(postgres, dataType)); - - dataType = new DataType("int8", "int8 (inteiro longo)", JavaClassEnum.BIG_INTEGER, false, true, false, true, 2, widgetInteger); - dataType = dataTypeService.save(dataType); - databaseDomainService.save(new DatabaseDomain(postgres, dataType)); + databaseDomainService.save(new DatabaseDomain(sqlServer, "bigint", dataType)); + databaseDomainService.save(new DatabaseDomain(mySQL, "bigint", dataType)); + databaseDomainService.save(new DatabaseDomain(postgres, "bigint", dataType)); + databaseDomainService.save(new DatabaseDomain(postgres, "int8", dataType)); - dataType = new DataType("smallint", "smallint (inteiro)", JavaClassEnum.INTEGER, false, true, false, true, 2, widgetInteger); + dataType = new DataType("Inteiro", JavaClassEnum.INTEGER, false, true, false, true, 2, widgetInteger); dataType = dataTypeService.save(dataType); - databaseDomainService.save(new DatabaseDomain(sqlServer, dataType)); - databaseDomainService.save(new DatabaseDomain(mySQL, dataType)); - databaseDomainService.save(new DatabaseDomain(postgres, dataType)); - - dataType = new DataType("int", "int (inteiro)", JavaClassEnum.INTEGER, false, true, false, true, 2, widgetInteger); - dataType = dataTypeService.save(dataType); - databaseDomainService.save(new DatabaseDomain(sqlServer, dataType)); - databaseDomainService.save(new DatabaseDomain(mySQL, dataType)); - - dataType = new DataType("integer", "integer (inteiro)", JavaClassEnum.INTEGER, false, true, false, true, 2, widgetInteger); + databaseDomainService.save(new DatabaseDomain(sqlServer, "int", dataType)); + databaseDomainService.save(new DatabaseDomain(sqlServer, "integer", dataType)); + databaseDomainService.save(new DatabaseDomain(sqlServer, "smallint", dataType)); + databaseDomainService.save(new DatabaseDomain(mySQL, "smallint", dataType)); + databaseDomainService.save(new DatabaseDomain(mySQL, "int", dataType)); + databaseDomainService.save(new DatabaseDomain(postgres, "smallint", dataType)); + databaseDomainService.save(new DatabaseDomain(postgres, "integer", dataType)); + databaseDomainService.save(new DatabaseDomain(oracle, "integer", dataType)); + + dataType = new DataType("Booleano", JavaClassEnum.BOOLEAN, false, false, false, false, 2, widgetCheckbox); dataType = dataTypeService.save(dataType); - databaseDomainService.save(new DatabaseDomain(postgres, dataType)); - databaseDomainService.save(new DatabaseDomain(oracle, dataType)); + databaseDomainService.save(new DatabaseDomain(sqlServer, "bit", dataType)); + databaseDomainService.save(new DatabaseDomain(mySQL, "bit", dataType)); - dataType = new DataType("bit", "bit (booleano)", JavaClassEnum.BOOLEAN, false, false, false, false, 2, widgetCheckbox); + dataType = new DataType("Decimal", JavaClassEnum.BIG_DECIMAL, true, false, true, false, 2, widgetDecimal); dataType = dataTypeService.save(dataType); - databaseDomainService.save(new DatabaseDomain(sqlServer, dataType)); - databaseDomainService.save(new DatabaseDomain(mySQL, dataType)); + databaseDomainService.save(new DatabaseDomain(sqlServer, "float", dataType)); + databaseDomainService.save(new DatabaseDomain(sqlServer, "numeric", dataType)); + databaseDomainService.save(new DatabaseDomain(sqlServer, "decimal", dataType)); + databaseDomainService.save(new DatabaseDomain(mySQL, "float", dataType)); + databaseDomainService.save(new DatabaseDomain(mySQL, "numeric", dataType)); + databaseDomainService.save(new DatabaseDomain(mySQL, "decimal", dataType)); + databaseDomainService.save(new DatabaseDomain(postgres, "numeric", dataType)); + databaseDomainService.save(new DatabaseDomain(oracle, "number", dataType)); + + dataType = new DataType("Double (decimal)", JavaClassEnum.DOUBLE, true, false, true, false, 2, widgetDecimal); + dataType = dataTypeService.save(dataType); + databaseDomainService.save(new DatabaseDomain(mySQL, "double", dataType)); - dataType = new DataType("numeric", "numeric (decimal)", JavaClassEnum.BIG_DECIMAL, true, false, true, false, 2, widgetDecimal); + dataType = new DataType("Real (decimal)", JavaClassEnum.FLOAT, true, false, true, false, 2, widgetDecimal); dataType = dataTypeService.save(dataType); - databaseDomainService.save(new DatabaseDomain(sqlServer, dataType)); - databaseDomainService.save(new DatabaseDomain(mySQL, dataType)); - databaseDomainService.save(new DatabaseDomain(postgres, dataType)); + databaseDomainService.save(new DatabaseDomain(sqlServer,"real", dataType)); + databaseDomainService.save(new DatabaseDomain(postgres,"real", dataType)); - dataType = new DataType("number", "number (decimal)", JavaClassEnum.BIG_DECIMAL, true, false, true, false, 2, widgetDecimal); + dataType = new DataType("Currency", JavaClassEnum.CURRENCY, false, false, false, false, 2, widgetMoney); dataType = dataTypeService.save(dataType); - databaseDomainService.save(new DatabaseDomain(oracle, dataType)); + databaseDomainService.save(new DatabaseDomain(sqlServer, "money", dataType)); + databaseDomainService.save(new DatabaseDomain(sqlServer, "smallmoney", dataType)); + databaseDomainService.save(new DatabaseDomain(postgres, "money", dataType)); - dataType = new DataType("decimal", "decimal", JavaClassEnum.BIG_DECIMAL, true, false, true, false, 2, widgetDecimal); - dataType = dataTypeService.save(dataType); - databaseDomainService.save(new DatabaseDomain(sqlServer, dataType)); - databaseDomainService.save(new DatabaseDomain(mySQL, dataType)); - - dataType = new DataType("float", "float (decimal)", JavaClassEnum.FLOAT, true, false, true, false, 2, widgetDecimal); - dataType = dataTypeService.save(dataType); - databaseDomainService.save(new DatabaseDomain(sqlServer, dataType)); - databaseDomainService.save(new DatabaseDomain(mySQL, dataType)); - - dataType = new DataType("double", "double (decimal)", JavaClassEnum.DOUBLE, true, false, true, false, 2, widgetDecimal); - dataType = dataTypeService.save(dataType); - databaseDomainService.save(new DatabaseDomain(mySQL, dataType)); - - dataType = new DataType("real", "real (decimal)", JavaClassEnum.FLOAT, true, false, true, false, 2, widgetDecimal); + dataType = new DataType("date", "date (data)", JavaClassEnum.DATE, false, false, false, false, 2, widgetDate); dataType = dataTypeService.save(dataType); - databaseDomainService.save(new DatabaseDomain(sqlServer, dataType)); databaseDomainService.save(new DatabaseDomain(postgres, dataType)); - - dataType = new DataType("smallmoney", "smallmoney (currency)", JavaClassEnum.CURRENCY, false, false, false, false, 2, widgetMoney); - dataType = dataTypeService.save(dataType); - databaseDomainService.save(new DatabaseDomain(sqlServer, dataType)); + databaseDomainService.save(new DatabaseDomain(oracle, dataType)); - dataType = new DataType("money", "money (currency)", JavaClassEnum.CURRENCY, false, false, false, false, 2, widgetMoney); - dataType = dataTypeService.save(dataType); - databaseDomainService.save(new DatabaseDomain(sqlServer, dataType)); - databaseDomainService.save(new DatabaseDomain(postgres, dataType)); - dataType = new DataType("smalldatetime", "smalldatetime (data)", JavaClassEnum.DATE, false, false, false, false, 2, widgetDate); dataType = dataTypeService.save(dataType); databaseDomainService.save(new DatabaseDomain(sqlServer, dataType)); - dataType = new DataType("date", "date (data)", JavaClassEnum.DATE, false, false, false, false, 2, widgetDate); - dataType = dataTypeService.save(dataType); - databaseDomainService.save(new DatabaseDomain(postgres, dataType)); - databaseDomainService.save(new DatabaseDomain(oracle, dataType)); dataType = new DataType("datetime", "datetime (data)", JavaClassEnum.DATE, false, false, false, false, 2, widgetDate); dataType = dataTypeService.save(dataType); -- libgit2 0.21.2