ruwin
/
device-mgt-plugins
forked from community/device-mgt-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reformat code

Browse Source
revert-dabc3590
Madhawa Perera 6 years ago
parent 374c54fa70
commit b1625f93dd
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File

24
components/extensions/remote-session-extension/org.wso2.carbon.device.mgt.extensions.remote.session/src/main/java/org/wso2/carbon/device/mgt/extensions/remote.session/RemoteSessionManagementServiceImpl.java
Unescape View File

@ -73,6 +73,7 @@ public class RemoteSessionManagementServiceImpl implements RemoteSessionManageme
sessionQueryParamList.add(session.getQueryString()); sessionQueryParamList.add(session.getQueryString());
sessionQueryParam.put(RemoteSessionConstants.QUERY_STRING, sessionQueryParamList); sessionQueryParam.put(RemoteSessionConstants.QUERY_STRING, sessionQueryParamList);
// if session initiated using operation id means request came from device.
if (operationId == null) { if (operationId == null) {
// Validate the token // Validate the token
OAuthAuthenticator oAuthAuthenticator = RemoteSessionManagementDataHolder.getInstance().getOauthAuthenticator(); OAuthAuthenticator oAuthAuthenticator = RemoteSessionManagementDataHolder.getInstance().getOauthAuthenticator();
@ -102,16 +103,8 @@ public class RemoteSessionManagementServiceImpl implements RemoteSessionManageme
.getMaxMessageBufferSize()); .getMaxMessageBufferSize());
session.setMaxIdleTimeout(RemoteSessionManagementDataHolder.getInstance().getMaxIdleTimeout()); session.setMaxIdleTimeout(RemoteSessionManagementDataHolder.getInstance().getMaxIdleTimeout());
// if session initiated using operation id means request came from device initializeClientSession(session, authenticationInfo.getTenantDomain(), deviceType, deviceId);
// if (operationId != null) {
// // create new device session
// initializeDeviceSession(session, authenticationInfo.getTenantDomain(), deviceType, deviceId,
// operationId);
// } else {
// create new client session
initializeClientSession(session, authenticationInfo.getTenantDomain(), deviceType,
deviceId);
// }
log.info("Current remote sessions count: " + RemoteSessionManagementDataHolder.getInstance() log.info("Current remote sessions count: " + RemoteSessionManagementDataHolder.getInstance()
.getSessionMap().size()); .getSessionMap().size());
@ -145,11 +138,11 @@ public class RemoteSessionManagementServiceImpl implements RemoteSessionManageme
session.setMaxIdleTimeout(RemoteSessionManagementDataHolder.getInstance().getMaxIdleTimeout()); session.setMaxIdleTimeout(RemoteSessionManagementDataHolder.getInstance().getMaxIdleTimeout());
String uuid = session.getQueryString(); String uuid = session.getQueryString();
if(uuid != null && uuid.isEmpty()){ if (uuid != null && uuid.isEmpty()) {
log.error("Could not find a UUID related to the remote session"); log.error("Could not find a UUID related to the remote session");
} else { } else {
String tenantDomain = RemoteSessionManagementDataHolder.getInstance().getUuidToTenantMap().remove(uuid); String tenantDomain = RemoteSessionManagementDataHolder.getInstance().getUuidToTenantMap().remove(uuid);
if(tenantDomain == null || tenantDomain.isEmpty()){ if (tenantDomain == null || tenantDomain.isEmpty()) {
log.error("Invalid UUID, could not create the remote session"); log.error("Invalid UUID, could not create the remote session");
} else { } else {
// create new device session // create new device session
@ -304,10 +297,11 @@ public class RemoteSessionManagementServiceImpl implements RemoteSessionManageme
JSONObject payload = new JSONObject(); JSONObject payload = new JSONObject();
payload.put("serverUrl", RemoteSessionManagementDataHolder.getInstance().getServerUrl()); payload.put("serverUrl", RemoteSessionManagementDataHolder.getInstance().getServerUrl());
payload.put("uuidToValidateDevice", uuidToValidateDevice); payload.put("uuidToValidateDevice", uuidToValidateDevice);
String uuidToTenantMap = RemoteSessionManagementDataHolder.getInstance().getUuidToTenantMap RemoteSessionManagementDataHolder.getInstance().getUuidToTenantMap
().putIfAbsent(uuidToValidateDevice, tenantDomain); ().put(uuidToValidateDevice, tenantDomain);
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
log.debug("UUID " + uuidToTenantMap + " is generated against the tenant : " + tenantDomain); log.debug("UUID " + uuidToValidateDevice + " is generated against the tenant : " +
RemoteSessionManagementDataHolder.getInstance().getUuidToTenantMap().get(uuidToValidateDevice));
} }
operation.setPayLoad(payload.toString()); operation.setPayLoad(payload.toString());
String date = new SimpleDateFormat(RemoteSessionConstants.DATE_FORMAT_NOW).format(new Date()); String date = new SimpleDateFormat(RemoteSessionConstants.DATE_FORMAT_NOW).format(new Date());

Write Preview
Loading…
Cancel
Save