Correções nos métodos dataObject

Carlos Alberto
1 parent 11efbb8f
Showing 3 changed files with 23 additions and 32 deletions Show diff stats
cit-esi-api/src/main/java/br/com/centralit/esi/api/data/service/impl/DataManager.java
cit-esi-api/src/main/java/br/com/centralit/esi/api/data/service/impl/DataObjectServiceImpl.java
cit-esi-api/src/main/java/br/com/centralit/esi/api/design/service/impl/FlowVersionServiceImpl.java
@@ -246,8 +246,6 @@ public class DataManager  {
 			throw new EsiExecutionException("SQL de INSERT não encontrado");
 		}
-		this.validateData(dataObject, map);
-	
 		Connection connection = this.dataSourceService.connect(dataObject.getDataSource());
 		try{
@@ -257,6 +255,8 @@ public class DataManager  {
 			dataObjectService.incrementSequences(connection, dataObject);
+			this.validateData(dataObject, map);
+			
 			DataObjectUtil.executeSQL(dataObject, connection, sql, map);
 			DataObjectUtil.verifyIdentity(dataObject, connection, map);
@@ -280,8 +280,6 @@ public class DataManager  {
 			throw new EsiExecutionException("SQL de UPDATE não encontrado");
 		}
-		this.validateData(dataObject, map);
-		
 		Connection connection = this.dataSourceService.connect(dataObject.getDataSource());
 		try{
@@ -289,6 +287,8 @@ public class DataManager  {
 				map = this.executeBusinessRule(connection, dataObject, map, dataObject.getUpdateRule());
 			}
+			this.validateData(dataObject, map);
+			
 			DataObjectUtil.executeSQL(dataObject, connection, sql, map);
 			this.dataSourceService.commit(connection);
@@ -333,8 +333,6 @@ public class DataManager  {
 			throw new EsiExecutionException("SQL de INSERT não encontrado");
 		}
-		this.validateData(dataObject, map);
-		
 		Connection connection = this.dataSourceService.connect(dataObject.getDataSource());
 		try{
@@ -344,6 +342,8 @@ public class DataManager  {
 			dataObjectService.incrementSequences(connection, dataObject);
+			this.validateData(dataObject, map);
+			
 			DataObjectUtil.executeSQL(dataObject, connection, sql, map);
 			DataObjectUtil.verifyIdentity(dataObject, connection, map);
@@ -368,13 +368,13 @@ public class DataManager  {
 		Connection connection = this.dataSourceService.connect(dataObject.getDataSource());
-		this.validateData(dataObject, map);
-		
 		try{
 			if (dataObject.getUpdateRule() != null) {
 				map = this.executeBusinessRule(connection, dataObject, map, dataObject.getUpdateRule());
 			}
+			this.validateData(dataObject, map);
+			
 			DataObjectUtil.executeSQL(dataObject, connection, sql, map);
 			this.dataSourceService.commit(connection);
@@ -200,7 +200,7 @@ public class DataObjectServiceImpl extends GenericServiceImpl&lt;DataObject, Long&gt; 
 			throw new EsiBusinessException("Tipo de dados não definido para a coluna '"+column.getName()+"' do objeto de dados '"+dataObject.getName()+"' ");
 		}
 		if (UtilString.isNullOrEmpty(column.getDatabaseType())) {
-			throw new EsiBusinessException("Tipo de columna BD não definido para a coluna '"+column.getName()+"' do objeto de dados '"+dataObject.getName()+"' ");
+			throw new EsiBusinessException("Tipo de coluna do BD não definido para a coluna '"+column.getName()+"' do objeto de dados '"+dataObject.getName()+"' ");
 		}
 	}
@@ -635,8 +635,6 @@ public class DataObjectServiceImpl extends GenericServiceImpl&lt;DataObject, Long&gt; 
 	public DataObject save(DataObject sourceObject, boolean replace) {
 		sourceObject.setId(null);
-		this.validate(sourceObject);
-		
 		DataObject dataObject = this.findByDataSourceAndName(sourceObject.getDataSource().getConnectionName(), sourceObject.getName());
 		if (dataObject != null) {
 			if (!replace) {
@@ -671,6 +669,9 @@ public class DataObjectServiceImpl extends GenericServiceImpl&lt;DataObject, Long&gt; 
 				}
 			}
 		}
+		
+		this.validate(sourceObject);
+
 		if (sourceObject.getSqls() != null) {
 			for (CustomSQL sql : sourceObject.getSqls()) {
 				sql.setId(null);
@@ -465,14 +465,9 @@ public class FlowVersionServiceImpl extends GenericServiceImpl&lt;FlowVersion, Long
 		if (flowVersion.getVariables() != null) {
 			List<FlowVariable> variables = new ArrayList<FlowVariable>();
 			for (FlowVariable flowVariable : flowVersion.getVariables()) {
-				if (flowVariable.getStatusVariable() == null) {
-					flowVariable.setStatusVariable(false);
-				}
-				if (!flowVariable.getStatusVariable()) {
-					flowVariable.setFlowVersion(flowVersion);
-					mapObj.put(""+flowVariable.getId(), flowVariable);
-					variables.add(flowVariable);
-				}
+				flowVariable.setFlowVersion(flowVersion);
+				mapObj.put(""+flowVariable.getId(), flowVariable);
+				variables.add(flowVariable);
 			}
 			flowVersion.setVariables(variables);
 		}
@@ -769,19 +764,14 @@ public class FlowVersionServiceImpl extends GenericServiceImpl&lt;FlowVersion, Long
 		if (oldFlowVersion.getVariables() != null) {
 			currentFlowVersion.setVariables(new ArrayList<FlowVariable>()); 
 			for (FlowVariable flowVariable : oldFlowVersion.getVariables()) {
-				if (flowVariable.getStatusVariable() == null) {
-					flowVariable.setStatusVariable(false);
-				}
-				if (!flowVariable.getStatusVariable()) {
-					try {
-						FlowVariable newFlowVariable = (FlowVariable) BeanUtils.cloneBean(flowVariable);
-						newFlowVariable.setId(null);
-						newFlowVariable.setFlowVersion(currentFlowVersion);
-						currentFlowVersion.getVariables().add(newFlowVariable);
-					} catch (Exception e) {
-						e.printStackTrace();
-						throw new EsiBusinessException(e);
-					}
+				try {
+					FlowVariable newFlowVariable = (FlowVariable) BeanUtils.cloneBean(flowVariable);
+					newFlowVariable.setId(null);
+					newFlowVariable.setFlowVersion(currentFlowVersion);
+					currentFlowVersion.getVariables().add(newFlowVariable);
+				} catch (Exception e) {
+					e.printStackTrace();
+					throw new EsiBusinessException(e);
 				}
 			}
 		}