You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2012/11/20 18:02:07 UTC
svn commit: r1411746 - in /cxf/branches/2.6.x-fixes: ./
rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/QueryContextProvider.java
Author: sergeyb
Date: Tue Nov 20 17:02:06 2012
New Revision: 1411746
URL: http://svn.apache.org/viewvc?rev=1411746&view=rev
Log:
Merged revisions 1411744 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1411744 | sergeyb | 2012-11-20 16:59:52 +0000 (Tue, 20 Nov 2012) | 1 line
Removing @Override
........
Modified:
cxf/branches/2.6.x-fixes/ (props changed)
cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/QueryContextProvider.java
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/trunk:r1411744
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/QueryContextProvider.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/QueryContextProvider.java?rev=1411746&r1=1411745&r2=1411746&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/QueryContextProvider.java (original)
+++ cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/QueryContextProvider.java Tue Nov 20 17:02:06 2012
@@ -39,18 +39,15 @@ public class QueryContextProvider implem
this.message = message;
}
- @Override
public String getConvertedExpression(String originalExpression) {
return getConvertedExpression(originalExpression, SearchBean.class);
}
- @Override
public <T> String getConvertedExpression(String originalExpression, Class<T> beanClass) {
return getConvertedExpression(originalExpression, beanClass, String.class);
}
- @Override
public <T, E> E getConvertedExpression(String originalExpression,
Class<T> beanClass,
Class<E> queryClass) {