Use Path where applicable.

Part of procedure to porting to Java7.

Addressed to #140

Author: php-coder

src/main/java/ru/mystamps/web/service/FilesystemImagePersistenceStrategy.java

@@ -20,6 +20,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
+import java.nio.file.Path;
 
 import javax.annotation.PostConstruct;
 
@@ -63,7 +64,7 @@ public void init() {
 	@Override
 	public void save(MultipartFile file, Image image) {
 		try {
-			File dest = createFile(image);
+			Path dest = createFile(image);
 			writeToFile(file, dest);
 
 			LOG.debug("Image's data was written into file {}", dest);
@@ -75,8 +76,8 @@ public void save(MultipartFile file, Image image) {
 
 	@Override
 	public ImageDto get(Image image) {
-		File dest = createFile(image);
-		if (!dest.exists()) {
+		Path dest = createFile(image);
+		if (!exists(dest)) {
 			LOG.warn("Found image without content: #{} ({} doesn't exist)", image.getId(), dest);
 			return null;
 		}
@@ -91,20 +92,25 @@ public ImageDto get(Image image) {
 	}
 
 	// protected to allow spying
-	protected File createFile(Image image) {
-		return new File(storageDir, generateFileName(image));
+	protected Path createFile(Image image) {
+		return new File(storageDir, generateFileName(image)).toPath();
 	}
 
 	// protected to allow spying
-	protected void writeToFile(MultipartFile file, File dest) throws IOException {
+	protected void writeToFile(MultipartFile file, Path dest) throws IOException {
 		// we can't use file.transferTo(dest) there because it creates file
 		// relatively to directory from multipart-config/location in web.xml
-		Files.copy(file.getInputStream(), dest.toPath());
+		Files.copy(file.getInputStream(), dest);
+	}
+
+	// protected to allow spying
+	protected boolean exists(Path path) {
+		return Files.exists(path);
 	}
 
 	// protected to allow spying
-	protected byte[] toByteArray(File dest) throws IOException {
-		return Files.readAllBytes(dest.toPath());
+	protected byte[] toByteArray(Path dest) throws IOException {
+		return Files.readAllBytes(dest);
 	}
 
 	private static String generateFileName(Image image) {

src/test/groovy/ru/mystamps/web/service/FilesystemImagePersistenceStrategyTest.groovy

@@ -25,12 +25,14 @@ import ru.mystamps.web.entity.Image
 import ru.mystamps.web.service.dto.ImageDto
 import ru.mystamps.web.service.exception.ImagePersistenceException
 
+import java.nio.file.Path
+
 class FilesystemImagePersistenceStrategyTest extends Specification {
 	private static final STORAGE_DIR = "/tmp"
 
 	private MultipartFile multipartFile = Mock()
 	private Image image = TestObjects.createImage()
-	private File mockFile = Mock(File, constructorArgs: ["/fake/path"])
+	private Path mockFile = Mock(Path)
 
 	private ImagePersistenceStrategy strategy = Spy(FilesystemImagePersistenceStrategy, constructorArgs: [STORAGE_DIR])
 
@@ -42,7 +44,7 @@ class FilesystemImagePersistenceStrategyTest extends Specification {
 		when:
 			strategy.save(multipartFile, image)
 		then:
-			1 * strategy.writeToFile(_ as MultipartFile, _ as File) >> {}
+			1 * strategy.writeToFile(_ as MultipartFile, _ as Path) >> {}
 	}
 
 	def "save() should saves file onto the configured directory"() {
@@ -51,8 +53,8 @@ class FilesystemImagePersistenceStrategyTest extends Specification {
 		when:
 			strategy.save(multipartFile, image)
 		then:
-			1 * strategy.writeToFile(_ as MultipartFile, { File file ->
-				assert file.parent == expectedDirectoryName
+			1 * strategy.writeToFile(_ as MultipartFile, { Path path ->
+				assert path.parent.toString() == expectedDirectoryName
 				return true
 			}) >> {}
 	}
@@ -65,15 +67,15 @@ class FilesystemImagePersistenceStrategyTest extends Specification {
 		when:
 			strategy.save(multipartFile, image)
 		then:
-			1 * strategy.writeToFile(_ as MultipartFile, { File file ->
-				assert file.name == expectedFileName
+			1 * strategy.writeToFile(_ as MultipartFile, { Path path ->
+				assert path.fileName.toString() == expectedFileName
 				return true
 			}) >> {}
 	}
 
 	def "save() should converts IOException to ImagePersistenceException"() {
 		given:
-			strategy.writeToFile(_ as MultipartFile, _ as File) >> { throw new IOException() }
+			strategy.writeToFile(_ as MultipartFile, _ as Path) >> { throw new IOException() }
 		when:
 			strategy.save(multipartFile, image)
 		then:
@@ -88,7 +90,7 @@ class FilesystemImagePersistenceStrategyTest extends Specification {
 
 	def "get() should returns null when file doesn't exist"() {
 		given:
-			mockFile.exists() >> false
+			strategy.exists(_ as Path) >> false
 		and:
 			strategy.createFile(_ as Image) >> mockFile
 		when:
@@ -99,11 +101,11 @@ class FilesystemImagePersistenceStrategyTest extends Specification {
 
 	def "get() should converts IOException to ImagePersistenceException"() {
 		given:
-			mockFile.exists() >> true
+			strategy.exists(_ as Path) >> true
 		and:
 			strategy.createFile(_ as Image) >> mockFile
 		and:
-			strategy.toByteArray(_ as File) >> { throw new IOException() }
+			strategy.toByteArray(_ as Path) >> { throw new IOException() }
 		when:
 			strategy.get(image)
 		then:
@@ -118,11 +120,11 @@ class FilesystemImagePersistenceStrategyTest extends Specification {
 		and:
 			byte[] expectedData = 'any data'.bytes
 		and:
-			mockFile.exists() >> true
+			strategy.exists(_ as Path) >> true
 		and:
 			strategy.createFile(_ as Image) >> mockFile
 		and:
-			strategy.toByteArray(_ as File) >> expectedData
+			strategy.toByteArray(_ as Path) >> expectedData
 		when:
 			ImageDto result = strategy.get(image)
 		then: