You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2007/12/21 14:43:18 UTC
svn commit: r606196 - in
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query:
ProcedureQuery.java SQLResultSetMapping.java SQLTemplate.java
SQLTemplateMetadata.java
Author: aadamchik
Date: Fri Dec 21 05:43:17 2007
New Revision: 606196
URL: http://svn.apache.org/viewvc?rev=606196&view=rev
Log:
generics
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/ProcedureQuery.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLResultSetMapping.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLTemplate.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLTemplateMetadata.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/ProcedureQuery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/ProcedureQuery.java?rev=606196&r1=606195&r2=606196&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/ProcedureQuery.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/ProcedureQuery.java Fri Dec 21 05:43:17 2007
@@ -100,7 +100,7 @@
/**
* Creates a ProcedureQuery based on a stored procedure.
* <p>
- * Performance Note: with current EntityResolver implementation it is preferrable to
+ * Performance Note: with current EntityResolver implementation it is preferable to
* use Procedure object instead of String as a query root. String root can cause
* unneeded EntityResolver reindexing on every call. See this mailing list thread: <a
* href="http://objectstyle.org/cayenne/lists/cayenne-user/2005/01/0109.html">
@@ -120,7 +120,7 @@
/**
* @since 1.1
*/
- public ProcedureQuery(Procedure procedure, Class resultType) {
+ public ProcedureQuery(Procedure procedure, Class<?> resultType) {
setRoot(procedure);
this.resultClass = resultType;
@@ -128,7 +128,7 @@
/**
* <p>
- * Performance Note: with current EntityResolver implementation it is preferrable to
+ * Performance Note: with current EntityResolver implementation it is preferable to
* use Procedure object instead of String as a query root. String root can cause
* unneeded EntityResolver reindexing on every call. See this mailing list thread: <a
* href="http://objectstyle.org/cayenne/lists/cayenne-user/2005/01/0109.html">
@@ -137,7 +137,7 @@
*
* @since 1.1
*/
- public ProcedureQuery(String procedureName, Class resultType) {
+ public ProcedureQuery(String procedureName, Class<?> resultType) {
setRoot(procedureName);
this.resultClass = resultType;
@@ -209,7 +209,7 @@
*
* @since 1.1
*/
- public void initWithProperties(Map properties) {
+ public void initWithProperties(Map<String, ?> properties) {
// must init defaults even if properties are empty
if (properties == null) {
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLResultSetMapping.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLResultSetMapping.java?rev=606196&r1=606195&r2=606196&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLResultSetMapping.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLResultSetMapping.java Fri Dec 21 05:43:17 2007
@@ -35,7 +35,7 @@
public class SQLResultSetMapping {
protected String name;
- protected List columnResults;
+ protected List<String> columnResults;
public SQLResultSetMapping() {
@@ -56,7 +56,7 @@
/**
* Returns a collection of mapped columns.
*/
- public List getColumnResults() {
+ public List<String> getColumnResults() {
return columnResults != null ? columnResults : Collections.EMPTY_LIST;
}
@@ -65,7 +65,7 @@
*/
public void addColumnResult(String column) {
if (columnResults == null) {
- columnResults = new ArrayList(3);
+ columnResults = new ArrayList<String>(3);
}
columnResults.add(column);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLTemplate.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLTemplate.java?rev=606196&r1=606195&r2=606196&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLTemplate.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLTemplate.java Fri Dec 21 05:43:17 2007
@@ -95,8 +95,8 @@
};
protected String defaultTemplate;
- protected Map templates;
- protected Map[] parameters;
+ protected Map<String, String> templates;
+ protected Map<String, ?>[] parameters;
protected String columnNamesCapitalization;
SQLTemplateMetadata selectInfo = new SQLTemplateMetadata();
@@ -130,7 +130,7 @@
/**
* @since 1.2
*/
- public SQLTemplate(Class rootClass, String defaultTemplate) {
+ public SQLTemplate(Class<?> rootClass, String defaultTemplate) {
setDefaultTemplate(defaultTemplate);
setRoot(rootClass);
}
@@ -200,7 +200,7 @@
}
else if (root instanceof Class) {
rootType = QueryBuilder.JAVA_CLASS_ROOT;
- rootString = ((Class) root).getName();
+ rootString = ((Class<?>) root).getName();
}
else if (root instanceof DataMap) {
rootType = QueryBuilder.DATA_MAP_ROOT;
@@ -235,17 +235,15 @@
// encode adapter SQL
if (templates != null && !templates.isEmpty()) {
- Iterator it = templates.entrySet().iterator();
- while (it.hasNext()) {
- Map.Entry entry = (Map.Entry) it.next();
- Object key = entry.getKey();
- Object value = entry.getValue();
+ for (Map.Entry<String, String> entry : templates.entrySet()) {
+ String key = entry.getKey();
+ String value = entry.getValue();
if (key != null && value != null) {
- String sql = value.toString().trim();
+ String sql = value.trim();
if (sql.length() > 0) {
encoder.print("<sql adapter-class=\"");
- encoder.print(key.toString());
+ encoder.print(key);
encoder.print("\"><![CDATA[");
encoder.print(sql);
encoder.println("]]></sql>");
@@ -265,7 +263,7 @@
*
* @since 1.1
*/
- public void initWithProperties(Map properties) {
+ public void initWithProperties(Map<String, ?> properties) {
// must init defaults even if properties are empty
selectInfo.initWithProperties(properties);
@@ -284,7 +282,7 @@
* Returns an iterator over parameter sets. Each element returned from the iterator is
* a java.util.Map.
*/
- public Iterator parametersIterator() {
+ public Iterator<?> parametersIterator() {
return (parameters == null || parameters.length == 0) ? IteratorUtils
.emptyIterator() : IteratorUtils.transformedIterator(IteratorUtils
.arrayIterator(parameters), nullMapTransformer);
@@ -301,7 +299,7 @@
* Returns a new query built using this query as a prototype and a new set of
* parameters.
*/
- public SQLTemplate queryWithParameters(Map parameters) {
+ public SQLTemplate queryWithParameters(Map<String, ?> parameters) {
return queryWithParameters(new Map[] {
parameters
});
@@ -311,7 +309,7 @@
* Returns a new query built using this query as a prototype and a new set of
* parameters.
*/
- public SQLTemplate queryWithParameters(Map[] parameters) {
+ public SQLTemplate queryWithParameters(Map<String, ?>[] parameters) {
// create a query replica
SQLTemplate query = new SQLTemplate();
@@ -319,7 +317,7 @@
query.setDefaultTemplate(getDefaultTemplate());
if (templates != null) {
- query.templates = new HashMap(templates);
+ query.templates = new HashMap<String, String>(templates);
}
query.selectInfo.copyFromInfo(this.selectInfo);
@@ -331,7 +329,7 @@
// problem reported in CAY-360.
if (!Util.isEmptyString(name)) {
- StringBuffer buffer = new StringBuffer(name);
+ StringBuilder buffer = new StringBuilder(name);
if (parameters != null) {
for (int i = 0; i < parameters.length; i++) {
@@ -353,7 +351,7 @@
*
* @since 1.1
*/
- public Query createQuery(Map parameters) {
+ public Query createQuery(Map<String, ?> parameters) {
return queryWithParameters(parameters);
}
@@ -442,7 +440,7 @@
return defaultTemplate;
}
- String template = (String) templates.get(key);
+ String template = templates.get(key);
return (template != null) ? template : defaultTemplate;
}
@@ -452,7 +450,7 @@
* as a failover strategy, rather it returns null.
*/
public synchronized String getCustomTemplate(String key) {
- return (templates != null) ? (String) templates.get(key) : null;
+ return (templates != null) ? templates.get(key) : null;
}
/**
@@ -466,7 +464,7 @@
*/
public synchronized void setTemplate(String key, String template) {
if (templates == null) {
- templates = new HashMap();
+ templates = new HashMap<String, String>();
}
templates.put(key, template);
@@ -481,7 +479,7 @@
/**
* Returns a collection of configured template keys.
*/
- public synchronized Collection getTemplateKeys() {
+ public synchronized Collection<String> getTemplateKeys() {
return (templates != null) ? Collections.unmodifiableCollection(templates
.keySet()) : Collections.EMPTY_LIST;
}
@@ -490,8 +488,8 @@
* Utility method to get the first set of parameters, since most queries will only
* have one.
*/
- public Map getParameters() {
- Map map = (parameters != null && parameters.length > 0) ? parameters[0] : null;
+ public Map<String, ?> getParameters() {
+ Map<String, ?> map = (parameters != null && parameters.length > 0) ? parameters[0] : null;
return (map != null) ? map : Collections.EMPTY_MAP;
}
@@ -500,13 +498,13 @@
* since most queries will only have one set. Internally calls
* {@link #setParameters(Map[])}.
*/
- public void setParameters(Map map) {
+ public void setParameters(Map<String, ?> map) {
setParameters(map != null ? new Map[] {
map
} : null);
}
- public void setParameters(Map[] parameters) {
+ public void setParameters(Map<String, ?>[] parameters) {
if (parameters == null) {
this.parameters = null;
@@ -517,8 +515,8 @@
this.parameters = new Map[parameters.length];
for (int i = 0; i < parameters.length; i++) {
this.parameters[i] = parameters[i] != null
- ? new HashMap(parameters[i])
- : new HashMap();
+ ? new HashMap<String, Object>(parameters[i])
+ : new HashMap<String, Object>();
}
}
}
@@ -554,7 +552,7 @@
*
* @since 1.2
*/
- public void addPrefetches(Collection prefetches) {
+ public void addPrefetches(Collection<String> prefetches) {
selectInfo.addPrefetches(prefetches, PrefetchTreeNode.JOINT_PREFETCH_SEMANTICS);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLTemplateMetadata.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLTemplateMetadata.java?rev=606196&r1=606195&r2=606196&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLTemplateMetadata.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLTemplateMetadata.java Fri Dec 21 05:43:17 2007
@@ -20,7 +20,6 @@
import java.util.ArrayList;
import java.util.Collections;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -32,13 +31,13 @@
* @author Andrus Adamchik
*/
class SQLTemplateMetadata extends BaseQueryMetadata {
-
+
private SQLResultSetMapping resultSetMapping;
-
+
void setResultSetMapping(SQLResultSetMapping resultSetMapping) {
this.resultSetMapping = resultSetMapping;
}
-
+
public SQLResultSetMapping getResultSetMapping() {
return resultSetMapping;
}
@@ -58,7 +57,7 @@
// create a unique key based on entity, SQL, and parameters
- StringBuffer key = new StringBuffer();
+ StringBuilder key = new StringBuilder();
ObjEntity entity = getObjEntity();
if (entity != null) {
key.append(entity.getName());
@@ -71,15 +70,13 @@
key.append('/').append(query.getDefaultTemplate());
}
- Map parameters = query.getParameters();
+ Map<String, ?> parameters = query.getParameters();
if (!parameters.isEmpty()) {
- List keys = new ArrayList(parameters.keySet());
+ List<String> keys = new ArrayList<String>(parameters.keySet());
Collections.sort(keys);
- Iterator it = keys.iterator();
- while (it.hasNext()) {
- Object parameterKey = it.next();
+ for (String parameterKey : keys) {
key.append('/').append(parameterKey).append('=').append(
parameters.get(parameterKey));
}