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

Code formatting and refactoring for Permission Update Listeners of device types.

Browse Source
revert-dabc3590
Menaka Jayawardena 7 years ago
parent 82e8ad026f
commit 4bed9cb1ff
4 changed files with 46 additions and 77 deletions
Show Stats Download Patch File Download Diff File

33
components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.api/src/main/java/org/wso2/carbon/device/mgt/iot/androidsense/service/impl/listener/AndroidSensePermissionUpdateListener.java
Unescape View File

@ -32,10 +32,13 @@ import javax.servlet.ServletContextListener;
public class AndroidSensePermissionUpdateListener implements ServletContextListener { public class AndroidSensePermissionUpdateListener implements ServletContextListener {
private static Log log = LogFactory.getLog(AndroidSensePermissionUpdateListener.class); private static Log log = LogFactory.getLog(AndroidSensePermissionUpdateListener.class);
private static PrivilegedCarbonContext threadLocalCarbonContext;
private static RealmService realmService;
@Override @Override
public void contextInitialized(ServletContextEvent servletContextEvent) { public void contextInitialized(ServletContextEvent servletContextEvent) {
threadLocalCarbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext();
realmService = (RealmService) threadLocalCarbonContext.getOSGiService(RealmService.class, null);
UserStoreManager userStoreManager = getUserStoreManager(); UserStoreManager userStoreManager = getUserStoreManager();
try { try {
if (userStoreManager != null) { if (userStoreManager != null) {
@ -47,7 +50,8 @@ public class AndroidSensePermissionUpdateListener implements ServletContextListe
getAuthorizationManager().authorizeRole(AndroidSenseConstants.ROLE_NAME, getAuthorizationManager().authorizeRole(AndroidSenseConstants.ROLE_NAME,
AndroidSenseConstants.PERM_OWNING_DEVICE_VIEW, CarbonConstants.UI_PERMISSION_ACTION); AndroidSenseConstants.PERM_OWNING_DEVICE_VIEW, CarbonConstants.UI_PERMISSION_ACTION);
} }
} } catch (UserStoreException e) { }
} catch (UserStoreException e) {
log.error("Error while creating a role and adding a user for Android Sense.", e); log.error("Error while creating a role and adding a user for Android Sense.", e);
} }
} }
@ -57,57 +61,44 @@ public class AndroidSensePermissionUpdateListener implements ServletContextListe
} }
public static UserStoreManager getUserStoreManager() { private UserStoreManager getUserStoreManager() {
RealmService realmService;
UserStoreManager userStoreManager; UserStoreManager userStoreManager;
try { try {
PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
realmService = (RealmService) ctx.getOSGiService(RealmService.class, null);
if (realmService == null) { if (realmService == null) {
String msg = "Realm service has not initialized."; String msg = "Realm service has not initialized.";
log.error(msg);
throw new IllegalStateException(msg); throw new IllegalStateException(msg);
} }
int tenantId = ctx.getTenantId(); int tenantId = threadLocalCarbonContext.getTenantId();
userStoreManager = realmService.getTenantUserRealm(tenantId).getUserStoreManager(); userStoreManager = realmService.getTenantUserRealm(tenantId).getUserStoreManager();
realmService.getTenantUserRealm(tenantId).getAuthorizationManager(); realmService.getTenantUserRealm(tenantId).getAuthorizationManager();
} catch (UserStoreException e) { } catch (UserStoreException e) {
String msg = "Error occurred while retrieving current user store manager"; String msg = "Error occurred while retrieving current user store manager";
log.error(msg, e);
throw new IllegalStateException(msg); throw new IllegalStateException(msg);
} }
return userStoreManager; return userStoreManager;
} }
public static AuthorizationManager getAuthorizationManager() { private AuthorizationManager getAuthorizationManager() {
RealmService realmService;
AuthorizationManager authorizationManager; AuthorizationManager authorizationManager;
try { try {
PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
realmService = (RealmService) ctx.getOSGiService(RealmService.class, null);
if (realmService == null) { if (realmService == null) {
String msg = "Realm service has not initialized."; String msg = "Realm service has not initialized.";
log.error(msg);
throw new IllegalStateException(msg); throw new IllegalStateException(msg);
} }
int tenantId = ctx.getTenantId(); int tenantId = threadLocalCarbonContext.getTenantId();
authorizationManager = realmService.getTenantUserRealm(tenantId).getAuthorizationManager(); authorizationManager = realmService.getTenantUserRealm(tenantId).getAuthorizationManager();
} catch (UserStoreException e) { } catch (UserStoreException e) {
String msg = "Error occurred while retrieving current user store manager"; String msg = "Error occurred while retrieving current user store manager";
log.error(msg, e);
throw new IllegalStateException(msg); throw new IllegalStateException(msg);
} }
return authorizationManager; return authorizationManager;
} }
private Permission[] getPermissions() { private Permission[] getPermissions() {
Permission androidSense = new Permission(AndroidSenseConstants.PERM_ENROLL_ANDROID_SENSE, Permission androidSense = new Permission(AndroidSenseConstants.PERM_ENROLL_ANDROID_SENSE,
CarbonConstants.UI_PERMISSION_ACTION); CarbonConstants.UI_PERMISSION_ACTION);
Permission view = new Permission(AndroidSenseConstants.PERM_OWNING_DEVICE_VIEW, CarbonConstants Permission view = new Permission(AndroidSenseConstants.PERM_OWNING_DEVICE_VIEW,
.UI_PERMISSION_ACTION); CarbonConstants.UI_PERMISSION_ACTION);
return new Permission[]{androidSense, view}; return new Permission[]{androidSense, view};
} }
} }

