Hermes JPQL parser 2 integration (needs EclipseLink 2.4.0) - patch from Pascal

3 files changed, 97 insertions, 9 deletions

diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests.extension.resource/META-INF/MANIFEST.MF b/jpa/tests/org.eclipse.jpt.jpa.core.tests.extension.resource/META-INF/MANIFEST.MF
index 5720562bec..79f0917d2d 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests.extension.resource/META-INF/MANIFEST.MF
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests.extension.resource/META-INF/MANIFEST.MF
@@ -17,6 +17,7 @@ Require-Bundle: org.eclipse.core.resources,
  org.eclipse.jpt.jpa.gen,
  org.eclipse.jpt.jpa.db,
  org.eclipse.jpt.common.utility,
+ org.eclipse.persistence.jpa.jpql,
  org.eclipse.swt,
  org.eclipse.wst.common.project.facet.core,
  org.eclipse.wst.validation
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests.extension.resource/src/org/eclipse/jpt/jpa/core/tests/extension/resource/TestJpaJpqlQueryHelper.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests.extension.resource/src/org/eclipse/jpt/jpa/core/tests/extension/resource/TestJpaJpqlQueryHelper.java
new file mode 100644
index 0000000000..c14292c265
--- /dev/null
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests.extension.resource/src/org/eclipse/jpt/jpa/core/tests/extension/resource/TestJpaJpqlQueryHelper.java
@@ -0,0 +1,86 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Oracle. 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:
+ *     Oracle - initial API and implementation
+ *
+ ******************************************************************************/
+package org.eclipse.jpt.jpa.core.tests.extension.resource;
+
+import org.eclipse.jpt.jpa.core.jpql.JpaJpqlQueryHelper;
+import org.eclipse.jpt.jpa.core.jpql.spi.JpaManagedTypeProvider;
+
+import org.eclipse.jpt.jpa.core.context.NamedQuery;
+import org.eclipse.persistence.jpa.jpql.AbstractContentAssistVisitor;
+import org.eclipse.persistence.jpa.jpql.AbstractGrammarValidator;
+import org.eclipse.persistence.jpa.jpql.AbstractSemanticValidator;
+import org.eclipse.persistence.jpa.jpql.JPQLQueryContext;
+import org.eclipse.persistence.jpa.jpql.parser.JPQLGrammar;
+import org.eclipse.persistence.jpa.jpql.parser.JPQLGrammar2_0;
+
+/**
+ * @version 3.1
+ * @since 3.1
+ * @author Pascal Filion
+ */
+public class TestJpaJpqlQueryHelper extends JpaJpqlQueryHelper {
+
+	private static final JpaJpqlQueryHelper INSTANCE = new TestJpaJpqlQueryHelper();
+
+	/**
+	 * Creates a new <code>TestJpaJpqlQueryHelper</code>.
+	 */
+	public TestJpaJpqlQueryHelper() {
+		super(JPQLGrammar2_0.instance());
+	}
+
+	public static JpaJpqlQueryHelper instance() {
+		return INSTANCE;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected AbstractContentAssistVisitor buildContentAssistVisitor(JPQLQueryContext queryContext) {
+		return null;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected AbstractGrammarValidator buildGrammarValidator(JPQLQueryContext queryContext) {
+		return null;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected JPQLQueryContext buildJPQLQueryContext(JPQLGrammar jpqlGrammar) {
+		return null;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public JpaManagedTypeProvider buildProvider(NamedQuery query) {
+		return null;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected AbstractSemanticValidator buildSemanticValidator(JPQLQueryContext queryContext) {
+		return null;
+	}
+}
\ No newline at end of file
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests.extension.resource/src/org/eclipse/jpt/jpa/core/tests/extension/resource/TestJpaPlatformFactory.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests.extension.resource/src/org/eclipse/jpt/jpa/core/tests/extension/resource/TestJpaPlatformFactory.java
index 754eeeb007..5dc1eb4e3b 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests.extension.resource/src/org/eclipse/jpt/jpa/core/tests/extension/resource/TestJpaPlatformFactory.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests.extension.resource/src/org/eclipse/jpt/jpa/core/tests/extension/resource/TestJpaPlatformFactory.java
@@ -3,7 +3,7 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
+ *
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
@@ -14,9 +14,9 @@ import org.eclipse.jpt.jpa.core.JpaPlatform;
 import org.eclipse.jpt.jpa.core.JpaPlatformFactory;
 import org.eclipse.jpt.jpa.core.JpaPlatformVariation;
 import org.eclipse.jpt.jpa.core.internal.GenericJpaAnnotationDefinitionProvider;
-import org.eclipse.jpt.jpa.core.internal.JpaAnnotationProvider;
 import org.eclipse.jpt.jpa.core.internal.GenericJpaPlatform;
 import org.eclipse.jpt.jpa.core.internal.GenericJpaPlatformFactory.SimpleVersion;
+import org.eclipse.jpt.jpa.core.internal.JpaAnnotationProvider;
 
 /**
  * All the state in the JPA platform should be "static" (i.e. unchanging once
@@ -32,18 +32,19 @@ public class TestJpaPlatformFactory
 	public TestJpaPlatformFactory() {
 		super();
 	}
-	
-	
+
+
 	public JpaPlatform buildJpaPlatform(String id) {
 		return new GenericJpaPlatform(
 			id,
 			buildJpaVersion(),
-			new TestJpaFactory(), 
-			new JpaAnnotationProvider(GenericJpaAnnotationDefinitionProvider.instance()), 
+			new TestJpaFactory(),
+			new JpaAnnotationProvider(GenericJpaAnnotationDefinitionProvider.instance()),
 			TestJpaPlatformProvider.instance(),
-			buildJpaPlatformVariation());
+			buildJpaPlatformVariation(),
+			TestJpaJpqlQueryHelper.instance());
 	}
-	
+
 	private JpaPlatform.Version buildJpaVersion() {
 		return new SimpleVersion(JpaFacet.VERSION_1_0.getVersionString()) {
 			@Override
@@ -52,7 +53,7 @@ public class TestJpaPlatformFactory
 			}
 		};
 	}
-	
+
 	protected JpaPlatformVariation buildJpaPlatformVariation() {
 		return new JpaPlatformVariation() {
 			public Supported getTablePerConcreteClassInheritanceIsSupported() {