/*
 * Copyright 2014 - 2016 Real Logic Ltd.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package io.aeron.driver.uri;

import java.net.URI;
import java.net.URISyntaxException;
import java.util.Map;

public class UriUtil
{
    public static <M extends Map<String, String>> M parseQueryString(final URI uri, final M queryParams)
        throws URISyntaxException
    {
        final String query = uri.getQuery();

        if (null == query)
        {
            return queryParams;
        }

        final String[] pairs = query.split("&");
        for (final String pair : pairs)
        {
            final String[] componentParts = pair.split("=");
            if (componentParts.length == 2)
            {
                queryParams.put(componentParts[0], componentParts[1]);
            }
            else if (componentParts.length == 1)
            {
                queryParams.put(componentParts[0], "");
            }
            else
            {
                throw new URISyntaxException(pair, "Did not contain 1 or 2 parts");
            }
        }

        return queryParams;
    }
}

@@ -709,30 +709,460 @@
 p;%0A%0A
-public class UriUtil%0A%7B
+/**%0A * Utility functions for dealing with %7B@link URI%7Ds.%0A */%0Apublic class UriUtil%0A%7B%0A    /**%0A     * Parse a URI query string and extract the params as key value pairs.%0A     *%0A     * @param uri         with query string.%0A     * @param queryParams to be populated.%0A     * @param %3CM%3E container for the params%0A     * @return the queryParams that has been populated.%0A     * @throws URISyntaxException if a parsing exception occurs on the query string.%0A     */
 %0A   
@@ -1429,32 +1429,37 @@
      %7D%0A%0A        
+for (
 final String%5B%5D p
@@ -1458,18 +1458,15 @@
 ring
-%5B%5D
  pair
-s =
+ :
  que
@@ -1482,48 +1482,8 @@
 %22&%22)
-;%0A        for (final String pair : pairs
 )%0A  

Tidy up and add JavaDoc to UriUtil.