28
components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.api/src/main/java/org/wso2/carbon/device/mgt/iot/arduino/service/impl/listener/ArduinoPermissionUpdateListener.java
Unescape View File

@ -32,9 +32,13 @@ import javax.servlet.ServletContextListener;
public class ArduinoPermissionUpdateListener implements ServletContextListener { public class ArduinoPermissionUpdateListener implements ServletContextListener {
private static Log log = LogFactory.getLog(ArduinoPermissionUpdateListener.class); private static Log log = LogFactory.getLog(ArduinoPermissionUpdateListener.class);
private static PrivilegedCarbonContext threadLocalCarbonContext;
private static RealmService realmService;
@Override @Override
public void contextInitialized(ServletContextEvent servletContextEvent) { public void contextInitialized(ServletContextEvent servletContextEvent) {
threadLocalCarbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext();
realmService = (RealmService) threadLocalCarbonContext.getOSGiService(RealmService.class, null);
UserStoreManager userStoreManager = getUserStoreManager(); UserStoreManager userStoreManager = getUserStoreManager();
try { try {
if (userStoreManager != null) { if (userStoreManager != null) {
@ -57,44 +61,34 @@ public class ArduinoPermissionUpdateListener implements ServletContextListener {
} }
public static UserStoreManager getUserStoreManager() { private UserStoreManager getUserStoreManager() {
RealmService realmService;
UserStoreManager userStoreManager; UserStoreManager userStoreManager;
try { try {
PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
realmService = (RealmService) ctx.getOSGiService(RealmService.class, null);
if (realmService == null) { if (realmService == null) {
String msg = "Realm service has not initialized."; String msg = "Realm service has not initialized.";
log.error(msg);
throw new IllegalStateException(msg); throw new IllegalStateException(msg);
} }
int tenantId = ctx.getTenantId(); int tenantId = threadLocalCarbonContext.getTenantId();
userStoreManager = realmService.getTenantUserRealm(tenantId).getUserStoreManager(); userStoreManager = realmService.getTenantUserRealm(tenantId).getUserStoreManager();
realmService.getTenantUserRealm(tenantId).getAuthorizationManager(); realmService.getTenantUserRealm(tenantId).getAuthorizationManager();
} catch (UserStoreException e) { } catch (UserStoreException e) {
String msg = "Error occurred while retrieving current user store manager"; String msg = "Error occurred while retrieving current user store manager";
log.error(msg, e);
throw new IllegalStateException(msg); throw new IllegalStateException(msg);
} }
return userStoreManager; return userStoreManager;
} }
public static AuthorizationManager getAuthorizationManager() { private AuthorizationManager getAuthorizationManager() {
RealmService realmService;
AuthorizationManager authorizationManager; AuthorizationManager authorizationManager;
try { try {
PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
realmService = (RealmService) ctx.getOSGiService(RealmService.class, null);
if (realmService == null) { if (realmService == null) {
String msg = "Realm service has not initialized."; String msg = "Realm service has not initialized.";
log.error(msg);
throw new IllegalStateException(msg); throw new IllegalStateException(msg);
} }
int tenantId = ctx.getTenantId(); int tenantId = threadLocalCarbonContext.getTenantId();
authorizationManager = realmService.getTenantUserRealm(tenantId).getAuthorizationManager(); authorizationManager = realmService.getTenantUserRealm(tenantId).getAuthorizationManager();
} catch (UserStoreException e) { } catch (UserStoreException e) {
String msg = "Error occurred while retrieving current user store manager"; String msg = "Error occurred while retrieving current user store manager";
log.error(msg, e);
throw new IllegalStateException(msg); throw new IllegalStateException(msg);
} }
return authorizationManager; return authorizationManager;
@ -103,10 +97,8 @@ public class ArduinoPermissionUpdateListener implements ServletContextListener {
private Permission[] getPermissions() { private Permission[] getPermissions() {
Permission androidSense = new Permission(ArduinoConstants.PERM_ENROLL_ARDUINO, Permission androidSense = new Permission(ArduinoConstants.PERM_ENROLL_ARDUINO,
CarbonConstants.UI_PERMISSION_ACTION); CarbonConstants.UI_PERMISSION_ACTION);
Permission view = new Permission(ArduinoConstants.PERM_OWNING_DEVICE_VIEW, CarbonConstants Permission view = new Permission(ArduinoConstants.PERM_OWNING_DEVICE_VIEW,
.UI_PERMISSION_ACTION); CarbonConstants.UI_PERMISSION_ACTION);
return new Permission[]{androidSense, view}; return new Permission[]{androidSense, view};
} }
} }

27
components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.api/src/main/java/org/wso2/carbon/device/mgt/iot/raspberrypi/service/impl/listener/RaspberryPIPermissionUpdateListener.java
Unescape View File

@ -32,9 +32,13 @@ import javax.servlet.ServletContextListener;
public class RaspberryPIPermissionUpdateListener implements ServletContextListener { public class RaspberryPIPermissionUpdateListener implements ServletContextListener {
private static Log log = LogFactory.getLog(RaspberryPIPermissionUpdateListener.class); private static Log log = LogFactory.getLog(RaspberryPIPermissionUpdateListener.class);
private static PrivilegedCarbonContext threadLocalCarbonContext;
private static RealmService realmService;
@Override @Override
public void contextInitialized(ServletContextEvent servletContextEvent) { public void contextInitialized(ServletContextEvent servletContextEvent) {
threadLocalCarbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext();
realmService = (RealmService) threadLocalCarbonContext.getOSGiService(RealmService.class, null);
UserStoreManager userStoreManager = getUserStoreManager(); UserStoreManager userStoreManager = getUserStoreManager();
try { try {
if (userStoreManager != null) { if (userStoreManager != null) {
@ -57,44 +61,34 @@ public class RaspberryPIPermissionUpdateListener implements ServletContextListen
} }
public static UserStoreManager getUserStoreManager() { private UserStoreManager getUserStoreManager() {
RealmService realmService;
UserStoreManager userStoreManager; UserStoreManager userStoreManager;
try { try {
PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
realmService = (RealmService) ctx.getOSGiService(RealmService.class, null);
if (realmService == null) { if (realmService == null) {
String msg = "Realm service has not initialized."; String msg = "Realm service has not initialized.";
log.error(msg);
throw new IllegalStateException(msg); throw new IllegalStateException(msg);
} }
int tenantId = ctx.getTenantId(); int tenantId = threadLocalCarbonContext.getTenantId();
userStoreManager = realmService.getTenantUserRealm(tenantId).getUserStoreManager(); userStoreManager = realmService.getTenantUserRealm(tenantId).getUserStoreManager();
realmService.getTenantUserRealm(tenantId).getAuthorizationManager(); realmService.getTenantUserRealm(tenantId).getAuthorizationManager();
} catch (UserStoreException e) { } catch (UserStoreException e) {
String msg = "Error occurred while retrieving current user store manager"; String msg = "Error occurred while retrieving current user store manager";
log.error(msg, e);
throw new IllegalStateException(msg); throw new IllegalStateException(msg);
} }
return userStoreManager; return userStoreManager;
} }
public static AuthorizationManager getAuthorizationManager() { private AuthorizationManager getAuthorizationManager() {
RealmService realmService;
AuthorizationManager authorizationManager; AuthorizationManager authorizationManager;
try { try {
PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
realmService = (RealmService) ctx.getOSGiService(RealmService.class, null);
if (realmService == null) { if (realmService == null) {
String msg = "Realm service has not initialized."; String msg = "Realm service has not initialized.";
log.error(msg);
throw new IllegalStateException(msg); throw new IllegalStateException(msg);
} }
int tenantId = ctx.getTenantId(); int tenantId = threadLocalCarbonContext.getTenantId();
authorizationManager = realmService.getTenantUserRealm(tenantId).getAuthorizationManager(); authorizationManager = realmService.getTenantUserRealm(tenantId).getAuthorizationManager();
} catch (UserStoreException e) { } catch (UserStoreException e) {
String msg = "Error occurred while retrieving current user store manager"; String msg = "Error occurred while retrieving current user store manager";
log.error(msg, e);
throw new IllegalStateException(msg); throw new IllegalStateException(msg);
} }
return authorizationManager; return authorizationManager;
@ -103,9 +97,8 @@ public class RaspberryPIPermissionUpdateListener implements ServletContextListen
private Permission[] getPermissions() { private Permission[] getPermissions() {
Permission androidSense = new Permission(RaspberrypiConstants.PERM_ENROLL_RASPBERRYPI, Permission androidSense = new Permission(RaspberrypiConstants.PERM_ENROLL_RASPBERRYPI,
CarbonConstants.UI_PERMISSION_ACTION); CarbonConstants.UI_PERMISSION_ACTION);
Permission view = new Permission(RaspberrypiConstants.PERM_OWNING_DEVICE_VIEW, CarbonConstants Permission view = new Permission(RaspberrypiConstants.PERM_OWNING_DEVICE_VIEW,
.UI_PERMISSION_ACTION); CarbonConstants.UI_PERMISSION_ACTION);
return new Permission[]{androidSense, view}; return new Permission[]{androidSense, view};
} }
} }

27
components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/listener/VirtualFireAlarmPermissionUpdateListener.java
Unescape View File

@ -32,9 +32,13 @@ import javax.servlet.ServletContextListener;
public class VirtualFireAlarmPermissionUpdateListener implements ServletContextListener { public class VirtualFireAlarmPermissionUpdateListener implements ServletContextListener {
private static Log log = LogFactory.getLog(VirtualFireAlarmPermissionUpdateListener.class); private static Log log = LogFactory.getLog(VirtualFireAlarmPermissionUpdateListener.class);
private static PrivilegedCarbonContext threadLocalCarbonContext;
private static RealmService realmService;
@Override @Override
public void contextInitialized(ServletContextEvent servletContextEvent) { public void contextInitialized(ServletContextEvent servletContextEvent) {
threadLocalCarbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext();
realmService = (RealmService) threadLocalCarbonContext.getOSGiService(RealmService.class, null);
UserStoreManager userStoreManager = getUserStoreManager(); UserStoreManager userStoreManager = getUserStoreManager();
try { try {
if (userStoreManager != null) { if (userStoreManager != null) {
@ -57,44 +61,34 @@ public class VirtualFireAlarmPermissionUpdateListener implements ServletContextL
} }
public static UserStoreManager getUserStoreManager() { private UserStoreManager getUserStoreManager() {
RealmService realmService;
UserStoreManager userStoreManager; UserStoreManager userStoreManager;
try { try {
PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
realmService = (RealmService) ctx.getOSGiService(RealmService.class, null);
if (realmService == null) { if (realmService == null) {
String msg = "Realm service has not initialized."; String msg = "Realm service has not initialized.";
log.error(msg);
throw new IllegalStateException(msg); throw new IllegalStateException(msg);
} }
int tenantId = ctx.getTenantId(); int tenantId = threadLocalCarbonContext.getTenantId();
userStoreManager = realmService.getTenantUserRealm(tenantId).getUserStoreManager(); userStoreManager = realmService.getTenantUserRealm(tenantId).getUserStoreManager();
realmService.getTenantUserRealm(tenantId).getAuthorizationManager(); realmService.getTenantUserRealm(tenantId).getAuthorizationManager();
} catch (UserStoreException e) { } catch (UserStoreException e) {
String msg = "Error occurred while retrieving current user store manager"; String msg = "Error occurred while retrieving current user store manager";
log.error(msg, e);
throw new IllegalStateException(msg); throw new IllegalStateException(msg);
} }
return userStoreManager; return userStoreManager;
} }
public static AuthorizationManager getAuthorizationManager() { private AuthorizationManager getAuthorizationManager() {
RealmService realmService;
AuthorizationManager authorizationManager; AuthorizationManager authorizationManager;
try { try {
PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
realmService = (RealmService) ctx.getOSGiService(RealmService.class, null);
if (realmService == null) { if (realmService == null) {
String msg = "Realm service has not initialized."; String msg = "Realm service has not initialized.";
log.error(msg);
throw new IllegalStateException(msg); throw new IllegalStateException(msg);
} }
int tenantId = ctx.getTenantId(); int tenantId = threadLocalCarbonContext.getTenantId();
authorizationManager = realmService.getTenantUserRealm(tenantId).getAuthorizationManager(); authorizationManager = realmService.getTenantUserRealm(tenantId).getAuthorizationManager();
} catch (UserStoreException e) { } catch (UserStoreException e) {
String msg = "Error occurred while retrieving current user store manager"; String msg = "Error occurred while retrieving current user store manager";
log.error(msg, e);
throw new IllegalStateException(msg); throw new IllegalStateException(msg);
} }
return authorizationManager; return authorizationManager;
@ -103,9 +97,8 @@ public class VirtualFireAlarmPermissionUpdateListener implements ServletContextL
private Permission[] getPermissions() { private Permission[] getPermissions() {
Permission androidSense = new Permission(VirtualFireAlarmConstants.PERM_ENROLL_FIRE_ALARM, Permission androidSense = new Permission(VirtualFireAlarmConstants.PERM_ENROLL_FIRE_ALARM,
CarbonConstants.UI_PERMISSION_ACTION); CarbonConstants.UI_PERMISSION_ACTION);
Permission view = new Permission(VirtualFireAlarmConstants.PERM_OWNING_DEVICE_VIEW, CarbonConstants Permission view = new Permission(VirtualFireAlarmConstants.PERM_OWNING_DEVICE_VIEW,
.UI_PERMISSION_ACTION); CarbonConstants.UI_PERMISSION_ACTION);
return new Permission[]{androidSense, view}; return new Permission[]{androidSense, view};
} }
} }
Write Preview
Loading…
Cancel
Save