fixes line issues

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

@ -37,12 +37,10 @@ public class DeviceGroupRoleWrapper implements Serializable {
@ApiModelProperty(name = "id", value = "ID of the device group in the device group information database.") @ApiModelProperty(name = "id", value = "ID of the device group in the device group information database.")
private int id; private int id;
@ApiModelProperty(name = "description", value = "The device group description that can be set on the device group by the user.", @ApiModelProperty(name = "description", value = "The device group description that can be set on the device group by the user.", required = true)
required = true)
private String description; private String description;
@ApiModelProperty(name = "name", value = "The device group name that can be set on the device group by the user.", @ApiModelProperty(name = "name", value = "The device group name that can be set on the device group by the user.", required = true)
required = true)
private String name; private String name;
private String owner; private String owner;
@ -62,10 +60,8 @@ public class DeviceGroupRoleWrapper implements Serializable {
@ApiModelProperty(name = "userRoles", value = "User roles") @ApiModelProperty(name = "userRoles", value = "User roles")
private List<String> userRoles; private List<String> userRoles;
// @ApiModelProperty(name = "DeviceGroupRoleWrapper", value = "Device group role wrapper") public DeviceGroupRoleWrapper() {
// private List<DeviceGroupRoleWrapper> DeviceGroupRoleWrapper; }
public DeviceGroupRoleWrapper() {}
public DeviceGroupRoleWrapper(String name) { public DeviceGroupRoleWrapper(String name) {
this.name = name; this.name = name;
@ -79,7 +75,7 @@ public class DeviceGroupRoleWrapper implements Serializable {
this.status = status; this.status = status;
} }
private Map<String,String> groupProperties; private Map<String, String> groupProperties;
public int getGroupId() { public int getGroupId() {
return id; return id;
@ -113,11 +109,11 @@ public class DeviceGroupRoleWrapper implements Serializable {
this.owner = owner; this.owner = owner;
} }
public Map<String,String> getGroupProperties() { public Map<String, String> getGroupProperties() {
return groupProperties; return groupProperties;
} }
public void setGroupProperties(Map<String,String> groupProperties) { public void setGroupProperties(Map<String, String> groupProperties) {
this.groupProperties = groupProperties; this.groupProperties = groupProperties;
} }

@ -32,6 +32,7 @@ import java.util.Map;
* This interface represents the key operations associated with persisting group related information. * This interface represents the key operations associated with persisting group related information.
*/ */
public interface GroupDAO { public interface GroupDAO {
/** /**
* Add new Device Group. * Add new Device Group.
* *
@ -42,7 +43,6 @@ public interface GroupDAO {
*/ */
int addGroup(DeviceGroup deviceGroup, int tenantId) throws GroupManagementDAOException; int addGroup(DeviceGroup deviceGroup, int tenantId) throws GroupManagementDAOException;
/** /**
* Add properties for device group. * Add properties for device group.
* Note that groupId parameter is considered seperately due to the groupId parameter passed with * Note that groupId parameter is considered seperately due to the groupId parameter passed with
@ -55,8 +55,6 @@ public interface GroupDAO {
*/ */
int addGroupWithRoles(DeviceGroupRoleWrapper groups, int tenantId) throws GroupManagementDAOException; int addGroupWithRoles(DeviceGroupRoleWrapper groups, int tenantId) throws GroupManagementDAOException;
/** /**
* Add properties for device group. * Add properties for device group.
* Note that groupId parameter is considered seperately due to the groupId parameter passed with * Note that groupId parameter is considered seperately due to the groupId parameter passed with
@ -67,7 +65,6 @@ public interface GroupDAO {
* @return sql execution result. * @return sql execution result.
* @throws GroupManagementDAOException * @throws GroupManagementDAOException
*/ */
boolean addGroupProperties(DeviceGroup deviceGroup, int groupId, int tenantId) throws GroupManagementDAOException; boolean addGroupProperties(DeviceGroup deviceGroup, int groupId, int tenantId) throws GroupManagementDAOException;
/** /**
@ -80,7 +77,6 @@ public interface GroupDAO {
* @return sql execution result. * @return sql execution result.
* @throws GroupManagementDAOException * @throws GroupManagementDAOException
*/ */
boolean addGroupPropertiesWithRoles(DeviceGroupRoleWrapper groups, int groupId, int tenantId) throws GroupManagementDAOException; boolean addGroupPropertiesWithRoles(DeviceGroupRoleWrapper groups, int groupId, int tenantId) throws GroupManagementDAOException;
/** /**
@ -121,7 +117,7 @@ public interface GroupDAO {
* @return sql execution result. * @return sql execution result.
* @throws GroupManagementDAOException * @throws GroupManagementDAOException
*/ */
Map<String,String> getAllGroupProperties(int groupId, int tenantId) throws GroupManagementDAOException; Map<String, String> getAllGroupProperties(int groupId, int tenantId) throws GroupManagementDAOException;
/** /**
* Update an existing Device Group. * Update an existing Device Group.
@ -201,6 +197,7 @@ public interface GroupDAO {
/** /**
* Get the groups of device with device id provided * Get the groups of device with device id provided
*
* @param deviceId * @param deviceId
* @return groups which has the device. * @return groups which has the device.
* @throws GroupManagementDAOException * @throws GroupManagementDAOException
@ -427,16 +424,15 @@ public interface GroupDAO {
* @throws GroupManagementDAOException * @throws GroupManagementDAOException
*/ */
int getOwnGroupsCount(String username, int tenantId, String parentPath) throws GroupManagementDAOException; int getOwnGroupsCount(String username, int tenantId, String parentPath) throws GroupManagementDAOException;
/** /**
* Get device Ids of devices which are assigned to groups. components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dao/GroupDAO.java * Get device Ids of devices which are assigned to groups.
* *
* @param paginationRequest Request object with offset and limit. * @param paginationRequest Request object with offset and limit.
* @param groupNames default group names that should be omitted when checking the device * @param groupNames default group names that should be omitted when checking the device
* whether they have been assigned to groups * whether they have been assigned to groups
* @return details of devices that are unassigned to groups.
* @throws GroupManagementDAOException Might occur while retrieving information of group * @throws GroupManagementDAOException Might occur while retrieving information of group
* unassigned devices * unassigned devices
* @return details of devices that are unassigned to groups.
*/ */
List<Device> getGroupUnassignedDevices(PaginationRequest paginationRequest, List<Device> getGroupUnassignedDevices(PaginationRequest paginationRequest,

Loading…
Cancel
Save