Merge pull request #522 from IBM/issue-519

issue #519 - QueryParameterValue.toString should use query string format

Author: lmsurpre

fhir-search/src/main/java/com/ibm/fhir/search/parameters/QueryParameterValue.java

@@ -145,11 +145,13 @@ public String toString() {
         outputBuilder(returnString, valueDate);
 
         if (component != null && !component.isEmpty()) {
-            returnString.append("composite[");
-            // temporarily change the delimiter; NOT thread-safe
             String componentDelim = "";
             for (QueryParameter componentParam : component) {
-                returnString.append(componentDelim).append(componentParam);
+                List<QueryParameterValue> componentValues = componentParam.getValues();
+                if (componentValues.size() != 1) {
+                    throw new IllegalStateException("Components of a composite search parameter may only have a single value");
+                }
+                returnString.append(componentDelim).append(componentValues.get(0));
                 componentDelim = "$";
             }
         }

fhir-search/src/main/java/com/ibm/fhir/search/uri/UriBuilder.java

@@ -239,7 +239,7 @@ private String serializeSearchParmToQueryString(QueryParameter param) {
         return returnString.toString();
     }
 
-    /*
+    /**
      * creates a normal parameter and string.
      * 
      * @param param