Author: sergeyb Date: Thu Feb 16 17:04:26 2012 New Revision: 1245083 URL: http://svn.apache.org/viewvc?rev=1245083&view=rev Log: Merged revisions 1245071 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
................ r1245071 | sergeyb | 2012-02-16 16:40:11 +0000 (Thu, 16 Feb 2012) | 9 lines Merged revisions 1245070 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1245070 | sergeyb | 2012-02-16 16:31:15 +0000 (Thu, 16 Feb 2012) | 1 line [CXF-4116] Comparing Pattern string representations as the last step ........ ................ Modified: cxf/branches/2.4.x-fixes/ (props changed) cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/URITemplateTest.java Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 16 17:04:26 2012 @@ -1,2 +1,2 @@ -/cxf/branches/2.5.x-fixes:1244940 -/cxf/trunk:1244939 +/cxf/branches/2.5.x-fixes:1244940,1245071 +/cxf/trunk:1244939,1245070 Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java?rev=1245083&r1=1245082&r2=1245083&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java (original) +++ cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java Thu Feb 16 17:04:26 2012 @@ -98,6 +98,10 @@ public final class URITemplate { public String getValue() { return template; } + + public String getPatternValue() { + return templateRegexPattern.toString(); + } /** * List of all variables in order of appearance in template. @@ -341,6 +345,10 @@ public final class URITemplate { return gCustom1 < gCustom2 ? 1 : -1; } } + if (result == 0) { + result = t1.getPatternValue().compareTo(t2.getPatternValue()); + } + return result; } Modified: cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/URITemplateTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/URITemplateTest.java?rev=1245083&r1=1245082&r2=1245083&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/URITemplateTest.java (original) +++ cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/URITemplateTest.java Thu Feb 16 17:04:26 2012 @@ -40,6 +40,15 @@ public class URITemplateTest extends Ass } @Test + public void testCompareRegExTemplates() { + URITemplate t1 = new URITemplate("{entitySetName}{optionalParens: (\\(\\))?}"); + URITemplate t2 = new URITemplate("{entitySetName}{id: \\(.+?\\)}"); + assertTrue(URITemplate.compareTemplates(t1, t2) < 0); + assertTrue(URITemplate.compareTemplates(t2, t1) > 0); + assertEquals(0, URITemplate.compareTemplates(t2, t2)); + } + + @Test public void testPathCharacters() { String pathChars = ":@!$&'*+,;=-._~()"; assertTrue(new URITemplate(pathChars).match(pathChars,
