fix formating

revert-dabc3590
warunalakshitha 7 years ago
parent 9ebb808b1d
commit 09724df216

@ -43,9 +43,11 @@ public class ClientSessionSubscriptionEndpoint extends SubscriptionEndpoint {
private static final Log log = LogFactory.getLog(ClientSessionSubscriptionEndpoint.class); private static final Log log = LogFactory.getLog(ClientSessionSubscriptionEndpoint.class);
/** /**
* Web socket onOpen - When client sends a message * Web socket onOpen use when client connect to web socket url
* *
* @param session - Users registered session.. * @param session - Registered session.
* @param deviceType - DeviceType
* @param deviceId - Device Identifier
*/ */
@OnOpen @OnOpen
public void onOpen(Session session, @PathParam("deviceType") String deviceType, @PathParam("deviceId") String public void onOpen(Session session, @PathParam("deviceType") String deviceType, @PathParam("deviceId") String
@ -66,10 +68,12 @@ public class ClientSessionSubscriptionEndpoint extends SubscriptionEndpoint {
} }
/** /**
* Web socket onMessage - When client sends a message * Web socket onMessage use when client sends a string message
* *
* @param session - Users registered session. * @param session - Registered session.
* @param message - Status code for web-socket close. * @param deviceType - DeviceType
* @param deviceId - Device Identifier
* @param message - Status code for web-socket close.
*/ */
@OnMessage @OnMessage
public void onMessage(Session session, String message, @PathParam("deviceType") String deviceType, @PathParam public void onMessage(Session session, String message, @PathParam("deviceType") String deviceType, @PathParam
@ -78,10 +82,12 @@ public class ClientSessionSubscriptionEndpoint extends SubscriptionEndpoint {
} }
/** /**
* Web socket onMessage - When client sends a message * Web socket onMessage use when client sends a byte message
* *
* @param session - Users registered session. * @param session - Registered session.
* @param message - Message which needs to send to peer * @param deviceType - DeviceType
* @param deviceId - Device Identifier
* @param message - Message which needs to send to peer
*/ */
@OnMessage @OnMessage
public void onMessage(Session session, byte[] message, @PathParam("deviceType") String deviceType, @PathParam public void onMessage(Session session, byte[] message, @PathParam("deviceType") String deviceType, @PathParam
@ -90,10 +96,12 @@ public class ClientSessionSubscriptionEndpoint extends SubscriptionEndpoint {
} }
/** /**
* Web socket onClose - Remove the registered sessions * Web socket onClose - Handle socket connection close
* *
* @param session - Users registered session. * @param session - Registered session.
* @param reason - Status code for web-socket close. * @param deviceType - DeviceType
* @param deviceId - Device Identifier
* @param reason - Status code for web-socket close.
*/ */
@OnClose @OnClose
public void onClose(Session session, CloseReason reason, @PathParam("deviceType") String deviceType, @PathParam public void onClose(Session session, CloseReason reason, @PathParam("deviceType") String deviceType, @PathParam
@ -102,10 +110,12 @@ public class ClientSessionSubscriptionEndpoint extends SubscriptionEndpoint {
} }
/** /**
* Web socket onError - Remove the registered sessions * Web socket onError - Handle socket connection error
* *
* @param session - Users registered session. * @param session - Registered session.
* @param throwable - Status code for web-socket close. * @param deviceType - DeviceType
* @param deviceId - Device Identifier
* @param throwable - Status code for web-socket close.
*/ */
@OnError @OnError
public void onError(Session session, Throwable throwable, @PathParam("deviceType") String deviceType, @PathParam public void onError(Session session, Throwable throwable, @PathParam("deviceType") String deviceType, @PathParam

@ -43,9 +43,12 @@ public class DeviceSessionSubscriptionEndpoint extends SubscriptionEndpoint {
private static final Log log = LogFactory.getLog(DeviceSessionSubscriptionEndpoint.class); private static final Log log = LogFactory.getLog(DeviceSessionSubscriptionEndpoint.class);
/** /**
* Web socket onOpen - When client sends a message * Web socket onOpen use when device connect to web socket url
* *
* @param session - Users registered session.. * @param session - Web socket Session
* @param deviceType - DeviceType
* @param deviceId - Device Identifier
* @param operationId - Operations Id
*/ */
@OnOpen @OnOpen
public void onOpen(Session session, @PathParam("deviceType") String deviceType, @PathParam("deviceId") String public void onOpen(Session session, @PathParam("deviceType") String deviceType, @PathParam("deviceId") String
@ -66,10 +69,12 @@ public class DeviceSessionSubscriptionEndpoint extends SubscriptionEndpoint {
} }
/** /**
* Web socket onMessage - When client sends a message * Web socket onMessage use when device sends a string message
* *
* @param session - Users registered session. * @param session - Registered session.
* @param message - Status code for web-socket close. * @param message - Status code for web-socket close.
* @param deviceType - DeviceType
* @param deviceId - Device Identifier
*/ */
@OnMessage @OnMessage
public void onMessage(Session session, String message, @PathParam("deviceType") String deviceType, @PathParam public void onMessage(Session session, String message, @PathParam("deviceType") String deviceType, @PathParam
@ -78,10 +83,13 @@ public class DeviceSessionSubscriptionEndpoint extends SubscriptionEndpoint {
} }
/** /**
* Web socket onMessage - When client sends a message * Web socket onMessage use when device sends a byte message
* *
* @param session - Users registered session. * @param session - Registered session.
* @param message - Message which needs to send to peer * @param message - Status code for web-socket close.
* @param deviceType - DeviceType
* @param deviceId - Device Identifier
* @param message - Message which needs to send to peer
*/ */
@OnMessage @OnMessage
public void onMessage(Session session, byte[] message, @PathParam("deviceType") String deviceType, @PathParam public void onMessage(Session session, byte[] message, @PathParam("deviceType") String deviceType, @PathParam
@ -90,10 +98,12 @@ public class DeviceSessionSubscriptionEndpoint extends SubscriptionEndpoint {
} }
/** /**
* Web socket onClose - Remove the registered sessions * Web socket onClose - Handle socket connection close
* *
* @param session - Users registered session. * @param session - Registered session.
* @param reason - Status code for web-socket close. * @param deviceType - DeviceType
* @param deviceId - Device Identifier
* @param reason - Status code for web-socket close.
*/ */
@OnClose @OnClose
public void onClose(Session session, CloseReason reason, @PathParam("deviceType") String deviceType, @PathParam public void onClose(Session session, CloseReason reason, @PathParam("deviceType") String deviceType, @PathParam
@ -102,10 +112,12 @@ public class DeviceSessionSubscriptionEndpoint extends SubscriptionEndpoint {
} }
/** /**
* Web socket onError - Remove the registered sessions * Web socket onError - Handle socket connection error
* *
* @param session - Users registered session. * @param session - Registered session.
* @param throwable - Status code for web-socket close. * @param deviceType - DeviceType
* @param deviceId - Device Identifier
* @param throwable - Status code for web-socket close.
*/ */
@OnError @OnError
public void onError(Session session, Throwable throwable, @PathParam("deviceType") String deviceType, @PathParam public void onError(Session session, Throwable throwable, @PathParam("deviceType") String deviceType, @PathParam

@ -38,7 +38,9 @@ public class SubscriptionEndpoint {
/** /**
* Web socket onMessage - When client sends a message * Web socket onMessage - When client sends a message
* *
* @param session - Users registered session. * @param session - Registered session.
* @param deviceType - DeviceType
* @param deviceId - Device Identifier
* @param message - Status code for web-socket close. * @param message - Status code for web-socket close.
*/ */
public void onMessage(Session session, String message, @PathParam("deviceType") String deviceType, @PathParam public void onMessage(Session session, String message, @PathParam("deviceType") String deviceType, @PathParam
@ -64,9 +66,11 @@ public class SubscriptionEndpoint {
} }
/** /**
* Web socket onMessage - When client sends a message * Web socket onMessage use When client sends a message
* *
* @param session - Users registered session. * @param session - Registered session.
* @param deviceType - DeviceType
* @param deviceId - Device Identifier
* @param message - Message which needs to send to peer * @param message - Message which needs to send to peer
*/ */
public void onMessage(Session session, byte[] message, @PathParam("deviceType") String deviceType, @PathParam public void onMessage(Session session, byte[] message, @PathParam("deviceType") String deviceType, @PathParam
@ -92,9 +96,11 @@ public class SubscriptionEndpoint {
} }
/** /**
* Web socket onClose - Remove the registered sessions * Web socket onClose - Handle socket connection close
* *
* @param session - Users registered session. * @param session - Registered session.
* @param deviceType - DeviceType
* @param deviceId - Device Identifier
* @param reason - Status code for web-socket close. * @param reason - Status code for web-socket close.
*/ */
public void onClose(Session session, CloseReason reason, @PathParam("deviceType") String deviceType, @PathParam public void onClose(Session session, CloseReason reason, @PathParam("deviceType") String deviceType, @PathParam
@ -110,9 +116,11 @@ public class SubscriptionEndpoint {
} }
/** /**
* Web socket onError - Remove the registered sessions * Web socket onError - Handle socket connection error
* *
* @param session - Users registered session. * @param session - Registered session.
* @param deviceType - DeviceType
* @param deviceId - Device Identifier
* @param throwable - Status code for web-socket close. * @param throwable - Status code for web-socket close.
*/ */
public void onError(Session session, Throwable throwable, @PathParam("deviceType") String deviceType, @PathParam public void onError(Session session, Throwable throwable, @PathParam("deviceType") String deviceType, @PathParam

@ -25,4 +25,7 @@ package org.wso2.carbon.device.mgt.extensions.remote.session.endpoint.constants;
*/ */
public class Constants { public class Constants {
public static final String HTTP_HEADERS = "HttpHeaders"; public static final String HTTP_HEADERS = "HttpHeaders";
private Constants() {
}
} }

@ -28,6 +28,9 @@ import javax.websocket.server.ServerEndpointConfig;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
/**
* Class for handle HTTP session
*/
public class HttpSessionConfigurator extends ServerEndpointConfig.Configurator { public class HttpSessionConfigurator extends ServerEndpointConfig.Configurator {
public void modifyHandshake(ServerEndpointConfig config, HandshakeRequest request, HandshakeResponse response) { public void modifyHandshake(ServerEndpointConfig config, HandshakeRequest request, HandshakeResponse response) {
Map<String, List<String>> httpHeaders = request.getHeaders(); Map<String, List<String>> httpHeaders = request.getHeaders();

@ -23,6 +23,9 @@ import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.context.PrivilegedCarbonContext; import org.wso2.carbon.context.PrivilegedCarbonContext;
import org.wso2.carbon.device.mgt.extensions.remote.session.RemoteSessionManagementService; import org.wso2.carbon.device.mgt.extensions.remote.session.RemoteSessionManagementService;
/**
* Class for store remote management service instances
*/
public class ServiceHolder { public class ServiceHolder {
private static ServiceHolder instance; private static ServiceHolder instance;

Loading…
Cancel
Save