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 2008/06/06 00:05:49 UTC
svn commit: r663760 - in
/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator: api/
config/ config/xml/ internal/ internal/db/ internal/java/model/
internal/sqlmap/ internal/types/ internal/util/ internal/util/messages/
Author: jgbutler
Date: Thu Jun 5 15:05:48 2008
New Revision: 663760
URL: http://svn.apache.org/viewvc?rev=663760&view=rev
Log:
ibator: minor refactoring
Modified:
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/FullyQualifiedTable.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/IbatorContext.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/TableConfiguration.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/xml/IbatorConfigurationParser.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/DefaultCommentGenerator.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/db/DatabaseIntrospector.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/db/IntrospectedTableDefaultImpl.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/java/model/JavaModelGeneratorJava2Impl.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/sqlmap/SqlMapGeneratorIterateImpl.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/types/JavaTypeResolverDefaultImpl.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/util/StringUtility.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/util/messages/messages.properties
Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/FullyQualifiedTable.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/FullyQualifiedTable.java?rev=663760&r1=663759&r2=663760&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/FullyQualifiedTable.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/FullyQualifiedTable.java Thu Jun 5 15:05:48 2008
@@ -288,7 +288,6 @@
}
// TODO - strip characters that are not valid in package names
-
return sb.toString();
}
Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/IbatorContext.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/IbatorContext.java?rev=663760&r1=663759&r2=663760&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/IbatorContext.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/IbatorContext.java Thu Jun 5 15:05:48 2008
@@ -465,7 +465,7 @@
super.addProperty(name, value);
if (PropertyRegistry.CONTEXT_SUPPRESS_TYPE_WARNINGS.equals(name)) {
- suppressTypeWarnings = "true".equalsIgnoreCase(value); //$NON-NLS-1$
+ suppressTypeWarnings = StringUtility.isTrue(value);
} else if (PropertyRegistry.CONTEXT_BEGINNING_DELIMITER.equals(name)) {
beginningDelimiter = value;
} else if (PropertyRegistry.CONTEXT_ENDING_DELIMITER.equals(name)) {
Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/TableConfiguration.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/TableConfiguration.java?rev=663760&r1=663759&r2=663760&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/TableConfiguration.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/TableConfiguration.java Thu Jun 5 15:05:48 2008
@@ -481,7 +481,7 @@
}
}
- if ("true".equalsIgnoreCase(getProperty(PropertyRegistry.TABLE_USE_COLUMN_INDEXES))) { //$NON-NLS-1$
+ if (StringUtility.isTrue(getProperty(PropertyRegistry.TABLE_USE_COLUMN_INDEXES))) {
// when using column indexes, either both or neither query ids should be set
if (selectByExampleStatementEnabled && selectByPrimaryKeyStatementEnabled) {
boolean queryId1Set = StringUtility.stringHasValue(selectByExampleQueryId);
Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/xml/IbatorConfigurationParser.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/xml/IbatorConfigurationParser.java?rev=663760&r1=663759&r2=663760&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/xml/IbatorConfigurationParser.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/xml/IbatorConfigurationParser.java Thu Jun 5 15:05:48 2008
@@ -367,43 +367,35 @@
}
if (StringUtility.stringHasValue(enableInsert)) {
- tc.setInsertStatementEnabled("true" //$NON-NLS-1$
- .equals(enableInsert));
+ tc.setInsertStatementEnabled(StringUtility.isTrue(enableInsert));
}
if (StringUtility.stringHasValue(enableSelectByPrimaryKey)) {
- tc.setSelectByPrimaryKeyStatementEnabled("true" //$NON-NLS-1$
- .equals(enableSelectByPrimaryKey));
+ tc.setSelectByPrimaryKeyStatementEnabled(StringUtility.isTrue(enableSelectByPrimaryKey));
}
if (StringUtility.stringHasValue(enableSelectByExample)) {
- tc.setSelectByExampleStatementEnabled("true" //$NON-NLS-1$
- .equals(enableSelectByExample));
+ tc.setSelectByExampleStatementEnabled(StringUtility.isTrue(enableSelectByExample));
}
if (StringUtility.stringHasValue(enableUpdateByPrimaryKey)) {
- tc.setUpdateByPrimaryKeyStatementEnabled("true" //$NON-NLS-1$
- .equals(enableUpdateByPrimaryKey));
+ tc.setUpdateByPrimaryKeyStatementEnabled(StringUtility.isTrue(enableUpdateByPrimaryKey));
}
if (StringUtility.stringHasValue(enableDeleteByPrimaryKey)) {
- tc.setDeleteByPrimaryKeyStatementEnabled("true" //$NON-NLS-1$
- .equals(enableDeleteByPrimaryKey));
+ tc.setDeleteByPrimaryKeyStatementEnabled(StringUtility.isTrue(enableDeleteByPrimaryKey));
}
if (StringUtility.stringHasValue(enableDeleteByExample)) {
- tc.setDeleteByExampleStatementEnabled("true" //$NON-NLS-1$
- .equals(enableDeleteByExample));
+ tc.setDeleteByExampleStatementEnabled(StringUtility.isTrue(enableDeleteByExample));
}
if (StringUtility.stringHasValue(enableCountByExample)) {
- tc.setCountByExampleStatementEnabled("true" //$NON-NLS-1$
- .equals(enableCountByExample));
+ tc.setCountByExampleStatementEnabled(StringUtility.isTrue(enableCountByExample));
}
if (StringUtility.stringHasValue(enableUpdateByExample)) {
- tc.setUpdateByExampleStatementEnabled("true" //$NON-NLS-1$
- .equals(enableUpdateByExample));
+ tc.setUpdateByExampleStatementEnabled(StringUtility.isTrue(enableUpdateByExample));
}
if (StringUtility.stringHasValue(selectByPrimaryKeyQueryId)) {
@@ -419,13 +411,11 @@
}
if (StringUtility.stringHasValue(escapeWildcards)) {
- tc.setWildcardEscapingEnabled("true" //$NON-NLS-1$
- .equals(escapeWildcards));
+ tc.setWildcardEscapingEnabled(StringUtility.isTrue(escapeWildcards));
}
if (StringUtility.stringHasValue(delmitIdentifiers)) {
- tc.setDelimitIdentifiers("true" //$NON-NLS-1$
- .equals(delmitIdentifiers));
+ tc.setDelimitIdentifiers(StringUtility.isTrue(delmitIdentifiers));
}
NodeList nodeList = node.getChildNodes();
@@ -478,7 +468,7 @@
}
if (StringUtility.stringHasValue(delimitedColumnName)) {
- co.setColumnNameDelimited("true".equalsIgnoreCase(delimitedColumnName)); //$NON-NLS-1$
+ co.setColumnNameDelimited(StringUtility.isTrue(delimitedColumnName));
}
tc.addColumnOverride(co);
@@ -488,7 +478,7 @@
Properties attributes = parseAttributes(node);
String column = attributes.getProperty("column"); //$NON-NLS-1$
- boolean identity = "true".equals(attributes.getProperty("identity")); //$NON-NLS-1$ //$NON-NLS-2$
+ boolean identity = StringUtility.isTrue(attributes.getProperty("identity")); //$NON-NLS-1$
String sqlStatement = attributes.getProperty("sqlStatement"); //$NON-NLS-1$
String type = attributes.getProperty("type"); //$NON-NLS-1$
@@ -505,7 +495,7 @@
IgnoredColumn ic = new IgnoredColumn(column);
if (StringUtility.stringHasValue(delimitedColumnName)) {
- ic.setColumnNameDelimited("true".equalsIgnoreCase(delimitedColumnName)); //$NON-NLS-1$
+ ic.setColumnNameDelimited(StringUtility.isTrue(delimitedColumnName));
}
tc.addIgnoredColumn(ic);
Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/DefaultCommentGenerator.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/DefaultCommentGenerator.java?rev=663760&r1=663759&r2=663760&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/DefaultCommentGenerator.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/DefaultCommentGenerator.java Thu Jun 5 15:05:48 2008
@@ -32,6 +32,7 @@
import org.apache.ibatis.ibator.api.dom.xml.XmlElement;
import org.apache.ibatis.ibator.config.MergeConstants;
import org.apache.ibatis.ibator.config.PropertyRegistry;
+import org.apache.ibatis.ibator.internal.util.StringUtility;
/**
* @author Jeff Butler
@@ -214,9 +215,8 @@
public void addConfigurationProperties(Properties properties) {
this.properties.putAll(properties);
- if ("true".equalsIgnoreCase(properties.getProperty(PropertyRegistry.COMMENT_GENERATOR_SUPPRESS_DATE))) { //$NON-NLS-1$
- suppressDate = true;
- }
+ suppressDate =
+ StringUtility.isTrue(properties.getProperty(PropertyRegistry.COMMENT_GENERATOR_SUPPRESS_DATE));
}
/**
Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/db/DatabaseIntrospector.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/db/DatabaseIntrospector.java?rev=663760&r1=663759&r2=663760&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/db/DatabaseIntrospector.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/db/DatabaseIntrospector.java Thu Jun 5 15:05:48 2008
@@ -221,7 +221,7 @@
calculatedColumnName = matcher.replaceAll(replaceString);
}
- if ("true".equalsIgnoreCase(tc.getProperty(PropertyRegistry.TABLE_USE_ACTUAL_COLUMN_NAMES))) { //$NON-NLS-1$
+ if (StringUtility.isTrue(tc.getProperty(PropertyRegistry.TABLE_USE_ACTUAL_COLUMN_NAMES))) {
cd.setJavaProperty(JavaBeansUtil.getValidPropertyName(calculatedColumnName));
} else {
cd.setJavaProperty(JavaBeansUtil.getCamelCaseString(calculatedColumnName, false));
@@ -446,7 +446,7 @@
atn.getTableName(),
tc.getDomainObjectName(),
tc.getAlias(),
- "true".equalsIgnoreCase(tc.getProperty(PropertyRegistry.TABLE_IGNORE_QUALIFIERS_AT_RUNTIME)), //$NON-NLS-1$
+ StringUtility.isTrue(tc.getProperty(PropertyRegistry.TABLE_IGNORE_QUALIFIERS_AT_RUNTIME)),
tc.getProperty(PropertyRegistry.TABLE_RUNTIME_CATALOG),
tc.getProperty(PropertyRegistry.TABLE_RUNTIME_SCHEMA),
tc.getProperty(PropertyRegistry.TABLE_RUNTIME_TABLE_NAME),
Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/db/IntrospectedTableDefaultImpl.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/db/IntrospectedTableDefaultImpl.java?rev=663760&r1=663759&r2=663760&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/db/IntrospectedTableDefaultImpl.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/db/IntrospectedTableDefaultImpl.java Thu Jun 5 15:05:48 2008
@@ -34,6 +34,7 @@
import org.apache.ibatis.ibator.internal.rules.FlatModelRules;
import org.apache.ibatis.ibator.internal.rules.HierarchicalModelRules;
import org.apache.ibatis.ibator.internal.rules.IbatorRules;
+import org.apache.ibatis.ibator.internal.util.StringUtility;
/**
* @author Jeff Butler
@@ -238,7 +239,7 @@
SqlMapGeneratorConfiguration config = ibatorContext.getSqlMapGeneratorConfiguration();
StringBuffer sb = new StringBuffer(config.getTargetPackage());
- if ("true".equalsIgnoreCase(config.getProperty(PropertyRegistry.ANY_ENABLE_SUB_PACKAGES))) { //$NON-NLS-1$
+ if (StringUtility.isTrue(config.getProperty(PropertyRegistry.ANY_ENABLE_SUB_PACKAGES))) {
sb.append(fullyQualifiedTable.getSubPackage());
}
@@ -278,7 +279,7 @@
StringBuffer sb = new StringBuffer();
sb.append(config.getTargetPackage());
- if ("true".equalsIgnoreCase(config.getProperty(PropertyRegistry.ANY_ENABLE_SUB_PACKAGES))) { //$NON-NLS-1$
+ if (StringUtility.isTrue(config.getProperty(PropertyRegistry.ANY_ENABLE_SUB_PACKAGES))) {
sb.append(fullyQualifiedTable.getSubPackage());
}
@@ -290,7 +291,7 @@
StringBuffer sb = new StringBuffer();
sb.append(config.getTargetPackage());
- if ("true".equalsIgnoreCase(config.getProperty(PropertyRegistry.ANY_ENABLE_SUB_PACKAGES))) { //$NON-NLS-1$
+ if (StringUtility.isTrue(config.getProperty(PropertyRegistry.ANY_ENABLE_SUB_PACKAGES))) {
sb.append(fullyQualifiedTable.getSubPackage());
}
Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/java/model/JavaModelGeneratorJava2Impl.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/java/model/JavaModelGeneratorJava2Impl.java?rev=663760&r1=663759&r2=663760&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/java/model/JavaModelGeneratorJava2Impl.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/java/model/JavaModelGeneratorJava2Impl.java Thu Jun 5 15:05:48 2008
@@ -121,7 +121,7 @@
IbatorPlugin plugins = ibatorContext.getPlugins();
String rootClass = getRootClass(introspectedTable);
- boolean trimStrings = "true".equalsIgnoreCase(properties //$NON-NLS-1$
+ boolean trimStrings = StringUtility.isTrue(properties
.getProperty(PropertyRegistry.MODEL_GENERATOR_TRIM_STRINGS));
StringBuffer sb = new StringBuffer();
Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/sqlmap/SqlMapGeneratorIterateImpl.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/sqlmap/SqlMapGeneratorIterateImpl.java?rev=663760&r1=663759&r2=663760&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/sqlmap/SqlMapGeneratorIterateImpl.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/sqlmap/SqlMapGeneratorIterateImpl.java Thu Jun 5 15:05:48 2008
@@ -288,7 +288,7 @@
*/
protected XmlElement getBaseResultMapElement(IntrospectedTable introspectedTable) {
boolean useColumnIndex =
- "true".equalsIgnoreCase(introspectedTable.getTableConfigurationProperty(PropertyRegistry.TABLE_USE_COLUMN_INDEXES)); //$NON-NLS-1$
+ StringUtility.isTrue(introspectedTable.getTableConfigurationProperty(PropertyRegistry.TABLE_USE_COLUMN_INDEXES));
XmlElement answer = new XmlElement("resultMap"); //$NON-NLS-1$
answer.addAttribute(new Attribute("id", //$NON-NLS-1$
XmlConstants.BASE_RESULT_MAP_ID));
@@ -348,13 +348,13 @@
*/
protected XmlElement getResultMapWithBLOBsElement(IntrospectedTable introspectedTable) {
boolean useColumnIndex =
- "true".equalsIgnoreCase(introspectedTable.getTableConfigurationProperty(PropertyRegistry.TABLE_USE_COLUMN_INDEXES)); //$NON-NLS-1$
+ StringUtility.isTrue(introspectedTable.getTableConfigurationProperty(PropertyRegistry.TABLE_USE_COLUMN_INDEXES));
XmlElement answer = new XmlElement("resultMap"); //$NON-NLS-1$
FullyQualifiedTable table = introspectedTable.getFullyQualifiedTable();
- answer.addAttribute(new Attribute("id",
- XmlConstants.RESULT_MAP_WITH_BLOBS_ID)); //$NON-NLS-1$
+ answer.addAttribute(new Attribute("id", //$NON-NLS-1$
+ XmlConstants.RESULT_MAP_WITH_BLOBS_ID));
FullyQualifiedJavaType returnType;
if (introspectedTable.getRules().generateRecordWithBLOBsClass()) {
Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/types/JavaTypeResolverDefaultImpl.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/types/JavaTypeResolverDefaultImpl.java?rev=663760&r1=663759&r2=663760&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/types/JavaTypeResolverDefaultImpl.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/types/JavaTypeResolverDefaultImpl.java Thu Jun 5 15:05:48 2008
@@ -26,6 +26,7 @@
import org.apache.ibatis.ibator.config.IbatorContext;
import org.apache.ibatis.ibator.config.PropertyRegistry;
import org.apache.ibatis.ibator.internal.db.ColumnDefinition;
+import org.apache.ibatis.ibator.internal.util.StringUtility;
/**
*
@@ -53,7 +54,7 @@
* @see org.apache.ibatis.ibator.api.JavaTypeResolver#initializeResolvedJavaType(org.apache.ibatis.ibator.internal.db.ColumnDefinition)
*/
public boolean initializeResolvedJavaType(ColumnDefinition cd) {
- boolean forceBigDecimals = "true".equalsIgnoreCase(properties //$NON-NLS-1$
+ boolean forceBigDecimals = StringUtility.isTrue(properties
.getProperty(PropertyRegistry.TYPE_RESOLVER_FORCE_BIG_DECIMALS));
boolean rc = true;
Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/util/StringUtility.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/util/StringUtility.java?rev=663760&r1=663759&r2=663760&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/util/StringUtility.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/util/StringUtility.java Thu Jun 5 15:05:48 2008
@@ -90,4 +90,8 @@
return sb.toString();
}
+
+ public static boolean isTrue(String s) {
+ return "true".equalsIgnoreCase(s); //$NON-NLS-1$
+ }
}
Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/util/messages/messages.properties
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/util/messages/messages.properties?rev=663760&r1=663759&r2=663760&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/util/messages/messages.properties (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/util/messages/messages.properties Thu Jun 5 15:05:48 2008
@@ -70,8 +70,8 @@
Progress.0=Connecting to the Database
Progress.1=Introspecting table {0}
Progress.3=XML Parser Errors occured:
-Progress.4=iBATOR finshed successfully.
-Progress.5=iBATOR finshed successfully, there were warninigs.
+Progress.4=ibator finshed successfully.
+Progress.5=ibator finshed successfully, there were warninigs.
Progress.6=Generating Example class for table {0}
Progress.7=Generating Primary Key class for table {0}
Progress.8=Generating Record class for table {0}