You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by pp...@apache.org on 2009/09/02 08:17:27 UTC
svn commit: r810366 - in
/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence:
ParameterImpl.java criteria/ParameterExpressionImpl.java
meta/AbstractManagedType.java
Author: ppoddar
Date: Wed Sep 2 06:17:27 2009
New Revision: 810366
URL: http://svn.apache.org/viewvc?rev=810366&view=rev
Log:
OPENJPA-1275: Align with JPA 2.0 Public Draft Version 2
Modified:
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ParameterImpl.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/ParameterExpressionImpl.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/AbstractManagedType.java
Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ParameterImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ParameterImpl.java?rev=810366&r1=810365&r2=810366&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ParameterImpl.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ParameterImpl.java Wed Sep 2 06:17:27 2009
@@ -72,7 +72,7 @@
return _position;
}
- public Class<T> getJavaType() {
+ public Class<T> getParameterType() {
return _expectedValueType;
}
@@ -95,7 +95,7 @@
public String toString() {
StringBuilder buf = new StringBuilder("Parameter");
- buf.append("<" + getJavaType().getSimpleName() + ">");
+ buf.append("<" + getParameterType().getSimpleName() + ">");
if (_name != null) {
buf.append("('" + _name + "')");
} else if (_position != null) {
Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/ParameterExpressionImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/ParameterExpressionImpl.java?rev=810366&r1=810365&r2=810366&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/ParameterExpressionImpl.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/ParameterExpressionImpl.java Wed Sep 2 06:17:27 2009
@@ -101,4 +101,8 @@
public StringBuilder asValue(CriteriaQueryImpl<?> q) {
return Expressions.asValue(q, ":", _name == null ? "param" : _name);
}
+
+ public Class<T> getParameterType() {
+ return getJavaType();
+ }
}
Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/AbstractManagedType.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/AbstractManagedType.java?rev=810366&r1=810365&r2=810366&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/AbstractManagedType.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/AbstractManagedType.java Wed Sep 2 06:17:27 2009
@@ -290,7 +290,7 @@
* Returns all collection-valued attributes of the managed type.
*
*/
- public java.util.Set<PluralAttribute<? super X, ?, ?>> getCollections() {
+ public java.util.Set<PluralAttribute<? super X, ?, ?>> getPluralAttributes() {
return filter(attrs, new HashSet<PluralAttribute<? super X, ?, ?>>(),
pluralAttributeFilter);
}
@@ -299,7 +299,7 @@
* Return all collection-valued attributes declared by the managed type.
*
*/
- public java.util.Set<PluralAttribute<X, ?, ?>> getDeclaredCollections() {
+ public java.util.Set<PluralAttribute<X, ?, ?>> getDeclaredPluralAttributes() {
return filter(attrs, new HashSet<PluralAttribute<X, ?, ?>>(),
declaredAttributeFilter,
pluralAttributeFilter);