Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2F42410B36 for ; Wed, 4 Dec 2013 10:41:45 +0000 (UTC) Received: (qmail 22396 invoked by uid 500); 4 Dec 2013 10:41:41 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 22207 invoked by uid 500); 4 Dec 2013 10:41:40 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 22147 invoked by uid 99); 4 Dec 2013 10:41:38 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Dec 2013 10:41:38 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Dec 2013 10:41:36 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A860A2388A5B; Wed, 4 Dec 2013 10:41:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1547756 - in /cxf/trunk/rt/rs/extensions/search/src: main/java/org/apache/cxf/jaxrs/ext/search/SearchContextImpl.java test/java/org/apache/cxf/jaxrs/ext/search/SearchContextImplCustomParserTest.java Date: Wed, 04 Dec 2013 10:41:14 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131204104114.A860A2388A5B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sergeyb Date: Wed Dec 4 10:41:14 2013 New Revision: 1547756 URL: http://svn.apache.org/r1547756 Log: [CXF-5430] Making a parser property simpler Modified: cxf/trunk/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchContextImpl.java cxf/trunk/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchContextImplCustomParserTest.java Modified: cxf/trunk/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchContextImpl.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchContextImpl.java?rev=1547756&r1=1547755&r2=1547756&view=diff ============================================================================== --- cxf/trunk/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchContextImpl.java (original) +++ cxf/trunk/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchContextImpl.java Wed Dec 4 10:41:14 2013 @@ -42,6 +42,7 @@ public class SearchContextImpl implement public static final String SEARCH_QUERY = "_search"; public static final String SHORT_SEARCH_QUERY = "_s"; + public static final String CUSTOM_SEARCH_PARSER_PROPERTY = "search.parser"; public static final String CUSTOM_SEARCH_QUERY_PARAM_NAME = "search.query.parameter.name"; private static final String USE_PLAIN_QUERY_PARAMETERS = "search.use.plain.queries"; private static final String USE_ALL_QUERY_COMPONENT = "search.use.all.query.component"; @@ -171,7 +172,7 @@ public class SearchContextImpl implement Map beanProperties, Map parserProperties) { - Object parserProp = message.getContextualProperty(SearchConditionParser.class.getName()); + Object parserProp = message.getContextualProperty(CUSTOM_SEARCH_PARSER_PROPERTY); if (parserProp != null) { return getCustomParser(parserProp); } Modified: cxf/trunk/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchContextImplCustomParserTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchContextImplCustomParserTest.java?rev=1547756&r1=1547755&r2=1547756&view=diff ============================================================================== --- cxf/trunk/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchContextImplCustomParserTest.java (original) +++ cxf/trunk/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchContextImplCustomParserTest.java Wed Dec 4 10:41:14 2013 @@ -30,7 +30,7 @@ public class SearchContextImplCustomPars public void testQuery() { Message m = new MessageImpl(); m.put(SearchContextImpl.CUSTOM_SEARCH_QUERY_PARAM_NAME, "$customfilter"); - m.put(SearchConditionParser.class.getName(), new CustomParser()); + m.put(SearchContextImpl.CUSTOM_SEARCH_PARSER_PROPERTY, new CustomParser()); m.put(Message.QUERY_STRING, "$customfilter=color is red"); SearchCondition sc = new SearchContextImpl(m).getCondition(Color.class);