Author: markt
Date: Thu Jan 17 20:19:14 2013
New Revision: 1434890
URL: http://svn.apache.org/viewvc?rev=1434890&view=rev
Log:
Rename
Added:
tomcat/trunk/java/org/apache/tomcat/websocket/PojoPathParam.java
- copied, changed from r1434878,
tomcat/trunk/java/org/apache/tomcat/websocket/PathParam.java
tomcat/trunk/java/org/apache/tomcat/websocket/PojoUriTemplate.java
- copied, changed from r1434878,
tomcat/trunk/java/org/apache/tomcat/websocket/UriTemplate.java
Removed:
tomcat/trunk/java/org/apache/tomcat/websocket/PathParam.java
tomcat/trunk/java/org/apache/tomcat/websocket/UriTemplate.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/PojoMethodMapping.java
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/PojoMethodMapping.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/PojoMethodMapping.java?rev=1434890&r1=1434889&r2=1434890&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/PojoMethodMapping.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/PojoMethodMapping.java Thu
Jan 17 20:19:14 2013
@@ -45,12 +45,12 @@ public class PojoMethodMapping {
private final Method onOpen;
private final Method onClose;
private final Method onError;
- private final PathParam[] onOpenParams;
- private final PathParam[] onCloseParams;
- private final PathParam[] onErrorParams;
+ private final PojoPathParam[] onOpenParams;
+ private final PojoPathParam[] onCloseParams;
+ private final PojoPathParam[] onErrorParams;
private final Set<MessageMethod> onMessage = new HashSet<>();
private final String wsPath;
- private final UriTemplate template;
+ private final PojoUriTemplate 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 UriTemplate(wsPath.substring(servletPath.length() -
2));
+ template = new
PojoUriTemplate(wsPath.substring(servletPath.length() - 2));
} else {
template = null;
}
@@ -133,27 +133,27 @@ public class PojoMethodMapping {
}
- private static PathParam[] getPathParams(Method m, boolean isError) {
+ private static PojoPathParam[] getPathParams(Method m, boolean isError) {
if (m == null) {
- return new PathParam[0];
+ return new PojoPathParam[0];
}
boolean foundError = !isError;
Class<?>[] types = m.getParameterTypes();
Annotation[][] paramsAnnotations = m.getParameterAnnotations();
- PathParam[] result = new PathParam[types.length];
+ PojoPathParam[] result = new PojoPathParam[types.length];
for (int i = 0; i < types.length; i++) {
Class<?> type = types[i];
if (type.equals(Session.class)) {
- result[i] = new PathParam(type, null);
+ result[i] = new PojoPathParam(type, null);
} else if (type.equals(Throwable.class)) {
foundError = true;
- result[i] = new PathParam(type, null);
+ result[i] = new PojoPathParam(type, null);
} else {
Annotation[] paramAnnotations = paramsAnnotations[i];
for (Annotation paramAnnotation : paramAnnotations) {
if (paramAnnotation.annotationType().equals(
WebSocketPathParam.class)) {
- result[i] = new PathParam(type,
+ result[i] = new PojoPathParam(type,
((WebSocketPathParam)
paramAnnotation).value());
break;
}
@@ -172,8 +172,8 @@ public class PojoMethodMapping {
}
- private static Object[] buildArgs(PathParam[] pathParams,
- UriTemplate template, String pathInfo, Session session,
+ private static Object[] buildArgs(PojoPathParam[] pathParams,
+ PojoUriTemplate template, String pathInfo, Session session,
Throwable throwable) {
Object[] result = new Object[pathParams.length];
Map<String,String> pathValues;
@@ -231,18 +231,18 @@ public class PojoMethodMapping {
private static class MessageMethod {
private final Method m;
- private final UriTemplate template;
+ private final PojoUriTemplate template;
private int indexString = -1;
private int indexByteArray = -1;
private int indexByteBuffer = -1;
private int indexPong = -1;
private int indexBoolean = -1;
private int indexSession = -1;
- private Map<Integer,PathParam> indexPathParams = new HashMap<>();
+ private Map<Integer,PojoPathParam> indexPathParams = new HashMap<>();
private int indexPayload = -1;
- public MessageMethod(Method m, UriTemplate template) {
+ public MessageMethod(Method m, PojoUriTemplate template) {
this.m = m;
this.template = template;
@@ -256,7 +256,7 @@ public class PojoMethodMapping {
if (paramAnnotation.annotationType().equals(
WebSocketPathParam.class)) {
indexPathParams.put(
- Integer.valueOf(i), new PathParam(types[i],
+ Integer.valueOf(i), new
PojoPathParam(types[i],
((WebSocketPathParam)
paramAnnotation).value()));
break;
}
@@ -354,9 +354,9 @@ public class PojoMethodMapping {
pathParams = template.match(pathInfo);
}
- for (Map.Entry<Integer,PathParam> entry :
+ for (Map.Entry<Integer,PojoPathParam> entry :
indexPathParams.entrySet()) {
- PathParam pathParam = entry.getValue();
+ PojoPathParam pathParam = entry.getValue();
String valueString = pathParams.get(pathParam.getName());
Object value = null;
if (valueString != null) {
Copied: tomcat/trunk/java/org/apache/tomcat/websocket/PojoPathParam.java (from
r1434878, tomcat/trunk/java/org/apache/tomcat/websocket/PathParam.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/PojoPathParam.java?p2=tomcat/trunk/java/org/apache/tomcat/websocket/PojoPathParam.java&p1=tomcat/trunk/java/org/apache/tomcat/websocket/PathParam.java&r1=1434878&r2=1434890&rev=1434890&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/PathParam.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/PojoPathParam.java Thu Jan 17
20:19:14 2013
@@ -24,13 +24,13 @@ package org.apache.tomcat.websocket;
* {@link javax.websocket.Session} and {@link java.lang.Throwable} parameters,
* {@link #getName()} will always return <code>null</code>.
*/
-public class PathParam {
+public class PojoPathParam {
private final Class<?> type;
private final String name;
- public PathParam(Class<?> type, String name) {
+ public PojoPathParam(Class<?> type, String name) {
this.type = type;
this.name = name;
}
Copied: tomcat/trunk/java/org/apache/tomcat/websocket/PojoUriTemplate.java
(from r1434878, tomcat/trunk/java/org/apache/tomcat/websocket/UriTemplate.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/PojoUriTemplate.java?p2=tomcat/trunk/java/org/apache/tomcat/websocket/PojoUriTemplate.java&p1=tomcat/trunk/java/org/apache/tomcat/websocket/UriTemplate.java&r1=1434878&r2=1434890&rev=1434890&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/UriTemplate.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/PojoUriTemplate.java Thu Jan
17 20:19:14 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 UriTemplate {
+public class PojoUriTemplate {
private static StringManager sm =
StringManager.getManager(Constants.PACKAGE_NAME);
private final String template;
@@ -37,7 +37,7 @@ public class UriTemplate {
private final List<String> names = new ArrayList<>();
- public UriTemplate(String template) {
+ public PojoUriTemplate(String template) {
this.template = template;
// +10 is just a guess at this point
StringBuilder pattern = new StringBuilder(template.length() + 10);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
