Author: fdesbois Date: 2010-04-02 11:19:54 +0200 (Fri, 02 Apr 2010) New Revision: 1870 Log: - Rename methods to manage transaction and error (treateError, closeTransaction) - Change log level to debug - remove addException for user exceptions in abstract method -> not needed, already add the Exception.class Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java 2010-04-01 18:35:15 UTC (rev 1869) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java 2010-04-02 09:19:54 UTC (rev 1870) @@ -74,7 +74,7 @@ * ... * * @Override - * public void doCatch(TopiaContext transaction, Exception eee, + * public void treateError(TopiaContext transaction, Exception eee, * String message, Object... args) throws AppException { * * // Note that the message from service doesn't directly use _() for @@ -101,7 +101,7 @@ * } * * @Override - * public void doFinally(TopiaContext transaction) { + * public void closeTransaction(TopiaContext transaction) { * if (transaction != null) { * try { * transaction.closeContext(); @@ -125,7 +125,7 @@ * * // only catch exception for rootContext * } catch (TopiaNotFoundException eee) { - * doCatch(eee, n_("app.error.context.getTopiaRootContext")); + * treateError(eee, n_("app.error.context.getTopiaRootContext")); * } * return null; * } @@ -250,14 +250,14 @@ addException(beginTransaction, TopiaException.class); ObjectModelOperation doCatch1 = - addOperation(newContextImplementor, "doCatch", "void"); + addOperation(newContextImplementor, "treateError", "void"); addParameter(doCatch1, Exception.class, "eee"); addParameter(doCatch1, String.class, "message"); addParameter(doCatch1, "Object...", "args"); addException(doCatch1, exception.getQualifiedName()); ObjectModelOperation doCatch2 = - addOperation(newContextImplementor, "doCatch", "void"); + addOperation(newContextImplementor, "treateError", "void"); addParameter(doCatch2, TopiaContext.class, "transaction"); addParameter(doCatch2, Exception.class, "eee"); addParameter(doCatch2, String.class, "message"); @@ -265,7 +265,7 @@ addException(doCatch2, exception.getQualifiedName()); ObjectModelOperation doFinally = - addOperation(newContextImplementor, "doFinally", "void"); + addOperation(newContextImplementor, "closeTransaction", "void"); addParameter(doFinally, TopiaContext.class, "transaction"); } @@ -475,7 +475,7 @@ if (needTransaction) { addParameter(abstOp, TopiaContext.class, "transaction"); - addException(abstOp, TopiaException.class); + //addException(abstOp, TopiaException.class); } String toStringAppend = ""; @@ -515,8 +515,8 @@ String errorKey = StringUtils.lowerCase(modelName) + ".error." + serviceName + "." + op.getName(); - String doCatchParams = "eee, I18n.n_(\"" + errorKey + "\")"; - doCatchParams += needErrorArgs ? ", errorArgs.toArray()" : ""; + String treateErrorParams = "eee, I18n.n_(\"" + errorKey + "\")"; + treateErrorParams += needErrorArgs ? ", errorArgs.toArray()" : ""; // Return managment String opReturnType = ""; @@ -550,7 +550,7 @@ // Add transaction in the execute operation parameters // and doCatch parameters opParams = "transaction" + separatorParams + opParams; - doCatchParams = "transaction, " + doCatchParams; + treateErrorParams = "transaction, " + treateErrorParams; } else { buffer.append("" /*{ @@ -561,23 +561,21 @@ buffer.append("" /*{ - if (log.isInfoEnabled()) { - log.info("<%=first%>:[ <%=opName%> ]"); + long startTime = 0; + if (log.isDebugEnabled()) { + log.debug("<%=first%>:[ begin <%=opName%> ]"); + startTime = System.currentTimeMillis(); } if (log.isTraceEnabled()) { String message = new StringBuilder("# ARGS >")<%=toStringAppend%>. toString(); log.trace(message); - } - long startTime = 0; - if (log.isDebugEnabled()) { - startTime = System.currentTimeMillis(); - } + } <%=opReturnType%>execute<%=opName%>(<%=opParams%>); if (log.isDebugEnabled()) { long stopTime = System.currentTimeMillis(); - log.debug("<%=first%>:[ <%=opName%> ] Time = " + + log.debug("<%=first%>:[ end <%=opName%> ] Time = " + DurationFormatUtils.formatDurationHMS( stopTime - startTime)); } @@ -586,7 +584,7 @@ // Copy exceptions for (String ex : op.getExceptions()) { addException(implOp, ex); - addException(abstOp, ex); + //addException(abstOp, ex); // Add catch block for known exceptions we want to throw String exName = GeneratorUtil.getSimpleName(ex); buffer.append("" @@ -598,14 +596,14 @@ buffer.append("" /*{ } catch (Exception eee) { - context.doCatch(<%=doCatchParams%>); }*/); + context.treateError(<%=treateErrorParams%>); }*/); if (needTransaction) { // Finally block to close transaction buffer.append("" /*{ } finally { - context.doFinally(transaction); }*/); + context.closeTransaction(transaction); }*/); } buffer.append(""