Updated Branches:
refs/heads/master 1018aee5d - bd6796897
DELTASPIKE-518 DS Data should support Wrapped JPA APIs. Base don JL Monteiro
patch, Thanks :)
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/bd679689
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/bd679689
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/bd679689
Branch: refs/heads/master
Commit: bd6796897ec8e7602a8dcdabe143077bc2ee156c
Parents: 1018aee
Author: Romain Manni-Bucau rmannibu...@apache.org
Authored: Thu Feb 6 19:34:33 2014 +0100
Committer: Romain Manni-Bucau rmannibu...@apache.org
Committed: Thu Feb 6 19:34:33 2014 +0100
--
deltaspike/modules/data/impl/pom.xml| 6 ++
.../impl/builder/AnnotatedQueryBuilder.java | 2 +-
.../postprocessor/CountQueryPostProcessor.java | 2 +-
.../jpa/EclipseLinkEjbQueryStringExtractor.java | 4 +-
.../util/jpa/HibernateQueryStringExtractor.java | 4 +-
.../util/jpa/OpenJpaQueryStringExtractor.java | 5 +-
.../impl/util/jpa/QueryStringExtractor.java | 4 +-
.../util/jpa/QueryStringExtractorFactory.java | 40 +++-
.../jpa/QueryStringExtractorFactoryTest.java| 65
9 files changed, 101 insertions(+), 31 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/bd679689/deltaspike/modules/data/impl/pom.xml
--
diff --git a/deltaspike/modules/data/impl/pom.xml
b/deltaspike/modules/data/impl/pom.xml
index 7b262fb..3661270 100755
--- a/deltaspike/modules/data/impl/pom.xml
+++ b/deltaspike/modules/data/impl/pom.xml
@@ -121,6 +121,12 @@
artifactIdshrinkwrap-resolver-impl-maven/artifactId
scopetest/scope
/dependency
+dependency
+groupIdorg.apache.openjpa/groupId
+artifactIdopenjpa/artifactId
+version2.3.0/version
+scopetest/scope
+/dependency
/dependencies
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/bd679689/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/AnnotatedQueryBuilder.java
--
diff --git
a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/AnnotatedQueryBuilder.java
b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/AnnotatedQueryBuilder.java
index b201af4..b44d369 100644
---
a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/AnnotatedQueryBuilder.java
+++
b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/AnnotatedQueryBuilder.java
@@ -63,7 +63,7 @@ public class AnnotatedQueryBuilder extends QueryBuilder
else
{
javax.persistence.Query namedQuery =
entityManager.createNamedQuery(query.named());
-String named =
factory.select(namedQuery).extractFrom(namedQuery);
+String named = factory.extract(namedQuery);
String jpqlQuery =
context.applyQueryStringPostProcessors(named);
result = params.applyTo(entityManager.createQuery(jpqlQuery));
}
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/bd679689/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/postprocessor/CountQueryPostProcessor.java
--
diff --git
a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/postprocessor/CountQueryPostProcessor.java
b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/postprocessor/CountQueryPostProcessor.java
index 6659776..c34e269 100644
---
a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/postprocessor/CountQueryPostProcessor.java
+++
b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/postprocessor/CountQueryPostProcessor.java
@@ -55,7 +55,7 @@ public class CountQueryPostProcessor implements
JpaQueryPostProcessor
{
return context.getQueryString();
}
-return factory.select(query).extractFrom(query);
+return factory.extract(query);
}
private static class QueryExtraction
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/bd679689/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/util/jpa/EclipseLinkEjbQueryStringExtractor.java
--
diff --git
a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/util/jpa/EclipseLinkEjbQueryStringExtractor.java