root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

polishing

This commit is contained in:
Juergen Hoeller 2009-02-09 18:28:04 +00:00
parent 60392d6e74
commit fc6d7358ef
3 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
org.springframework.beans/src/main/java/org/springframework/beans/factory/config/InstantiationAwareBeanPostProcessorAdapter.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2008 the original author or authors.
* Copyright 2002-2009 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -39,11 +39,11 @@ import org.springframework.beans.PropertyValues;
*/
public abstract class InstantiationAwareBeanPostProcessorAdapter implements SmartInstantiationAwareBeanPostProcessor {
public Class predictBeanType(Class beanClass, String beanName) {
public Class<?> predictBeanType(Class<?> beanClass, String beanName) {
return null;
}
public Constructor[] determineCandidateConstructors(Class beanClass, String beanName) throws BeansException {
public Constructor<?>[] determineCandidateConstructors(Class beanClass, String beanName) throws BeansException {
return null;
}

18
org.springframework.orm/src/main/java/org/springframework/orm/jdo/JdoOperations.java
View File

@ -279,7 +279,7 @@ public interface JdoOperations {
* @see javax.jdo.Query#declareParameters
* @see javax.jdo.Query#executeWithArray
*/
<T> Collection<T> find(Class<T> entityClass, String filter, String parameters, Object[] values)
<T> Collection<T> find(Class<T> entityClass, String filter, String parameters, Object... values)
throws DataAccessException;
/**
@ -298,7 +298,8 @@ public interface JdoOperations {
* @see javax.jdo.Query#executeWithArray
* @see javax.jdo.Query#setOrdering
*/
<T> Collection<T> find(Class<T> entityClass, String filter, String parameters, Object[] values, String ordering)
<T> Collection<T> find(
Class<T> entityClass, String filter, String parameters, Object[] values, String ordering)
throws DataAccessException;
/**
@ -314,7 +315,7 @@ public interface JdoOperations {
* @see javax.jdo.Query#declareParameters
* @see javax.jdo.Query#executeWithMap
*/
<T> Collection<T> find(Class<T> entityClass, String filter, String parameters, Map values)
<T> Collection<T> find(Class<T> entityClass, String filter, String parameters, Map<String, ?> values)
throws DataAccessException;
/**
@ -333,7 +334,8 @@ public interface JdoOperations {
* @see javax.jdo.Query#executeWithMap
* @see javax.jdo.Query#setOrdering
*/
<T> Collection<T> find(Class<T> entityClass, String filter, String parameters, Map values, String ordering)
<T> Collection<T> find(
Class<T> entityClass, String filter, String parameters, Map<String, ?> values, String ordering)
throws DataAccessException;
/**
@ -367,7 +369,7 @@ public interface JdoOperations {
* @throws org.springframework.dao.DataAccessException in case of JDO errors
* @see javax.jdo.PersistenceManager#newQuery(String)
*/
Collection find(String queryString, Object[] values) throws DataAccessException;
Collection find(String queryString, Object... values) throws DataAccessException;
/**
* Find persistent instances through the given single-string JDOQL query.
@ -377,7 +379,7 @@ public interface JdoOperations {
* @throws org.springframework.dao.DataAccessException in case of JDO errors
* @see javax.jdo.PersistenceManager#newQuery(String)
*/
Collection find(String queryString, Map values) throws DataAccessException;
Collection find(String queryString, Map<String, ?> values) throws DataAccessException;
/**
* Find persistent instances through the given named query.
@ -399,7 +401,7 @@ public interface JdoOperations {
* @throws org.springframework.dao.DataAccessException in case of JDO errors
* @see javax.jdo.PersistenceManager#newNamedQuery(Class, String)
*/
<T> Collection<T> findByNamedQuery(Class<T> entityClass, String queryName, Object[] values)
<T> Collection<T> findByNamedQuery(Class<T> entityClass, String queryName, Object... values)
throws DataAccessException;
/**
@ -411,7 +413,7 @@ public interface JdoOperations {
* @throws org.springframework.dao.DataAccessException in case of JDO errors
* @see javax.jdo.PersistenceManager#newNamedQuery(Class, String)
*/
<T> Collection<T> findByNamedQuery(Class<T> entityClass, String queryName, Map values)
<T> Collection<T> findByNamedQuery(Class<T> entityClass, String queryName, Map<String, ?> values)
throws DataAccessException;
}

16
org.springframework.orm/src/main/java/org/springframework/orm/jdo/JdoTemplate.java
View File

@ -440,15 +440,16 @@ public class JdoTemplate extends JdoAccessor implements JdoOperations {
}, true);
}
public <T> Collection<T> find(Class<T> entityClass, String filter, String parameters, Map values)
public <T> Collection<T> find(
Class<T> entityClass, String filter, String parameters, Map<String, ?> values)
throws DataAccessException {
return find(entityClass, filter, parameters, values, null);
}
public <T> Collection<T> find(
final Class<T> entityClass, final String filter, final String parameters, final Map values,
final String ordering) throws DataAccessException {
final Class<T> entityClass, final String filter, final String parameters,
final Map<String, ?> values, final String ordering) throws DataAccessException {
return execute(new JdoCallback<Collection<T>>() {
@SuppressWarnings("unchecked")
@ -485,7 +486,7 @@ public class JdoTemplate extends JdoAccessor implements JdoOperations {
}, true);
}
public Collection find(final String queryString, final Object[] values) throws DataAccessException {
public Collection find(final String queryString, final Object... values) throws DataAccessException {
return execute(new JdoCallback<Collection>() {
public Collection doInJdo(PersistenceManager pm) throws JDOException {
Query query = pm.newQuery(queryString);
@ -495,7 +496,7 @@ public class JdoTemplate extends JdoAccessor implements JdoOperations {
}, true);
}
public Collection find(final String queryString, final Map values) throws DataAccessException {
public Collection find(final String queryString, final Map<String, ?> values) throws DataAccessException {
return execute(new JdoCallback<Collection>() {
public Collection doInJdo(PersistenceManager pm) throws JDOException {
Query query = pm.newQuery(queryString);
@ -518,7 +519,7 @@ public class JdoTemplate extends JdoAccessor implements JdoOperations {
}, true);
}
public <T> Collection<T> findByNamedQuery(final Class<T> entityClass, final String queryName, final Object[] values)
public <T> Collection<T> findByNamedQuery(final Class<T> entityClass, final String queryName, final Object... values)
throws DataAccessException {
return execute(new JdoCallback<Collection<T>>() {
@ -531,7 +532,8 @@ public class JdoTemplate extends JdoAccessor implements JdoOperations {
}, true);
}
public <T> Collection<T> findByNamedQuery(final Class<T> entityClass, final String queryName, final Map values)
public <T> Collection<T> findByNamedQuery(
final Class<T> entityClass, final String queryName, final Map<String, ?> values)
throws DataAccessException {
return execute(new JdoCallback<Collection<T>>() {