From 51af13e97bc4725e8cc010c72bbedb667b0a0e0f Mon Sep 17 00:00:00 2001
From: radhika <radhika@curoverse.com>
Date: Sun, 4 May 2014 16:47:25 -0400
Subject: [PATCH] 2525: small refactoring

---
 .../java/org/arvados/sdk/java/Arvados.java     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/sdk/java/src/main/java/org/arvados/sdk/java/Arvados.java b/sdk/java/src/main/java/org/arvados/sdk/java/Arvados.java
index cd643b6d0f..11649ebb9e 100644
--- a/sdk/java/src/main/java/org/arvados/sdk/java/Arvados.java
+++ b/sdk/java/src/main/java/org/arvados/sdk/java/Arvados.java
@@ -267,20 +267,20 @@ public class Arvados {
       } else if (("array".equals(parameter.getType())) ||
                  ("Array".equals(parameter.getType()))) {
         if (parameterValue.getClass().isArray()){
-          value = getValueFromArrayType(parameterValue);
+          value = getJsonValueFromArrayType(parameterValue);
         } else if (List.class.isAssignableFrom(parameterValue.getClass())) {
-          value = getValueFromListType(parameterValue);
+          value = getJsonValueFromListType(parameterValue);
         }
       } else if (("Hash".equals(parameter.getType())) ||
                  ("hash".equals(parameter.getType()))) {
-        value = getValueFromMapType(parameterValue);
+        value = getJsonValueFromMapType(parameterValue);
       } else {
         if (parameterValue.getClass().isArray()){
-          value = getValueFromArrayType(parameterValue);
+          value = getJsonValueFromArrayType(parameterValue);
         } else if (List.class.isAssignableFrom(parameterValue.getClass())) {
-          value = getValueFromListType(parameterValue);
+          value = getJsonValueFromListType(parameterValue);
         } else if (Map.class.isAssignableFrom(parameterValue.getClass())) {
-          value = getValueFromMapType(parameterValue);
+          value = getJsonValueFromMapType(parameterValue);
         }
       }
     }
@@ -288,7 +288,7 @@ public class Arvados {
     parameters.put(parameterName, value);
   }
 
-  private String getValueFromArrayType (Object parameterValue) {
+  private String getJsonValueFromArrayType (Object parameterValue) {
     String arrayStr = Arrays.deepToString((Object[])parameterValue);
     arrayStr = arrayStr.substring(1, arrayStr.length()-1);
     Object[] array = arrayStr.split(",");
@@ -302,7 +302,7 @@ public class Arvados {
     return value;
   }
 
-  private String getValueFromListType (Object parameterValue) {
+  private String getJsonValueFromListType (Object parameterValue) {
     List paramList = (List)parameterValue;
     Object[] array = new Object[paramList.size()];
     String arrayStr = Arrays.deepToString(paramList.toArray(array));
@@ -318,7 +318,7 @@ public class Arvados {
     return value;
   }
 
-  private String getValueFromMapType (Object parameterValue) {
+  private String getJsonValueFromMapType (Object parameterValue) {
     JSONObject json = new JSONObject((Map)parameterValue);
     return json.toString();
   }
-- 
2.30.2