Bug 305598 - [api] Mark MatchQuery and IMatchQuery as deprecated
diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/IMatchQuery.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/IMatchQuery.java
index aebceca..1d8dd16 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/IMatchQuery.java
+++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/IMatchQuery.java
@@ -16,8 +16,16 @@
* exclusive from all other calls. <P>
*
* @noimplement This interface is not intended to be implemented by clients. Clients
- * creating custom queries must extend {@link ExpressionMatchQuery} or
- * {@link MatchQuery} instead.
+ * creating custom queries must extend {@link ExpressionMatchQuery}.
+ * @deprecated This interface is likely to be removed in 3.6M7. If possible, use one of the
+ * predefined queries in {@link QueryUtil} or use the {@link QueryUtil#createMatchQuery(String, Object...)}
+ * to create a custom expression based query. If the query cannot be expressed using
+ * the p2QL, then use a predefined or custom expression query as a first filter
+ * (in worst case, use {@link QueryUtil#createIUAnyQuery()}) and then provide further filtering
+ * like so:<pre>
+ * for(iter = queryable.query(someExpressionQuery).iterator(); iter.hasNext();) {
+ * // do your match here
+ * }</pre>
* @since 2.0
*/
public interface IMatchQuery<T> extends IQuery<T> {
diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/MatchQuery.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/MatchQuery.java
index 6798a47..2fa1943 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/MatchQuery.java
+++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/MatchQuery.java
@@ -24,6 +24,15 @@
* remote execution. This class is intended for simple queries against small data
* sources where indexed lookup and remote query execution are not needed.
* </p>
+ * @deprecated This class is likely to be removed in 3.6M7. If possible, use one of the
+ * predefined queries in {@link QueryUtil} or use the {@link QueryUtil#createMatchQuery(String, Object...)}
+ * to create a custom expression based query. If the query cannot be expressed using
+ * the p2QL, then use a predefined or custom expression query as a first filter
+ * (in worst case, use {@link QueryUtil#createIUAnyQuery()}) and then provide further filtering
+ * like so:<pre>
+ * for(iter = queryable.query(someExpressionQuery).iterator(); iter.hasNext();) {
+ * // do your match here
+ * }</pre>
* @since 2.0
*/
public abstract class MatchQuery<T> implements IMatchQuery<T> {
