Author: lresende
Date: Thu Nov 16 17:39:06 2006
New Revision: 476023
URL: http://svn.apache.org/viewvc?view=rev&rev=476023
Log:
checkstyle updates
Modified:
incubator/tuscany/sandbox/lresende/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessComponentTypeLoader.java
incubator/tuscany/sandbox/lresende/container.das/src/main/java/org/apache/tuscany/container/dataaccessscript/CommandMapper.java
incubator/tuscany/sandbox/lresende/container.das/src/main/java/org/apache/tuscany/container/dataaccessscript/DataAccessInstanceImpl.java
Modified:
incubator/tuscany/sandbox/lresende/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessComponentTypeLoader.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/sandbox/lresende/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessComponentTypeLoader.java?view=diff&rev=476023&r1=476022&r2=476023
==============================================================================
---
incubator/tuscany/sandbox/lresende/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessComponentTypeLoader.java
(original)
+++
incubator/tuscany/sandbox/lresende/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessComponentTypeLoader.java
Thu Nov 16 17:39:06 2006
@@ -107,8 +107,7 @@
url,
ComponentType.class,
deploymentContext);
- DataAccessComponentType dasCt = new DataAccessComponentType(ct);
- return dasCt;
+ return new DataAccessComponentType(ct);
}
private String getSideFileName(DataAccessImplementation implementation) {
Modified:
incubator/tuscany/sandbox/lresende/container.das/src/main/java/org/apache/tuscany/container/dataaccessscript/CommandMapper.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/sandbox/lresende/container.das/src/main/java/org/apache/tuscany/container/dataaccessscript/CommandMapper.java?view=diff&rev=476023&r1=476022&r2=476023
==============================================================================
---
incubator/tuscany/sandbox/lresende/container.das/src/main/java/org/apache/tuscany/container/dataaccessscript/CommandMapper.java
(original)
+++
incubator/tuscany/sandbox/lresende/container.das/src/main/java/org/apache/tuscany/container/dataaccessscript/CommandMapper.java
Thu Nov 16 17:39:06 2006
@@ -24,15 +24,7 @@
public class CommandMapper {
public static String getCommandName(String serviceAPIName){
- /*if(serviceAPIName.equals("getAllCustomers")){
- return "allCustomers";
- }
- else
- return null;
- */
-
- String commandName =
serviceAPIName.substring(serviceAPIName.indexOf("get")+3);
- return commandName;
+ return
serviceAPIName.substring(serviceAPIName.indexOf("get")+3);
}
public static String getServiceAPIName(String commandName){
Modified:
incubator/tuscany/sandbox/lresende/container.das/src/main/java/org/apache/tuscany/container/dataaccessscript/DataAccessInstanceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/sandbox/lresende/container.das/src/main/java/org/apache/tuscany/container/dataaccessscript/DataAccessInstanceImpl.java?view=diff&rev=476023&r1=476022&r2=476023
==============================================================================
---
incubator/tuscany/sandbox/lresende/container.das/src/main/java/org/apache/tuscany/container/dataaccessscript/DataAccessInstanceImpl.java
(original)
+++
incubator/tuscany/sandbox/lresende/container.das/src/main/java/org/apache/tuscany/container/dataaccessscript/DataAccessInstanceImpl.java
Thu Nov 16 17:39:06 2006
@@ -50,9 +50,9 @@
}
//if any of the 3 below - its dynamic way , else , its static way
- if(!functionName.equals("execute") &&
- !functionName.equals("executeQuery") &&
- !functionName.equals("applyChanges")){
+ if(! "execute".equals(functionName) &&
+ ! "executeQuery".equals(functionName) &&
+ ! "applyChanges".equals(functionName)){
//try for static way
String commandName = CommandMapper.getCommandName(functionName);
System.out.println("commandName:"+commandName);
@@ -78,12 +78,10 @@
private DataObject invokeRDBDASSelect(Command cmd, ArrayList paramsList){
DataObject dObject = null;
- if(paramsList != null){
- if(paramsList.size()>=3){
- Map<Integer, Object> inParams = new Hashtable<Integer,
Object>();
- inParams = (Map<Integer, Object>)paramsList.get(2);
- DataAccessUtils.fromJavaToRDBDASPositionBased(inParams,
cmd);
- }
+ if(paramsList != null && paramsList.size()>=3){
+ Map<Integer, Object> inParams = new Hashtable<Integer,
Object>();
+ inParams = (Map<Integer, Object>)paramsList.get(2);
+ DataAccessUtils.fromJavaToRDBDASPositionBased(inParams, cmd);
}
dObject = cmd.executeQuery();
if(dObject == null){
@@ -93,91 +91,78 @@
}
private void invokeRDBDASDelete(Command cmd, ArrayList paramsList){
- if(paramsList != null){
- if(paramsList.size()>=3){
- Map<Integer, Object> inParams = new Hashtable<Integer,
Object>();
- inParams = (Map<Integer, Object>)paramsList.get(2);
- DataAccessUtils.fromJavaToRDBDASPositionBased(inParams,
cmd);
- }
+ if(paramsList != null && paramsList.size()>=3){
+ Map<Integer, Object> inParams = new Hashtable<Integer,
Object>();
+ inParams = (Map<Integer, Object>)paramsList.get(2);
+ DataAccessUtils.fromJavaToRDBDASPositionBased(inParams, cmd);
}
cmd.execute();
}
private void invokeRDBDASInsert(Command cmd, ArrayList paramsList){
- if(paramsList != null){
- if(paramsList.size()>=3){
- Map<Integer, Object> inParams = new Hashtable<Integer,
Object>();
- inParams = (Map<Integer, Object>)paramsList.get(2);
- DataAccessUtils.fromJavaToRDBDASPositionBased(inParams,
cmd);
- }
+ if(paramsList != null && paramsList.size()>=3){
+ Map<Integer, Object> inParams = new Hashtable<Integer,
Object>();
+ inParams = (Map<Integer, Object>)paramsList.get(2);
+ DataAccessUtils.fromJavaToRDBDASPositionBased(inParams, cmd);
}
cmd.execute();
}
private void invokeRDBDASUpdate(Command cmd, ArrayList paramsList){
- if(paramsList != null){
- if(paramsList.size()>=4){
-
- String paramsTableName = paramsList.get(1).toString();
- int idx =
paramsTableName.indexOf(DataAccessEngine.SEPARATOR);
- String tableName = paramsTableName.substring(idx+1);
-
- String genericSelectForRoot = "select * from "+
tableName;
-
-
System.out.println("genericSelectForRoot:"+genericSelectForRoot);
- cmd = dasInstance.createCommand(genericSelectForRoot);
-
- //set UPD and WHERE params
- if(paramsList.get(2) instanceof Map){
- Map<String, Object> updParams = (Map<String,
Object>)paramsList.get(2);
-
- if(paramsList.get(3) instanceof Map){
- Map<String, Object> whereParams =
(Map<String, Object>)paramsList.get(3);
- DataObject root =
DataAccessUtils.fromJavaToRDBDASNameBased(updParams, whereParams, cmd,
tableName);
- dasInstance.applyChanges(root);
- }
- }
+ if(paramsList != null && paramsList.size()>=4){
+ String paramsTableName = paramsList.get(1).toString();
+ int idx = paramsTableName.indexOf(DataAccessEngine.SEPARATOR);
+ String tableName = paramsTableName.substring(idx+1);
+
+ String genericSelectForRoot = "select * from "+ tableName;
+
+
System.out.println("genericSelectForRoot:"+genericSelectForRoot);
+ cmd = dasInstance.createCommand(genericSelectForRoot);
+
+ //set UPD and WHERE params
+ if(paramsList.get(2) instanceof Map){
+ Map<String, Object> updParams = (Map<String,
Object>)paramsList.get(2);
+
+ if(paramsList.get(3) instanceof Map){
+ Map<String, Object> whereParams = (Map<String,
Object>)paramsList.get(3);
+ DataObject root =
DataAccessUtils.fromJavaToRDBDASNameBased(updParams, whereParams, cmd,
tableName);
+ dasInstance.applyChanges(root);
+ }
}
}
}
private DataObject invokeRDBDASProcedure(Command cmd, ArrayList
paramsList){
- DataObject dataObj = null;
- if(paramsList != null){
+ DataObject dataObj = null;
+ if(paramsList != null && paramsList.size()>=3){
//set IN params
- if(paramsList.size()>=3){
- if(paramsList.get(2) instanceof Map){
- Map<Integer, Object> inParams = (Map<Integer,
Object>)paramsList.get(2);
-
DataAccessUtils.fromJavaToRDBDASPositionBased(inParams, cmd);
- }
-
+ if(paramsList.get(2) instanceof Map){
+ Map<Integer, Object> inParams = (Map<Integer,
Object>)paramsList.get(2);
+ DataAccessUtils.fromJavaToRDBDASPositionBased(inParams,
cmd);
}
dataObj = cmd.executeQuery();
- if(paramsList.size()>=4){
- if(paramsList.get(3) instanceof Map){
- Map<Integer, Object> outParams = (Map<Integer,
Object>)paramsList.get(3);
-
DataAccessUtils.fromRDBDASToJavaPositionBased(outParams, cmd);
- paramsList.add(3, outParams);
- }
+ if(paramsList.size()>=4 && paramsList.get(3) instanceof Map){
+ Map<Integer, Object> outParams = (Map<Integer,
Object>)paramsList.get(3);
+
DataAccessUtils.fromRDBDASToJavaPositionBased(outParams, cmd);
+ paramsList.add(3, outParams);
}
System.out.println("executed SP..");
}
- return dataObj;
+ return dataObj; // NOPMD
}
private DataObject invokeRDBDASFunction(Command cmd, ArrayList paramsList){
- String commandKind = null;
- //TODO
+ String commandKind = null;
commandKind = (String)paramsList.get(1);
System.out.println("commandKind:"+commandKind);
if(commandKind.equals(DataAccessEngine.SELECT)){
DataObject dataObj = invokeRDBDASSelect(cmd, paramsList);
- return dataObj;
+ return dataObj; //NOPMD
}
if(commandKind.equals(DataAccessEngine.DELETE)){
@@ -197,7 +182,7 @@
if(commandKind.equals(DataAccessEngine.PROCEDURE)){
DataObject dataObj = invokeRDBDASProcedure(cmd, paramsList);
- return dataObj;
+ return dataObj; //NOPMD
}
//TODO..need to implement for UPDATE, CREATE etc.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
