From b0383f90805abc4c7528ed3d38e752ab0dcb40de Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 28 Jun 2011 14:08:47 +0000 Subject: [PATCH] fixed getHeaderNames signature git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4636 50f2f4bb-b051-0410-bef5-90022cba6387 --- .../java/org/springframework/mock/web/MockMultipartFile.java | 2 +- .../java/org/springframework/mock/web/MockMultipartFile.java | 2 +- .../java/org/springframework/mock/web/MockMultipartFile.java | 2 +- .../java/org/springframework/web/multipart/MultipartFile.java | 2 +- .../web/multipart/commons/CommonsMultipartFile.java | 2 +- .../web/multipart/support/StandardServletMultipartResolver.java | 2 +- .../java/org/springframework/mock/web/MockMultipartFile.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/MockMultipartFile.java b/org.springframework.test/src/main/java/org/springframework/mock/web/MockMultipartFile.java index e63f63c4315..6b87593a167 100644 --- a/org.springframework.test/src/main/java/org/springframework/mock/web/MockMultipartFile.java +++ b/org.springframework.test/src/main/java/org/springframework/mock/web/MockMultipartFile.java @@ -151,7 +151,7 @@ public class MockMultipartFile implements MultipartFile { } } - public Iterator getHeaderNames(String name) { + public Iterator getHeaderNames() { return Collections.singleton(CONTENT_TYPE).iterator(); } diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/mock/web/MockMultipartFile.java b/org.springframework.web.portlet/src/test/java/org/springframework/mock/web/MockMultipartFile.java index e63f63c4315..6b87593a167 100644 --- a/org.springframework.web.portlet/src/test/java/org/springframework/mock/web/MockMultipartFile.java +++ b/org.springframework.web.portlet/src/test/java/org/springframework/mock/web/MockMultipartFile.java @@ -151,7 +151,7 @@ public class MockMultipartFile implements MultipartFile { } } - public Iterator getHeaderNames(String name) { + public Iterator getHeaderNames() { return Collections.singleton(CONTENT_TYPE).iterator(); } diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockMultipartFile.java b/org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockMultipartFile.java index c3a31abbcab..c9271fcddfb 100644 --- a/org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockMultipartFile.java +++ b/org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockMultipartFile.java @@ -151,7 +151,7 @@ public class MockMultipartFile implements MultipartFile { } } - public Iterator getHeaderNames(String name) { + public Iterator getHeaderNames() { return Collections.singleton(CONTENT_TYPE).iterator(); } diff --git a/org.springframework.web/src/main/java/org/springframework/web/multipart/MultipartFile.java b/org.springframework.web/src/main/java/org/springframework/web/multipart/MultipartFile.java index 85978cf7a02..8fdb1b23ae3 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/multipart/MultipartFile.java +++ b/org.springframework.web/src/main/java/org/springframework/web/multipart/MultipartFile.java @@ -124,6 +124,6 @@ public interface MultipartFile { * @return the names of the headers * @since 3.1 */ - Iterator getHeaderNames(String name); + Iterator getHeaderNames(); } diff --git a/org.springframework.web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartFile.java b/org.springframework.web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartFile.java index 0d7dd52eb6d..f1097a7fefa 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartFile.java +++ b/org.springframework.web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartFile.java @@ -209,7 +209,7 @@ public class CommonsMultipartFile implements MultipartFile, Serializable { } } - public Iterator getHeaderNames(String name) { + public Iterator getHeaderNames() { return Collections.singleton(CONTENT_TYPE).iterator(); } diff --git a/org.springframework.web/src/main/java/org/springframework/web/multipart/support/StandardServletMultipartResolver.java b/org.springframework.web/src/main/java/org/springframework/web/multipart/support/StandardServletMultipartResolver.java index 6a3d9308993..08b8a74492b 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/multipart/support/StandardServletMultipartResolver.java +++ b/org.springframework.web/src/main/java/org/springframework/web/multipart/support/StandardServletMultipartResolver.java @@ -161,7 +161,7 @@ public class StandardServletMultipartResolver implements MultipartResolver { return (headers != null ? StringUtils.toStringArray(headers) : null); } - public Iterator getHeaderNames(String name) { + public Iterator getHeaderNames() { return this.part.getHeaderNames().iterator(); } } diff --git a/org.springframework.web/src/test/java/org/springframework/mock/web/MockMultipartFile.java b/org.springframework.web/src/test/java/org/springframework/mock/web/MockMultipartFile.java index e63f63c4315..6b87593a167 100644 --- a/org.springframework.web/src/test/java/org/springframework/mock/web/MockMultipartFile.java +++ b/org.springframework.web/src/test/java/org/springframework/mock/web/MockMultipartFile.java @@ -151,7 +151,7 @@ public class MockMultipartFile implements MultipartFile { } } - public Iterator getHeaderNames(String name) { + public Iterator getHeaderNames() { return Collections.singleton(CONTENT_TYPE).iterator(); }