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/20 19:36:53 UTC
svn commit: r605993 - in /cayenne/main/trunk/framework:
cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/
cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/
cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/bridge...
Author: aadamchik
Date: Thu Dec 20 10:36:50 2007
New Revision: 605993
URL: http://svn.apache.org/viewvc?rev=605993&view=rev
Log:
generics
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/ParameterizedQuery.java
cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/JpaNativeQuery.java
cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/JpaQuery.java
cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/JpaUnit.java
cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/JpaUnitClassLoader.java
cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/JtaEntityManagerFactory.java
cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/Provider.java
cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/ResourceLocalEntityManager.java
cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/ResourceLocalEntityManagerFactory.java
cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/TypeCheckingEntityManager.java
cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/bridge/JpaIndirectQuery.java
cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/reflect/JpaCollectionFieldAccessor.java
cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/util/BaseTreeVisitor.java
cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/util/HierarchicalTreeVisitor.java
cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/util/TraversalUtil.java
cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/util/TreeNodeChild.java
cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/MockClassTransformer.java
cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/MockEntityManagerFactory.java
cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/MockObjectContext.java
cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/MockPersistenceProvider.java
cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/ResourceLocalEntityManagerFactoryTest.java
cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/bridge/DataMapConverterRelationshipsTest.java
cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/bridge/DataMapConverterTest.java
cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/conf/MappingAssertion.java
cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/conf/MockAnnotatedBean3.java
cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/conf/UnitDescriptorParserTest.java
cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/map/EntityMapTraversalTest.java
cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/util/MockHierarchicalTreeVisitor.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/ParameterizedQuery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/ParameterizedQuery.java?rev=605993&r1=605992&r2=605993&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/ParameterizedQuery.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/ParameterizedQuery.java Thu Dec 20 10:36:50 2007
@@ -36,5 +36,5 @@
* parameters. In case of select queries, it is up to the implementing query to name
* the new query to avoid cache key conflicts.
*/
- public Query createQuery(Map<String,?> parameters);
+ Query createQuery(Map<String, ?> parameters);
}
Modified: cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/JpaNativeQuery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/JpaNativeQuery.java?rev=605993&r1=605992&r2=605993&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/JpaNativeQuery.java (original)
+++ cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/JpaNativeQuery.java Thu Dec 20 10:36:50 2007
@@ -29,7 +29,7 @@
private static final String POSITIONAL_PARAM_PREFIX = "positional_";
- public JpaNativeQuery(ObjectContext context, String sqlString, Class resultClass) {
+ public JpaNativeQuery(ObjectContext context, String sqlString, Class<?> resultClass) {
super(context);
setQuery(new SQLTemplate(resultClass, processSQLString(sqlString)));
}
Modified: cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/JpaQuery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/JpaQuery.java?rev=605993&r1=605992&r2=605993&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/JpaQuery.java (original)
+++ cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/JpaQuery.java Thu Dec 20 10:36:50 2007
@@ -92,6 +92,7 @@
* @return a list of the results
* @throws IllegalStateException if called for an EJB QL UPDATE or DELETE statement
*/
+ @SuppressWarnings("unchecked")
public List getResultList() {
return context.performQuery(queryWithParameters());
}
@@ -129,7 +130,7 @@
* @throws IllegalStateException if called for an EJB QL UPDATE or DELETE statement
*/
public Object getSingleResult() {
- List rows = getResultList();
+ List<?> rows = getResultList();
if (rows.size() == 0) {
throw new NoResultException();
}
Modified: cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/JpaUnit.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/JpaUnit.java?rev=605993&r1=605992&r2=605993&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/JpaUnit.java (original)
+++ cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/JpaUnit.java Thu Dec 20 10:36:50 2007
@@ -223,7 +223,7 @@
this.persistenceUnitRootUrl = persistenceUnitRootUrl;
}
- public void addProperties(Map properties) {
+ public void addProperties(Map<?, ?> properties) {
this.properties.putAll(properties);
}
Modified: cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/JpaUnitClassLoader.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/JpaUnitClassLoader.java?rev=605993&r1=605992&r2=605993&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/JpaUnitClassLoader.java (original)
+++ cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/JpaUnitClassLoader.java Thu Dec 20 10:36:50 2007
@@ -44,7 +44,7 @@
return super.loadClass(name, resolve);
}
- Class c = findLoadedClass(name);
+ Class<?> c = findLoadedClass(name);
if (c == null) {
c = findClass(name);
Modified: cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/JtaEntityManagerFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/JtaEntityManagerFactory.java?rev=605993&r1=605992&r2=605993&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/JtaEntityManagerFactory.java (original)
+++ cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/JtaEntityManagerFactory.java Thu Dec 20 10:36:50 2007
@@ -91,6 +91,7 @@
}
@Override
+ @SuppressWarnings("unchecked")
public EntityManager createEntityManager(Map map) {
checkClosed();
CayenneEntityManager em = new JtaEntityManager(createObjectContext(), this);
Modified: cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/Provider.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/Provider.java?rev=605993&r1=605992&r2=605993&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/Provider.java (original)
+++ cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/Provider.java Thu Dec 20 10:36:50 2007
@@ -158,6 +158,7 @@
* a {@link JpaUnit} and calls
* {@link #createContainerEntityManagerFactory(PersistenceUnitInfo, Map)}.
*/
+ @SuppressWarnings("unchecked")
public EntityManagerFactory createEntityManagerFactory(String emName, Map map) {
JpaUnit ui = loadUnit(emName);
@@ -200,6 +201,7 @@
* provider will ignore all but 'javax.persistence.transactionType' property in the
* passed property map.
*/
+ @SuppressWarnings("unchecked")
public synchronized EntityManagerFactory createContainerEntityManagerFactory(
PersistenceUnitInfo unit,
Map map) {
@@ -309,7 +311,7 @@
* Returns whether provided configuration specifies a JTA or RESOURCE_LOCAL
* EntityManager.
*/
- private boolean isJta(PersistenceUnitInfo unit, Map overrides) {
+ private boolean isJta(PersistenceUnitInfo unit, Map<?, ?> overrides) {
PersistenceUnitTransactionType txType;
String txTypeOverride = (overrides != null) ? (String) overrides
.get(TRANSACTION_TYPE_PROPERTY) : null;
@@ -403,7 +405,7 @@
try {
// adapter class is not enhanced, so use a normal class loader
- Class dbAdapterClass = Class.forName(adapterClass, true, Thread
+ Class<?> dbAdapterClass = Class.forName(adapterClass, true, Thread
.currentThread()
.getContextClassLoader());
return (DbAdapter) dbAdapterClass.newInstance();
Modified: cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/ResourceLocalEntityManager.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/ResourceLocalEntityManager.java?rev=605993&r1=605992&r2=605993&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/ResourceLocalEntityManager.java (original)
+++ cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/ResourceLocalEntityManager.java Thu Dec 20 10:36:50 2007
@@ -285,6 +285,7 @@
return new JpaQuery(context, name);
}
+ @SuppressWarnings("unchecked")
public Query createNativeQuery(String sqlString, Class resultClass) {
checkClosed();
return new JpaNativeQuery(context, sqlString, resultClass);
Modified: cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/ResourceLocalEntityManagerFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/ResourceLocalEntityManagerFactory.java?rev=605993&r1=605992&r2=605993&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/ResourceLocalEntityManagerFactory.java (original)
+++ cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/ResourceLocalEntityManagerFactory.java Thu Dec 20 10:36:50 2007
@@ -104,6 +104,7 @@
*
* @return a new EntityManager instance.
*/
+ @SuppressWarnings("unchecked")
public EntityManager createEntityManager(Map map) {
checkClosed();
CayenneEntityManager em = new ResourceLocalEntityManager(
Modified: cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/TypeCheckingEntityManager.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/TypeCheckingEntityManager.java?rev=605993&r1=605992&r2=605993&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/TypeCheckingEntityManager.java (original)
+++ cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/TypeCheckingEntityManager.java Thu Dec 20 10:36:50 2007
@@ -43,7 +43,7 @@
this.entityManager = entityManager;
}
- protected void checkEntityType(Class entityClass) throws IllegalArgumentException {
+ protected void checkEntityType(Class<?> entityClass) throws IllegalArgumentException {
if (entityClass == null) {
throw new IllegalArgumentException("Null entity class");
}
@@ -65,10 +65,6 @@
}
}
- protected void enhance(Class entityClass) {
-
- }
-
public void clear() {
entityManager.clear();
}
@@ -86,6 +82,7 @@
return entityManager.createNamedQuery(name);
}
+ @SuppressWarnings("unchecked")
public Query createNativeQuery(String sqlString, Class resultClass) {
checkEntityType(resultClass);
return entityManager.createNativeQuery(sqlString, resultClass);
Modified: cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/bridge/JpaIndirectQuery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/bridge/JpaIndirectQuery.java?rev=605993&r1=605992&r2=605993&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/bridge/JpaIndirectQuery.java (original)
+++ cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/bridge/JpaIndirectQuery.java Thu Dec 20 10:36:50 2007
@@ -17,7 +17,6 @@
* under the License.
****************************************************************/
-
package org.apache.cayenne.jpa.bridge;
import java.util.Map;
@@ -41,9 +40,9 @@
protected JpaNamedQuery jpaQuery;
protected DataMap parentMap;
protected ObjEntity parentEntity;
- protected Map parameters;
+ protected Map<String, ?> parameters;
- public Query createQuery(Map parameters) {
+ public Query createQuery(Map<String, ?> parameters) {
JpaIndirectQuery clone;
try {
clone = (JpaIndirectQuery) getClass().newInstance();
Modified: cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/reflect/JpaCollectionFieldAccessor.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/reflect/JpaCollectionFieldAccessor.java?rev=605993&r1=605992&r2=605993&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/reflect/JpaCollectionFieldAccessor.java (original)
+++ cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/reflect/JpaCollectionFieldAccessor.java Thu Dec 20 10:36:50 2007
@@ -26,8 +26,8 @@
class JpaCollectionFieldAccessor extends FieldAccessor {
- public JpaCollectionFieldAccessor(Class objectClass, String propertyName,
- Class propertyType) {
+ public JpaCollectionFieldAccessor(Class<?> objectClass, String propertyName,
+ Class<?> propertyType) {
super(objectClass, propertyName, propertyType);
if (!Persistent.class.isAssignableFrom(objectClass)) {
Modified: cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/util/BaseTreeVisitor.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/util/BaseTreeVisitor.java?rev=605993&r1=605992&r2=605993&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/util/BaseTreeVisitor.java (original)
+++ cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/util/BaseTreeVisitor.java Thu Dec 20 10:36:50 2007
@@ -33,7 +33,7 @@
// TODO, andrus, 4/24/2006 - move to Cayenne core in 2.0
public class BaseTreeVisitor implements HierarchicalTreeVisitor {
- protected Map childVisitors;
+ protected Map<String, HierarchicalTreeVisitor> childVisitors;
protected boolean terminatingOnNoChildVisitor;
public BaseTreeVisitor() {
@@ -48,13 +48,12 @@
this.terminatingOnNoChildVisitor = terminatingOnNoChildVisitor;
}
- public HierarchicalTreeVisitor childVisitor(ProjectPath path, Class childType) {
+ public HierarchicalTreeVisitor childVisitor(ProjectPath path, Class<?> childType) {
if (childVisitors == null) {
return terminatingOnNoChildVisitor ? null : this;
}
- HierarchicalTreeVisitor childVisitor = (HierarchicalTreeVisitor) childVisitors
- .get(childType.getName());
+ HierarchicalTreeVisitor childVisitor = childVisitors.get(childType.getName());
return childVisitor != null ? childVisitor : terminatingOnNoChildVisitor
? null
: this;
@@ -67,9 +66,9 @@
return true;
}
- public void addChildVisitor(Class childClass, HierarchicalTreeVisitor visitor) {
+ public void addChildVisitor(Class<?> childClass, HierarchicalTreeVisitor visitor) {
if (childVisitors == null) {
- childVisitors = new HashMap();
+ childVisitors = new HashMap<String, HierarchicalTreeVisitor>();
}
childVisitors.put(childClass.getName(), visitor);
Modified: cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/util/HierarchicalTreeVisitor.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/util/HierarchicalTreeVisitor.java?rev=605993&r1=605992&r2=605993&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/util/HierarchicalTreeVisitor.java (original)
+++ cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/util/HierarchicalTreeVisitor.java Thu Dec 20 10:36:50 2007
@@ -46,5 +46,5 @@
* Returns an instance of the child visitor for a given project path and a type of
* child. Returning null would result in skipping the particular child type.
*/
- HierarchicalTreeVisitor childVisitor(ProjectPath path, Class childType);
+ HierarchicalTreeVisitor childVisitor(ProjectPath path, Class<?> childType);
}
Modified: cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/util/TraversalUtil.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/util/TraversalUtil.java?rev=605993&r1=605992&r2=605993&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/util/TraversalUtil.java (original)
+++ cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/util/TraversalUtil.java Thu Dec 20 10:36:50 2007
@@ -39,7 +39,7 @@
static final ClassTraversalDescriptor noopDescriptor = new ClassTraversalDescriptor();
static final Map<String, ClassTraversalDescriptor> descriptors = new HashMap<String, ClassTraversalDescriptor>();
- private static Method[] traversableGetters(Class nodeType) {
+ private static Method[] traversableGetters(Class<?> nodeType) {
Collection<Method> getters = null;
@@ -59,7 +59,7 @@
return getters != null ? getters.toArray(new Method[getters.size()]) : null;
}
- static synchronized ClassTraversalDescriptor getDescriptor(Class nodeType) {
+ static synchronized ClassTraversalDescriptor getDescriptor(Class<?> nodeType) {
String typeName = nodeType.getName();
ClassTraversalDescriptor descriptor = descriptors.get(typeName);
if (descriptor == null) {
@@ -92,7 +92,7 @@
if (visitor.onStartNode(path)) {
ClassTraversalDescriptor descriptor = getDescriptor(node.getClass());
- Class[] childTypes = descriptor.getTraversableChildTypes();
+ Class<?>[] childTypes = descriptor.getTraversableChildTypes();
if (childTypes != null && childTypes.length > 0) {
for (int i = 0; i < childTypes.length; i++) {
@@ -106,7 +106,7 @@
continue;
}
else if (child instanceof Collection) {
- Collection children = (Collection) child;
+ Collection<?> children = (Collection<?>) child;
if (children != null && !children.isEmpty()) {
for (Object collectionChild : children) {
@@ -127,7 +127,7 @@
static class ClassTraversalDescriptor {
- Class[] traversableChildTypes;
+ Class<?>[] traversableChildTypes;
Method[] traversableGetters;
ClassTraversalDescriptor() {
@@ -138,7 +138,7 @@
this.traversableGetters = traversableChildGetters;
this.traversableChildTypes = new Class[traversableChildGetters.length];
for (int i = 0; i < traversableChildGetters.length; i++) {
- Class type = traversableChildGetters[i].getReturnType();
+ Class<?> type = traversableChildGetters[i].getReturnType();
if (Collection.class.isAssignableFrom(type)) {
type = traversableChildGetters[i]
.getAnnotation(TreeNodeChild.class)
@@ -156,7 +156,7 @@
}
}
- Class[] getTraversableChildTypes() {
+ Class<?>[] getTraversableChildTypes() {
return traversableChildTypes;
}
Modified: cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/util/TreeNodeChild.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/util/TreeNodeChild.java?rev=605993&r1=605992&r2=605993&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/util/TreeNodeChild.java (original)
+++ cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/util/TreeNodeChild.java Thu Dec 20 10:36:50 2007
@@ -33,5 +33,5 @@
@Retention(RetentionPolicy.RUNTIME)
public @interface TreeNodeChild {
- Class type() default void.class;
+ Class<?> type() default void.class;
}
Modified: cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/MockClassTransformer.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/MockClassTransformer.java?rev=605993&r1=605992&r2=605993&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/MockClassTransformer.java (original)
+++ cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/MockClassTransformer.java Thu Dec 20 10:36:50 2007
@@ -40,7 +40,7 @@
this.transformed = new ArrayList<String>();
}
- public Collection getTransformed() {
+ public Collection<String> getTransformed() {
return transformed;
}
Modified: cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/MockEntityManagerFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/MockEntityManagerFactory.java?rev=605993&r1=605992&r2=605993&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/MockEntityManagerFactory.java (original)
+++ cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/MockEntityManagerFactory.java Thu Dec 20 10:36:50 2007
@@ -29,14 +29,14 @@
public class MockEntityManagerFactory implements EntityManagerFactory {
protected String persistenceUnitName;
- protected Map properties;
+ protected Map<?, ?> properties;
protected PersistenceUnitInfo info;
public MockEntityManagerFactory() {
}
- public MockEntityManagerFactory(String persistenceUnitName, Map properties) {
+ public MockEntityManagerFactory(String persistenceUnitName, Map<?, ?> properties) {
this.persistenceUnitName = persistenceUnitName;
this.properties = properties;
}
@@ -50,6 +50,7 @@
return null;
}
+ @SuppressWarnings("unchecked")
public EntityManager createEntityManager(Map parameters) {
return null;
}
@@ -65,7 +66,7 @@
return persistenceUnitName;
}
- public Map getProperties() {
+ public Map<?, ?> getProperties() {
return properties;
}
Modified: cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/MockObjectContext.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/MockObjectContext.java?rev=605993&r1=605992&r2=605993&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/MockObjectContext.java (original)
+++ cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/MockObjectContext.java Thu Dec 20 10:36:50 2007
@@ -31,7 +31,6 @@
import org.apache.cayenne.map.EntityResolver;
import org.apache.cayenne.query.Query;
-
public class MockObjectContext implements ObjectContext {
public void commitChanges() {
@@ -43,7 +42,7 @@
public void deleteObject(Object object) throws DeleteDenyException {
}
- public Collection deletedObjects() {
+ public Collection<?> deletedObjects() {
return null;
}
@@ -63,15 +62,15 @@
return null;
}
- public Collection modifiedObjects() {
+ public Collection<?> modifiedObjects() {
return null;
}
- public Persistent newObject(Class persistentClass) {
+ public <T> T newObject(Class<T> persistentClass) {
return null;
}
- public Collection newObjects() {
+ public Collection<?> newObjects() {
return null;
}
@@ -79,7 +78,7 @@
return null;
}
- public List performQuery(Query query) {
+ public List<?> performQuery(Query query) {
return null;
}
@@ -105,7 +104,7 @@
public void rollbackChangesLocally() {
}
- public Collection uncommittedObjects() {
+ public Collection<?> uncommittedObjects() {
return null;
}
Modified: cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/MockPersistenceProvider.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/MockPersistenceProvider.java?rev=605993&r1=605992&r2=605993&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/MockPersistenceProvider.java (original)
+++ cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/MockPersistenceProvider.java Thu Dec 20 10:36:50 2007
@@ -25,7 +25,6 @@
import javax.persistence.spi.PersistenceProvider;
import javax.persistence.spi.PersistenceUnitInfo;
-
public class MockPersistenceProvider implements PersistenceProvider {
protected String unitName;
@@ -38,12 +37,14 @@
this.unitName = unitName;
}
+ @SuppressWarnings("unchecked")
public EntityManagerFactory createEntityManagerFactory(String emName, Map map) {
return unitName != null && unitName.equals(emName)
? new MockEntityManagerFactory(emName, map)
: null;
}
+ @SuppressWarnings("unchecked")
public EntityManagerFactory createContainerEntityManagerFactory(
PersistenceUnitInfo info,
Map map) {
Modified: cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/ResourceLocalEntityManagerFactoryTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/ResourceLocalEntityManagerFactoryTest.java?rev=605993&r1=605992&r2=605993&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/ResourceLocalEntityManagerFactoryTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/ResourceLocalEntityManagerFactoryTest.java Thu Dec 20 10:36:50 2007
@@ -52,7 +52,7 @@
}
try {
- f.createEntityManager(new HashMap());
+ f.createEntityManager(new HashMap<Object, Object>());
fail("Closed EntityManagerFactory is supposed to throw");
}
catch (IllegalStateException e) {
Modified: cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/bridge/DataMapConverterRelationshipsTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/bridge/DataMapConverterRelationshipsTest.java?rev=605993&r1=605992&r2=605993&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/bridge/DataMapConverterRelationshipsTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/bridge/DataMapConverterRelationshipsTest.java Thu Dec 20 10:36:50 2007
@@ -113,12 +113,12 @@
assertSame(dbr1, dbr2.getReverseRelationship());
}
- private DataMap load(Class... classes) {
+ private DataMap load(Class<?>... classes) {
EntityMapLoaderContext context = new EntityMapLoaderContext(
new MockPersistenceUnitInfo());
EntityMapAnnotationLoader loader = new EntityMapAnnotationLoader(context);
- for (Class c : classes) {
+ for (Class<?> c : classes) {
loader.loadClassMapping(c);
}
@@ -126,10 +126,6 @@
assertFalse("Found conflicts: " + context.getConflicts(), context
.getConflicts()
.hasFailures());
-
- // PrintWriter out = new PrintWriter(System.out);
- // context.getEntityMap().encodeAsXML(new XMLEncoder(out, "\t"));
- // out.flush();
DataMap dataMap = new DataMapConverter().toDataMap("n1", context);
assertFalse("Found DataMap conflicts: " + context.getConflicts(), context
Modified: cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/bridge/DataMapConverterTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/bridge/DataMapConverterTest.java?rev=605993&r1=605992&r2=605993&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/bridge/DataMapConverterTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/bridge/DataMapConverterTest.java Thu Dec 20 10:36:50 2007
@@ -79,9 +79,11 @@
listeners.getEntityListeners().add(l2);
DataMap cayenneMap = new DataMapConverter().toDataMap("n1", context);
- Collection entityListeners = cayenneMap.getDefaultEntityListeners();
+ Collection<EntityListener> entityListeners = cayenneMap
+ .getDefaultEntityListeners();
assertEquals(2, entityListeners.size());
- Collection defaultListeners = cayenneMap.getDefaultEntityListeners();
+ Collection<EntityListener> defaultListeners = cayenneMap
+ .getDefaultEntityListeners();
assertEquals(2, defaultListeners.size());
EntityListener cl1 = cayenneMap.getDefaultEntityListener("abc.C1");
@@ -153,7 +155,7 @@
ObjEntity entity = cayenneMap.getObjEntity("E1");
assertNotNull(entity);
- Collection entityListeners = entity.getEntityListeners();
+ Collection<EntityListener> entityListeners = entity.getEntityListeners();
assertEquals(2, entityListeners.size());
EntityListener cl1 = entity.getEntityListener("abc.C1");
Modified: cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/conf/MappingAssertion.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/conf/MappingAssertion.java?rev=605993&r1=605992&r2=605993&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/conf/MappingAssertion.java (original)
+++ cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/conf/MappingAssertion.java Thu Dec 20 10:36:50 2007
@@ -596,7 +596,7 @@
assertNotNull(a2.getCascade());
Collection<CascadeType> cascades = a2.getCascade().getCascades();
assertEquals(2, cascades.size());
- Iterator cascades1It = cascades.iterator();
+ Iterator<CascadeType> cascades1It = cascades.iterator();
assertSame(CascadeType.REMOVE, cascades1It.next());
assertSame(CascadeType.REFRESH, cascades1It.next());
@@ -610,7 +610,7 @@
assertEquals("mb2", a3.getMappedBy());
assertNotNull(a3.getCascade());
assertEquals(2, a3.getCascade().getCascades().size());
- Iterator cascades2It = a3.getCascade().getCascades().iterator();
+ Iterator<CascadeType> cascades2It = a3.getCascade().getCascades().iterator();
assertSame(CascadeType.PERSIST, cascades2It.next());
assertSame(CascadeType.MERGE, cascades2It.next());
Modified: cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/conf/MockAnnotatedBean3.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/conf/MockAnnotatedBean3.java?rev=605993&r1=605992&r2=605993&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/conf/MockAnnotatedBean3.java (original)
+++ cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/conf/MockAnnotatedBean3.java Thu Dec 20 10:36:50 2007
@@ -49,7 +49,7 @@
@OneToMany
// no collection type - must result in a failure
- protected Collection toBean2s2;
+ protected Collection<?> toBean2s2;
// date w/o Temporal annotation must resolve to TIMESTAMP
protected Date date;
Modified: cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/conf/UnitDescriptorParserTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/conf/UnitDescriptorParserTest.java?rev=605993&r1=605992&r2=605993&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/conf/UnitDescriptorParserTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/conf/UnitDescriptorParserTest.java Thu Dec 20 10:36:50 2007
@@ -43,7 +43,7 @@
.currentThread()
.getContextClassLoader()
.getResourceAsStream("xml-samples/persistence1.xml");
- Collection units = parser.getPersistenceUnits(new InputSource(in), root);
+ Collection<JpaUnit> units = parser.getPersistenceUnits(new InputSource(in), root);
assertEquals(1, units.size());
@@ -74,7 +74,7 @@
.currentThread()
.getContextClassLoader()
.getResourceAsStream("xml-samples/persistence-schema-headers.xml");
- Collection units = parser.getPersistenceUnits(new InputSource(in), root);
+ Collection<JpaUnit> units = parser.getPersistenceUnits(new InputSource(in), root);
assertEquals(1, units.size());
@@ -105,13 +105,13 @@
.currentThread()
.getContextClassLoader()
.getResourceAsStream("xml-samples/persistence2.xml");
- Collection units = parser.getPersistenceUnits(new InputSource(in), root);
+ Collection<JpaUnit> units = parser.getPersistenceUnits(new InputSource(in), root);
assertEquals(3, units.size());
- Iterator it = units.iterator();
+ Iterator<JpaUnit> it = units.iterator();
for (int i = 1; i <= 3; i++) {
- JpaUnit info = (JpaUnit) it.next();
+ JpaUnit info = it.next();
assertEquals("Unit" + i, info.getPersistenceUnitName());
assertEquals(root, info.getPersistenceUnitRootUrl());
@@ -131,11 +131,11 @@
.currentThread()
.getContextClassLoader()
.getResourceAsStream("xml-samples/persistence3.xml");
- Collection units = parser.getPersistenceUnits(new InputSource(in), root);
+ Collection<JpaUnit> units = parser.getPersistenceUnits(new InputSource(in), root);
assertEquals(1, units.size());
- JpaUnit info = (JpaUnit) units.iterator().next();
+ JpaUnit info = units.iterator().next();
assertEquals("OrderManagement4", info.getPersistenceUnitName());
assertEquals(PersistenceUnitTransactionType.RESOURCE_LOCAL, info
@@ -163,15 +163,15 @@
.currentThread()
.getContextClassLoader()
.getResourceAsStream("xml-samples/persistence-schema-headers.xml");
- Collection units = parser.getPersistenceUnits(new InputSource(in), root);
+ Collection<JpaUnit> units = parser.getPersistenceUnits(new InputSource(in), root);
assertEquals(1, units.size());
- JpaUnit info = (JpaUnit) units.iterator().next();
+ JpaUnit info = units.iterator().next();
assertEquals("OrderManagement", info.getPersistenceUnitName());
- // JTA is the default when type is ommitted
+ // JTA is the default when type is omitted
assertEquals(PersistenceUnitTransactionType.JTA, info.getTransactionType());
assertEquals(root, info.getPersistenceUnitRootUrl());
assertTrue(info.getDescription().startsWith("This unit manages orders"));
Modified: cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/map/EntityMapTraversalTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/map/EntityMapTraversalTest.java?rev=605993&r1=605992&r2=605993&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/map/EntityMapTraversalTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/map/EntityMapTraversalTest.java Thu Dec 20 10:36:50 2007
@@ -45,10 +45,10 @@
JpaId a2 = new JpaId();
e1.getAttributes().getIds().add(a2);
-
+
JpaColumn c1 = new JpaColumn();
a1.setColumn(c1);
-
+
JpaColumn c2 = new JpaColumn();
a2.setColumn(c2);
@@ -69,9 +69,9 @@
class TestVisitor implements HierarchicalTreeVisitor {
- protected Collection visitedNodes = new ArrayList();
+ protected Collection<Object> visitedNodes = new ArrayList<Object>();
- public HierarchicalTreeVisitor childVisitor(ProjectPath path, Class childType) {
+ public HierarchicalTreeVisitor childVisitor(ProjectPath path, Class<?> childType) {
return this;
}
Modified: cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/util/MockHierarchicalTreeVisitor.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/util/MockHierarchicalTreeVisitor.java?rev=605993&r1=605992&r2=605993&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/util/MockHierarchicalTreeVisitor.java (original)
+++ cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/util/MockHierarchicalTreeVisitor.java Thu Dec 20 10:36:50 2007
@@ -31,7 +31,7 @@
public void onFinishNode(ProjectPath path) {
}
- public HierarchicalTreeVisitor childVisitor(ProjectPath path, Class childType) {
+ public HierarchicalTreeVisitor childVisitor(ProjectPath path, Class<?> childType) {
return null;
}
}