JPA 2.1 PFD updates
diff --git a/src/javax/persistence/EntityGraph.java b/src/javax/persistence/EntityGraph.java
index 8095f78..fc4def9 100644
--- a/src/javax/persistence/EntityGraph.java
+++ b/src/javax/persistence/EntityGraph.java
@@ -137,8 +137,6 @@
* Add a node to the graph that corresponds to a map key
* that is a managed type. This allows for construction of
* multi-node entity graphs that include related managed types.
- * Use of this method implicitly adds the corresponding attribute
- * node to the graph.
*
* @param attribute attribute
* @return subgraph for the key attribute
diff --git a/src/javax/persistence/Subgraph.java b/src/javax/persistence/Subgraph.java
index 82e7c85..95c565a 100644
--- a/src/javax/persistence/Subgraph.java
+++ b/src/javax/persistence/Subgraph.java
@@ -194,7 +194,7 @@
public List<AttributeNode<?>> getAttributeNodes();
/**
- * Return the type of for which this subgraph was defined.
+ * Return the type for which this subgraph was defined.
* @return managed type referenced by the subgraph
*/
public Class<T> getClassType();
diff --git a/src/javax/persistence/TypedQuery.java b/src/javax/persistence/TypedQuery.java
index e8057f9..3a42b49 100644
--- a/src/javax/persistence/TypedQuery.java
+++ b/src/javax/persistence/TypedQuery.java
@@ -237,7 +237,7 @@
* @return the same query instance
* @throws IllegalStateException if the query is found not to
* be a Java Persistence query language SELECT query
- * or a Criteria API query
+ * or a CriteriaQuery query
*/
TypedQuery<X> setLockMode(LockModeType lockMode);
diff --git a/src/javax/persistence/criteria/CommonAbstractQuery.java b/src/javax/persistence/criteria/CommonAbstractQuery.java
deleted file mode 100644
index bff6a8b..0000000
--- a/src/javax/persistence/criteria/CommonAbstractQuery.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
- * which accompanies this distribution.
- * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
- * and the Eclipse Distribution License is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
- *
- * Contributors:
- * Linda DeMichiel - Java Persistence 2.1
- * Linda DeMichiel - Java Persistence 2.0
- *
- ******************************************************************************/
-package javax.persistence.criteria;
-
-import javax.persistence.metamodel.EntityType;
-
-/**
- * The <code>CommonAbstractQuery</code> interface defines functionality that is
- * common to both top-level queries and subqueries as well as to update and
- * delete criteria operations.
- * It is not intended to be used directly in query construction.
- *
- * <p> All queries must have:
- * a set of root entities (which may in turn own joins).
- * <p> All queries may have:
- * a conjunction of restrictions.
- *
- * <p> Note that criteria queries and criteria update and delete operations
- * are typed differently.
- * Criteria queries are typed according to the query result type.
- * Update and delete operations are typed according to the target of the
- * update or delete.
- *
- * @since Java Persistence 2.1
- */
-public interface CommonAbstractQuery {
-
- /**
- * Create and add a query root corresponding to the given entity.
- * @param entityClass the entity class
- * @return query root corresponding to the given entity
- */
- <X> Root<X> from(Class<X> entityClass);
-
- /**
- * Create and add a query root corresponding to the given entity,
- * @param entity metamodel entity representing the entity
- * of type X
- * @return query root corresponding to the given entity
- */
- <X> Root<X> from(EntityType<X> entity);
-
- /**
- * Modify the query to restrict the query results according
- * to the specified boolean expression.
- * Replaces the previously added restriction(s), if any.
- * @param restriction a simple or compound boolean expression
- * @return the modified query
- */
- CommonAbstractQuery where(Expression<Boolean> restriction);
-
- /**
- * Modify the query to restrict the query results according
- * to the conjunction of the specified restriction predicates.
- * Replaces the previously added restriction(s), if any.
- * If no restrictions are specified, any previously added
- * restrictions are simply removed.
- * @param restrictions zero or more restriction predicates
- * @return the modified query
- */
- CommonAbstractQuery where(Predicate... restrictions);
-
- /**
- * Create a subquery of the query.
- * @param type the subquery result type
- * @return subquery
- */
- <U> Subquery<U> subquery(Class<U> type);
-
- /**
- * Return the predicate that corresponds to the where clause
- * restriction(s), or null if no restrictions have been
- * specified.
- * @return where clause predicate
- */
- Predicate getRestriction();
-
-}
