Author: markt
Date: Fri Feb 15 17:25:48 2013
New Revision: 1446699
URL: http://svn.apache.org/r1446699
Log:
Rename. All endpoints, not just Pojos will need this.
Added:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/UriTemplate.java
- copied, changed from r1446080,
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoUriTemplate.java
tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestUriTemplate.java
- copied, changed from r1446080,
tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoUriTemplate.java
Removed:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoUriTemplate.java
tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoUriTemplate.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java?rev=1446699&r1=1446698&r2=1446699&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
Fri Feb 15 17:25:48 2013
@@ -50,7 +50,7 @@ public class PojoMethodMapping {
private final PojoPathParam[] onErrorParams;
private final Set<MessageMethod> onMessage = new HashSet<>();
private final String wsPath;
- private final PojoUriTemplate template;
+ private final UriTemplate template;
public PojoMethodMapping(Class<?> clazzPojo, String wsPath,
@@ -60,7 +60,7 @@ public class PojoMethodMapping {
Method close = null;
Method error = null;
if (wsPath.length() > servletPath.length()) {
- template = new
PojoUriTemplate(wsPath.substring(servletPath.length() - 2));
+ template = new UriTemplate(wsPath.substring(servletPath.length() -
2));
} else {
template = null;
}
@@ -173,7 +173,7 @@ public class PojoMethodMapping {
private static Object[] buildArgs(PojoPathParam[] pathParams,
- PojoUriTemplate template, String pathInfo, Session session,
+ UriTemplate template, String pathInfo, Session session,
Throwable throwable) {
Object[] result = new Object[pathParams.length];
Map<String,String> pathValues;
@@ -231,7 +231,7 @@ public class PojoMethodMapping {
private static class MessageMethod {
private final Method m;
- private final PojoUriTemplate template;
+ private final UriTemplate template;
private int indexString = -1;
private int indexByteArray = -1;
private int indexByteBuffer = -1;
@@ -242,7 +242,7 @@ public class PojoMethodMapping {
private int indexPayload = -1;
- public MessageMethod(Method m, PojoUriTemplate template) {
+ public MessageMethod(Method m, UriTemplate template) {
this.m = m;
this.template = template;
Copied: tomcat/trunk/java/org/apache/tomcat/websocket/pojo/UriTemplate.java
(from r1446080,
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoUriTemplate.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/UriTemplate.java?p2=tomcat/trunk/java/org/apache/tomcat/websocket/pojo/UriTemplate.java&p1=tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoUriTemplate.java&r1=1446080&r2=1446699&rev=1446699&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoUriTemplate.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/pojo/UriTemplate.java Fri Feb
15 17:25:48 2013
@@ -29,7 +29,7 @@ import org.apache.tomcat.util.res.String
* Extracts path parameters from URIs used to create web socket connections
* using the URI template defined for the associated Endpoint.
*/
-public class PojoUriTemplate {
+public class UriTemplate {
private static StringManager sm =
StringManager.getManager(Constants.PACKAGE_NAME);
private final String template;
@@ -37,7 +37,7 @@ public class PojoUriTemplate {
private final List<String> names = new ArrayList<>();
- public PojoUriTemplate(String template) {
+ public UriTemplate(String template) {
this.template = template;
// +10 is just a guess at this point
StringBuilder pattern = new StringBuilder(template.length() + 10);
Copied: tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestUriTemplate.java
(from r1446080,
tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoUriTemplate.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestUriTemplate.java?p2=tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestUriTemplate.java&p1=tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoUriTemplate.java&r1=1446080&r2=1446699&rev=1446699&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoUriTemplate.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestUriTemplate.java Fri
Feb 15 17:25:48 2013
@@ -21,11 +21,11 @@ import java.util.Map;
import org.junit.Assert;
import org.junit.Test;
-public class TestPojoUriTemplate {
+public class TestUriTemplate {
@Test
public void testBasic() throws Exception {
- PojoUriTemplate t = new PojoUriTemplate("/{a}/{b}");
+ UriTemplate t = new UriTemplate("/{a}/{b}");
Map<String,String> result = t.match("/foo/bar");
Assert.assertEquals(2, result.size());
@@ -38,14 +38,14 @@ public class TestPojoUriTemplate {
@Test(expected=java.lang.IllegalArgumentException.class)
public void testOneOfTwo() throws Exception {
- PojoUriTemplate t = new PojoUriTemplate("/{a}/{b}");
+ UriTemplate t = new UriTemplate("/{a}/{b}");
t.match("/foo");
}
@Test
public void testBasicPrefix() throws Exception {
- PojoUriTemplate t = new PojoUriTemplate("/x{a}/y{b}");
+ UriTemplate t = new UriTemplate("/x{a}/y{b}");
Map<String,String> result = t.match("/xfoo/ybar");
Assert.assertEquals(2, result.size());
@@ -58,28 +58,28 @@ public class TestPojoUriTemplate {
@Test(expected=java.lang.IllegalArgumentException.class)
public void testPrefixOneOfTwo() throws Exception {
- PojoUriTemplate t = new PojoUriTemplate("/x{a}/y{b}");
+ UriTemplate t = new UriTemplate("/x{a}/y{b}");
t.match("/xfoo");
}
@Test(expected=java.lang.IllegalArgumentException.class)
public void testPrefixTwoOfTwo() throws Exception {
- PojoUriTemplate t = new PojoUriTemplate("/x{a}/y{b}");
+ UriTemplate t = new UriTemplate("/x{a}/y{b}");
t.match("/ybar");
}
@Test(expected=java.lang.IllegalArgumentException.class)
public void testQuote1() throws Exception {
- PojoUriTemplate t = new PojoUriTemplate("/.{a}");
+ UriTemplate t = new UriTemplate("/.{a}");
t.match("/yfoo");
}
@Test
public void testQuote2() throws Exception {
- PojoUriTemplate t = new PojoUriTemplate("/.{a}");
+ UriTemplate t = new UriTemplate("/.{a}");
Map<String,String> result = t.match("/.foo");
Assert.assertEquals(1, result.size());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
