dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #38476
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 19593: updated ApprovalController to use WebMessage
------------------------------------------------------------
revno: 19593
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2015-07-09 11:31:49 +0700
message:
updated ApprovalController to use WebMessage
modified:
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataApprovalController.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-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataApprovalController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataApprovalController.java 2015-07-08 05:42:56 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataApprovalController.java 2015-07-09 04:31:49 +0000
@@ -46,6 +46,7 @@
import org.hisp.dhis.dataset.DataSet;
import org.hisp.dhis.dataset.DataSetService;
import org.hisp.dhis.dxf2.common.JacksonUtils;
+import org.hisp.dhis.dxf2.webmessage.WebMessageException;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
import org.hisp.dhis.period.Period;
@@ -55,7 +56,7 @@
import org.hisp.dhis.user.User;
import org.hisp.dhis.user.UserService;
import org.hisp.dhis.webapi.utils.ContextUtils;
-import org.hisp.dhis.webapi.utils.InputUtils;
+import org.hisp.dhis.webapi.utils.WebMessageUtils;
import org.hisp.dhis.webapi.webdomain.approval.Approval;
import org.hisp.dhis.webapi.webdomain.approval.Approvals;
import org.springframework.beans.factory.annotation.Autowired;
@@ -133,7 +134,7 @@
@RequestParam String ds,
@RequestParam String pe,
@RequestParam String ou, HttpServletResponse response )
- throws IOException
+ throws IOException, WebMessageException
{
log.info( "GET " + APPROVALS_PATH + "?ds=" + ds + "&pe=" + pe + "&ou=" + ou );
@@ -141,24 +142,21 @@
if ( dataSet == null )
{
- ContextUtils.conflictResponse( response, "Illegal data set identifier: " + ds );
- return;
+ throw new WebMessageException( WebMessageUtils.conflict( "Illegal data set identifier: " + ds ) );
}
Period period = PeriodType.getPeriodFromIsoString( pe );
if ( period == null )
{
- ContextUtils.conflictResponse( response, "Illegal period identifier: " + pe );
- return;
+ throw new WebMessageException( WebMessageUtils.conflict( "Illegal period identifier: " + pe ) );
}
OrganisationUnit organisationUnit = organisationUnitService.getOrganisationUnit( ou );
if ( organisationUnit == null )
{
- ContextUtils.conflictResponse( response, "Illegal organisation unit identifier: " + ou );
- return;
+ throw new WebMessageException( WebMessageUtils.conflict( "Illegal organisation unit identifier: " + ou ) );
}
DataElementCategoryOptionCombo combo = categoryService.getDefaultDataElementCategoryOptionCombo();
@@ -251,7 +249,7 @@
@RequestParam Set<String> ds,
@RequestParam String pe,
@RequestParam( required = false ) String ou,
- HttpServletResponse response ) throws IOException
+ HttpServletResponse response ) throws IOException, WebMessageException
{
Set<DataSet> dataSets = new HashSet<>( objectManager.getByUid( DataSet.class, ds ) );
@@ -259,8 +257,7 @@
if ( period == null )
{
- ContextUtils.conflictResponse( response, "Illegal period identifier: " + pe );
- return;
+ throw new WebMessageException( WebMessageUtils.conflict( "Illegal period identifier: " + pe ) );
}
OrganisationUnit orgUnit = organisationUnitService.getOrganisationUnit( ou );
@@ -271,7 +268,7 @@
for ( DataApprovalStatus status : statusList )
{
- Map<String, Object> item = new HashMap<String, Object>();
+ Map<String, Object> item = new HashMap<>();
DataApproval approval = status.getDataApproval();
@@ -307,7 +304,7 @@
public void saveApproval(
@RequestParam String ds,
@RequestParam String pe,
- @RequestParam String ou, HttpServletResponse response )
+ @RequestParam String ou, HttpServletResponse response ) throws WebMessageException
{
log.info( "POST " + APPROVALS_PATH + "?ds=" + ds + "&pe=" + pe + "&ou=" + ou );
@@ -315,32 +312,28 @@
if ( dataSet == null )
{
- ContextUtils.conflictResponse( response, "Illegal data set identifier: " + ds );
- return;
+ throw new WebMessageException( WebMessageUtils.conflict( "Illegal data set identifier: " + ds ) );
}
Period period = PeriodType.getPeriodFromIsoString( pe );
if ( period == null )
{
- ContextUtils.conflictResponse( response, "Illegal period identifier: " + pe );
- return;
+ throw new WebMessageException( WebMessageUtils.conflict( "Illegal period identifier: " + pe ) );
}
OrganisationUnit organisationUnit = organisationUnitService.getOrganisationUnit( ou );
if ( organisationUnit == null )
{
- ContextUtils.conflictResponse( response, "Illegal organisation unit identifier: " + ou );
- return;
+ throw new WebMessageException( WebMessageUtils.conflict( "Illegal organisation unit identifier: " + ou ) );
}
DataApprovalLevel dataApprovalLevel = dataApprovalLevelService.getHighestDataApprovalLevel( organisationUnit );
if ( dataApprovalLevel == null )
{
- ContextUtils.conflictResponse( response, "Approval level not found." );
- return;
+ throw new WebMessageException( WebMessageUtils.conflict( "Approval level not found." ) );
}
User user = currentUserService.getCurrentUser();
@@ -353,11 +346,11 @@
@RequestMapping( value = APPROVALS_PATH + "/approvals", method = RequestMethod.POST )
public void saveApprovalBatch( @RequestBody Approvals approvals,
- HttpServletRequest request, HttpServletResponse response )
+ HttpServletRequest request, HttpServletResponse response ) throws WebMessageException
{
if ( approvals.getDs() == null || approvals.getDs().isEmpty() || approvals.getPe() == null || approvals.getPe().isEmpty() )
{
- ContextUtils.conflictResponse( response, "Approval must have data sets and periods" );
+ throw new WebMessageException( WebMessageUtils.conflict( "Approval must have data sets and periods" ) );
}
dataApprovalService.approveData( getDataApprovalList( approvals ) );
@@ -365,11 +358,11 @@
@RequestMapping( value = APPROVALS_PATH + "/unapprovals", method = RequestMethod.POST )
public void removeApprovalBatch( @RequestBody Approvals approvals,
- HttpServletRequest request, HttpServletResponse response )
+ HttpServletRequest request, HttpServletResponse response ) throws WebMessageException
{
if ( approvals.getDs() == null || approvals.getDs().isEmpty() || approvals.getPe() == null || approvals.getPe().isEmpty() )
{
- ContextUtils.conflictResponse( response, "Approval must have data sets and periods" );
+ throw new WebMessageException( WebMessageUtils.conflict( "Approval must have data sets and periods" ) );
}
dataApprovalService.unapproveData( getDataApprovalList( approvals ) );
@@ -378,7 +371,7 @@
@PreAuthorize( "hasRole('ALL') or hasRole('F_APPROVE_DATA') or hasRole('F_APPROVE_DATA_LOWER_LEVELS')" )
@RequestMapping( value = MULTIPLE_SAVE_RESOURCE_PATH, method = RequestMethod.POST )
public void saveApprovalMultiple( @RequestBody DataApprovalStateRequests dataApprovalStateRequests,
- HttpServletResponse response )
+ HttpServletResponse response ) throws WebMessageException
{
List<DataApproval> dataApprovalList = new ArrayList<>();
@@ -388,16 +381,14 @@
if ( dataSet == null )
{
- ContextUtils.conflictResponse( response, "Illegal data set identifier: " + dataApprovalStateRequest.getDs() );
- return;
+ throw new WebMessageException( WebMessageUtils.conflict( "Illegal data set identifier: " + dataApprovalStateRequest.getDs() ) );
}
Period period = PeriodType.getPeriodFromIsoString( dataApprovalStateRequest.getPe() );
if ( period == null )
{
- ContextUtils.conflictResponse( response, "Illegal period identifier: " + dataApprovalStateRequest.getPe() );
- return;
+ throw new WebMessageException( WebMessageUtils.conflict( "Illegal period identifier: " + dataApprovalStateRequest.getPe() ) );
}
OrganisationUnit organisationUnit = organisationUnitService.getOrganisationUnit(
@@ -405,16 +396,14 @@
if ( organisationUnit == null )
{
- ContextUtils.conflictResponse( response, "Illegal organisation unit identifier: " + dataApprovalStateRequest.getOu() );
- return;
+ throw new WebMessageException( WebMessageUtils.conflict( "Illegal organisation unit identifier: " + dataApprovalStateRequest.getOu() ) );
}
DataApprovalLevel dataApprovalLevel = dataApprovalLevelService.getHighestDataApprovalLevel( organisationUnit );
if ( dataApprovalLevel == null )
{
- ContextUtils.conflictResponse( response, "Approval level not found." );
- return;
+ throw new WebMessageException( WebMessageUtils.conflict( "Approval level not found." ) );
}
User user = dataApprovalStateRequest.getAb() == null ?
@@ -439,7 +428,7 @@
public void acceptApproval(
@RequestParam String ds,
@RequestParam String pe,
- @RequestParam String ou, HttpServletResponse response )
+ @RequestParam String ou, HttpServletResponse response ) throws WebMessageException
{
log.info( "POST " + APPROVALS_PATH + ACCEPTANCES_PATH + "?ds=" + ds + "&pe=" + pe + "&ou=" + ou );
@@ -447,32 +436,28 @@
if ( dataSet == null )
{
- ContextUtils.conflictResponse( response, "Illegal data set identifier: " + ds );
- return;
+ throw new WebMessageException( WebMessageUtils.conflict( "Illegal data set identifier: " + ds ) );
}
Period period = PeriodType.getPeriodFromIsoString( pe );
if ( period == null )
{
- ContextUtils.conflictResponse( response, "Illegal period identifier: " + pe );
- return;
+ throw new WebMessageException( WebMessageUtils.conflict( "Illegal period identifier: " + pe ) );
}
OrganisationUnit organisationUnit = organisationUnitService.getOrganisationUnit( ou );
if ( organisationUnit == null )
{
- ContextUtils.conflictResponse( response, "Illegal organisation unit identifier: " + ou );
- return;
+ throw new WebMessageException( WebMessageUtils.conflict( "Illegal organisation unit identifier: " + ou ) );
}
DataApprovalLevel dataApprovalLevel = dataApprovalLevelService.getHighestDataApprovalLevel( organisationUnit );
if ( dataApprovalLevel == null )
{
- ContextUtils.conflictResponse( response, "Approval level not found." );
- return;
+ throw new WebMessageException( WebMessageUtils.conflict( "Approval level not found." ) );
}
User user = currentUserService.getCurrentUser();
@@ -485,11 +470,11 @@
@RequestMapping( value = ACCEPTANCES_PATH + "/acceptances", method = RequestMethod.POST )
public void saveAcceptanceBatch( @RequestBody Approvals approvals,
- HttpServletRequest request, HttpServletResponse response )
+ HttpServletRequest request, HttpServletResponse response ) throws WebMessageException
{
if ( approvals.getDs() == null || approvals.getDs().isEmpty() || approvals.getPe() == null || approvals.getPe().isEmpty() )
{
- ContextUtils.conflictResponse( response, "Approval must have data sets and periods" );
+ throw new WebMessageException( WebMessageUtils.conflict( "Approval must have data sets and periods" ) );
}
dataApprovalService.acceptData( getDataApprovalList( approvals ) );
@@ -497,11 +482,11 @@
@RequestMapping( value = ACCEPTANCES_PATH + "/unacceptances", method = RequestMethod.POST )
public void removeAcceptancesBatch( @RequestBody Approvals approvals,
- HttpServletRequest request, HttpServletResponse response )
+ HttpServletRequest request, HttpServletResponse response ) throws WebMessageException
{
if ( approvals.getDs() == null || approvals.getDs().isEmpty() || approvals.getPe() == null || approvals.getPe().isEmpty() )
{
- ContextUtils.conflictResponse( response, "Approval must have data sets and periods" );
+ throw new WebMessageException( WebMessageUtils.conflict( "Approval must have data sets and periods" ) );
}
dataApprovalService.unacceptData( getDataApprovalList( approvals ) );
@@ -510,7 +495,7 @@
@PreAuthorize( "hasRole('ALL') or hasRole('F_ACCEPT_DATA_LOWER_LEVELS')" )
@RequestMapping( value = MULTIPLE_ACCEPTANCES_RESOURCE_PATH, method = RequestMethod.POST )
public void acceptApprovalMultiple( @RequestBody DataApprovalStateRequests dataApprovalStateRequests,
- HttpServletResponse response )
+ HttpServletResponse response ) throws WebMessageException
{
List<DataApproval> dataApprovalList = new ArrayList<>();
@@ -520,16 +505,14 @@
if ( dataSet == null )
{
- ContextUtils.conflictResponse( response, "Illegal data set identifier: " + dataApprovalStateRequest.getDs() );
- return;
+ throw new WebMessageException( WebMessageUtils.conflict( "Illegal data set identifier: " + dataApprovalStateRequest.getDs() ) );
}
Period period = PeriodType.getPeriodFromIsoString( dataApprovalStateRequest.getPe() );
if ( period == null )
{
- ContextUtils.conflictResponse( response, "Illegal period identifier: " + dataApprovalStateRequest.getPe() );
- return;
+ throw new WebMessageException( WebMessageUtils.conflict( "Illegal period identifier: " + dataApprovalStateRequest.getPe() ) );
}
OrganisationUnit organisationUnit = organisationUnitService.getOrganisationUnit(
@@ -537,16 +520,14 @@
if ( organisationUnit == null )
{
- ContextUtils.conflictResponse( response, "Illegal organisation unit identifier: " + dataApprovalStateRequest.getOu() );
- return;
+ throw new WebMessageException( WebMessageUtils.conflict( "Illegal organisation unit identifier: " + dataApprovalStateRequest.getOu() ) );
}
DataApprovalLevel dataApprovalLevel = dataApprovalLevelService.getHighestDataApprovalLevel( organisationUnit );
if ( dataApprovalLevel == null )
{
- ContextUtils.conflictResponse( response, "Approval level not found." );
- return;
+ throw new WebMessageException( WebMessageUtils.conflict( "Approval level not found." ) );
}
User user = dataApprovalStateRequest.getAb() == null ?
@@ -570,7 +551,7 @@
public void removeApproval(
@RequestParam Set<String> ds,
@RequestParam String pe,
- @RequestParam String ou, HttpServletResponse response )
+ @RequestParam String ou, HttpServletResponse response ) throws WebMessageException
{
log.info( "DELETE " + APPROVALS_PATH + "?ds=" + ds + "&pe=" + pe + "&ou=" + ou );
@@ -578,32 +559,28 @@
if ( dataSets.size() != ds.size() )
{
- ContextUtils.conflictResponse( response, "Illegal data set identifier in this list: " + ds );
- return;
+ throw new WebMessageException( WebMessageUtils.conflict( "Illegal data set identifier in this list: " + ds ) );
}
Period period = PeriodType.getPeriodFromIsoString( pe );
if ( period == null )
{
- ContextUtils.conflictResponse( response, "Illegal period identifier: " + pe );
- return;
+ throw new WebMessageException( WebMessageUtils.conflict( "Illegal period identifier: " + pe ) );
}
OrganisationUnit organisationUnit = organisationUnitService.getOrganisationUnit( ou );
if ( organisationUnit == null )
{
- ContextUtils.conflictResponse( response, "Illegal organisation unit identifier: " + ou );
- return;
+ throw new WebMessageException( WebMessageUtils.conflict( "Illegal organisation unit identifier: " + ou ) );
}
DataApprovalLevel dataApprovalLevel = dataApprovalLevelService.getHighestDataApprovalLevel( organisationUnit );
if ( dataApprovalLevel == null )
{
- ContextUtils.conflictResponse( response, "Approval level not found." );
- return;
+ throw new WebMessageException( WebMessageUtils.conflict( "Approval level not found." ) );
}
User user = currentUserService.getCurrentUser();
@@ -624,7 +601,7 @@
public void unacceptApproval(
@RequestParam String ds,
@RequestParam String pe,
- @RequestParam String ou, HttpServletResponse response )
+ @RequestParam String ou, HttpServletResponse response ) throws WebMessageException
{
log.info( "DELETE " + APPROVALS_PATH + ACCEPTANCES_PATH + "?ds=" + ds + "&pe=" + pe + "&ou=" + ou );
@@ -632,32 +609,28 @@
if ( dataSet == null )
{
- ContextUtils.conflictResponse( response, "Illegal data set identifier: " + ds );
- return;
+ throw new WebMessageException( WebMessageUtils.conflict( "Illegal data set identifier: " + ds ) );
}
Period period = PeriodType.getPeriodFromIsoString( pe );
if ( period == null )
{
- ContextUtils.conflictResponse( response, "Illegal period identifier: " + pe );
- return;
+ throw new WebMessageException( WebMessageUtils.conflict( "Illegal period identifier: " + pe ) );
}
OrganisationUnit organisationUnit = organisationUnitService.getOrganisationUnit( ou );
if ( organisationUnit == null )
{
- ContextUtils.conflictResponse( response, "Illegal organisation unit identifier: " + ou );
- return;
+ throw new WebMessageException( WebMessageUtils.conflict( "Illegal organisation unit identifier: " + ou ) );
}
DataApprovalLevel dataApprovalLevel = dataApprovalLevelService.getHighestDataApprovalLevel( organisationUnit );
if ( dataApprovalLevel == null )
{
- ContextUtils.conflictResponse( response, "Approval level not found." );
- return;
+ throw new WebMessageException( WebMessageUtils.conflict( "Approval level not found." ) );
}
User user = currentUserService.getCurrentUser();
