dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 17423
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-11-11 14:57:38 +0545
message:
  minor refactor in idObjectUtils getLocal* naming
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObjectUtils.java
  dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/DefaultResourceTableService.java
  dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java
  dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/report/impl/DefaultReportService.java
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/RelationshipTypeController.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/IdentifiableObjectUtils.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObjectUtils.java	2014-11-11 08:30:34 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObjectUtils.java	2014-11-11 09:12:38 +0000
@@ -121,18 +121,18 @@
      * @param calendar the calendar to use for generation of iso periods.
      * @return a list of iso period identifiers.
      */
-    public static <T extends IdentifiableObject> List<String> getLocalPeriods( Collection<T> periods, Calendar calendar )
+    public static <T extends IdentifiableObject> List<String> getLocalPeriodIdentifiers( Collection<T> periods, Calendar calendar )
     {
-        List<String> isoPeriods = new ArrayList<>();
+        List<String> localIdentifiers = new ArrayList<>();
 
         for ( IdentifiableObject object : periods )
         {
             Period period = (Period) object;
             DateTimeUnit dateTimeUnit = calendar.fromIso( period.getStartDate() );
-            isoPeriods.add( period.getPeriodType().getIsoDate( dateTimeUnit ) );
+            localIdentifiers.add( period.getPeriodType().getIsoDate( dateTimeUnit ) );
         }
 
-        return isoPeriods;
+        return localIdentifiers;
     }
 
     /**
@@ -143,7 +143,7 @@
      * @param calendar   Calendar to create from
      * @return Period identifier based on given calendar
      */
-    public static String getLocalPeriod( Date date, PeriodType periodType, Calendar calendar )
+    public static String getLocalPeriodIdentifier( Date date, PeriodType periodType, Calendar calendar )
     {
         return getLocalPeriod( periodType.createPeriod( date, calendar ), calendar );
     }

=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/DefaultResourceTableService.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/DefaultResourceTableService.java	2014-11-11 08:13:46 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/DefaultResourceTableService.java	2014-11-11 09:12:38 +0000
@@ -31,6 +31,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.hisp.dhis.calendar.Calendar;
+import org.hisp.dhis.common.IdentifiableObjectUtils;
 import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
 import org.hisp.dhis.dataelement.CategoryOptionGroup;
 import org.hisp.dhis.dataelement.CategoryOptionGroupSet;
@@ -66,7 +67,6 @@
 import java.util.List;
 import java.util.Map;
 
-import static org.hisp.dhis.common.IdentifiableObjectUtils.getLocalPeriod;
 import static org.hisp.dhis.dataapproval.DataApprovalLevelService.APPROVAL_LEVEL_UNAPPROVED;
 import static org.hisp.dhis.resourcetable.ResourceTableStore.*;
 
@@ -481,7 +481,7 @@
                 {
                     if ( rowType.getFrequencyOrder() <= periodType.getFrequencyOrder() )
                     {
-                        values.add( getLocalPeriod( startDate, periodType, calendar ) );
+                        values.add( IdentifiableObjectUtils.getLocalPeriodIdentifier( startDate, periodType, calendar ) );
                     }
                     else
                     {

=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java	2014-11-11 08:45:17 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java	2014-11-11 09:12:38 +0000
@@ -112,7 +112,7 @@
 import static org.hisp.dhis.analytics.DataQueryParams.*;
 import static org.hisp.dhis.common.DimensionalObject.*;
 import static org.hisp.dhis.common.DimensionalObjectUtils.toDimension;
-import static org.hisp.dhis.common.IdentifiableObjectUtils.getLocalPeriods;
+import static org.hisp.dhis.common.IdentifiableObjectUtils.getLocalPeriodIdentifiers;
 import static org.hisp.dhis.common.IdentifiableObjectUtils.getUids;
 import static org.hisp.dhis.common.NameableObjectUtils.asList;
 import static org.hisp.dhis.common.NameableObjectUtils.asTypedList;
@@ -479,7 +479,7 @@
             }
             else
             {
-                periodUids = getLocalPeriods( params.getDimensionOrFilter( PERIOD_DIM_ID ), calendar );
+                periodUids = getLocalPeriodIdentifiers( params.getDimensionOrFilter( PERIOD_DIM_ID ), calendar );
             }
 
             metaData.put( PERIOD_DIM_ID, periodUids );

=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/report/impl/DefaultReportService.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/report/impl/DefaultReportService.java	2014-11-11 08:13:46 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/report/impl/DefaultReportService.java	2014-11-11 09:12:38 +0000
@@ -266,7 +266,7 @@
             }
             else
             {
-                periods = IdentifiableObjectUtils.getLocalPeriods( report.getRelatives().getRelativePeriods( date, format, true ), calendar );
+                periods = IdentifiableObjectUtils.getLocalPeriodIdentifiers( report.getRelatives().getRelativePeriods( date, format, true ), calendar );
             }
         }
 

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/RelationshipTypeController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/RelationshipTypeController.java	2014-11-11 09:08:17 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/RelationshipTypeController.java	2014-11-11 09:12:38 +0000
@@ -39,6 +39,7 @@
  */
 @Controller
 @RequestMapping( value = RelationshipTypeSchemaDescriptor.API_ENDPOINT )
-public class RelationshipTypeController extends AbstractCrudController<RelationshipType>
+public class RelationshipTypeController
+    extends AbstractCrudController<RelationshipType>
 {
 }