remove unnecessary imports, fixes line issues

v5.0.26
Thilina Sandaruwan 1 year ago
parent 67c529b0fa
commit bb50717370

@ -49,9 +49,6 @@ import io.entgra.device.mgt.core.device.mgt.api.jaxrs.util.DeviceMgtAPIUtils;
import io.entgra.device.mgt.core.policy.mgt.common.PolicyAdministratorPoint; import io.entgra.device.mgt.core.policy.mgt.common.PolicyAdministratorPoint;
import io.entgra.device.mgt.core.policy.mgt.common.PolicyManagementException; import io.entgra.device.mgt.core.policy.mgt.common.PolicyManagementException;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.transaction.UserTransaction;
import javax.ws.rs.DefaultValue; import javax.ws.rs.DefaultValue;
import javax.ws.rs.GET; import javax.ws.rs.GET;
import javax.ws.rs.POST; import javax.ws.rs.POST;
@ -467,5 +464,4 @@ public class GroupManagementServiceImpl implements GroupManagementService {
return Response.status(Response.Status.BAD_REQUEST).entity(e.getMessage()).build(); return Response.status(Response.Status.BAD_REQUEST).entity(e.getMessage()).build();
} }
} }
} }

@ -197,8 +197,6 @@ public abstract class AbstractGroupDAOImpl implements GroupDAO {
if (hasStatus) { if (hasStatus) {
stmt.setString(7, deviceGroup.getStatus()); stmt.setString(7, deviceGroup.getStatus());
} }
stmt.executeUpdate(); stmt.executeUpdate();
rs = stmt.getGeneratedKeys(); rs = stmt.getGeneratedKeys();
if (rs.next()) { if (rs.next()) {
@ -239,8 +237,6 @@ public abstract class AbstractGroupDAOImpl implements GroupDAO {
if (hasStatus) { if (hasStatus) {
stmt.setString(7, groups.getStatus()); stmt.setString(7, groups.getStatus());
} }
stmt.executeUpdate(); stmt.executeUpdate();
rs = stmt.getGeneratedKeys(); rs = stmt.getGeneratedKeys();
if (rs.next()) { if (rs.next()) {

@ -46,13 +46,12 @@ public interface GroupManagementProviderService {
/** /**
* Add new device group and create default role with default permissions. * Add new device group and create default role with default permissions.
* *
* @param groups to add * @param groups to add
* @param defaultRole of the deviceGroup * @param defaultRole of the deviceGroup
* @param defaultPermissions of the default role * @param defaultPermissions of the default role
* @throws GroupManagementException * @throws GroupManagementException
*/ */
void createGroupWithRoles(DeviceGroupRoleWrapper groups, String defaultRole, void createGroupWithRoles(DeviceGroupRoleWrapper groups, String defaultRole, String[] defaultPermissions) throws GroupManagementException, GroupAlreadyExistException, RoleDoesNotExistException;
String[] defaultPermissions )throws GroupManagementException, GroupAlreadyExistException, RoleDoesNotExistException;
/** /**
* Update existing device group. * Update existing device group.

@ -147,9 +147,7 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid
} }
} }
public void createGroupWithRoles(DeviceGroupRoleWrapper groups, String defaultRole, String[] defaultPermissions) throws GroupManagementException, GroupAlreadyExistException {
public void createGroupWithRoles(DeviceGroupRoleWrapper groups, String defaultRole, String[] defaultPermissions)
throws GroupManagementException, GroupAlreadyExistException {
if (groups == null) { if (groups == null) {
String msg = "Received incomplete data for createGroup"; String msg = "Received incomplete data for createGroup";
log.error(msg); log.error(msg);
@ -168,9 +166,7 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid
} else { } else {
DeviceGroup immediateParentGroup = groupDAO.getGroup(groups.getParentGroupId(), tenantId); DeviceGroup immediateParentGroup = groupDAO.getGroup(groups.getParentGroupId(), tenantId);
if (immediateParentGroup == null) { if (immediateParentGroup == null) {
String msg = "Parent group with group ID '" + groups.getParentGroupId() String msg = "Parent group with group ID '" + groups.getParentGroupId() + "' does not exist. Hence creating of group '" + groups.getName() + "' was not success";
+ "' does not exist. Hence creating of group '" + groups.getName()
+ "' was not success";
log.error(msg); log.error(msg);
throw new GroupManagementException(msg); throw new GroupManagementException(msg);
} }

Loading…
Cancel
Save