← Back to branch summary

~stian-sandvold/dhis2/UserSettingFallback

« back to all changes in this revision

Viewing changes to dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/IdentityPopulator.java

  • Committer: Stian Sandvold
  • Date: 2016-03-14 12:16:33 UTC
  • mfrom: (21871.1.422 dhis2)
  • Revision ID: stian.sandvold@gmail.com-20160314121633-ojggeaoszdunzltj
merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/IdentityPopulator.java
52
52
    private static final Map<String, String> TABLE_ID_MAP = DimensionalObjectUtils.asMap(
53
53
        "dataelementcategoryoption", "categoryoptionid",
54
54
        "dataelementcategory", "categoryid",
55
 
        "program_attributes", "programtrackedentityattributeid" );
 
55
        "program_attributes", "programtrackedentityattributeid",
 
56
        "users", "userid"
 
57
    );
56
58
 
57
59
    private List<String> tables = new ArrayList<>();
58
 
    
 
60
 
59
61
    public void setTables( List<String> tables )
60
62
    {
61
63
        this.tables = tables;
177
179
 
178
180
    private String getIdColumn( String table )
179
181
    {
180
 
        return TABLE_ID_MAP.getOrDefault( table, ( table + "id" ) );
 
182
        return TABLE_ID_MAP.getOrDefault( table, (table + "id") );
181
183
    }
182
184
 
183
185
    private void createOrgUnitUuids()