=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAttribute.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAttribute.java 2014-03-18 08:10:10 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAttribute.java 2014-03-18 13:40:38 +0000 @@ -315,7 +315,7 @@ @JsonProperty @JsonView( { DetailedView.class } ) @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 ) - public Boolean getUnique() + public Boolean isUnique() { return unique; } @@ -429,7 +429,7 @@ sortOrderInVisitSchedule = trackedEntityAttribute.getSortOrderInVisitSchedule(); displayInListNoProgram = trackedEntityAttribute.getDisplayInListNoProgram(); sortOrderInListNoProgram = trackedEntityAttribute.getSortOrderInListNoProgram(); - unique = trackedEntityAttribute.getUnique(); + unique = trackedEntityAttribute.isUnique(); orgunitScope = trackedEntityAttribute.getOrgunitScope(); programScope = trackedEntityAttribute.getProgramScope(); periodType = trackedEntityAttribute.getPeriodType(); === modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/hibernate/HibernateTrackedEntityInstanceStore.java' --- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/hibernate/HibernateTrackedEntityInstanceStore.java 2014-03-18 08:10:10 +0000 +++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/hibernate/HibernateTrackedEntityInstanceStore.java 2014-03-18 13:40:38 +0000 @@ -455,7 +455,7 @@ { TrackedEntityAttribute attribute = attributeValue.getAttribute(); - if ( attribute.getUnique() ) + if ( attribute.isUnique() ) { hasUnique = true; break; @@ -475,7 +475,7 @@ { TrackedEntityAttribute attribute = attributeValue.getAttribute(); - if ( attribute.getUnique() ) + if ( attribute.isUnique() ) { Conjunction conjunction = Restrictions.conjunction(); conjunction.add( Restrictions.eq( "attributeValue.value", attributeValue.getValue() ) );