1
Download as
Browse Code »

Commit fa57517110a3084316ddd165aff99b3c238e3233

Authored by carlos.alberto
1 parent f4e62df9
Exists in master

Padronizaçãp de dataTypes

Showing 3 changed files with 58 additions and 75 deletions   Show diff stats
cit-esi-api/src/main/java/br/com/centralit/esi/api/data/model/DataType.java
  Diff comments   View file @fa57517
... ... @@ -29,10 +29,7 @@ public class DataType extends PersistentObjectAudit {
29 29 @GeneratedValue(strategy = GenerationType.AUTO)
30 30 @JsonView({Views.EsiDataObjectListView.class, Views.EsiDataObjectEditView.class})
31 31 protected Long id;
32   -
33   - @Column(nullable = false, length=100)
34   - @JsonView({ Views.GenericView.class})
35   - private String name;
  32 +
36 33  
37 34 @Column(length=100)
38 35 @JsonView({ Views.GenericView.class})
... ... @@ -64,8 +61,7 @@ public class DataType extends PersistentObjectAudit {
64 61 // TODO Auto-generated constructor stub
65 62 }
66 63  
67   - public DataType(String name, String description, JavaClassEnum javaClass, Boolean allowSize, Boolean allowGeneratedValue, Boolean allowPrecision, Boolean allowAutoIncrement, Integer width, FormWidget widget) {
68   - this.name = name;
  64 + public DataType(String description, JavaClassEnum javaClass, Boolean allowSize, Boolean allowGeneratedValue, Boolean allowPrecision, Boolean allowAutoIncrement, Integer width, FormWidget widget) {
69 65 this.description = description;
70 66 this.javaClass = javaClass;
71 67 this.widget = widget;
... ... @@ -89,14 +85,6 @@ public class DataType extends PersistentObjectAudit {
89 85 return this.id;
90 86 }
91 87  
92   - public String getName() {
93   - return name;
94   - }
95   -
96   - public void setName(String name) {
97   - this.name = name;
98   - }
99   -
100 88 public Boolean getAllowSize() {
101 89 return allowSize;
102 90 }
... ...
cit-esi-api/src/main/java/br/com/centralit/esi/api/data/model/DatabaseDomain.java
  Diff comments   View file @fa57517
1 1 package br.com.centralit.esi.api.data.model;
2 2  
  3 +import javax.persistence.Column;
3 4 import javax.persistence.Entity;
4 5 import javax.persistence.FetchType;
5 6 import javax.persistence.GeneratedValue;
... ... @@ -25,9 +26,13 @@ public class DatabaseDomain extends PersistentObject {
25 26  
26 27 @Id
27 28 @GeneratedValue(strategy = GenerationType.AUTO)
28   - @JsonView({Views.EsiDataObjectListView.class, Views.EsiDataObjectEditView.class})
  29 + @JsonView({Views.GenericView.class})
29 30 protected Long id;
30 31  
  32 + @Column(nullable = false, length=100)
  33 + @JsonView({ Views.GenericView.class})
  34 + private String name;
  35 +
31 36 @ManyToOne(fetch = FetchType.LAZY, optional = false)
32 37 @JsonIgnore
33 38 private Database database;
... ... @@ -40,8 +45,9 @@ public class DatabaseDomain extends PersistentObject {
40 45 // TODO Auto-generated constructor stub
41 46 }
42 47  
43   - public DatabaseDomain(Database database, DataType dataType) {
  48 + public DatabaseDomain(Database database, String name, DataType dataType) {
44 49 this.database = database;
  50 + this.name = name;
45 51 this.dataType = dataType;
46 52 }
47 53  
... ... @@ -70,4 +76,12 @@ public class DatabaseDomain extends PersistentObject {
70 76 this.id = id;
71 77 }
72 78  
  79 + public String getName() {
  80 + return name;
  81 + }
  82 +
  83 + public void setName(String name) {
  84 + this.name = name;
  85 + }
  86 +
73 87 }
... ...
cit-esi-web/src/main/java/br/com/centralit/listener/StartupListenerEsi.java
  Diff comments   View file @fa57517
... ... @@ -334,83 +334,64 @@ public class StartupListenerEsi extends UtilStartup implements ApplicationListen
334 334  
335 335 // name, description, javaClass, allowSize, allowGeneratedValue, allowPrecision, allowAutoIncrement, width, widget
336 336  
337   - DataType dataType = new DataType("bigint", "bigint (inteiro longo)", JavaClassEnum.BIG_INTEGER, false, true, false, true, 2, widgetInteger);
  337 + DataType dataType = new DataType("Inteiro longo", JavaClassEnum.BIG_INTEGER, false, true, false, true, 2, widgetInteger);
338 338 dataType = dataTypeService.save(dataType);
339   - databaseDomainService.save(new DatabaseDomain(sqlServer, dataType));
340   - databaseDomainService.save(new DatabaseDomain(mySQL, dataType));
341   - databaseDomainService.save(new DatabaseDomain(postgres, dataType));
342   -
343   - dataType = new DataType("int8", "int8 (inteiro longo)", JavaClassEnum.BIG_INTEGER, false, true, false, true, 2, widgetInteger);
344   - dataType = dataTypeService.save(dataType);
345   - databaseDomainService.save(new DatabaseDomain(postgres, dataType));
  339 + databaseDomainService.save(new DatabaseDomain(sqlServer, "bigint", dataType));
  340 + databaseDomainService.save(new DatabaseDomain(mySQL, "bigint", dataType));
  341 + databaseDomainService.save(new DatabaseDomain(postgres, "bigint", dataType));
  342 + databaseDomainService.save(new DatabaseDomain(postgres, "int8", dataType));
346 343  
347   - dataType = new DataType("smallint", "smallint (inteiro)", JavaClassEnum.INTEGER, false, true, false, true, 2, widgetInteger);
  344 + dataType = new DataType("Inteiro", JavaClassEnum.INTEGER, false, true, false, true, 2, widgetInteger);
348 345 dataType = dataTypeService.save(dataType);
349   - databaseDomainService.save(new DatabaseDomain(sqlServer, dataType));
350   - databaseDomainService.save(new DatabaseDomain(mySQL, dataType));
351   - databaseDomainService.save(new DatabaseDomain(postgres, dataType));
352   -
353   - dataType = new DataType("int", "int (inteiro)", JavaClassEnum.INTEGER, false, true, false, true, 2, widgetInteger);
354   - dataType = dataTypeService.save(dataType);
355   - databaseDomainService.save(new DatabaseDomain(sqlServer, dataType));
356   - databaseDomainService.save(new DatabaseDomain(mySQL, dataType));
357   -
358   - dataType = new DataType("integer", "integer (inteiro)", JavaClassEnum.INTEGER, false, true, false, true, 2, widgetInteger);
  346 + databaseDomainService.save(new DatabaseDomain(sqlServer, "int", dataType));
  347 + databaseDomainService.save(new DatabaseDomain(sqlServer, "integer", dataType));
  348 + databaseDomainService.save(new DatabaseDomain(sqlServer, "smallint", dataType));
  349 + databaseDomainService.save(new DatabaseDomain(mySQL, "smallint", dataType));
  350 + databaseDomainService.save(new DatabaseDomain(mySQL, "int", dataType));
  351 + databaseDomainService.save(new DatabaseDomain(postgres, "smallint", dataType));
  352 + databaseDomainService.save(new DatabaseDomain(postgres, "integer", dataType));
  353 + databaseDomainService.save(new DatabaseDomain(oracle, "integer", dataType));
  354 +
  355 + dataType = new DataType("Booleano", JavaClassEnum.BOOLEAN, false, false, false, false, 2, widgetCheckbox);
359 356 dataType = dataTypeService.save(dataType);
360   - databaseDomainService.save(new DatabaseDomain(postgres, dataType));
361   - databaseDomainService.save(new DatabaseDomain(oracle, dataType));
  357 + databaseDomainService.save(new DatabaseDomain(sqlServer, "bit", dataType));
  358 + databaseDomainService.save(new DatabaseDomain(mySQL, "bit", dataType));
362 359  
363   - dataType = new DataType("bit", "bit (booleano)", JavaClassEnum.BOOLEAN, false, false, false, false, 2, widgetCheckbox);
  360 + dataType = new DataType("Decimal", JavaClassEnum.BIG_DECIMAL, true, false, true, false, 2, widgetDecimal);
364 361 dataType = dataTypeService.save(dataType);
365   - databaseDomainService.save(new DatabaseDomain(sqlServer, dataType));
366   - databaseDomainService.save(new DatabaseDomain(mySQL, dataType));
  362 + databaseDomainService.save(new DatabaseDomain(sqlServer, "float", dataType));
  363 + databaseDomainService.save(new DatabaseDomain(sqlServer, "numeric", dataType));
  364 + databaseDomainService.save(new DatabaseDomain(sqlServer, "decimal", dataType));
  365 + databaseDomainService.save(new DatabaseDomain(mySQL, "float", dataType));
  366 + databaseDomainService.save(new DatabaseDomain(mySQL, "numeric", dataType));
  367 + databaseDomainService.save(new DatabaseDomain(mySQL, "decimal", dataType));
  368 + databaseDomainService.save(new DatabaseDomain(postgres, "numeric", dataType));
  369 + databaseDomainService.save(new DatabaseDomain(oracle, "number", dataType));
  370 +
  371 + dataType = new DataType("Double (decimal)", JavaClassEnum.DOUBLE, true, false, true, false, 2, widgetDecimal);
  372 + dataType = dataTypeService.save(dataType);
  373 + databaseDomainService.save(new DatabaseDomain(mySQL, "double", dataType));
367 374  
368   - dataType = new DataType("numeric", "numeric (decimal)", JavaClassEnum.BIG_DECIMAL, true, false, true, false, 2, widgetDecimal);
  375 + dataType = new DataType("Real (decimal)", JavaClassEnum.FLOAT, true, false, true, false, 2, widgetDecimal);
369 376 dataType = dataTypeService.save(dataType);
370   - databaseDomainService.save(new DatabaseDomain(sqlServer, dataType));
371   - databaseDomainService.save(new DatabaseDomain(mySQL, dataType));
372   - databaseDomainService.save(new DatabaseDomain(postgres, dataType));
  377 + databaseDomainService.save(new DatabaseDomain(sqlServer,"real", dataType));
  378 + databaseDomainService.save(new DatabaseDomain(postgres,"real", dataType));
373 379  
374   - dataType = new DataType("number", "number (decimal)", JavaClassEnum.BIG_DECIMAL, true, false, true, false, 2, widgetDecimal);
  380 + dataType = new DataType("Currency", JavaClassEnum.CURRENCY, false, false, false, false, 2, widgetMoney);
375 381 dataType = dataTypeService.save(dataType);
376   - databaseDomainService.save(new DatabaseDomain(oracle, dataType));
  382 + databaseDomainService.save(new DatabaseDomain(sqlServer, "money", dataType));
  383 + databaseDomainService.save(new DatabaseDomain(sqlServer, "smallmoney", dataType));
  384 + databaseDomainService.save(new DatabaseDomain(postgres, "money", dataType));
377 385  
378   - dataType = new DataType("decimal", "decimal", JavaClassEnum.BIG_DECIMAL, true, false, true, false, 2, widgetDecimal);
379   - dataType = dataTypeService.save(dataType);
380   - databaseDomainService.save(new DatabaseDomain(sqlServer, dataType));
381   - databaseDomainService.save(new DatabaseDomain(mySQL, dataType));
382   -
383   - dataType = new DataType("float", "float (decimal)", JavaClassEnum.FLOAT, true, false, true, false, 2, widgetDecimal);
384   - dataType = dataTypeService.save(dataType);
385   - databaseDomainService.save(new DatabaseDomain(sqlServer, dataType));
386   - databaseDomainService.save(new DatabaseDomain(mySQL, dataType));
387   -
388   - dataType = new DataType("double", "double (decimal)", JavaClassEnum.DOUBLE, true, false, true, false, 2, widgetDecimal);
389   - dataType = dataTypeService.save(dataType);
390   - databaseDomainService.save(new DatabaseDomain(mySQL, dataType));
391   -
392   - dataType = new DataType("real", "real (decimal)", JavaClassEnum.FLOAT, true, false, true, false, 2, widgetDecimal);
  386 + dataType = new DataType("date", "date (data)", JavaClassEnum.DATE, false, false, false, false, 2, widgetDate);
393 387 dataType = dataTypeService.save(dataType);
394   - databaseDomainService.save(new DatabaseDomain(sqlServer, dataType));
395 388 databaseDomainService.save(new DatabaseDomain(postgres, dataType));
396   -
397   - dataType = new DataType("smallmoney", "smallmoney (currency)", JavaClassEnum.CURRENCY, false, false, false, false, 2, widgetMoney);
398   - dataType = dataTypeService.save(dataType);
399   - databaseDomainService.save(new DatabaseDomain(sqlServer, dataType));
  389 + databaseDomainService.save(new DatabaseDomain(oracle, dataType));
400 390  
401   - dataType = new DataType("money", "money (currency)", JavaClassEnum.CURRENCY, false, false, false, false, 2, widgetMoney);
402   - dataType = dataTypeService.save(dataType);
403   - databaseDomainService.save(new DatabaseDomain(sqlServer, dataType));
404   - databaseDomainService.save(new DatabaseDomain(postgres, dataType));
405   -
406 391 dataType = new DataType("smalldatetime", "smalldatetime (data)", JavaClassEnum.DATE, false, false, false, false, 2, widgetDate);
407 392 dataType = dataTypeService.save(dataType);
408 393 databaseDomainService.save(new DatabaseDomain(sqlServer, dataType));
409 394  
410   - dataType = new DataType("date", "date (data)", JavaClassEnum.DATE, false, false, false, false, 2, widgetDate);
411   - dataType = dataTypeService.save(dataType);
412   - databaseDomainService.save(new DatabaseDomain(postgres, dataType));
413   - databaseDomainService.save(new DatabaseDomain(oracle, dataType));
414 395  
415 396 dataType = new DataType("datetime", "datetime (data)", JavaClassEnum.DATE, false, false, false, false, 2, widgetDate);
416 397 dataType = dataTypeService.save(dataType);
... ...