dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #38587
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 19652: minor fixes, adds missing @Override annotations
------------------------------------------------------------
revno: 19652
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2015-07-15 16:45:45 +0700
message:
minor fixes, adds missing @Override annotations
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseDimensionalObject.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElement.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSet.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/eventchart/EventChart.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/eventreport/EventReport.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/option/OptionSet.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/PeriodType.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAttribute.java
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataintegrity/DefaultDataIntegrityService.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/DataApprovalPermissionsEvaluator.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/DefaultDataApprovalLevelService.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/hibernate/HibernateDataApprovalStore.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/hibernate/HibernateCategoryOptionGroupStore.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/hibernate/HibernateCategoryOptionStore.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/DefaultProgramStageInstanceService.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/DefaultSecurityService.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserService.java
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/JdbcEventStore.java
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/comparator/TrackedEntityAttributeValueSortOrderComparator.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AbstractCrudController.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/user/CurrentUserController.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseDimensionalObject.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseDimensionalObject.java 2015-06-18 14:35:18 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseDimensionalObject.java 2015-07-15 09:45:45 +0000
@@ -280,6 +280,7 @@
this.filter = filter;
}
+ @Override
@JsonProperty
@JsonView( { DetailedView.class, ExportView.class } )
@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElement.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElement.java 2015-07-13 12:34:39 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElement.java 2015-07-15 09:45:45 +0000
@@ -511,6 +511,7 @@
return optionSet != null;
}
+ @Override
public boolean hasLegendSet()
{
return legendSet != null;
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSet.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSet.java 2015-07-13 12:34:39 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSet.java 2015-07-15 09:45:45 +0000
@@ -414,6 +414,7 @@
return optionCombos;
}
+ @Override
public int increaseVersion()
{
return ++version;
@@ -589,6 +590,7 @@
this.mobile = mobile;
}
+ @Override
@JsonProperty
@JsonView( { DetailedView.class, ExportView.class } )
@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
@@ -597,6 +599,7 @@
return version;
}
+ @Override
public void setVersion( int version )
{
this.version = version;
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/eventchart/EventChart.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/eventchart/EventChart.java 2015-04-04 06:18:39 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/eventchart/EventChart.java 2015-07-15 09:45:45 +0000
@@ -277,6 +277,7 @@
this.endDate = endDate;
}
+ @Override
@JsonProperty
@JsonSerialize( as = BaseIdentifiableObject.class )
@JsonView( { DetailedView.class, ExportView.class, DimensionalView.class } )
@@ -286,11 +287,13 @@
return dataElementValueDimension;
}
+ @Override
public void setDataElementValueDimension( DataElement dataElementValueDimension )
{
this.dataElementValueDimension = dataElementValueDimension;
}
+ @Override
@JsonProperty
@JsonSerialize( as = BaseIdentifiableObject.class )
@JsonView( { DetailedView.class, ExportView.class, DimensionalView.class } )
@@ -300,6 +303,7 @@
return attributeValueDimension;
}
+ @Override
public void setAttributeValueDimension( TrackedEntityAttribute attributeValueDimension )
{
this.attributeValueDimension = attributeValueDimension;
@@ -333,6 +337,7 @@
this.rowDimensions = rowDimensions;
}
+ @Override
@JsonProperty
@JsonView( { DetailedView.class, ExportView.class, DimensionalView.class } )
@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
@@ -346,6 +351,7 @@
this.outputType = outputType;
}
+ @Override
@JsonProperty
@JsonView( { DetailedView.class, ExportView.class, DimensionalView.class } )
@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
@@ -376,6 +382,7 @@
// Analytical properties
// -------------------------------------------------------------------------
+ @Override
@JsonProperty
@JsonDeserialize( as = BaseDimensionalObject.class )
@JsonSerialize( as = BaseDimensionalObject.class )
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/eventreport/EventReport.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/eventreport/EventReport.java 2015-04-01 15:34:05 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/eventreport/EventReport.java 2015-07-15 09:45:45 +0000
@@ -298,6 +298,7 @@
this.endDate = endDate;
}
+ @Override
@JsonProperty
@JsonSerialize( as = BaseIdentifiableObject.class )
@JsonView( { DetailedView.class, ExportView.class, DimensionalView.class } )
@@ -307,11 +308,13 @@
return dataElementValueDimension;
}
+ @Override
public void setDataElementValueDimension( DataElement dataElementValueDimension )
{
this.dataElementValueDimension = dataElementValueDimension;
}
+ @Override
@JsonProperty
@JsonSerialize( as = BaseIdentifiableObject.class )
@JsonView( { DetailedView.class, ExportView.class, DimensionalView.class } )
@@ -321,6 +324,7 @@
return attributeValueDimension;
}
+ @Override
public void setAttributeValueDimension( TrackedEntityAttribute attributeValueDimension )
{
this.attributeValueDimension = attributeValueDimension;
@@ -459,6 +463,7 @@
this.hideNaData = hideNaData;
}
+ @Override
@JsonProperty
@JsonView( { DetailedView.class, ExportView.class, DimensionalView.class } )
@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
@@ -472,6 +477,7 @@
this.outputType = outputType;
}
+ @Override
@JsonProperty
@JsonView( { DetailedView.class, ExportView.class, DimensionalView.class } )
@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
@@ -541,6 +547,7 @@
// Analytical properties
// -------------------------------------------------------------------------
+ @Override
@JsonProperty
@JsonDeserialize( as = BaseDimensionalObject.class )
@JsonSerialize( as = BaseDimensionalObject.class )
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/option/OptionSet.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/option/OptionSet.java 2015-05-11 14:01:03 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/option/OptionSet.java 2015-07-15 09:45:45 +0000
@@ -82,6 +82,7 @@
options.clear();
}
+ @Override
public int increaseVersion()
{
return ++version;
@@ -143,6 +144,7 @@
this.options = options;
}
+ @Override
@JsonProperty
@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public int getVersion()
@@ -150,6 +152,7 @@
return version;
}
+ @Override
public void setVersion( int version )
{
this.version = version;
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/PeriodType.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/PeriodType.java 2015-06-11 19:52:58 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/PeriodType.java 2015-07-15 09:45:45 +0000
@@ -247,6 +247,7 @@
{
return periodCache.get( getCacheKey( date ), new Callable<Period>()
{
+ @Override
public Period call() throws Exception
{
return createPeriod( createCalendarInstance( date ) );
@@ -283,6 +284,7 @@
{
return periodCache.get( getCacheKey( calendar, date ), new Callable<Period>()
{
+ @Override
public Period call() throws Exception
{
return createPeriod( calendar.fromIso( DateTimeUnit.fromJdkDate( date ) ), calendar );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java 2015-07-13 12:34:39 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java 2015-07-15 09:45:45 +0000
@@ -250,6 +250,7 @@
return null;
}
+ @Override
public int increaseVersion()
{
return ++version;
@@ -273,6 +274,7 @@
this.description = description;
}
+ @Override
@JsonProperty
@JsonView( { DetailedView.class, ExportView.class } )
@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
@@ -281,6 +283,7 @@
return version;
}
+ @Override
public void setVersion( int version )
{
this.version = version;
=== 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 2015-07-13 12:34:39 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAttribute.java 2015-07-15 09:45:45 +0000
@@ -144,6 +144,7 @@
return optionSet != null;
}
+ @Override
public boolean hasLegendSet()
{
return legendSet != null;
=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataintegrity/DefaultDataIntegrityService.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataintegrity/DefaultDataIntegrityService.java 2015-06-15 13:44:20 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataintegrity/DefaultDataIntegrityService.java 2015-07-15 09:45:45 +0000
@@ -298,6 +298,7 @@
// DataSet
// -------------------------------------------------------------------------
+ @Override
public SetMap<DataSet, DataElementOperand> getCategoryOptionCombosNotInDataElementCategoryCombo()
{
SetMap<DataSet, DataElementOperand> map = new SetMap<>();
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/DataApprovalPermissionsEvaluator.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/DataApprovalPermissionsEvaluator.java 2015-04-22 14:42:37 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/DataApprovalPermissionsEvaluator.java 2015-07-15 09:45:45 +0000
@@ -226,6 +226,7 @@
{
userApprovalLevel = ( USER_APPROVAL_LEVEL_CACHE.get( user.getId() + "-" + da.getOrganisationUnit().getId(), new Callable<DataApprovalLevel>()
{
+ @Override
public DataApprovalLevel call() throws ExecutionException
{
return dataApprovalLevelService.getUserApprovalLevel( user, dataApproval.getOrganisationUnit() );
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/DefaultDataApprovalLevelService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/DefaultDataApprovalLevelService.java 2015-06-10 12:41:58 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/DefaultDataApprovalLevelService.java 2015-07-15 09:45:45 +0000
@@ -237,13 +237,15 @@
return dataApprovalLevels;
}
-
+
+ @Override
public Map<Integer, DataApprovalLevel> getDataApprovalLevelMap()
{
List<DataApprovalLevel> levels = dataApprovalLevelStore.getAllDataApprovalLevels();
return Maps.uniqueIndex( levels, new Function<DataApprovalLevel, Integer>()
{
+ @Override
public Integer apply( DataApprovalLevel level )
{
return level.getLevel();
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/hibernate/HibernateDataApprovalStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/hibernate/HibernateDataApprovalStore.java 2015-06-23 11:51:15 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/hibernate/HibernateDataApprovalStore.java 2015-07-15 09:45:45 +0000
@@ -95,6 +95,7 @@
private JdbcTemplate jdbcTemplate;
+ @Override
public void setJdbcTemplate( JdbcTemplate jdbcTemplate )
{
this.jdbcTemplate = jdbcTemplate;
@@ -109,6 +110,7 @@
private CurrentUserService currentUserService;
+ @Override
public void setCurrentUserService( CurrentUserService currentUserService )
{
this.currentUserService = currentUserService;
@@ -452,6 +454,7 @@
DataElementCategoryOptionCombo optionCombo = ( aoc == null || aoc == 0 ? null : optionComboCache.get( aoc, new Callable<DataElementCategoryOptionCombo>()
{
+ @Override
public DataElementCategoryOptionCombo call() throws ExecutionException
{
return categoryService.getDataElementCategoryOptionCombo( aoc );
@@ -460,6 +463,7 @@
OrganisationUnit ou = ( orgUnit != null ? orgUnit : orgUnitCache.get( ouId, new Callable<OrganisationUnit>()
{
+ @Override
public OrganisationUnit call() throws ExecutionException
{
return organisationUnitService.getOrganisationUnit( ouId );
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/hibernate/HibernateCategoryOptionGroupStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/hibernate/HibernateCategoryOptionGroupStore.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/hibernate/HibernateCategoryOptionGroupStore.java 2015-07-15 09:45:45 +0000
@@ -43,6 +43,7 @@
extends HibernateIdentifiableObjectStore<CategoryOptionGroup>
implements CategoryOptionGroupStore
{
+ @Override
@SuppressWarnings("unchecked")
public List<CategoryOptionGroup> getCategoryOptionGroups( CategoryOptionGroupSet groupSet )
{
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/hibernate/HibernateCategoryOptionStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/hibernate/HibernateCategoryOptionStore.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/hibernate/HibernateCategoryOptionStore.java 2015-07-15 09:45:45 +0000
@@ -43,6 +43,7 @@
extends HibernateIdentifiableObjectStore<DataElementCategoryOption>
implements CategoryOptionStore
{
+ @Override
@SuppressWarnings("unchecked")
public List<DataElementCategoryOption> getCategoryOptions( DataElementCategory category )
{
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/DefaultProgramStageInstanceService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/DefaultProgramStageInstanceService.java 2015-07-02 07:05:55 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/DefaultProgramStageInstanceService.java 2015-07-15 09:45:45 +0000
@@ -446,6 +446,7 @@
return programStageInstance;
}
+ @Override
public ProgramStageInstance createProgramStageInstance( ProgramInstance programInstance, ProgramStage programStage,
Date enrollmentDate, Date dateOfIncident, OrganisationUnit organisationUnit )
{
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/DefaultSecurityService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/DefaultSecurityService.java 2015-07-14 07:21:33 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/DefaultSecurityService.java 2015-07-15 09:45:45 +0000
@@ -185,6 +185,7 @@
return null;
}
+ @Override
public String validateInvite( UserCredentials credentials )
{
if ( credentials == null )
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserService.java 2015-06-16 05:11:29 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserService.java 2015-07-15 09:45:45 +0000
@@ -373,6 +373,7 @@
return true;
}
+ @Override
public boolean canAddOrUpdateUser( Collection<String> userGroups )
{
User currentUser = currentUserService.getCurrentUser();
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java 2015-07-14 13:10:08 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java 2015-07-15 09:45:45 +0000
@@ -741,6 +741,7 @@
boolean inUserHierarchy = orgUnitInHierarchyMap.get( orgUnit.getUid(), new Callable<Boolean>()
{
+ @Override
public Boolean call() throws Exception
{
return organisationUnitService.isInUserHierarchy( orgUnit.getUid(), currentOrgUnits );
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/JdbcEventStore.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/JdbcEventStore.java 2015-07-02 07:05:55 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/JdbcEventStore.java 2015-07-15 09:45:45 +0000
@@ -278,6 +278,7 @@
return eventRows;
}
+ @Override
public int getEventCount( EventSearchParams params, List<OrganisationUnit> organisationUnits )
{
String sql = getEventSelectQuery( params, organisationUnits );
=== modified file 'dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/comparator/TrackedEntityAttributeValueSortOrderComparator.java'
--- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/comparator/TrackedEntityAttributeValueSortOrderComparator.java 2015-02-03 14:32:52 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/comparator/TrackedEntityAttributeValueSortOrderComparator.java 2015-07-15 09:45:45 +0000
@@ -35,6 +35,7 @@
public class TrackedEntityAttributeValueSortOrderComparator
implements Comparator<TrackedEntityAttributeValue>
{
+ @Override
public int compare( TrackedEntityAttributeValue value0, TrackedEntityAttributeValue value1 )
{
if ( value0 == null || value1 == null || value0.getAttribute() == null || value1.getAttribute() == null )
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AbstractCrudController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AbstractCrudController.java 2015-07-14 07:21:33 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AbstractCrudController.java 2015-07-15 09:45:45 +0000
@@ -35,7 +35,6 @@
import com.google.common.base.Joiner;
import com.google.common.base.Optional;
import com.google.common.collect.Lists;
-import org.hisp.dhis.security.acl.AclService;
import org.hisp.dhis.common.BaseIdentifiableObject;
import org.hisp.dhis.common.IdentifiableObject;
import org.hisp.dhis.common.IdentifiableObjectManager;
@@ -72,6 +71,7 @@
import org.hisp.dhis.schema.Property;
import org.hisp.dhis.schema.Schema;
import org.hisp.dhis.schema.SchemaService;
+import org.hisp.dhis.security.acl.AclService;
import org.hisp.dhis.user.CurrentUserService;
import org.hisp.dhis.user.User;
import org.hisp.dhis.webapi.service.ContextService;
@@ -197,7 +197,7 @@
options.getOptions().put( "viewClass", "sharing" );
}
- handleLinksAndAccess( options, entities, false );
+ handleLinksAndAccess( options, entities );
linkService.generatePagerLinks( pager, getEntityClass() );
@@ -959,11 +959,11 @@
}
}
- protected void handleLinksAndAccess( WebOptions options, List<T> entityList, boolean deepScan )
+ protected void handleLinksAndAccess( WebOptions options, List<T> entityList )
{
if ( options != null && options.hasLinks() )
{
- linkService.generateLinks( entityList, deepScan );
+ linkService.generateLinks( entityList, false );
}
if ( entityList != null && aclService.isSupported( getEntityClass() ) )
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/user/CurrentUserController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/user/CurrentUserController.java 2015-07-15 09:33:32 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/user/CurrentUserController.java 2015-07-15 09:45:45 +0000
@@ -676,7 +676,7 @@
for ( OrganisationUnit ou : userOrganisationUnits )
{
- Set<DataSet> dataSets = new HashSet<DataSet>( Sets.intersection( ou.getDataSets(), userDataSets ) );
+ Set<DataSet> dataSets = new HashSet<>( Sets.intersection( ou.getDataSets(), userDataSets ) );
if ( dataSets.size() > 0 )
{
@@ -698,7 +698,7 @@
formOrganisationUnit.setParent( organisationUnit.getParent().getUid() );
}
- Set<DataSet> dataSets = new HashSet<DataSet>( Sets.intersection( organisationUnit.getDataSets(), userDataSets ) );
+ Set<DataSet> dataSets = new HashSet<>( Sets.intersection( organisationUnit.getDataSets(), userDataSets ) );
i18nService.internationalise( dataSets );
for ( DataSet dataSet : dataSets )
