dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 19294
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2015-06-05 13:19:27 +0200
message:
  Minor
modified:
  dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/webmessage/DescriptiveWebMessage.java
  dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/webmessage/WebMessage.java
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/ProgramIndicatorController.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-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/webmessage/DescriptiveWebMessage.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/webmessage/DescriptiveWebMessage.java	2015-06-05 10:40:30 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/webmessage/DescriptiveWebMessage.java	2015-06-05 11:19:27 +0000
@@ -32,6 +32,9 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+/**
+ * @author Lars Helge Overland
+ */
 public class DescriptiveWebMessage
     extends WebMessage
 {    

=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/webmessage/WebMessage.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/webmessage/WebMessage.java	2015-06-05 11:12:14 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/webmessage/WebMessage.java	2015-06-05 11:19:27 +0000
@@ -47,11 +47,12 @@
 public class WebMessage
 {
     /**
-     * Message status, currently two statuses are available: OK, ERROR.
+     * Message status, currently two statuses are available: OK, ERROR. Default
+     * value is OK.
      *
      * @see WebMessageStatus
      */
-    protected WebMessageStatus status;
+    protected WebMessageStatus status = WebMessageStatus.OK;
 
     /**
      * Internal code for this message. Should be used to help with third party clients which
@@ -60,7 +61,7 @@
     protected Integer code;
 
     /**
-     * HTTP status code.
+     * HTTP status code. Default value is 200.
      */
     protected Integer httpStatusCode = HttpStatus.OK.value();
 
@@ -90,13 +91,10 @@
 
     public WebMessage()
     {
-        this.status = WebMessageStatus.OK;
-        this.httpStatusCode = HttpStatus.OK.value();
     }
 
     public WebMessage( WebMessageStatus status )
     {
-        this.status = status;
         this.httpStatusCode = HttpStatus.OK.value();
     }
 

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/ProgramIndicatorController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/ProgramIndicatorController.java	2015-06-05 11:12:14 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/ProgramIndicatorController.java	2015-06-05 11:19:27 +0000
@@ -72,9 +72,7 @@
         
         if ( message.okStatus() )
         {
-            String description = programIndicatorService.getExpressionDescription( expression );
-            
-            message.setDescription( description );
+            message.setDescription( programIndicatorService.getExpressionDescription( expression ) );
         }
         
         webMessageService.sendJson( message, response );
@@ -94,9 +92,7 @@
         
         if ( message.okStatus() )
         {
-            String description = programIndicatorService.getExpressionDescription( expression );
-            
-            message.setDescription( description );
+            message.setDescription( programIndicatorService.getExpressionDescription( expression ) );
         }
         
         webMessageService.sendJson( message, response );