You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ibatis.apache.org by jg...@apache.org on 2007/02/16 00:43:30 UTC
svn commit: r508237 [2/2] - in
/ibatis/trunk/java/mapper/mapper2/tools/abator/core: build/ htmldoc/
htmldoc/configreference/ htmldoc/usage/ src/org/apache/ibatis/abator/ant/
src/org/apache/ibatis/abator/api/
src/org/apache/ibatis/abator/api/dom/java/ s...
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/BaseDAOGenerator.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/BaseDAOGenerator.java?view=diff&rev=508237&r1=508236&r2=508237
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/BaseDAOGenerator.java (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/BaseDAOGenerator.java Thu Feb 15 15:43:28 2007
@@ -38,6 +38,7 @@
import org.apache.ibatis.abator.api.dom.java.Parameter;
import org.apache.ibatis.abator.api.dom.java.PrimitiveTypeWrapper;
import org.apache.ibatis.abator.api.dom.java.TopLevelClass;
+import org.apache.ibatis.abator.config.AbatorContext;
import org.apache.ibatis.abator.internal.AbatorObjectFactory;
import org.apache.ibatis.abator.internal.DefaultDAOMethodNameCalculator;
import org.apache.ibatis.abator.internal.ExtendedDAOMethodNameCalculator;
@@ -87,6 +88,7 @@
*/
public class BaseDAOGenerator implements DAOGenerator {
+ protected AbatorContext abatorContext;
protected AbstractDAOTemplate daoTemplate;
protected Map properties;
@@ -212,17 +214,14 @@
ProgressCallback callback) {
List list = new ArrayList();
- String tableName = introspectedTable.getTable()
- .getFullyQualifiedTableNameAsConfigured();
-
callback.startSubTask(Messages.getString("Progress.10", //$NON-NLS-1$
- tableName));
+ introspectedTable.getTable().toString()));
CompilationUnit cu = getDAOImplementation(introspectedTable);
GeneratedJavaFile gjf = new GeneratedJavaFile(cu, targetProject);
list.add(gjf);
callback.startSubTask(Messages.getString("Progress.11", //$NON-NLS-1$
- tableName));
+ introspectedTable.getTable().toString()));
cu = getDAOInterface(introspectedTable);
gjf = new GeneratedJavaFile(cu, targetProject);
list.add(gjf);
@@ -1156,7 +1155,7 @@
return map;
}
- public void addContextProperties(Map properties) {
- this.properties.putAll(properties);
+ public void setAbatorContext(AbatorContext abatorContext) {
+ this.abatorContext = abatorContext;
}
}
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/BaseLegacyDAOGenerator.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/BaseLegacyDAOGenerator.java?view=diff&rev=508237&r1=508236&r2=508237
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/BaseLegacyDAOGenerator.java (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/BaseLegacyDAOGenerator.java Thu Feb 15 15:43:28 2007
@@ -19,7 +19,6 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
import org.apache.ibatis.abator.api.DAOGenerator;
import org.apache.ibatis.abator.api.FullyQualifiedTable;
@@ -45,8 +44,6 @@
*/
public class BaseLegacyDAOGenerator extends BaseDAOGenerator implements DAOGenerator {
- private boolean suppressTypeWarnings;
-
/**
*
*/
@@ -98,7 +95,7 @@
StringBuffer sb = new StringBuffer();
- if (suppressTypeWarnings) {
+ if (abatorContext.getSuppressTypeWarnings()) {
method1.addSuppressTypeWarningsAnnotation();
}
method1.addBodyLine("Map parms = getExampleParms(example);"); //$NON-NLS-1$
@@ -172,7 +169,7 @@
StringBuffer sb = new StringBuffer();
- if (suppressTypeWarnings) {
+ if (abatorContext.getSuppressTypeWarnings()) {
method1.addSuppressTypeWarningsAnnotation();
}
method1.addBodyLine("Map parms = getExampleParms(example);"); //$NON-NLS-1$
@@ -265,7 +262,7 @@
Method method = new Method();
method.addComment(table);
method.setVisibility(JavaVisibility.PRIVATE);
- if (suppressTypeWarnings) {
+ if (abatorContext.getSuppressTypeWarnings()) {
method.addSuppressTypeWarningsAnnotation();
}
method.setReturnType(FullyQualifiedJavaType.getNewMapInstance());
@@ -327,7 +324,7 @@
Method method = new Method();
method.addComment(table);
method.setVisibility(JavaVisibility.PRIVATE);
- if (suppressTypeWarnings) {
+ if (abatorContext.getSuppressTypeWarnings()) {
method.addSuppressTypeWarningsAnnotation();
}
method.setReturnType(FullyQualifiedJavaType.getNewMapInstance());
@@ -416,14 +413,5 @@
method.addBodyLine("return parms;"); //$NON-NLS-1$
return method;
- }
-
- public void addContextProperties(Map properties) {
- super.addContextProperties(properties);
-
- if ("true".equalsIgnoreCase //$NON-NLS-1$
- ((String) properties.get("suppressTypeWarnings"))) { //$NON-NLS-1$
- suppressTypeWarnings = true;
- }
}
}
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/model/JavaModelGeneratorJava2Impl.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/model/JavaModelGeneratorJava2Impl.java?view=diff&rev=508237&r1=508236&r2=508237
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/model/JavaModelGeneratorJava2Impl.java (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/model/JavaModelGeneratorJava2Impl.java Thu Feb 15 15:43:28 2007
@@ -34,6 +34,7 @@
import org.apache.ibatis.abator.api.dom.java.Method;
import org.apache.ibatis.abator.api.dom.java.Parameter;
import org.apache.ibatis.abator.api.dom.java.TopLevelClass;
+import org.apache.ibatis.abator.config.AbatorContext;
import org.apache.ibatis.abator.internal.db.ColumnDefinition;
import org.apache.ibatis.abator.internal.util.JavaBeansUtil;
import org.apache.ibatis.abator.internal.util.StringUtility;
@@ -68,6 +69,7 @@
*/
public class JavaModelGeneratorJava2Impl implements JavaModelGenerator {
+ protected AbatorContext abatorContext;
protected List warnings;
/**
@@ -87,12 +89,6 @@
private Map tableValueMaps;
- /**
- * if true, then the annotation to suppress type warnings will be
- * added to the appropriate methods
- */
- private boolean suppressTypeWarnings;
-
public JavaModelGeneratorJava2Impl() {
super();
tableValueMaps = new HashMap();
@@ -103,15 +99,6 @@
this.properties.putAll(properties);
}
- public void addContextProperties(Map properties) {
- this.properties.putAll(properties);
-
- if ("true".equalsIgnoreCase //$NON-NLS-1$
- ((String) properties.get("suppressTypeWarnings"))) { //$NON-NLS-1$
- suppressTypeWarnings = true;
- }
- }
-
/*
* (non-Javadoc)
*
@@ -354,12 +341,9 @@
public List getGeneratedJavaFiles(IntrospectedTable introspectedTable, ProgressCallback callback) {
List list = new ArrayList();
- String tableName = introspectedTable.getTable()
- .getFullyQualifiedTableNameAsConfigured();
-
callback.startSubTask(Messages.getString(
"Progress.6", //$NON-NLS-1$
- tableName));
+ introspectedTable.getTable().toString()));
TopLevelClass tlc = getExample(introspectedTable);
if (tlc != null) {
afterExampleGenerationHook(introspectedTable, tlc);
@@ -369,7 +353,7 @@
callback.startSubTask(Messages.getString(
"Progress.7", //$NON-NLS-1$
- tableName));
+ introspectedTable.getTable().toString()));
tlc = getPrimaryKey(introspectedTable);
if (tlc != null) {
afterPrimaryKeyGenerationHook(introspectedTable, tlc);
@@ -379,7 +363,7 @@
callback.startSubTask(Messages.getString(
"Progress.8", //$NON-NLS-1$
- tableName));
+ introspectedTable.getTable().toString()));
tlc = getBaseRecord(introspectedTable);
if (tlc != null) {
afterBaseRecordGenerationHook(introspectedTable, tlc);
@@ -389,7 +373,7 @@
callback.startSubTask(Messages.getString(
"Progress.9", //$NON-NLS-1$
- tableName));
+ introspectedTable.getTable().toString()));
tlc = getRecordWithBLOBs(introspectedTable);
if (tlc != null) {
afterRecordWithBLOBsGenerationHook(introspectedTable, tlc);
@@ -623,7 +607,7 @@
Method method = new Method();
method.setVisibility(JavaVisibility.PUBLIC);
if (!(this instanceof JavaModelGeneratorJava5Impl)) {
- if (suppressTypeWarnings) {
+ if (abatorContext.getSuppressTypeWarnings()) {
method.addSuppressTypeWarningsAnnotation();
}
}
@@ -774,7 +758,7 @@
method = new Method();
method.addComment(table);
method.setVisibility(JavaVisibility.PUBLIC);
- if (suppressTypeWarnings) {
+ if (abatorContext.getSuppressTypeWarnings()) {
method.addSuppressTypeWarningsAnnotation();
}
method.setName("or"); //$NON-NLS-1$
@@ -787,7 +771,7 @@
method = new Method();
method.addComment(table);
method.setVisibility(JavaVisibility.PUBLIC);
- if (suppressTypeWarnings) {
+ if (abatorContext.getSuppressTypeWarnings()) {
method.addSuppressTypeWarningsAnnotation();
}
method.setName("createCriteria"); //$NON-NLS-1$
@@ -949,7 +933,7 @@
// now add the methods for simplifying the individual field set methods
method = new Method();
method.setVisibility(JavaVisibility.PRIVATE);
- if (suppressTypeWarnings) {
+ if (abatorContext.getSuppressTypeWarnings()) {
method.addSuppressTypeWarningsAnnotation();
}
method.setName("addCriterion"); //$NON-NLS-1$
@@ -975,7 +959,7 @@
method = new Method();
method.setVisibility(JavaVisibility.PRIVATE);
- if (suppressTypeWarnings) {
+ if (abatorContext.getSuppressTypeWarnings()) {
method.addSuppressTypeWarningsAnnotation();
}
method.setName("addCriterion"); //$NON-NLS-1$
@@ -997,7 +981,7 @@
method = new Method();
method.setVisibility(JavaVisibility.PRIVATE);
- if (suppressTypeWarnings) {
+ if (abatorContext.getSuppressTypeWarnings()) {
method.addSuppressTypeWarningsAnnotation();
}
method.setName("addCriterion"); //$NON-NLS-1$
@@ -1046,7 +1030,7 @@
method = new Method();
method.setVisibility(JavaVisibility.PRIVATE);
- if (suppressTypeWarnings) {
+ if (abatorContext.getSuppressTypeWarnings()) {
method.addSuppressTypeWarningsAnnotation();
}
method.setName("addCriterionForJDBCDate"); //$NON-NLS-1$
@@ -1110,7 +1094,7 @@
method = new Method();
method.setVisibility(JavaVisibility.PRIVATE);
- if (suppressTypeWarnings) {
+ if (abatorContext.getSuppressTypeWarnings()) {
method.addSuppressTypeWarningsAnnotation();
}
method.setName("addCriterionForJDBCTime"); //$NON-NLS-1$
@@ -1434,5 +1418,9 @@
innerClass.addMethod(method);
return answer;
+ }
+
+ public void setAbatorContext(AbatorContext abatorContext) {
+ this.abatorContext = abatorContext;
}
}
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/sqlmap/SqlMapGeneratorIterateImpl.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/sqlmap/SqlMapGeneratorIterateImpl.java?view=diff&rev=508237&r1=508236&r2=508237
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/sqlmap/SqlMapGeneratorIterateImpl.java (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/sqlmap/SqlMapGeneratorIterateImpl.java Thu Feb 15 15:43:28 2007
@@ -33,6 +33,7 @@
import org.apache.ibatis.abator.api.dom.xml.Document;
import org.apache.ibatis.abator.api.dom.xml.TextElement;
import org.apache.ibatis.abator.api.dom.xml.XmlElement;
+import org.apache.ibatis.abator.config.AbatorContext;
import org.apache.ibatis.abator.config.GeneratedKey;
import org.apache.ibatis.abator.internal.db.ColumnDefinition;
import org.apache.ibatis.abator.internal.util.StringUtility;
@@ -44,6 +45,7 @@
public class SqlMapGeneratorIterateImpl implements SqlMapGenerator {
protected List warnings;
+ protected AbatorContext abatorContext;
/**
* Contains any properties passed in from the SqlMap configuration element.
@@ -97,10 +99,6 @@
this.properties.putAll(properties);
}
- public void addContextProperties(Map properties) {
- this.properties.putAll(properties);
- }
-
/*
* (non-Javadoc)
*
@@ -130,7 +128,7 @@
FullyQualifiedTable table = introspectedTable.getTable();
callback.startSubTask(Messages.getString(
"Progress.12", //$NON-NLS-1$
- table.getFullyQualifiedTableNameAsConfigured()));
+ table.toString()));
list.add(getSqlMap(introspectedTable));
return list;
@@ -827,7 +825,7 @@
Map map = getTableStringMap(table);
s = (String) map.get(key);
if (s == null) {
- s = table.getFullyQualifiedTableNameWithUnderscoresAtRuntime();
+ s = table.getSqlMapNamespace();
map.put(key, s);
}
@@ -881,7 +879,7 @@
s = (String) map.get(key);
if (s == null) {
StringBuffer sb = new StringBuffer();
- sb.append(table.getFullyQualifiedTableNameWithUnderscoresAtRuntime());
+ sb.append(table.getSqlMapNamespace());
sb.append("_SqlMap.xml"); //$NON-NLS-1$
@@ -1444,5 +1442,9 @@
}
return answer;
+ }
+
+ public void setAbatorContext(AbatorContext abatorContext) {
+ this.abatorContext = abatorContext;
}
}
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/types/JavaTypeResolverDefaultImpl.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/types/JavaTypeResolverDefaultImpl.java?view=diff&rev=508237&r1=508236&r2=508237
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/types/JavaTypeResolverDefaultImpl.java (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/types/JavaTypeResolverDefaultImpl.java Thu Feb 15 15:43:28 2007
@@ -24,6 +24,7 @@
import org.apache.ibatis.abator.api.JavaTypeResolver;
import org.apache.ibatis.abator.api.dom.java.FullyQualifiedJavaType;
+import org.apache.ibatis.abator.config.AbatorContext;
import org.apache.ibatis.abator.exception.UnsupportedDataTypeException;
import org.apache.ibatis.abator.internal.db.ColumnDefinition;
@@ -36,6 +37,8 @@
protected List warnings;
protected Map properties;
+
+ protected AbatorContext abatorContext;
public JavaTypeResolverDefaultImpl() {
super();
@@ -46,10 +49,6 @@
this.properties.putAll(properties);
}
- public void addContextProperties(Map properties) {
- this.properties.putAll(properties);
- }
-
/*
* (non-Javadoc)
* @see org.apache.ibatis.abator.api.JavaTypeResolver#initializeResolvedJavaType(org.apache.ibatis.abator.internal.db.ColumnDefinition)
@@ -241,4 +240,8 @@
public void setWarnings(List warnings) {
this.warnings = warnings;
}
+
+ public void setAbatorContext(AbatorContext abatorContext) {
+ this.abatorContext = abatorContext;
+ }
}
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/util/StringUtility.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/util/StringUtility.java?view=diff&rev=508237&r1=508236&r2=508237
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/util/StringUtility.java (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/util/StringUtility.java Thu Feb 15 15:43:28 2007
@@ -54,4 +54,8 @@
return sb.toString();
}
+
+ public static boolean stringContainsSpace(String s) {
+ return s != null && s.indexOf(' ') != -1;
+ }
}
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/test/org/apache/ibatis/abator/internal/util/JavaBeansUtilTests.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/test/org/apache/ibatis/abator/internal/util/JavaBeansUtilTests.java?view=diff&rev=508237&r1=508236&r2=508237
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/test/org/apache/ibatis/abator/internal/util/JavaBeansUtilTests.java (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/test/org/apache/ibatis/abator/internal/util/JavaBeansUtilTests.java Thu Feb 15 15:43:28 2007
@@ -50,6 +50,7 @@
assertEquals("yaxis", JavaBeansUtil.getValidPropertyName("Yaxis"));
assertEquals("i_PARAM_INT_1", JavaBeansUtil.getValidPropertyName("I_PARAM_INT_1"));
assertEquals("_fred", JavaBeansUtil.getValidPropertyName("_fred"));
+ assertEquals("accountType", JavaBeansUtil.getValidPropertyName("AccountType"));
}
public void testGetGetterMethodName() {
@@ -61,6 +62,7 @@
assertEquals("isActive", JavaBeansUtil.getGetterMethodName("active", FullyQualifiedJavaType.getBooleanPrimitiveInstance()));
assertEquals("getI_PARAM_INT_1", JavaBeansUtil.getGetterMethodName("i_PARAM_INT_1", FullyQualifiedJavaType.getStringInstance()));
assertEquals("get_fred", JavaBeansUtil.getGetterMethodName("_fred", FullyQualifiedJavaType.getStringInstance()));
+ assertEquals("getAccountType", JavaBeansUtil.getGetterMethodName("AccountType", FullyQualifiedJavaType.getStringInstance()));
}
public void testGetSetterMethodName() {
@@ -71,5 +73,6 @@
assertEquals("setA", JavaBeansUtil.getSetterMethodName("a"));
assertEquals("setI_PARAM_INT_1", JavaBeansUtil.getSetterMethodName("i_PARAM_INT_1"));
assertEquals("set_fred", JavaBeansUtil.getSetterMethodName("_fred"));
+ assertEquals("setAccountType", JavaBeansUtil.getSetterMethodName("AccountType"));
}
}
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/abatorConfig.xml
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/abatorConfig.xml?view=diff&rev=508237&r1=508236&r2=508237
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/abatorConfig.xml (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/abatorConfig.xml Thu Feb 15 15:43:28 2007
@@ -31,6 +31,7 @@
<table tableName="PKBlobs" />
<table tableName="PKFieldsBlobs" />
<table tableName="FieldsBlobs" />
+ <table tableName="awful table" />
</abatorContext>
<abatorContext generatorSet="Java2" defaultModelType="flat">