← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 21597: toString, json

 

------------------------------------------------------------
revno: 21597
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2016-01-05 18:35:56 +0100
message:
  toString, json
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.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/user/UserCredentials.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java	2016-01-04 02:27:49 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java	2016-01-05 17:35:56 +0000
@@ -806,18 +806,19 @@
     @Override
     public String toString()
     {
-        return "UserCredentials{" +
-            "username='" + username + '\'' +
-            ", openId='" + openId + '\'' +
-            ", password='" + password + '\'' +
-            ", passwordLastUpdated=" + passwordLastUpdated +
-            ", userAuthorityGroups=" + userAuthorityGroups +
-            ", lastLogin=" + lastLogin +
-            ", restoreToken='" + restoreToken + '\'' +
-            ", restoreCode='" + restoreCode + '\'' +
-            ", restoreExpiry=" + restoreExpiry +
-            ", selfRegistered=" + selfRegistered +
-            ", disabled=" + disabled +
-            '}';
+        return "{" +
+            "\"userInfo\":\"" + userInfo + "\", " +
+            "\"username\":\"" + username + "\", " +
+            "\"openId\":\"" + openId + "\", " +
+            "\"password\":\"" + password + "\", " +
+            "\"passwordLastUpdated\":\"" + passwordLastUpdated + "\", " +
+            "\"userAuthorityGroups\":\"" + userAuthorityGroups + "\", " +
+            "\"lastLogin\":\"" + lastLogin + "\", " +
+            "\"restoreToken\":\"" + restoreToken + "\", " +
+            "\"restoreCode\":\"" + restoreCode + "\", " +
+            "\"restoreExpiry\":\"" + restoreExpiry + "\", " +
+            "\"selfRegistered\":\"" + selfRegistered + "\", " +
+            "\"disabled\":\"" + disabled + "\" " +
+            "}";
     }
 }