Author: markt
Date: Mon Mar 23 10:13:20 2015
New Revision: 1668583
URL: http://svn.apache.org/r1668583
Log:
Refactoring.
Ensure all the constants are in the Constants class
Remove PACKAGE_NAME constant.
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/Constants.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointServer.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeBinary.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeText.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/pojo/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/Constants.java?rev=1668583&r1=1668582&r2=1668583&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/pojo/Constants.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/pojo/Constants.java Mon Mar
23 10:13:20 2015
@@ -21,8 +21,10 @@ package org.apache.tomcat.websocket.pojo
*/
public class Constants {
- protected static final String PACKAGE_NAME =
- Constants.class.getPackage().getName();
+ public static final String POJO_PATH_PARAM_KEY =
+ "org.apache.tomcat.websocket.pojo.PojoEndpoint.pathParams";
+ public static final String POJO_METHOD_MAPPING_KEY =
+ "org.apache.tomcat.websocket.pojo.PojoEndpoint.methodMapping";
private Constants() {
// Hide default constructor
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java?rev=1668583&r1=1668582&r2=1668583&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java
Mon Mar 23 10:13:20 2015
@@ -40,8 +40,7 @@ import org.apache.tomcat.util.res.String
public abstract class PojoEndpointBase extends Endpoint {
private static final Log log = LogFactory.getLog(PojoEndpointBase.class);
- private static final StringManager sm =
- StringManager.getManager(Constants.PACKAGE_NAME);
+ private static final StringManager sm =
StringManager.getManager(PojoEndpointBase.class);
private Object pojo;
private Map<String,String> pathParameters;
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointServer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointServer.java?rev=1668583&r1=1668582&r2=1668583&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointServer.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointServer.java
Mon Mar 23 10:13:20 2015
@@ -32,13 +32,7 @@ import org.apache.tomcat.util.res.String
public class PojoEndpointServer extends PojoEndpointBase {
private static final StringManager sm =
- StringManager.getManager(Constants.PACKAGE_NAME);
-
- public static final String POJO_PATH_PARAM_KEY =
- "org.apache.tomcat.websocket.pojo.PojoEndpoint.pathParams";
- public static final String POJO_METHOD_MAPPING_KEY =
- "org.apache.tomcat.websocket.pojo.PojoEndpoint.methodMapping";
-
+ StringManager.getManager(PojoEndpointServer.class);
@Override
public void onOpen(Session session, EndpointConfig endpointConfig) {
@@ -59,12 +53,12 @@ public class PojoEndpointServer extends
@SuppressWarnings("unchecked")
Map<String,String> pathParameters =
(Map<String, String>) sec.getUserProperties().get(
- POJO_PATH_PARAM_KEY);
+ Constants.POJO_PATH_PARAM_KEY);
setPathParameters(pathParameters);
PojoMethodMapping methodMapping =
(PojoMethodMapping) sec.getUserProperties().get(
- POJO_METHOD_MAPPING_KEY);
+ Constants.POJO_METHOD_MAPPING_KEY);
setMethodMapping(methodMapping);
doOnOpen(session, endpointConfig);
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeBinary.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeBinary.java?rev=1668583&r1=1668582&r2=1668583&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeBinary.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeBinary.java
Mon Mar 23 10:13:20 2015
@@ -39,7 +39,7 @@ public class PojoMessageHandlerWholeBina
extends PojoMessageHandlerWholeBase<ByteBuffer> {
private static final StringManager sm =
- StringManager.getManager(Constants.PACKAGE_NAME);
+ StringManager.getManager(PojoMessageHandlerWholeBinary.class);
private final List<Decoder> decoders = new ArrayList<>();
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeText.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeText.java?rev=1668583&r1=1668582&r2=1668583&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeText.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeText.java
Mon Mar 23 10:13:20 2015
@@ -40,7 +40,7 @@ public class PojoMessageHandlerWholeText
extends PojoMessageHandlerWholeBase<String> {
private static final StringManager sm =
- StringManager.getManager(Constants.PACKAGE_NAME);
+ StringManager.getManager(PojoMessageHandlerWholeText.class);
private final List<Decoder> decoders = new ArrayList<>();
private final Class<?> primitiveType;
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=1668583&r1=1668582&r2=1668583&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
Mon Mar 23 10:13:20 2015
@@ -58,7 +58,7 @@ import org.apache.tomcat.websocket.Util.
public class PojoMethodMapping {
private static final StringManager sm =
- StringManager.getManager(Constants.PACKAGE_NAME);
+ StringManager.getManager(PojoMethodMapping.class);
private final Method onOpen;
private final Method onClose;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
