From 782c2a4657ef3c92fce91aa9a0276b2773f49a25 Mon Sep 17 00:00:00 2001 From: Arjen Poutsma Date: Wed, 14 Sep 2011 14:01:50 +0000 Subject: [PATCH] Removed ServletUriComponentsBuilder for now. --- .../support/ServletUriComponentsBuilder.java | 54 ------------------- 1 file changed, 54 deletions(-) delete mode 100644 org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/ServletUriComponentsBuilder.java diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/ServletUriComponentsBuilder.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/ServletUriComponentsBuilder.java deleted file mode 100644 index 4c5b0413e6..0000000000 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/ServletUriComponentsBuilder.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright 2002-2011 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.servlet.support; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.util.Assert; -import org.springframework.web.context.request.RequestAttributes; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; -import org.springframework.web.util.UriComponentsBuilder; - -/** @author Arjen Poutsma */ -public class ServletUriComponentsBuilder extends UriComponentsBuilder { - - - public static ServletUriComponentsBuilder fromCurrentServletRequest() { - RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes(); - Assert.state(requestAttributes != null, "Could not find current RequestAttributes in RequestContextHolder"); - Assert.isInstanceOf(ServletRequestAttributes.class, requestAttributes); - - HttpServletRequest servletRequest = ((ServletRequestAttributes) requestAttributes).getRequest(); - Assert.state(servletRequest != null, "Could not find current HttpServletRequest in ServletRequestAttributes"); - return fromServletRequest(servletRequest); - } - - public static ServletUriComponentsBuilder fromServletRequest(HttpServletRequest request) { - Assert.notNull(request, "'request' must not be null"); - - ServletUriComponentsBuilder builder = new ServletUriComponentsBuilder(); - builder.scheme(request.getScheme()); - builder.host(request.getServerName()); - builder.port(request.getServerPort()); - builder.path(request.getRequestURI()); -// builder.query(request.getQueryString()); - - return builder; - } - -}