[jboss-cvs] JBossAS SVN: r109267 - projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Nov 11 01:25:33 EST 2010
Author: jeff.zhang
Date: 2010-11-11 01:25:32 -0500 (Thu, 11 Nov 2010)
New Revision: 109267
Modified:
projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/ActivationCodeGen.java
projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/AsCodeGen.java
projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/CfCodeGen.java
projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/CmCodeGen.java
projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/ConnImplCodeGen.java
projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/MbeanImplCodeGen.java
projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/MbeanInterfaceCodeGen.java
projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/McCodeGen.java
projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/McfCodeGen.java
projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/PropsCodeGen.java
projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/RaCodeGen.java
Log:
[JBJCA-460] Apply improvements to code generator
Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/ActivationCodeGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/ActivationCodeGen.java 2010-11-11 05:06:52 UTC (rev 109266)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/ActivationCodeGen.java 2010-11-11 06:25:32 UTC (rev 109267)
@@ -163,8 +163,6 @@
writeEol(out);
out.write("import javax.resource.ResourceException;");
writeEol(out);
- out.write("import javax.resource.spi.ActivationSpec;");
- writeEol(out);
out.write("import javax.resource.spi.endpoint.MessageEndpointFactory;");
writeEol(out);
writeEol(out);
Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/AsCodeGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/AsCodeGen.java 2010-11-11 05:06:52 UTC (rev 109266)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/AsCodeGen.java 2010-11-11 06:25:32 UTC (rev 109267)
@@ -48,8 +48,8 @@
{
if (def.isUseAnnotation())
{
- out.write("@Activation(messageListeners = {" + def.getRaPackage() +
- ".inflow." + def.getMlClass() + ".class})");
+ out.write("@Activation(messageListeners = { " + def.getRaPackage() +
+ ".inflow." + def.getMlClass() + ".class })");
writeEol(out);
}
out.write("public class " + getClassName(def) + " implements ActivationSpec");
@@ -94,7 +94,7 @@
out.write("package " + def.getRaPackage() + ".inflow;");
writeEol(out);
writeEol(out);
- out.write("import java.io.PrintWriter;");
+ out.write("import java.util.logging.Logger;");
writeEol(out);
writeEol(out);
out.write("import javax.resource.ResourceException;");
@@ -115,9 +115,6 @@
out.write("import javax.resource.spi.ResourceAdapter;");
writeEol(out);
writeEol(out);
- out.write("import java.util.logging.Logger;");
- writeEol(out);
- writeEol(out);
}
/**
Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/CfCodeGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/CfCodeGen.java 2010-11-11 05:06:52 UTC (rev 109266)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/CfCodeGen.java 2010-11-11 06:25:32 UTC (rev 109267)
@@ -49,6 +49,9 @@
int indent = 1;
writeIndent(out, indent);
+ out.write("/** reference */");
+ writeEol(out);
+ writeIndent(out, indent);
out.write("private Reference reference;");
writeEol(out);
writeEol(out);
@@ -63,7 +66,7 @@
out.write(" * default constructor");
writeEol(out);
writeIndent(out, indent);
- out.write(" * @param cxManager ConnectionManager");
+ out.write(" * @param cxManager ConnectionManager");
writeEol(out);
writeIndent(out, indent);
out.write(" */");
@@ -92,16 +95,11 @@
out.write("package " + def.getRaPackage() + ";");
writeEol(out);
writeEol(out);
- out.write("import java.io.Serializable;");
- writeEol(out);
- writeEol(out);
out.write("import javax.naming.NamingException;");
writeEol(out);
out.write("import javax.naming.Reference;");
writeEol(out);
writeEol(out);
- out.write("import javax.resource.Referenceable;");
- writeEol(out);
out.write("import javax.resource.ResourceException;");
writeEol(out);
out.write("import javax.resource.spi.ConnectionManager;");
@@ -210,7 +208,7 @@
out.write(" *");
writeEol(out);
writeIndent(out, indent);
- out.write(" * @param reference A Reference instance");
+ out.write(" * @param reference A Reference instance");
writeEol(out);
writeIndent(out, indent);
out.write(" */");
Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/CmCodeGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/CmCodeGen.java 2010-11-11 05:06:52 UTC (rev 109266)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/CmCodeGen.java 2010-11-11 06:25:32 UTC (rev 109267)
@@ -127,7 +127,7 @@
out.write("@Override");
writeEol(out);
writeIndent(out, indent);
- out.write("public Object allocateConnection(ManagedConnectionFactory mcf," +
+ out.write("public Object allocateConnection(ManagedConnectionFactory mcf, " +
"ConnectionRequestInfo cri) throws ResourceException");
writeLeftCurlyBracket(out, indent);
writeIndent(out, indent + 1);
Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/ConnImplCodeGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/ConnImplCodeGen.java 2010-11-11 05:06:52 UTC (rev 109266)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/ConnImplCodeGen.java 2010-11-11 06:25:32 UTC (rev 109267)
@@ -113,6 +113,29 @@
writeIndent(out, indent);
out.write(" * call " + method.getMethodName());
writeEol(out);
+
+ int paramSize = method.getParams().size();
+ for (int i = 0; i < paramSize; i++)
+ {
+ MethodParam param = method.getParams().get(i);
+ writeIndent(out, indent);
+ out.write(" * @param " + param.getName() + " " + param.getType());
+ writeEol(out);
+ }
+ int exceptionSize = method.getExceptionType().size();
+ for (int i = 0; i < exceptionSize; i++)
+ {
+ String ex = method.getExceptionType().get(i);
+ writeIndent(out, indent);
+ out.write(" * @throws " + ex);
+ writeEol(out);
+ }
+ if (!method.getReturnType().equals("void"))
+ {
+ writeIndent(out, indent);
+ out.write(" * @return " + method.getReturnType());
+ writeEol(out);
+ }
writeIndent(out, indent);
out.write(" */");
writeEol(out);
@@ -120,7 +143,7 @@
writeIndent(out, indent);
out.write("public " + method.getReturnType() + " " +
method.getMethodName() + "(");
- int paramSize = method.getParams().size();
+
for (int i = 0; i < paramSize; i++)
{
MethodParam param = method.getParams().get(i);
@@ -131,7 +154,7 @@
out.write(", ");
}
out.write(")");
- int exceptionSize = method.getExceptionType().size();
+
for (int i = 0; i < exceptionSize; i++)
{
if (i == 0)
Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/MbeanImplCodeGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/MbeanImplCodeGen.java 2010-11-11 05:06:52 UTC (rev 109266)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/MbeanImplCodeGen.java 2010-11-11 06:25:32 UTC (rev 109267)
@@ -51,6 +51,9 @@
writeLeftCurlyBracket(out, 0);
writeIndent(out, indent);
+ out.write("/** JNDI name */");
+ writeEol(out);
+ writeIndent(out, indent);
out.write("private static final String JNDI_NAME = \"java:/eis/" + def.getDefaultValue() + "\";");
writeEol(out);
writeEol(out);
@@ -67,7 +70,23 @@
writeIndent(out, indent);
out.write(" * call " + method.getMethodName());
writeEol(out);
+ for (MethodParam param : method.getParams())
+ {
+ writeIndent(out, indent);
+ out.write(" * @param " + param.getName() + " " + param.getName());
+ writeEol(out);
+ }
+ if (!method.getReturnType().equals("void"))
+ {
+ writeIndent(out, indent);
+ out.write(" * @return " + method.getReturnType());
+ writeEol(out);
+ }
writeIndent(out, indent);
+ out.write(" * @throws Exception");
+ writeEol(out);
+
+ writeIndent(out, indent);
out.write(" */");
writeEol(out);
@@ -137,6 +156,9 @@
out.write(" * getConnection");
writeEol(out);
writeIndent(out, indent);
+ out.write(" * @return " + def.getConnInterfaceClass());
+ writeEol(out);
+ writeIndent(out, indent);
out.write(" */");
writeEol(out);
writeIndent(out, indent);
Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/MbeanInterfaceCodeGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/MbeanInterfaceCodeGen.java 2010-11-11 05:06:52 UTC (rev 109266)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/MbeanInterfaceCodeGen.java 2010-11-11 06:25:32 UTC (rev 109267)
@@ -75,7 +75,7 @@
writeEol(out);
}
writeIndent(out, indent);
- out.write(" * @throws Exception");
+ out.write(" * @throws Exception exception");
writeEol(out);
writeIndent(out, indent);
out.write(" */");
@@ -110,6 +110,9 @@
out.write(" * call me");
writeEol(out);
writeIndent(out, indent);
+ out.write(" * @throws Exception exception");
+ writeEol(out);
+ writeIndent(out, indent);
out.write(" */");
writeEol(out);
Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/McCodeGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/McCodeGen.java 2010-11-11 05:06:52 UTC (rev 109266)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/McCodeGen.java 2010-11-11 06:25:32 UTC (rev 109267)
@@ -84,6 +84,9 @@
out.write("import java.io.PrintWriter;");
writeEol(out);
writeEol(out);
+ out.write("import java.util.logging.Logger;");
+ writeEol(out);
+ writeEol(out);
out.write("import javax.resource.ResourceException;");
writeEol(out);
out.write("import javax.resource.spi.ConnectionEventListener;");
@@ -102,9 +105,6 @@
out.write("import javax.transaction.xa.XAResource;");
writeEol(out);
writeEol(out);
- out.write("import java.util.logging.Logger;");
- writeEol(out);
- writeEol(out);
}
/**
@@ -140,16 +140,16 @@
out.write(" *");
writeEol(out);
writeIndent(out, indent);
- out.write(" * @param subject security context as JAAS subject");
+ out.write(" * @param subject security context as JAAS subject");
writeEol(out);
writeIndent(out, indent);
- out.write(" * @param cxRequestInfo ConnectionRequestInfo instance");
+ out.write(" * @param cxRequestInfo ConnectionRequestInfo instance");
writeEol(out);
writeIndent(out, indent);
- out.write(" * @return generic Object instance representing the connection handle. ");
+ out.write(" * @return generic Object instance representing the connection handle. ");
writeEol(out);
writeIndent(out, indent);
- out.write(" * @throws ResourceException generic exception if operation fails");
+ out.write(" * @throws ResourceException generic exception if operation fails");
writeEol(out);
writeIndent(out, indent);
out.write(" */");
@@ -158,7 +158,7 @@
writeIndent(out, indent);
out.write("public Object getConnection(Subject subject,");
writeEol(out);
- writeIndent(out, indent + 2);
+ writeIndent(out, indent + 1);
out.write("ConnectionRequestInfo cxRequestInfo) throws ResourceException");
writeLeftCurlyBracket(out, indent);
writeIndent(out, indent + 1);
@@ -182,10 +182,10 @@
out.write(" *");
writeEol(out);
writeIndent(out, indent);
- out.write(" * @param connection Application-level connection handle");
+ out.write(" * @param connection Application-level connection handle");
writeEol(out);
writeIndent(out, indent);
- out.write(" * @throws ResourceException generic exception if operation fails");
+ out.write(" * @throws ResourceException generic exception if operation fails");
writeEol(out);
writeIndent(out, indent);
out.write(" */");
@@ -219,7 +219,7 @@
out.write(" *");
writeEol(out);
writeIndent(out, indent);
- out.write(" * @throws ResourceException generic exception if operation fails");
+ out.write(" * @throws ResourceException generic exception if operation fails");
writeEol(out);
writeIndent(out, indent);
out.write(" */");
@@ -244,7 +244,7 @@
out.write(" *");
writeEol(out);
writeIndent(out, indent);
- out.write(" * @throws ResourceException generic exception if operation fails");
+ out.write(" * @throws ResourceException generic exception if operation fails");
writeEol(out);
writeIndent(out, indent);
out.write(" */");
@@ -278,7 +278,7 @@
out.write(" *");
writeEol(out);
writeIndent(out, indent);
- out.write(" * @param listener a new ConnectionEventListener to be registered");
+ out.write(" * @param listener a new ConnectionEventListener to be registered");
writeEol(out);
writeIndent(out, indent);
out.write(" */");
@@ -302,7 +302,7 @@
out.write(" *");
writeEol(out);
writeIndent(out, indent);
- out.write(" * @param listener already registered connection event listener to be removed");
+ out.write(" * @param listener already registered connection event listener to be removed");
writeEol(out);
writeIndent(out, indent);
out.write(" */");
@@ -336,10 +336,10 @@
out.write(" *");
writeEol(out);
writeIndent(out, indent);
- out.write(" * @return Character ourput stream associated with this Managed-Connection instance");
+ out.write(" * @return Character ourput stream associated with this Managed-Connection instance");
writeEol(out);
writeIndent(out, indent);
- out.write(" * @throws ResourceException generic exception if operation fails");
+ out.write(" * @throws ResourceException generic exception if operation fails");
writeEol(out);
writeIndent(out, indent);
out.write(" */");
@@ -366,10 +366,10 @@
out.write(" *");
writeEol(out);
writeIndent(out, indent);
- out.write(" * @param out Character Output stream to be associated");
+ out.write(" * @param out Character Output stream to be associated");
writeEol(out);
writeIndent(out, indent);
- out.write(" * @throws ResourceException generic exception if operation fails");
+ out.write(" * @throws ResourceException generic exception if operation fails");
writeEol(out);
writeIndent(out, indent);
out.write(" */");
@@ -403,10 +403,10 @@
out.write(" *");
writeEol(out);
writeIndent(out, indent);
- out.write(" * @return LocalTransaction instance");
+ out.write(" * @return LocalTransaction instance");
writeEol(out);
writeIndent(out, indent);
- out.write(" * @throws ResourceException generic exception if operation fails");
+ out.write(" * @throws ResourceException generic exception if operation fails");
writeEol(out);
writeIndent(out, indent);
out.write(" */");
@@ -433,10 +433,10 @@
out.write(" *");
writeEol(out);
writeIndent(out, indent);
- out.write(" * @return XAResource instance");
+ out.write(" * @return XAResource instance");
writeEol(out);
writeIndent(out, indent);
- out.write(" * @throws ResourceException generic exception if operation fails");
+ out.write(" * @throws ResourceException generic exception if operation fails");
writeEol(out);
writeIndent(out, indent);
out.write(" */");
@@ -476,7 +476,7 @@
out.write(" * @return ManagedConnectionMetaData instance");
writeEol(out);
writeIndent(out, indent);
- out.write(" * @throws ResourceException generic exception if operation fails");
+ out.write(" * @throws ResourceException generic exception if operation fails");
writeEol(out);
writeIndent(out, indent);
out.write(" */");
Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/McfCodeGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/McfCodeGen.java 2010-11-11 05:06:52 UTC (rev 109266)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/McfCodeGen.java 2010-11-11 06:25:32 UTC (rev 109267)
@@ -149,6 +149,10 @@
out.write("import java.util.Set;");
writeEol(out);
writeEol(out);
+ out.write("import java.util.logging.Logger;");
+ writeEol(out);
+ writeEol(out);
+
out.write("import javax.resource.ResourceException;");
writeEol(out);
@@ -183,9 +187,6 @@
out.write("import javax.security.auth.Subject;");
writeEol(out);
writeEol(out);
- out.write("import java.util.logging.Logger;");
- writeEol(out);
- writeEol(out);
}
/**
Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/PropsCodeGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/PropsCodeGen.java 2010-11-11 05:06:52 UTC (rev 109266)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/PropsCodeGen.java 2010-11-11 06:25:32 UTC (rev 109267)
@@ -57,7 +57,7 @@
if (def.isUseAnnotation())
{
writeIndent(out, indent);
- out.write("@ConfigProperty(defaultValue=\"" + getConfigProps(def).get(i).getValue() + "\")");
+ out.write("@ConfigProperty(defaultValue = \"" + getConfigProps(def).get(i).getValue() + "\")");
writeEol(out);
}
writeIndent(out, indent);
Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/RaCodeGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/RaCodeGen.java 2010-11-11 05:06:52 UTC (rev 109266)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/RaCodeGen.java 2010-11-11 06:25:32 UTC (rev 109267)
@@ -204,6 +204,10 @@
writeEol(out);
}
}
+ out.write("import java.util.logging.Logger;");
+ writeEol(out);
+ writeEol(out);
+
out.write("import javax.resource.ResourceException;");
writeEol(out);
out.write("import javax.resource.spi.ActivationSpec;");
@@ -246,9 +250,7 @@
out.write("import javax.transaction.xa.XAResource;");
writeEol(out);
writeEol(out);
- out.write("import java.util.logging.Logger;");
- writeEol(out);
- writeEol(out);
+
}
/**
More information about the jboss-cvs-commits
mailing list