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/10/13 04:57:16 UTC
svn commit: r824574 - in /openjpa/trunk: ./
openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/
openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/
openjpa-persistence-jdbc/src/test/java/o...
Author: ppoddar
Date: Tue Oct 13 02:57:15 2009
New Revision: 824574
URL: http://svn.apache.org/viewvc?rev=824574&view=rev
Log:
OPENJPA-1345: Missing files from TeamCity auto-commit
Added:
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaBuilderImpl.java
- copied, changed from r824467, openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaBuilder.java
Removed:
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaBuilder.java
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/JoinDomainTestCase.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestEmbeddableCriteria.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypeSafeCondExpression.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/BeneContact.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Book1.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent3.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestMappedById.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestMultipleLevelDerivedIdentity1.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/validation/TestValidationFactory.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerFactoryImpl.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/Expressions.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/OpenJPACriteriaBuilder.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/SubqueryImpl.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/Members.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/MetamodelImpl.java
openjpa/trunk/openjpa-persistence/src/main/resources/META-INF/services/org.apache.openjpa.kernel.exps.ExpressionParser
openjpa/trunk/pom.xml
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/JoinDomainTestCase.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/JoinDomainTestCase.java?rev=824574&r1=824573&r2=824574&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/JoinDomainTestCase.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/JoinDomainTestCase.java Tue Oct 13 02:57:15 2009
@@ -19,6 +19,7 @@
package org.apache.openjpa.persistence.criteria;
import javax.persistence.EntityManager;
+import javax.persistence.criteria.CriteriaBuilder;
import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
@@ -41,7 +42,7 @@
setDictionary();
}
em = getEntityManagerFactory().createEntityManager();
- cb = getEntityManagerFactory().getQueryBuilder();
+ cb = getEntityManagerFactory().getCriteriaBuilder();
}
protected OpenJPAEntityManagerFactorySPI getEntityManagerFactory() {
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestEmbeddableCriteria.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestEmbeddableCriteria.java?rev=824574&r1=824573&r2=824574&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestEmbeddableCriteria.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestEmbeddableCriteria.java Tue Oct 13 02:57:15 2009
@@ -385,7 +385,7 @@
Root<EntityA_Coll_Embed_ToOne> a = q.from(EntityA_Coll_Embed_ToOne.class);
Join<EntityA_Coll_Embed_ToOne, Embed_ToOne> e = a.join(EntityA_Coll_Embed_ToOne_.embed1s);
Predicate p1 = cb.like(e.get(Embed_ToOne_.name1), "%1");
- Predicate p2 = cb.isEmpty(a.get(EntityA_Coll_Embed_ToOne_.embed1s)).negate();
+ Predicate p2 = cb.isEmpty(a.get(EntityA_Coll_Embed_ToOne_.embed1s)).not();
Predicate p3 = cb.isNotNull(e.get(Embed_ToOne_.b));
q.where(cb.and(cb.and(p1, p2), p3));
q.orderBy(cb.asc(e));
@@ -497,7 +497,7 @@
Join<EntityA_Embed_ToMany, Embed_ToMany> e = a.join(EntityA_Embed_ToMany_.embed);
e.alias("e");
q.select(e);
- q.where(cb.isEmpty(e.get(Embed_ToMany_.bs)).negate());
+ q.where(cb.isEmpty(e.get(Embed_ToMany_.bs)).not());
q.orderBy(cb.asc(e));
assertEquivalence(q, jpql);
}
@@ -512,7 +512,7 @@
Subquery<EntityA_Embed_ToMany> sq = q.subquery(EntityA_Embed_ToMany.class);
Root<EntityA_Embed_ToMany> a1 = sq.from(EntityA_Embed_ToMany.class);
sq.select(a1);
- sq.where(cb.isEmpty(a1.get(EntityA_Embed_ToMany_.embed).get(Embed_ToMany_.bs)).negate());
+ sq.where(cb.isEmpty(a1.get(EntityA_Embed_ToMany_.embed).get(Embed_ToMany_.bs)).not());
q.where(cb.exists(sq));
q.orderBy(cb.asc(a));
assertEquivalence(q, jpql);
@@ -627,7 +627,7 @@
Expression<Embed_Embed_ToMany> e = a.get(EntityA_Embed_Embed_ToMany_.embed);
q.select(e);
q.where(cb.isEmpty(a.get(EntityA_Embed_Embed_ToMany_.embed).get(Embed_Embed_ToMany_.embed).
- get(Embed_ToMany_.bs)).negate());
+ get(Embed_ToMany_.bs)).not());
q.orderBy(cb.asc(e));
assertEquivalence(q, jpql);
}
@@ -729,7 +729,7 @@
join(Embed_Coll_Integer_.otherIntVals);
e.alias("e");
q.multiselect(e, a.get(EntityA_Embed_Coll_Integer_.embed).get(Embed_Coll_Integer_.intVal2));
- q.where(cb.isEmpty(a.get(EntityA_Embed_Coll_Integer_.embed).get(Embed_Coll_Integer_.otherIntVals)).negate());
+ q.where(cb.isEmpty(a.get(EntityA_Embed_Coll_Integer_.embed).get(Embed_Coll_Integer_.otherIntVals)).not());
q.orderBy(cb.asc(e));
assertEquivalence(q, jpql);
}
@@ -865,7 +865,7 @@
ListJoin<EntityA_Coll_Embed_Embed, Embed_Embed> e = a.join(EntityA_Coll_Embed_Embed_.embeds);
q.orderBy(cb.asc(e.get(Embed_Embed_.intVal3)));
q.multiselect(e, e.get(Embed_Embed_.intVal1), e.get(Embed_Embed_.embed).get(Embed_.intVal2));
- q.where(cb.isEmpty(a.get(EntityA_Coll_Embed_Embed_.embeds)).negate());
+ q.where(cb.isEmpty(a.get(EntityA_Coll_Embed_Embed_.embeds)).not());
assertEquivalence(q, jpql);
}
@@ -1249,7 +1249,7 @@
ListJoin<Embed_Coll_Embed, Embed> e = a.join(EntityA_Embed_Coll_Embed_.embed).join(Embed_Coll_Embed_.embeds);
q.orderBy(cb.asc(e));
q.multiselect(e, e.get(Embed_.intVal1), e.get(Embed_.intVal2));
- q.where(cb.isEmpty(a.get(EntityA_Embed_Coll_Embed_.embed).get(Embed_Coll_Embed_.embeds)).negate());
+ q.where(cb.isEmpty(a.get(EntityA_Embed_Coll_Embed_.embed).get(Embed_Coll_Embed_.embeds)).not());
assertEquivalence(q, jpql);
}
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypeSafeCondExpression.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypeSafeCondExpression.java?rev=824574&r1=824573&r2=824574&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypeSafeCondExpression.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypeSafeCondExpression.java Tue Oct 13 02:57:15 2009
@@ -80,7 +80,7 @@
CriteriaQuery<String> cq = cb.createQuery(String.class);
Root<CompUser> o = cq.from(CompUser.class);
- cq.where(cb.and(cb.between(o.get(CompUser_.age), 19, 40).negate(),
+ cq.where(cb.and(cb.between(o.get(CompUser_.age), 19, 40).not(),
cb.equal(o.get(CompUser_.computerName), "PC")));
cq.select(o.get(CompUser_.name));
@@ -104,7 +104,7 @@
CriteriaQuery<String> cq = cb.createQuery(String.class);
Root<CompUser> o = cq.from(CompUser.class);
cq.where(cb.in(o.get(CompUser_.age)).value(29).value(40).value(10)
- .negate());
+ .not());
cq.select(o.get(CompUser_.name));
assertEquivalence(cq, jpql);
@@ -118,7 +118,7 @@
Root<CompUser> o = cq.from(CompUser.class);
cq.where(cb.and(
cb.like(o.get(CompUser_.name),"Sha%"),
- cb.in(o.get(CompUser_.computerName)).value("PC").value("Laptop").negate()
+ cb.in(o.get(CompUser_.computerName)).value("PC").value("Laptop").not()
));
cq.select(o.get(CompUser_.computerName));
@@ -134,7 +134,7 @@
Root<CompUser> o = cq.from(CompUser.class);
cq.where(cb.and(
cb.like(o.get(CompUser_.name),"Sha%o_"),
- cb.in(o.get(CompUser_.computerName)).value("UNIX").value("DOS").negate()
+ cb.in(o.get(CompUser_.computerName)).value("UNIX").value("DOS").not()
));
cq.select(o.get(CompUser_.computerName));
@@ -196,7 +196,7 @@
CriteriaQuery<String> cq = cb.createQuery(String.class);
Root<CompUser> o = cq.from(CompUser.class);
cq.select(o.get(CompUser_.name));
- cq.where(cb.isEmpty(o.get(CompUser_.nicknames)).negate());
+ cq.where(cb.isEmpty(o.get(CompUser_.nicknames)).not());
assertEquivalence(cq, query);
}
@@ -512,7 +512,7 @@
Expression<Class<? extends CompUser>> etype = e.type();
// how to specify the following
q.multiselect(e.type());
- q.where(cb.equal(e.type(), param1).negate());
+ q.where(cb.equal(e.type(), param1).not());
assertEquivalence(q, query, new String[]{"t"}, new Class[]{MaleUser.class});
}
@@ -557,7 +557,7 @@
CriteriaQuery<CompUser> cq = cb.createQuery(CompUser.class);
Root<CompUser> e = cq.from(CompUser.class);
cq.where(cb.in(e.type()).value(MaleUser.class).value(FemaleUser.class)
- .negate());
+ .not());
assertEquivalence(cq, query);
}
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/BeneContact.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/BeneContact.java?rev=824574&r1=824573&r2=824574&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/BeneContact.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/BeneContact.java Tue Oct 13 02:57:15 2009
@@ -26,7 +26,7 @@
import javax.persistence.FetchType;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
-import javax.persistence.MappedById;
+import javax.persistence.MapsId;
import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
@@ -98,7 +98,7 @@
@ManyToOne(targetEntity=Beneficiary.class, fetch=FetchType.EAGER)
@JoinColumn(name="ID")
- @MappedById("beneficiaryPK")
+ @MapsId("beneficiaryPK")
public Beneficiary getBeneficiary() {
return beneficiary;
}
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Book1.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Book1.java?rev=824574&r1=824573&r2=824574&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Book1.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Book1.java Tue Oct 13 02:57:15 2009
@@ -27,7 +27,7 @@
import javax.persistence.EmbeddedId;
import javax.persistence.Entity;
import javax.persistence.ManyToOne;
-import javax.persistence.MappedById;
+import javax.persistence.MapsId;
import javax.persistence.OneToMany;
import org.apache.openjpa.persistence.jdbc.VersionColumn;
@@ -52,7 +52,7 @@
@OneToMany(cascade = CascadeType.ALL, mappedBy = "book")
private Set<Page1> pages = new HashSet<Page1>();
- @MappedById("library")
+ @MapsId("library")
@Column(nullable = false)
@ManyToOne
private Library1 library;
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent3.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent3.java?rev=824574&r1=824573&r2=824574&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent3.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent3.java Tue Oct 13 02:57:15 2009
@@ -26,10 +26,10 @@
@EmbeddedId
DependentId3 id;
- @MappedById("empPK")
+ @MapsId("empPK")
@ManyToOne Employee3 emp;
- @MappedById("parentPK")
+ @MapsId("parentPK")
@OneToOne Parent3 parent;
public Employee3 getEmp() {
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestMappedById.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestMappedById.java?rev=824574&r1=824573&r2=824574&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestMappedById.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestMappedById.java Tue Oct 13 02:57:15 2009
@@ -93,7 +93,7 @@
/**
* This is spec 2.4.1.2 Example 1, case(b)
*/
- public void testMappedById1() {
+ public void testMapsId1() {
createObj1();
findObj1();
queryObj1();
@@ -102,7 +102,7 @@
/**
* This is spec 2.4.1.2 Example 3, case(b)
*/
- public void testMappedById2() {
+ public void testMapsId2() {
createObj2();
findObj2();
queryObj2();
@@ -111,7 +111,7 @@
/**
* This is spec 2.4.1.2 Example 5, case(b)
*/
- public void testMappedById3() {
+ public void testMapsId3() {
createObj3();
findObj3();
queryObj3();
@@ -120,7 +120,7 @@
/**
* This is a variation of spec 2.4.1.2 Example 4, case(b) with generated key
*/
- public void testMappedById4() {
+ public void testMapsId4() {
// Not all databases support GenerationType.IDENTITY column(s)
if (!((JDBCConfiguration) emf.getConfiguration()).
getDBDictionaryInstance().supportsAutoAssign) {
@@ -132,10 +132,10 @@
/**
* This is a variation of spec 2.4.1.2 Example 1, case(b):
- * two MappedById annotations in Dependent3 and both parent
+ * two MapsId annotations in Dependent3 and both parent
* classes use generated key
*/
- public void testMappedById5() {
+ public void testMapsId5() {
// Not all databases support GenerationType.IDENTITY column(s)
if (!((JDBCConfiguration) emf.getConfiguration()).
getDBDictionaryInstance().supportsAutoAssign) {
@@ -149,7 +149,7 @@
/**
* This is spec 2.4.1.2 Example 5, case(a)
*/
- public void testMappedById6() {
+ public void testMapsId6() {
createObj6();
findObj6();
queryObj6();
@@ -158,7 +158,7 @@
/**
* This is spec 2.4.1.2 Example 6, case(a)
*/
- public void testMappedById7() {
+ public void testMapsId7() {
createObj7();
findObj7();
queryObj7();
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestMultipleLevelDerivedIdentity1.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestMultipleLevelDerivedIdentity1.java?rev=824574&r1=824573&r2=824574&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestMultipleLevelDerivedIdentity1.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestMultipleLevelDerivedIdentity1.java Tue Oct 13 02:57:15 2009
@@ -27,7 +27,7 @@
/**
* This is a variation of TestMultipleLevelDerivedIdentity Using
- * MappedById annotations.
+ * MapsId annotations.
* @author Fay Wang
*
*/
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/validation/TestValidationFactory.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/validation/TestValidationFactory.java?rev=824574&r1=824573&r2=824574&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/validation/TestValidationFactory.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/validation/TestValidationFactory.java Tue Oct 13 02:57:15 2009
@@ -16,7 +16,7 @@
import java.util.HashMap;
import java.util.Map;
-import javax.persistence.spi.ValidationMode;
+import javax.persistence.ValidationMode;
import org.apache.openjpa.conf.OpenJPAConfiguration;
import org.apache.openjpa.lib.log.Log;
Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerFactoryImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerFactoryImpl.java?rev=824574&r1=824573&r2=824574&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerFactoryImpl.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerFactoryImpl.java Tue Oct 13 02:57:15 2009
@@ -41,7 +41,8 @@
import org.apache.openjpa.lib.conf.Value;
import org.apache.openjpa.lib.util.Closeable;
import org.apache.openjpa.lib.util.Localizer;
-import org.apache.openjpa.persistence.criteria.CriteriaBuilder;
+import org.apache.openjpa.persistence.criteria.CriteriaBuilderImpl;
+import org.apache.openjpa.persistence.criteria.OpenJPACriteriaBuilder;
import org.apache.openjpa.persistence.meta.MetamodelImpl;
import org.apache.openjpa.persistence.query.OpenJPAQueryBuilder;
import org.apache.openjpa.persistence.query.QueryBuilderImpl;
@@ -292,8 +293,8 @@
return getStoreCache();
}
- public CriteriaBuilder getQueryBuilder() {
- return new CriteriaBuilder().setMetaModel(getMetamodel());
+ public OpenJPACriteriaBuilder getCriteriaBuilder() {
+ return new CriteriaBuilderImpl().setMetaModel(getMetamodel());
}
public OpenJPAQueryBuilder getDynamicQueryBuilder() {
Copied: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaBuilderImpl.java (from r824467, openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaBuilder.java)
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaBuilderImpl.java?p2=openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaBuilderImpl.java&p1=openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaBuilder.java&r1=824467&r2=824574&rev=824574&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaBuilder.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaBuilderImpl.java Tue Oct 13 02:57:15 2009
@@ -30,6 +30,7 @@
import javax.persistence.Tuple;
import javax.persistence.criteria.CompoundSelection;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Expression;
import javax.persistence.criteria.From;
@@ -62,12 +63,11 @@
*
*/
@SuppressWarnings("serial")
-public class CriteriaBuilder implements OpenJPACriteriaBuilder, ExpressionParser {
- public static final String LANG_CRITERIA = "javax.persistence.criteria";
+public class CriteriaBuilderImpl implements OpenJPACriteriaBuilder, ExpressionParser {
private MetamodelImpl _model;
- public CriteriaBuilder setMetaModel(MetamodelImpl model) {
+ public OpenJPACriteriaBuilder setMetaModel(MetamodelImpl model) {
_model = model;
return this;
}
@@ -148,15 +148,13 @@
return new Expressions.Avg(x);
}
- public <Y extends Comparable<Y>> Predicate between(
- Expression<? extends Y> v, Expression<? extends Y> x,
+ public <Y extends Comparable<? super Y>> Predicate between(Expression<? extends Y> v, Expression<? extends Y> x,
Expression<? extends Y> y) {
- return new Expressions.Between<Y>(v, x, y);
+ return new Expressions.Between(v,x,y);
}
- public <Y extends Comparable<Y>> Predicate between(
- Expression<? extends Y> v, Y x, Y y) {
- return new Expressions.Between<Y>(v,x,y);
+ public <Y extends Comparable<? super Y>> Predicate between(Expression<? extends Y> v, Y x, Y y) {
+ return new Expressions.Between(v,x,y);
}
public <T> Coalesce<T> coalesce() {
@@ -195,7 +193,7 @@
return new Expressions.Count(x, true);
}
- public CriteriaQuery<Object> createQuery() {
+ public OpenJPACriteriaQuery<Object> createQuery() {
return new CriteriaQueryImpl<Object>(_model, Object.class);
}
@@ -264,27 +262,27 @@
return new Expressions.GreaterThanEqual(x,y);
}
- public <Y extends Comparable<Y>> Predicate greaterThan(
+ public <Y extends Comparable<? super Y>> Predicate greaterThan(
Expression<? extends Y> x, Expression<? extends Y> y) {
return new Expressions.GreaterThan(x,y);
}
- public <Y extends Comparable<Y>> Predicate greaterThan(
+ public <Y extends Comparable<? super Y>> Predicate greaterThan(
Expression<? extends Y> x, Y y) {
return new Expressions.GreaterThan(x, y);
}
- public <Y extends Comparable<Y>> Predicate greaterThanOrEqualTo(
+ public <Y extends Comparable<? super Y>> Predicate greaterThanOrEqualTo(
Expression<? extends Y> x, Expression<? extends Y> y) {
return new Expressions.GreaterThanEqual(x,y);
}
- public <Y extends Comparable<Y>> Predicate greaterThanOrEqualTo(
+ public <Y extends Comparable<? super Y>> Predicate greaterThanOrEqualTo(
Expression<? extends Y> x, Y y) {
return new Expressions.GreaterThanEqual(x,y);
}
- public <X extends Comparable<X>> Expression<X> greatest(Expression<X> x) {
+ public <X extends Comparable<? super X>> Expression<X> greatest(Expression<X> x) {
return new Expressions.Max<X>(x);
}
@@ -322,11 +320,11 @@
}
public <E, C extends Collection<E>> Predicate isNotMember(E e, Expression<C> c) {
- return isMember(e, c).negate();
+ return isMember(e, c).not();
}
public <E, C extends Collection<E>> Predicate isNotMember(Expression<E> e, Expression<C> c) {
- return isMember(e, c).negate();
+ return isMember(e, c).not();
}
public Predicate isTrue(Expression<Boolean> x) {
@@ -345,7 +343,7 @@
return new Expressions.LessThanEqual(x,y);
}
- public <X extends Comparable<X>> Expression<X> least(Expression<X> x) {
+ public <X extends Comparable<? super X>> Expression<X> least(Expression<X> x) {
return new Expressions.Min<X>(x);
}
@@ -354,20 +352,21 @@
}
- public <Y extends Comparable<Y>> Predicate lessThan(Expression<? extends Y> x, Expression<? extends Y> y) {
+ public <Y extends Comparable<? super Y>> Predicate lessThan(Expression<? extends Y> x, Expression<? extends Y> y) {
return new Expressions.LessThan(x,y);
}
- public <Y extends Comparable<Y>> Predicate lessThan(Expression<? extends Y> x, Y y) {
+ public <Y extends Comparable<? super Y>> Predicate lessThan(Expression<? extends Y> x, Y y) {
return new Expressions.LessThan(x,y);
}
- public <Y extends Comparable<Y>> Predicate lessThanOrEqualTo(Expression<? extends Y> x, Expression<? extends Y> y) {
+ public <Y extends Comparable<? super Y>> Predicate lessThanOrEqualTo(Expression<? extends Y> x,
+ Expression<? extends Y> y) {
return new Expressions.LessThanEqual(x,y);
}
- public <Y extends Comparable<Y>> Predicate lessThanOrEqualTo(Expression<? extends Y> x, Y y) {
+ public <Y extends Comparable<? super Y>> Predicate lessThanOrEqualTo(Expression<? extends Y> x, Y y) {
return new Expressions.LessThanEqual(x,y);
}
@@ -460,7 +459,7 @@
}
public Predicate not(Expression<Boolean> restriction) {
- return ((Predicate)restriction).negate();
+ return ((Predicate)restriction).not();
}
public Predicate notEqual(Expression<?> x, Expression<?> y) {
@@ -472,27 +471,27 @@
}
public Predicate notLike(Expression<String> x, Expression<String> pattern) {
- return like(x, pattern).negate();
+ return like(x, pattern).not();
}
public Predicate notLike(Expression<String> x, String pattern) {
- return like(x, pattern).negate();
+ return like(x, pattern).not();
}
public Predicate notLike(Expression<String> x, Expression<String> pattern, Expression<Character> escapeChar) {
- return like(x, pattern, escapeChar).negate();
+ return like(x, pattern, escapeChar).not();
}
public Predicate notLike(Expression<String> x, Expression<String> pattern, char escapeChar) {
- return like(x, pattern, escapeChar).negate();
+ return like(x, pattern, escapeChar).not();
}
public Predicate notLike(Expression<String> x, String pattern, Expression<Character> escapeChar) {
- return like(x, pattern, escapeChar).negate();
+ return like(x, pattern, escapeChar).not();
}
public Predicate notLike(Expression<String> x, String pattern, char escapeChar) {
- return like(x, pattern, escapeChar).negate();
+ return like(x, pattern, escapeChar).not();
}
public <Y> Expression<Y> nullif(Expression<Y> x, Expression<?> y) {
@@ -618,6 +617,14 @@
public <N extends Number> Expression<N> sum(N x, Expression<? extends N> y) {
return new Expressions.Sum<N>(x,y);
}
+
+ public Expression<Long> sumAsLong(Expression<Integer> x) {
+ return sum(x).as(Long.class);
+ }
+
+ public Expression<Double> sumAsDouble(Expression<Float> x) {
+ return sum(x).as(Double.class);
+ }
public Expression<BigDecimal> toBigDecimal(Expression<? extends Number> number) {
return new Expressions.Cast<BigDecimal>(number, BigDecimal.class);
@@ -735,9 +742,8 @@
throw new NullPointerException();
if (example == null) {
return from.isNull();
-
}
- ManagedType<T> type = (ManagedType<T>)_model.type(example.getClass());
+ ManagedType<T> type = (ManagedType<T>)_model.managedType(example.getClass());
return new CompareByExample<T>(this, type, from, example,
style == null ? qbeStyle() : style, excludes);
}
Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/Expressions.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/Expressions.java?rev=824574&r1=824573&r2=824574&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/Expressions.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/Expressions.java Tue Oct 13 02:57:15 2009
@@ -29,9 +29,9 @@
import javax.persistence.criteria.Expression;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.QueryBuilder;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Subquery;
-import javax.persistence.criteria.QueryBuilder.Trimspec;
+import javax.persistence.criteria.CriteriaBuilder.Trimspec;
import org.apache.openjpa.kernel.exps.ExpressionFactory;
import org.apache.openjpa.kernel.exps.Literal;
@@ -822,7 +822,7 @@
}
@Override
- public PredicateImpl negate() {
+ public PredicateImpl not() {
return new NotEqual(e1, e2).markNegated();
}
@@ -850,7 +850,7 @@
}
@Override
- public PredicateImpl negate() {
+ public PredicateImpl not() {
return new Equal(e1, e2).markNegated();
}
@@ -878,7 +878,7 @@
}
@Override
- public PredicateImpl negate() {
+ public PredicateImpl not() {
return new LessThanEqual(e1, e2).markNegated();
}
@@ -906,7 +906,7 @@
}
@Override
- public PredicateImpl negate() {
+ public PredicateImpl not() {
return new LessThan(e1, e2).markNegated();
}
@@ -934,7 +934,7 @@
}
@Override
- public PredicateImpl negate() {
+ public PredicateImpl not() {
return new GreaterThanEqual(e1, e2).markNegated();
}
@@ -962,7 +962,7 @@
}
@Override
- public PredicateImpl negate() {
+ public PredicateImpl not() {
return new GreaterThan(e1, e2).markNegated();
}
@@ -1082,7 +1082,7 @@
}
@Override
- public PredicateImpl negate() {
+ public PredicateImpl not() {
return new IsNotEmpty(collection).markNegated();
}
@@ -1116,7 +1116,7 @@
}
@Override
- public PredicateImpl negate() {
+ public PredicateImpl not() {
return new IsEmpty(collection).markNegated();
}
@@ -1256,7 +1256,7 @@
}
}
- public static class Coalesce<T> extends ExpressionImpl<T> implements QueryBuilder.Coalesce<T> {
+ public static class Coalesce<T> extends ExpressionImpl<T> implements CriteriaBuilder.Coalesce<T> {
private final List<Expression<? extends T>> values = new ArrayList<Expression<? extends T>>();
public Coalesce(Class<T> cls) {
@@ -1334,7 +1334,7 @@
}
@Override
- public PredicateImpl negate() {
+ public PredicateImpl not() {
return new IsNotNull(e).markNegated();
}
@@ -1365,7 +1365,7 @@
}
@Override
- public PredicateImpl negate() {
+ public PredicateImpl not() {
return new IsNull(e).markNegated();
}
@@ -1389,7 +1389,7 @@
}
- public static class In<T> extends PredicateImpl.Or implements QueryBuilder.In<T> {
+ public static class In<T> extends PredicateImpl.Or implements CriteriaBuilder.In<T> {
final ExpressionImpl<T> e;
public In(Expression<?> e) {
super();
@@ -1411,7 +1411,7 @@
}
@Override
- public PredicateImpl negate() {
+ public PredicateImpl not() {
In<T> notIn = new In<T>(e);
notIn.markNegated();
for (Predicate e : _exps) {
@@ -1463,7 +1463,7 @@
}
}
- public static class Case<T> extends ExpressionImpl<T> implements QueryBuilder.Case<T> {
+ public static class Case<T> extends ExpressionImpl<T> implements CriteriaBuilder.Case<T> {
private final List<Expression<? extends T>> thens = new ArrayList<Expression<? extends T>>();
private final List<Expression<Boolean>> whens = new ArrayList<Expression<Boolean>>();
private Expression<? extends T> otherwise;
@@ -1529,7 +1529,7 @@
}
}
- public static class SimpleCase<C,R> extends ExpressionImpl<R> implements QueryBuilder.SimpleCase<C,R> {
+ public static class SimpleCase<C,R> extends ExpressionImpl<R> implements CriteriaBuilder.SimpleCase<C,R> {
private final List<Expression<? extends R>> thens = new ArrayList<Expression<? extends R>>();
private final List<Expression<C>> whens = new ArrayList<Expression<C>>();
private Expression<? extends R> otherwise;
Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/OpenJPACriteriaBuilder.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/OpenJPACriteriaBuilder.java?rev=824574&r1=824573&r2=824574&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/OpenJPACriteriaBuilder.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/OpenJPACriteriaBuilder.java Tue Oct 13 02:57:15 2009
@@ -18,9 +18,11 @@
*/
package org.apache.openjpa.persistence.criteria;
+import javax.persistence.Tuple;
+import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.QueryBuilder;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.metamodel.Attribute;
import javax.persistence.metamodel.Metamodel;
@@ -31,7 +33,12 @@
* @author Pinaki Poddar
* @since 2.0.0
*/
-public interface OpenJPACriteriaBuilder extends QueryBuilder {
+public interface OpenJPACriteriaBuilder extends CriteriaBuilder {
+ /**
+ * The mnemonic to identify the query language.
+ */
+ public static final String LANG_CRITERIA = "javax.persistence.criteria";
+
/**
* Create a predicate based upon the attribute values of a given
* "example" entity instance. The predicate is the conjunction
@@ -81,5 +88,27 @@
* Gets the metamodel for the managed, persistent domain entities.
*/
public Metamodel getMetamodel();
+
+ /**
+ * Create a <code>CriteriaQuery</code> object.
+ * @return criteria query object
+ */
+ OpenJPACriteriaQuery<Object> createQuery();
+
+ /**
+ * Create a <code>CriteriaQuery</code> object with the specified result
+ * type.
+ * @param resultClass type of the query result
+ * @return criteria query object
+ */
+ <T> OpenJPACriteriaQuery<T> createQuery(Class<T> resultClass);
+
+ /**
+ * Create a <code>CriteriaQuery</code> object that returns a tuple of
+ * objects as its result.
+ * @return criteria query object
+ */
+ OpenJPACriteriaQuery<Tuple> createTupleQuery();
+
}
Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/SubqueryImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/SubqueryImpl.java?rev=824574&r1=824573&r2=824574&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/SubqueryImpl.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/SubqueryImpl.java Tue Oct 13 02:57:15 2009
@@ -67,7 +67,6 @@
private final AbstractQuery<?> _parent;
private final CriteriaQueryImpl<T> _delegate;
private final MetamodelImpl _model;
- private java.util.Set<Join<?,?>> _joins;
private org.apache.openjpa.kernel.exps.Subquery _subq;
private List<Join<?,?>> _corrJoins = null;
@@ -291,10 +290,6 @@
return join;
}
- public java.util.Set<Join<?, ?>> getJoins() {
- return _joins;
- }
-
org.apache.openjpa.kernel.exps.Subquery getSubQ() {
return _subq;
}
Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/Members.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/Members.java?rev=824574&r1=824573&r2=824574&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/Members.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/Members.java Tue Oct 13 02:57:15 2009
@@ -73,7 +73,7 @@
* Returns the managed type which declared this attribute.
*/
public final ManagedType<X> getDeclaringType() {
- return owner.model.type(fmd.getDeclaringType());
+ return owner.model.managedType(fmd.getDeclaringType());
}
/**
Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/MetamodelImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/MetamodelImpl.java?rev=824574&r1=824573&r2=824574&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/MetamodelImpl.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/MetamodelImpl.java Tue Oct 13 02:57:15 2009
@@ -161,7 +161,7 @@
* @return the metamodel managed type
* @throws IllegalArgumentException if not a managed class
*/
- public <X> ManagedType<X> type(Class<X> clazz) {
+ public <X> ManagedType<X> managedType(Class<X> clazz) {
if (_entities.containsKey(clazz))
return (EntityType<X>) _entities.get(clazz);
if (_embeddables.containsKey(clazz))
@@ -183,7 +183,7 @@
*/
public <X> Type<X> getType(Class<X> cls) {
try {
- return type(cls);
+ return managedType(cls);
} catch (IllegalArgumentException ex) {
if (_basics.containsKey(cls))
return (Type<X>)_basics.get(cls);
Modified: openjpa/trunk/openjpa-persistence/src/main/resources/META-INF/services/org.apache.openjpa.kernel.exps.ExpressionParser
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/resources/META-INF/services/org.apache.openjpa.kernel.exps.ExpressionParser?rev=824574&r1=824573&r2=824574&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/resources/META-INF/services/org.apache.openjpa.kernel.exps.ExpressionParser (original)
+++ openjpa/trunk/openjpa-persistence/src/main/resources/META-INF/services/org.apache.openjpa.kernel.exps.ExpressionParser Tue Oct 13 02:57:15 2009
@@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-org.apache.openjpa.persistence.criteria.CriteriaBuilder
+org.apache.openjpa.persistence.criteria.CriteriaBuilderImpl
Modified: openjpa/trunk/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/pom.xml?rev=824574&r1=824573&r2=824574&view=diff
==============================================================================
--- openjpa/trunk/pom.xml (original)
+++ openjpa/trunk/pom.xml Tue Oct 13 02:57:15 2009
@@ -502,7 +502,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.0_spec</artifactId>
- <version>1.0-PFD2</version>
+ <version>1.0-EA9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>