Download as
Browse Code »

Commit 06241cac4d9114d3916c33e370c9425ca97b665d

Authored by carlos.alberto
1 parent fa575171
Exists in master

Revert "Padronizaçãp de dataTypes" 

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