Author: mikedd
Date: Wed Jul 8 21:20:32 2009
New Revision: 792326
URL: http://svn.apache.org/viewvc?rev=792326&view=rev
Log:
OPENJPA-1167. Updating to EA4 version of the JPA specification from Geronimo.
Adding stub methods for compilation purposes. Some additional refactoring may
be needed (desired).
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingParser.java
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingParser.java
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingSerializer.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestMetaModelTypesafeCriteria.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypesafeCriteria.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Owner.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/TestOrderColumn.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/jdbc/order/order-orm-3.xml
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaBuilder.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaQueryImpl.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/FetchPathImpl.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/Joins.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/NewInstanceSelection.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/ParameterImpl.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/PathImpl.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/PredicateImpl.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/SelectionImpl.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/SubqueryImpl.java
openjpa/trunk/pom.xml
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingParser.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingParser.java?rev=792326&r1=792325&r2=792326&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingParser.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingParser.java
Wed Jul 8 21:20:32 2009
@@ -1895,14 +1895,6 @@
*/
private void parseJavaxOrderColumn(FieldMapping fm,
javax.persistence.OrderColumn order) {
- // If a table name is specified on the annotation and a table
- // name has not been defined, set the table name to the name
- // specified. This will be the name of the join table or
- // collection table.
- if (!StringUtils.isEmpty(order.table()) &&
- StringUtils.isEmpty(fm.getMappingInfo().getTableName())) {
- fm.getMappingInfo().setTableName(order.table());
- }
Column col = new Column();
if (!StringUtils.isEmpty(order.name()))
@@ -1912,8 +1904,6 @@
col.setNotNull(!order.nullable());
col.setFlag(Column.FLAG_UNINSERTABLE, !order.insertable());
col.setFlag(Column.FLAG_UNUPDATABLE, !order.updatable());
- if (!StringUtils.isEmpty(order.table()))
- col.setTableName(order.table());
fm.getMappingInfo().setOrderColumn(col);
}
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingParser.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingParser.java?rev=792326&r1=792325&r2=792326&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingParser.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingParser.java
Wed Jul 8 21:20:32 2009
@@ -1213,14 +1213,6 @@
FieldMapping fm = (FieldMapping)obj;
fm.getMappingInfo().setOrderColumn(col);
- // If a table name is specified on the element and a table
- // name has not been defined, set the table name to the name
- // specified. This will be the name of the join table or
- // collection table.
- if (!StringUtils.isEmpty(col.getTableName()) &&
- StringUtils.isEmpty(fm.getMappingInfo().getTableName())) {
- fm.getMappingInfo().setTableName(col.getTableName());
- }
}
return true;
}
@@ -1256,10 +1248,6 @@
if (val != null)
col.setFlag(Column.FLAG_UNUPDATABLE, "false".equals(val));
- val = attrs.getValue("table");
- if (val != null) {
- col.setTableName(val);
- }
return col;
}
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingSerializer.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingSerializer.java?rev=792326&r1=792325&r2=792326&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingSerializer.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingSerializer.java
Wed Jul 8 21:20:32 2009
@@ -457,8 +457,6 @@
addAttribute("updatable", "false");
if (orderCol.getTypeName() != null)
addAttribute("column-definition", orderCol.getTypeName());
- if (orderCol.getTableName() != null)
- addAttribute("table", orderCol.getTableName());
startElement("order-column");
endElement("order-column");
}
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestMetaModelTypesafeCriteria.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestMetaModelTypesafeCriteria.java?rev=792326&r1=792325&r2=792326&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestMetaModelTypesafeCriteria.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestMetaModelTypesafeCriteria.java
Wed Jul 8 21:20:32 2009
@@ -225,7 +225,7 @@
Join<Customer, Order> o = c.join(customer_.getSet("orders",
Order.class));
Join<Customer, Address> a =
c.join(customer_.getSingularAttribute("address", Address.class));
Expression<Double> taxedCost =
cb.prod(o.get(order_.getSingularAttribute("totalCost", Double.class)), 1.08);
- taxedCost.setAlias("taxedCost");
+ taxedCost.alias("taxedCost");
q.where(cb.equal(a.get(address_.getSingularAttribute("state",
String.class)), "CA"),
cb.equal(a.get(address_.getSingularAttribute("county",
String.class)), "Santa Clara"));
q.multiselect(o.get(order_.getSingularAttribute("quantity",
Integer.class)),
@@ -552,7 +552,7 @@
Join<Customer, Order> o = c.join(customer_.getSet("orders",
Order.class));
Join<Customer, Address> a =
c.join(customer_.getSingularAttribute("address", Address.class));
Expression<Double> taxedCost =
cb.prod(o.get(order_.getSingularAttribute("totalCost", Double.class)), 1.08);
- taxedCost.setAlias("taxedCost");
+ taxedCost.alias("taxedCost");
q.where(cb.equal(a.get(address_.getSingularAttribute("state",
String.class)), "CA"),
cb.equal(a.get(address_.getSingularAttribute("county",
String.class)), "Santa Clara"));
q.orderBy(cb.asc(o.get(order_.getSingularAttribute("quantity",
Integer.class))),
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypesafeCriteria.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypesafeCriteria.java?rev=792326&r1=792325&r2=792326&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypesafeCriteria.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypesafeCriteria.java
Wed Jul 8 21:20:32 2009
@@ -774,7 +774,7 @@
Join<Customer, Order> o = c.join(Customer_.orders);
Join<Customer, Address> a = c.join(Customer_.address);
Expression<Double> taxedCost = cb.prod(o.get(Order_.totalCost), 1.08);
- taxedCost.setAlias("taxedCost");
+ taxedCost.alias("taxedCost");
q.where(cb.equal(a.get(Address_.state), "CA"),
cb.equal(a.get(Address_.county), "Santa Clara"));
q.orderBy(cb.asc(o.get(Order_.quantity)),
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Owner.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Owner.java?rev=792326&r1=792325&r2=792326&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Owner.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Owner.java
Wed Jul 8 21:20:32 2009
@@ -21,10 +21,12 @@
import java.util.Collection;
import javax.persistence.CascadeType;
+import javax.persistence.CollectionTable;
import javax.persistence.ElementCollection;
import javax.persistence.Entity;
import javax.persistence.Inheritance;
import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
import javax.persistence.ManyToMany;
import javax.persistence.OneToMany;
import javax.persistence.OrderColumn;
@@ -39,25 +41,28 @@
// bidirectional one-to-many w/ default join column
@OneToMany(mappedBy="owner", cascade=CascadeType.ALL)
- @OrderColumn(name="car_o2m_order", table="car_o2m_table")
+ @JoinTable(name="car_o2m_table")
+ @OrderColumn(name="car_o2m_order")
private Collection<Car> cars;
// unidirectional one-to-many w/ join column
@OneToMany(cascade=CascadeType.ALL)
- @OrderColumn(table="home_o2m_table")
+ @JoinTable(name="home_o2m_table")
+ @OrderColumn
private Collection<Home> homes;
@ManyToMany(cascade=CascadeType.ALL)
- @OrderColumn(table="widget_m2m_table")
+ @JoinTable(name="widget_m2m_table")
+ @OrderColumn
private Collection<Widget> widgets;
// element collection
@ElementCollection
- @OrderColumn(name="bike_coll_order", table="bike_table")
+ @CollectionTable(name="bike_table")
+ @OrderColumn(name="bike_coll_order")
private Collection<Bicycle> bikeColl;
-
-
+
public void setCars(Collection<Car> cars) {
this.cars = cars;
}
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/TestOrderColumn.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/TestOrderColumn.java?rev=792326&r1=792325&r2=792326&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/TestOrderColumn.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/TestOrderColumn.java
Wed Jul 8 21:20:32 2009
@@ -740,9 +740,8 @@
}
/*
- * Validates the use of the table attribute on OrderColumn with
- * o2o, o2m, m2m, and collection table - with and without join
- * tables.
+ * Validates the use of the OrderColumn with o2o, o2m, m2m relationships
+ * and collection table - with and without join tables.
*/
public void testOrderColumnTable() {
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/jdbc/order/order-orm-3.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/jdbc/order/order-orm-3.xml?rev=792326&r1=792325&r2=792326&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/jdbc/order/order-orm-3.xml
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/jdbc/order/order-orm-3.xml
Wed Jul 8 21:20:32 2009
@@ -40,22 +40,25 @@
<id name="id">
<generated-value/>
</id>
- <one-to-many name="one2Melems">
- <order-column name="one2MOrder" table="xml_o2m_table" />
+ <one-to-many name="one2Melems">
+ <order-column name="one2MOrder" />
+ <join-table name="xml_o2m_table"/>
<cascade>
<cascade-all/>
</cascade>
</one-to-many>
<many-to-many name="m2melems">
- <order-column name="m2morder" table="xml_m2m_table" />
+ <order-column name="m2morder" />
+ <join-table name="xml_m2m_table"/>
<cascade>
<cascade-all/>
</cascade>
</many-to-many>
<element-collection name="collelems">
- <order-column table="xml_coll_table" />
+ <order-column/>
+ <collection-table name="xml_coll_table"/>
</element-collection>
</attributes>
Modified:
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java?rev=792326&r1=792325&r2=792326&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java
(original)
+++
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java
Wed Jul 8 21:20:32 2009
@@ -748,4 +748,36 @@
throw new UnsupportedOperationException(
"JPA 2.0 - Method not yet implemented");
}
+
+ public TypedQuery<X> setParameter(Parameter<Date> arg0, Date arg1,
+ TemporalType arg2) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public TypedQuery<X> setParameter(Parameter<Calendar> arg0, Calendar arg1,
+ TemporalType arg2) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Parameter<?> getParameter(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Parameter<?> getParameter(int arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Object getParameterValue(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Object getParameterValue(int arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
}
Modified:
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/CriteriaBuilder.java?rev=792326&r1=792325&r2=792326&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/CriteriaBuilder.java
Wed Jul 8 21:20:32 2009
@@ -29,6 +29,7 @@
import javax.persistence.Parameter;
import javax.persistence.Tuple;
+import javax.persistence.criteria.CompoundSelection;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Expression;
import javax.persistence.criteria.Order;
@@ -542,7 +543,7 @@
* @param selections arguments to the constructor
* @return selection item
*/
- public <Y> Selection<Y> construct(Class<Y> result, Selection<?>...
selections) {
+ public <Y> CompoundSelection<Y> construct(Class<Y> result, Selection<?>...
selections) {
return new NewInstanceSelection<Y>(result, selections);
}
@@ -663,4 +664,24 @@
public <V, M extends Map<?, V>> Expression<Collection<V>> values(M map) {
throw new AbstractMethodError();
}
+
+ public CompoundSelection<Object[]> array(Selection<?>... arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Predicate isNotNull(Expression<?> arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Predicate isNull(Expression<?> arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public CompoundSelection<Tuple> tuple(Selection<?>... arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
}
Modified:
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaQueryImpl.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaQueryImpl.java?rev=792326&r1=792325&r2=792326&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaQueryImpl.java
(original)
+++
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaQueryImpl.java
Wed Jul 8 21:20:32 2009
@@ -234,7 +234,7 @@
* is to be returned in the query result
* @return the modified query
*/
- public CriteriaQuery<T> select(Selection<T> selection) {
+ public CriteriaQuery<T> select(Selection<? extends T> selection) {
return select(new Selection<?>[]{selection});
}
@@ -384,7 +384,7 @@
alias = ALIAS_BASE + (++aliasCount);
while (_aliases.containsValue(alias))
alias = ALIAS_BASE + (++aliasCount);
- selection.setAlias(alias);
+ selection.alias(alias);
_aliases.put(selection, alias);
return _aliases.get(selection);
}
@@ -437,4 +437,14 @@
public boolean isRegistered(Selection<?> selection) {
return _variables.containsKey(selection);
}
+
+ public Class getResultType() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public CriteriaQuery<T> multiselect(List<Selection<?>> arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
}
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=792326&r1=792325&r2=792326&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
Wed Jul 8 21:20:32 2009
@@ -19,6 +19,9 @@
package org.apache.openjpa.persistence.criteria;
+import java.sql.Date;
+import java.sql.Time;
+import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -26,6 +29,7 @@
import javax.persistence.criteria.Expression;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.QueryBuilder;
+import javax.persistence.criteria.Selection;
import javax.persistence.criteria.Subquery;
import javax.persistence.criteria.QueryBuilder.Trimspec;
@@ -129,6 +133,21 @@
CriteriaQueryImpl<?> q) {
return factory.abs(Expressions.toValue(e, factory, model, q));
}
+
+ public Selection<X> alias(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public List<Selection<?>> getCompoundSelectionItems() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean isCompoundSelection() {
+ // TODO Auto-generated method stub
+ return false;
+ }
}
public static class Count extends UnaryFunctionalExpression<Long> {
@@ -149,6 +168,21 @@
Value v = factory.count(Expressions.toValue(e, factory, model, q));
return _distinct ? factory.distinct(v) : v;
}
+
+ public Selection<Long> alias(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public List<Selection<?>> getCompoundSelectionItems() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean isCompoundSelection() {
+ // TODO Auto-generated method stub
+ return false;
+ }
}
public static class Avg extends UnaryFunctionalExpression<Double> {
@@ -161,6 +195,21 @@
CriteriaQueryImpl<?> q) {
return factory.avg(Expressions.toValue(e, factory, model, q));
}
+
+ public Selection<Double> alias(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public List<Selection<?>> getCompoundSelectionItems() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean isCompoundSelection() {
+ // TODO Auto-generated method stub
+ return false;
+ }
}
public static class Sqrt extends UnaryFunctionalExpression<Double> {
@@ -173,6 +222,21 @@
CriteriaQueryImpl<?> q) {
return factory.sqrt(Expressions.toValue(e, factory, model, q));
}
+
+ public Selection<Double> alias(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public List<Selection<?>> getCompoundSelectionItems() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean isCompoundSelection() {
+ // TODO Auto-generated method stub
+ return false;
+ }
}
public static class Max<X> extends UnaryFunctionalExpression<X> {
@@ -185,6 +249,21 @@
CriteriaQueryImpl<?> q) {
return factory.max(Expressions.toValue(e, factory, model, q));
}
+
+ public Selection<X> alias(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public List<Selection<?>> getCompoundSelectionItems() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean isCompoundSelection() {
+ // TODO Auto-generated method stub
+ return false;
+ }
}
public static class Min<X> extends UnaryFunctionalExpression<X> {
@@ -197,6 +276,21 @@
CriteriaQueryImpl<?> q) {
return factory.min(Expressions.toValue(e, factory, model, q));
}
+
+ public Selection<X> alias(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public List<Selection<?>> getCompoundSelectionItems() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean isCompoundSelection() {
+ // TODO Auto-generated method stub
+ return false;
+ }
}
public static class Size extends UnaryFunctionalExpression<Integer> {
@@ -213,6 +307,21 @@
CriteriaQueryImpl<?> q) {
return factory.size(Expressions.toValue(e, factory, model, q));
}
+
+ public Selection<Integer> alias(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public List<Selection<?>> getCompoundSelectionItems() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean isCompoundSelection() {
+ // TODO Auto-generated method stub
+ return false;
+ }
}
public static class Type<X>
@@ -227,6 +336,21 @@
CriteriaQueryImpl<?> q) {
return factory.type(Expressions.toValue(e, factory, model, q));
}
+
+ public Selection<Class<? extends X>> alias(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public List<Selection<?>> getCompoundSelectionItems() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean isCompoundSelection() {
+ // TODO Auto-generated method stub
+ return false;
+ }
}
public static class Cast<B> extends UnaryFunctionalExpression<B> {
@@ -240,6 +364,21 @@
CriteriaQueryImpl<?> q) {
return factory.cast(Expressions.toValue(e, factory, model, q), b);
}
+
+ public Selection<B> alias(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public List<Selection<?>> getCompoundSelectionItems() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean isCompoundSelection() {
+ // TODO Auto-generated method stub
+ return false;
+ }
}
public static class Concat extends BinarayFunctionalExpression<String> {
@@ -262,6 +401,21 @@
Expressions.toValue(e1, factory, model, q),
Expressions.toValue(e2, factory, model, q));
}
+
+ public Selection<String> alias(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public List<Selection<?>> getCompoundSelectionItems() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean isCompoundSelection() {
+ // TODO Auto-generated method stub
+ return false;
+ }
}
public static class Substring extends UnaryFunctionalExpression<String> {
@@ -299,6 +453,21 @@
from == null ? null : from.toValue(factory, model, q),
len == null ? null : len.toValue(factory, model, q));
}
+
+ public Selection<String> alias(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public List<Selection<?>> getCompoundSelectionItems() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean isCompoundSelection() {
+ // TODO Auto-generated method stub
+ return false;
+ }
}
public static class Locate extends ExpressionImpl<Integer> {
@@ -348,6 +517,21 @@
factory.newLiteral(Numbers.valueOf(1),
Literal.TYPE_NUMBER));
}
+
+ public Selection<Integer> alias(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public List<Selection<?>> getCompoundSelectionItems() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean isCompoundSelection() {
+ // TODO Auto-generated method stub
+ return false;
+ }
}
public static class Trim extends BinarayFunctionalExpression<String> {
@@ -396,6 +580,21 @@
Expressions.toValue(e1, factory, model, q),
Expressions.toValue(e2, factory, model, q), spec);
}
+
+ public Selection<String> alias(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public List<Selection<?>> getCompoundSelectionItems() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean isCompoundSelection() {
+ // TODO Auto-generated method stub
+ return false;
+ }
}
public static class Sum<N extends Number>
@@ -426,6 +625,21 @@
Expressions.toValue(e1, factory, model, q),
Expressions.toValue(e2, factory, model, q));
}
+
+ public Selection<N> alias(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public List<Selection<?>> getCompoundSelectionItems() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean isCompoundSelection() {
+ // TODO Auto-generated method stub
+ return false;
+ }
}
public static class Product<N extends Number>
@@ -450,6 +664,21 @@
Expressions.toValue(e1, factory, model, q),
Expressions.toValue(e2, factory, model, q));
}
+
+ public Selection<N> alias(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public List<Selection<?>> getCompoundSelectionItems() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean isCompoundSelection() {
+ // TODO Auto-generated method stub
+ return false;
+ }
}
public static class Diff<N extends Number>
@@ -474,6 +703,21 @@
Expressions.toValue(e1, factory, model, q),
Expressions.toValue(e2, factory, model, q));
}
+
+ public Selection<N> alias(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public List<Selection<?>> getCompoundSelectionItems() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean isCompoundSelection() {
+ // TODO Auto-generated method stub
+ return false;
+ }
}
@@ -499,6 +743,21 @@
Expressions.toValue(e1, factory, model, q),
Expressions.toValue(e2, factory, model, q));
}
+
+ public Selection<N> alias(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public List<Selection<?>> getCompoundSelectionItems() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean isCompoundSelection() {
+ // TODO Auto-generated method stub
+ return false;
+ }
}
public static class Mod extends BinarayFunctionalExpression<Integer> {
@@ -519,6 +778,18 @@
Expressions.toValue(e1, factory, model, q),
Expressions.toValue(e2, factory, model, q));
}
+ public Selection<Integer> alias(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+ public List<Selection<?>> getCompoundSelectionItems() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+ public boolean isCompoundSelection() {
+ // TODO Auto-generated method stub
+ return false;
+ }
}
public static class CurrentDate extends ExpressionImpl<java.sql.Date> {
@@ -531,6 +802,21 @@
CriteriaQueryImpl<?> q) {
return factory.getCurrentDate();
}
+
+ public Selection<Date> alias(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public List<Selection<?>> getCompoundSelectionItems() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean isCompoundSelection() {
+ // TODO Auto-generated method stub
+ return false;
+ }
}
public static class CurrentTime extends ExpressionImpl<java.sql.Time> {
@@ -543,6 +829,21 @@
CriteriaQueryImpl<?> q) {
return factory.getCurrentTime();
}
+
+ public Selection<Time> alias(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public List<Selection<?>> getCompoundSelectionItems() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean isCompoundSelection() {
+ // TODO Auto-generated method stub
+ return false;
+ }
}
public static class CurrentTimestamp
@@ -556,6 +857,21 @@
CriteriaQueryImpl<?> q) {
return factory.getCurrentTimestamp();
}
+
+ public Selection<Timestamp> alias(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public List<Selection<?>> getCompoundSelectionItems() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean isCompoundSelection() {
+ // TODO Auto-generated method stub
+ return false;
+ }
}
public static class Equal extends BinaryLogicalExpression {
@@ -723,6 +1039,21 @@
}
return factory.newLiteral(value, literalType);
}
+
+ public Selection<X> alias(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public List<Selection<?>> getCompoundSelectionItems() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean isCompoundSelection() {
+ // TODO Auto-generated method stub
+ return false;
+ }
}
public static class TypeConstant<X> extends Constant<X> {
@@ -797,6 +1128,21 @@
v.setMetaData(meta);
return factory.index(v);
}
+
+ public Selection<Integer> alias(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public List<Selection<?>> getCompoundSelectionItems() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean isCompoundSelection() {
+ // TODO Auto-generated method stub
+ return false;
+ }
}
public static class IsMember<E> extends PredicateImpl {
@@ -920,6 +1266,21 @@
factory, model, q);
return factory.coalesceExpression(vs);
}
+
+ public Selection<T> alias(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public List<Selection<?>> getCompoundSelectionItems() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean isCompoundSelection() {
+ // TODO Auto-generated method stub
+ return false;
+ }
}
public static class Nullif<T> extends ExpressionImpl<T> {
@@ -948,6 +1309,21 @@
factory, model, q);
return factory.nullIfExpression(value1, value2);
}
+
+ public Selection<T> alias(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public List<Selection<?>> getCompoundSelectionItems() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean isCompoundSelection() {
+ // TODO Auto-generated method stub
+ return false;
+ }
}
public static class IsNull extends PredicateImpl {
@@ -1102,6 +1478,21 @@
(ExpressionImpl<?>)otherwise, factory, model, q);
return factory.generalCaseExpression(exps, other);
}
+
+ public Selection<T> alias(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public List<Selection<?>> getCompoundSelectionItems() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean isCompoundSelection() {
+ // TODO Auto-generated method stub
+ return false;
+ }
}
public static class SimpleCase<C,R> extends ExpressionImpl<R>
@@ -1177,6 +1568,21 @@
(ExpressionImpl<?>)otherwise, factory, model, q);
return factory.simpleCaseExpression(caseOperandExpr, exps, other);
}
+
+ public Selection<R> alias(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public List<Selection<?>> getCompoundSelectionItems() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean isCompoundSelection() {
+ // TODO Auto-generated method stub
+ return false;
+ }
}
public static class Lower extends UnaryFunctionalExpression<String> {
@@ -1190,6 +1596,21 @@
return factory.toLowerCase(
Expressions.toValue(e, factory, model, q));
}
+
+ public Selection<String> alias(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public List<Selection<?>> getCompoundSelectionItems() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean isCompoundSelection() {
+ // TODO Auto-generated method stub
+ return false;
+ }
}
public static class Upper extends UnaryFunctionalExpression<String> {
@@ -1203,6 +1624,21 @@
return factory.toUpperCase(
Expressions.toValue(e, factory, model, q));
}
+
+ public Selection<String> alias(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public List<Selection<?>> getCompoundSelectionItems() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean isCompoundSelection() {
+ // TODO Auto-generated method stub
+ return false;
+ }
}
public static class Length extends UnaryFunctionalExpression<Integer> {
@@ -1216,6 +1652,21 @@
return factory.stringLength(
Expressions.toValue(e, factory, model, q));
}
+
+ public Selection<Integer> alias(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public List<Selection<?>> getCompoundSelectionItems() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean isCompoundSelection() {
+ // TODO Auto-generated method stub
+ return false;
+ }
}
public static class Exists<X> extends PredicateImpl {
@@ -1251,6 +1702,21 @@
public Value toValue(ExpressionFactory factory, MetamodelImpl model,
CriteriaQueryImpl<?> q) {
return factory.all(Expressions.toValue(e, factory, model, q));
+ }
+
+ public Selection<X> alias(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public List<Selection<?>> getCompoundSelectionItems() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean isCompoundSelection() {
+ // TODO Auto-generated method stub
+ return false;
}
}
@@ -1265,6 +1731,21 @@
public Value toValue(ExpressionFactory factory, MetamodelImpl model,
CriteriaQueryImpl<?> q) {
return factory.any(Expressions.toValue(e, factory, model, q));
+ }
+
+ public Selection<X> alias(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public List<Selection<?>> getCompoundSelectionItems() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean isCompoundSelection() {
+ // TODO Auto-generated method stub
+ return false;
}
}
@@ -1300,6 +1781,21 @@
org.apache.openjpa.kernel.exps.Value e = actual.toValue(factory,
model, q);
e.setImplicitType(getJavaType());
return e;
+ }
+
+ public Selection<Y> alias(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public List<Selection<?>> getCompoundSelectionItems() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean isCompoundSelection() {
+ // TODO Auto-generated method stub
+ return false;
}
}
Modified:
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/FetchPathImpl.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/FetchPathImpl.java?rev=792326&r1=792325&r2=792326&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/FetchPathImpl.java
(original)
+++
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/FetchPathImpl.java
Wed Jul 8 21:20:32 2009
@@ -60,8 +60,8 @@
* Return the metamodel attribute corresponding to the fetch join.
* @return metamodel attribute for the join
*/
- public Attribute<? extends Z, X> getAttribute() {
- return (Attribute<? extends Z, X>)_member;
+ public Attribute<Z, X> getAttribute() {
+ return (Attribute<Z, X>)_member;
}
public FetchParent<?, Z> getParent() {
Modified:
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/Joins.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/Joins.java?rev=792326&r1=792325&r2=792326&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/Joins.java
(original)
+++
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/Joins.java
Wed Jul 8 21:20:32 2009
@@ -27,6 +27,7 @@
import javax.persistence.criteria.MapJoin;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.PluralJoin;
+import javax.persistence.criteria.Selection;
import javax.persistence.criteria.SetJoin;
import javax.persistence.metamodel.Attribute;
import javax.persistence.metamodel.CollectionAttribute;
@@ -363,6 +364,21 @@
return (CollectionAttribute<? super Z, E>)
_member.getType();
}
+
+ public Selection<E> alias(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public java.util.List<Selection<?>> getCompoundSelectionItems() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean isCompoundSelection() {
+ // TODO Auto-generated method stub
+ return false;
+ }
}
/**
@@ -380,6 +396,21 @@
public SetAttribute<? super Z, E> getModel() {
return (SetAttribute<? super Z, E>)_member;
}
+
+ public Selection<E> alias(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public java.util.List<Selection<?>> getCompoundSelectionItems() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean isCompoundSelection() {
+ // TODO Auto-generated method stub
+ return false;
+ }
}
/**
@@ -404,6 +435,21 @@
public Expression<Integer> index() {
return new Expressions.Index(this);
}
+
+ public Selection<E> alias(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public java.util.List<Selection<?>> getCompoundSelectionItems() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean isCompoundSelection() {
+ // TODO Auto-generated method stub
+ return false;
+ }
}
/**
@@ -454,6 +500,21 @@
c.registerVariable(this, var, path);
return join;
}
+
+ public Selection<V> alias(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public java.util.List<Selection<?>> getCompoundSelectionItems() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean isCompoundSelection() {
+ // TODO Auto-generated method stub
+ return false;
+ }
}
Modified:
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/NewInstanceSelection.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/NewInstanceSelection.java?rev=792326&r1=792325&r2=792326&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/NewInstanceSelection.java
(original)
+++
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/NewInstanceSelection.java
Wed Jul 8 21:20:32 2009
@@ -21,6 +21,7 @@
import java.util.Arrays;
import java.util.List;
+import javax.persistence.criteria.CompoundSelection;
import javax.persistence.criteria.Selection;
import org.apache.openjpa.persistence.ResultItemImpl;
@@ -34,7 +35,7 @@
* @param <X>
*/
public class NewInstanceSelection<X> extends ResultItemImpl<X>
- implements Selection<X> {
+ implements CompoundSelection<X> {
private List<Selection<?>> _args;
@@ -46,4 +47,24 @@
public List<Selection<?>> getConstructorArguments() {
return _args;
}
+
+ public List<Selection<?>> getSelectionItems() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Selection<X> alias(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public List<Selection<?>> getCompoundSelectionItems() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean isCompoundSelection() {
+ // TODO Auto-generated method stub
+ return false;
+ }
}
Modified:
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/ParameterImpl.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/ParameterImpl.java?rev=792326&r1=792325&r2=792326&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/ParameterImpl.java
(original)
+++
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/ParameterImpl.java
Wed Jul 8 21:20:32 2009
@@ -19,9 +19,11 @@
package org.apache.openjpa.persistence.criteria;
import java.util.Collection;
+import java.util.List;
import javax.persistence.Parameter;
import javax.persistence.criteria.ParameterExpression;
+import javax.persistence.criteria.Selection;
import org.apache.openjpa.kernel.exps.ExpressionFactory;
import org.apache.openjpa.kernel.exps.Value;
@@ -86,4 +88,19 @@
throw new IllegalStateException(this + " index is not set");
return position-1;
}
+
+ public Selection<T> alias(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public List<Selection<?>> getCompoundSelectionItems() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean isCompoundSelection() {
+ // TODO Auto-generated method stub
+ return false;
+ }
}
Modified:
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/PathImpl.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/PathImpl.java?rev=792326&r1=792325&r2=792326&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/PathImpl.java
(original)
+++
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/PathImpl.java
Wed Jul 8 21:20:32 2009
@@ -19,10 +19,13 @@
package org.apache.openjpa.persistence.criteria;
+import java.util.List;
+
import javax.persistence.criteria.Expression;
import javax.persistence.criteria.Join;
import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Selection;
import javax.persistence.metamodel.Bindable;
import javax.persistence.metamodel.ManagedType;
import javax.persistence.metamodel.MapAttribute;
@@ -252,4 +255,19 @@
public Expression<Class<? extends X>> type() {
return new Expressions.Type<X>(this);
}
+
+ public Selection<X> alias(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public List<Selection<?>> getCompoundSelectionItems() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean isCompoundSelection() {
+ // TODO Auto-generated method stub
+ return false;
+ }
}
Modified:
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/PredicateImpl.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/PredicateImpl.java?rev=792326&r1=792325&r2=792326&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/PredicateImpl.java
(original)
+++
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/PredicateImpl.java
Wed Jul 8 21:20:32 2009
@@ -23,6 +23,7 @@
import javax.persistence.criteria.Expression;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Selection;
import org.apache.openjpa.kernel.exps.ExpressionFactory;
import org.apache.openjpa.persistence.meta.MetamodelImpl;
@@ -133,4 +134,19 @@
super(BooleanOperator.OR, restrictions);
}
}
+
+ public Selection<Boolean> alias(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public List<Selection<?>> getCompoundSelectionItems() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean isCompoundSelection() {
+ // TODO Auto-generated method stub
+ return false;
+ }
}
Modified:
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/SelectionImpl.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/SelectionImpl.java?rev=792326&r1=792325&r2=792326&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/SelectionImpl.java
(original)
+++
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/SelectionImpl.java
Wed Jul 8 21:20:32 2009
@@ -40,6 +40,21 @@
public SelectionImpl(Class<X> cls) {
super(cls);
}
+
+ public Selection<X> alias(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public List<Selection<?>> getCompoundSelectionItems() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean isCompoundSelection() {
+ // TODO Auto-generated method stub
+ return false;
+ }
// public SelectionImpl<X> setSelections(Selection<?>... selections) {
// _sels = Arrays.asList(selections);
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=792326&r1=792325&r2=792326&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
Wed Jul 8 21:20:32 2009
@@ -32,6 +32,7 @@
import javax.persistence.criteria.MapJoin;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
+import javax.persistence.criteria.Selection;
import javax.persistence.criteria.SetJoin;
import javax.persistence.criteria.Subquery;
import javax.persistence.metamodel.EntityType;
@@ -331,5 +332,20 @@
: from._member.fmd.getElement().getDeclaredTypeMetaData();
return from._member.fmd.getDeclaredTypeMetaData();
+ }
+
+ public Selection<T> alias(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public List<Selection<?>> getCompoundSelectionItems() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean isCompoundSelection() {
+ // TODO Auto-generated method stub
+ return false;
}
}
Modified: openjpa/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/pom.xml?rev=792326&r1=792325&r2=792326&view=diff
==============================================================================
--- openjpa/trunk/pom.xml (original)
+++ openjpa/trunk/pom.xml Wed Jul 8 21:20:32 2009
@@ -492,7 +492,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.0_spec</artifactId>
- <version>1.0-EA3-SNAPSHOT</version>
+ <version>1.0-EA4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
