Merge in changes to web utils from Spring 4.1

spring-android-rest-template/src/main/java/org/springframework/web/util/OpaqueUriComponents.java

@@ -0,0 +1,163 @@
+/*
+ * Copyright 2002-2014 the original author or authors.
+ *
+ * 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 org.springframework.web.util;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Collections;
+import java.util.List;
+
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.util.ObjectUtils;
+
+/**
+ * Extension of {@link UriComponents} for opaque URIs.
+ *
+ * @author Arjen Poutsma
+ * @author Phillip Webb
+ * @since 2.0
+ * @see <a href="http://tools.ietf.org/html/rfc3986#section-1.2.3">Hierarchical vs Opaque URIs</a>
+ */
+@SuppressWarnings("serial")
+final class OpaqueUriComponents extends UriComponents {
+
+	private static final MultiValueMap<String, String> QUERY_PARAMS_NONE = new LinkedMultiValueMap<String, String>(0);
+
+	private final String ssp;
+
+
+	OpaqueUriComponents(String scheme, String schemeSpecificPart, String fragment) {
+		super(scheme, fragment);
+		this.ssp = schemeSpecificPart;
+	}
+
+
+	@Override
+	public String getSchemeSpecificPart() {
+		return this.ssp;
+	}
+
+	@Override
+	public String getUserInfo() {
+		return null;
+	}
+
+	@Override
+	public String getHost() {
+		return null;
+	}
+
+	@Override
+	public int getPort() {
+		return -1;
+	}
+
+	@Override
+	public String getPath() {
+		return null;
+	}
+
+	@Override
+	public List<String> getPathSegments() {
+		return Collections.emptyList();
+	}
+
+	@Override
+	public String getQuery() {
+		return null;
+	}
+
+	@Override
+	public MultiValueMap<String, String> getQueryParams() {
+		return QUERY_PARAMS_NONE;
+	}
+
+	@Override
+	public UriComponents encode(String encoding) throws UnsupportedEncodingException {
+		return this;
+	}
+
+	@Override
+	protected UriComponents expandInternal(UriTemplateVariables uriVariables) {
+		String expandedScheme = expandUriComponent(getScheme(), uriVariables);
+		String expandedSsp = expandUriComponent(getSchemeSpecificPart(), uriVariables);
+		String expandedFragment = expandUriComponent(getFragment(), uriVariables);
+		return new OpaqueUriComponents(expandedScheme, expandedSsp, expandedFragment);
+	}
+
+	@Override
+	public UriComponents normalize() {
+		return this;
+	}
+
+	@Override
+	public String toUriString() {
+		StringBuilder uriBuilder = new StringBuilder();
+
+		if (getScheme() != null) {
+			uriBuilder.append(getScheme());
+			uriBuilder.append(':');
+		}
+		if (this.ssp != null) {
+			uriBuilder.append(this.ssp);
+		}
+		if (getFragment() != null) {
+			uriBuilder.append('#');
+			uriBuilder.append(getFragment());
+		}
+
+		return uriBuilder.toString();
+	}
+
+	@Override
+	public URI toUri() {
+		try {
+			return new URI(getScheme(), this.ssp, getFragment());
+		}
+		catch (URISyntaxException ex) {
+			throw new IllegalStateException("Could not create URI object: " + ex.getMessage(), ex);
+		}
+	}
+
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj) {
+			return true;
+		}
+		if (!(obj instanceof OpaqueUriComponents)) {
+			return false;
+		}
+
+		OpaqueUriComponents other = (OpaqueUriComponents) obj;
+		return ObjectUtils.nullSafeEquals(getScheme(), other.getScheme()) &&
+				ObjectUtils.nullSafeEquals(this.ssp, other.ssp) &&
+				ObjectUtils.nullSafeEquals(getFragment(), other.getFragment());
+
+	}
+
+	@Override
+	public int hashCode() {
+		int result = ObjectUtils.nullSafeHashCode(getScheme());
+		result = 31 * result + ObjectUtils.nullSafeHashCode(this.ssp);
+		result = 31 * result + ObjectUtils.nullSafeHashCode(getFragment());
+		return result;
+	}
+
+}