Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ResourceRegion fits better in core.io.support (next to EncodedResource)

Browse Source 
Issue: SPR-14221
This commit is contained in:
Juergen Hoeller
2016-05-06 12:02:51 +02:00
parent e5dbe12e85
commit 42d32ba396
7 changed files with 59 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-web/src/test/java/org/springframework/http/HttpRangeTests.java
View File

@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.http;
import java.io.IOException;
@@ -22,13 +23,13 @@ import java.util.List;
import org.junit.Test;
import static org.junit.Assert.*;
import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock;
import org.springframework.core.io.ByteArrayResource;
import org.springframework.core.io.InputStreamResource;
import org.springframework.core.io.ResourceRegion;
import org.springframework.core.io.support.ResourceRegion;
import static org.junit.Assert.*;
import static org.mockito.BDDMockito.*;
import static org.mockito.Mockito.mock;
/**
* Unit tests for {@link HttpRange}.

8
spring-web/src/test/java/org/springframework/http/converter/ResourceRegionHttpMessageConverterTests.java
View File

@@ -16,9 +16,6 @@
package org.springframework.http.converter;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.*;
import java.lang.reflect.Type;
import java.nio.charset.Charset;
import java.util.ArrayList;
@@ -30,13 +27,16 @@ import org.junit.Test;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
import org.springframework.core.io.ResourceRegion;
import org.springframework.core.io.support.ResourceRegion;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpRange;
import org.springframework.http.MediaType;
import org.springframework.http.MockHttpOutputMessage;
import org.springframework.util.StringUtils;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
/**
* Test cases for {@link ResourceRegionHttpMessageConverter} class.
*