CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

remove warnings.

Browse Source
This commit is contained in:
Keith Woodlock
2013-02-20 20:00:33 +00:00
parent 3b636fcc2e
commit fd2515c1ff
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-db/patches/11-ddl_group_level_table.sql
+1 -3
View File
@@ -8,9 +8,7 @@ CREATE TABLE `m_group_level` (
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
INDEX `Parent_levelId_reference` (`parent_id`), INDEX `Parent_levelId_reference` (`parent_id`),
CONSTRAINT `Parent_levelId_reference` FOREIGN KEY (`parent_id`) REFERENCES `m_group_level` (`id`) CONSTRAINT `Parent_levelId_reference` FOREIGN KEY (`parent_id`) REFERENCES `m_group_level` (`id`)
) )ENGINE=InnoDB DEFAULT CHARSET=utf8;
COLLATE='utf8_general_ci'
ENGINE=InnoDB;
INSERT INTO `m_group_level` (`id`, `parent_id`, `is_super_parent`, `level_name`, `recursable`, `can_have_clients`) VALUES (1, NULL, 1, 'Center', 1, 0); INSERT INTO `m_group_level` (`id`, `parent_id`, `is_super_parent`, `level_name`, `recursable`, `can_have_clients`) VALUES (1, NULL, 1, 'Center', 1, 0);
INSERT INTO `m_group_level` (`id`, `parent_id`, `is_super_parent`, `level_name`, `recursable`, `can_have_clients`) VALUES (2, 1, 0, 'Group', 0, 1); INSERT INTO `m_group_level` (`id`, `parent_id`, `is_super_parent`, `level_name`, `recursable`, `can_have_clients`) VALUES (2, 1, 0, 'Group', 0, 1);
mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/data/GroupData.java
+5 -4
View File
@@ -9,7 +9,6 @@ import java.util.Collection;
import org.mifosplatform.organisation.office.data.OfficeLookup; import org.mifosplatform.organisation.office.data.OfficeLookup;
import org.mifosplatform.portfolio.client.data.ClientLookup; import org.mifosplatform.portfolio.client.data.ClientLookup;
import org.mifosplatform.portfolio.group.domain.GroupLevel;
/** /**
* Immutable data object representing groups. * Immutable data object representing groups.
@@ -21,6 +20,7 @@ public class GroupData {
private final String externalId; private final String externalId;
private final Long officeId; private final Long officeId;
private final String officeName; private final String officeName;
@SuppressWarnings("unused")
private final GroupLevelData groupLevelData; private final GroupLevelData groupLevelData;
private final Collection<ClientLookup> clientMembers; private final Collection<ClientLookup> clientMembers;
@@ -31,7 +31,7 @@ public class GroupData {
@SuppressWarnings("unused") @SuppressWarnings("unused")
private final Collection<GroupLookupData> allowedParentGroups; private final Collection<GroupLookupData> allowedParentGroups;
public GroupData(final Long id, final Long officeId, final String officeName, final String name, final String externalId ) { public GroupData(final Long id, final Long officeId, final String officeName, final String name, final String externalId) {
this.id = id; this.id = id;
this.officeId = officeId; this.officeId = officeId;
this.officeName = officeName; this.officeName = officeName;
@@ -46,7 +46,8 @@ public class GroupData {
} }
public GroupData(final GroupData group, final Collection<ClientLookup> clientMembers, final Collection<ClientLookup> allowedClients, public GroupData(final GroupData group, final Collection<ClientLookup> clientMembers, final Collection<ClientLookup> allowedClients,
final Collection<OfficeLookup> allowedOffices, final Collection<GroupLookupData> allowedParentGroups , final GroupLevelData groupLevelData) { final Collection<OfficeLookup> allowedOffices, final Collection<GroupLookupData> allowedParentGroups,
final GroupLevelData groupLevelData) {
this.id = group.getId(); this.id = group.getId();
this.officeId = group.getOfficeId(); this.officeId = group.getOfficeId();
this.officeName = group.getOfficeName(); this.officeName = group.getOfficeName();
@@ -61,7 +62,7 @@ public class GroupData {
} }
public GroupData(final Long officeId, final Collection<ClientLookup> allowedClients, final Collection<OfficeLookup> allowedOffices, public GroupData(final Long officeId, final Collection<ClientLookup> allowedClients, final Collection<OfficeLookup> allowedOffices,
final Collection<GroupLookupData> allowedParentGroups , final GroupLevelData groupLevelData ) { final Collection<GroupLookupData> allowedParentGroups, final GroupLevelData groupLevelData) {
this.id = null; this.id = null;
this.officeId = officeId; this.officeId = officeId;
this.officeName = null; this.officeName = null;
mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/domain/Group.java
+2 -1
View File
@@ -47,6 +47,7 @@ public class Group extends AbstractPersistable<Long> {
@JoinColumn(name = "staff_id", nullable = true) @JoinColumn(name = "staff_id", nullable = true)
private Staff loanOfficer; private Staff loanOfficer;
@SuppressWarnings("unused")
@Column(name = "level_id", nullable = false) @Column(name = "level_id", nullable = false)
private Long levelId; private Long levelId;
@@ -180,7 +181,7 @@ public class Group extends AbstractPersistable<Long> {
} }
} }
private String hierarchyOf(Long id) { private String hierarchyOf(final Long id) {
return this.hierarchy + id.toString() + "."; return this.hierarchy + id.toString() + ".";
} }