Merge pull request #39 from cdwijayarathna/code-improvements

Code quality improvements
wso2 · Apr 9, 2016 · 9bb0294 · 9bb0294
2 parents 256b018 + 6404364
commit 9bb0294
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/...aron-core/src/main/java/org/wso2/charon/core/protocol/endpoints/UserResourceEndpoint.java b/...aron-core/src/main/java/org/wso2/charon/core/protocol/endpoints/UserResourceEndpoint.java
@@ -56,6 +56,8 @@
  * based on the HTTP requests received by SCIM Client.
  */
 public class UserResourceEndpoint extends AbstractResourceEndpoint {
+    private static final String INPUT_PARAMETER_META = "meta";
+    private static final String INPUT_PARAMETER_ATTRIBUTES = "attributes";
     private Log logger = LogFactory.getLog(UserResourceEndpoint.class);
 
     /**
@@ -484,9 +486,7 @@ public SCIMResponse updateWithPUT(String existingId, String scimObjectString,
                 //retrieve the old object
                 User oldUser = userManager.getUser(existingId);
                 if (oldUser != null) {
-                    User validatedUser =
-                            (User) ServerSideValidator.validateUpdatedSCIMObject(oldUser, user,
-                                    schema);
+                    User validatedUser = (User) ServerSideValidator.validateUpdatedSCIMObject(oldUser, user, schema);
                     updatedUser = userManager.updateUser(validatedUser);
 
                 } else {
@@ -580,18 +580,18 @@ public SCIMResponse updateWithPATCH(String existingId, String scimObjectString,
 
             JSONObject decodedJsonObj = new JSONObject(new JSONTokener(scimObjectString));
 
-            Object metaAttributeValueObject = decodedJsonObj.opt("meta");
+            Object metaAttributeValueObject = decodedJsonObj.opt(INPUT_PARAMETER_META);
             String[] metaAttributeIds = new String[0];
 
             if (metaAttributeValueObject != null) {
-                String metaAttributeVal = decodedJsonObj.opt("meta").toString();
+                String metaAttributeVal = decodedJsonObj.opt(INPUT_PARAMETER_META).toString();
                 JSONObject attributeObject = new JSONObject(new JSONTokener(metaAttributeVal));
-                JSONArray attributes = (JSONArray) attributeObject.opt("attributes");
+                JSONArray attributes = (JSONArray) attributeObject.opt(INPUT_PARAMETER_ATTRIBUTES);
                 metaAttributeIds = new String[attributes.length()];
                 for (int i = 0; i < attributes.length(); i++) {
                     metaAttributeIds[i] = attributes.getString(i);
                 }
-                decodedJsonObj.remove("meta");
+                decodedJsonObj.remove(INPUT_PARAMETER_META);
                 scimObjectString = decodedJsonObj.toString();
 
             }
@@ -605,9 +605,7 @@ public SCIMResponse updateWithPATCH(String existingId, String scimObjectString,
                     user.setDisplayName(oldUser.getDisplayName());
                 }
                 if (oldUser != null) {
-                    User validatedUser =
-                            (User) ServerSideValidator.validateUpdatedSCIMObject(oldUser, user,
-                                    schema);
+                    User validatedUser = (User) ServerSideValidator.validateUpdatedSCIMObject(oldUser, user, schema);
                     updatedUser = userManager.patchUser(validatedUser, oldUser, metaAttributeIds);
 
                 } else {
@@ -662,7 +660,7 @@ public SCIMResponse updateWithPATCH(String existingId, String scimObjectString,
             logger.error("Couldn't find the requested resource.", e);
             return AbstractResourceEndpoint.encodeSCIMException(encoder, e);
         } catch (JSONException e) {
-            logger.error("Error while parsing JSOn.", e);
+            logger.error("Error while parsing JSON.", e);
             return AbstractResourceEndpoint.encodeSCIMException(encoder, new BadRequestException());
         }
     }