From b3bd1647da1cc1fb6a2f9a6a166300a8bb45cc2e Mon Sep 17 00:00:00 2001
From: Matija Obreza <matija.obreza@croptrust.org>
Date: Mon, 1 Oct 2018 15:08:34 +0200
Subject: [PATCH] RepositoryService#getFileBytes by path removed

- Could not check permissions
---
 .../service/RepositoryService.java            | 10 --------
 .../service/impl/RepositoryServiceImpl.java   | 25 ++-----------------
 .../service/ImageGalleryThumbnailsTest.java   |  5 +++-
 3 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/file-repository-core/src/main/java/org/genesys/filerepository/service/RepositoryService.java b/file-repository-core/src/main/java/org/genesys/filerepository/service/RepositoryService.java
index d8f5a13..21103b9 100644
--- a/file-repository-core/src/main/java/org/genesys/filerepository/service/RepositoryService.java
+++ b/file-repository-core/src/main/java/org/genesys/filerepository/service/RepositoryService.java
@@ -108,16 +108,6 @@ public interface RepositoryService {
 	 */
 	RepositoryFile getFile(Path path, String filename) throws NoSuchRepositoryFileException, InvalidRepositoryPathException;
 
-	/**
-	 * Get repository file bytes by its path and filename.
-	 *
-	 * @param repositoryPath path to the file
-	 * @param filename name of the file in the storage, not original filename
-	 * @return the file bytes
-	 * @throws NoSuchRepositoryFileException the no such repository file exception
-	 */
-	byte[] getFileBytes(Path repositoryPath) throws NoSuchRepositoryFileException;
-
 	/**
 	 * Gets the file bytes.
 	 *
diff --git a/file-repository-core/src/main/java/org/genesys/filerepository/service/impl/RepositoryServiceImpl.java b/file-repository-core/src/main/java/org/genesys/filerepository/service/impl/RepositoryServiceImpl.java
index 4e3f0f8..e918fb2 100644
--- a/file-repository-core/src/main/java/org/genesys/filerepository/service/impl/RepositoryServiceImpl.java
+++ b/file-repository-core/src/main/java/org/genesys/filerepository/service/impl/RepositoryServiceImpl.java
@@ -117,11 +117,11 @@ public class RepositoryServiceImpl implements RepositoryService, InitializingBea
 				LOG.debug("Updating SHA-1 and MD5 for file uuid={}", repositoryFile.getUuid());
 			}
 			try {
-				final byte[] bytes = getFileBytes(repositoryFile.getFolder().getFolderPath().resolve(repositoryFile.getFilename()));
+				final byte[] bytes = getFileBytes(repositoryFile);
 				repositoryFile.setSha1Sum(DigestUtils.sha1Hex(bytes));
 				repositoryFile.setMd5Sum(DigestUtils.md5Hex(bytes));
 				repositoryFilePersistence.save(repositoryFile);
-			} catch (final NoSuchRepositoryFileException e) {
+			} catch (final IOException e) {
 				LOG.warn("Failed to generate hash sums: {}", e.getMessage());
 			}
 		}
@@ -329,27 +329,6 @@ public class RepositoryServiceImpl implements RepositoryService, InitializingBea
 		return repositoryFile;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.genesys.filerepository.service.RepositoryService#getFileBytes
-	 * (java.lang.String, java.lang.String)
-	 */
-	/**
-	 * @deprecated Permission check not possible, use {@link #getFileBytes(RepositoryFile)}
-	 */
-	@Override
-	public byte[] getFileBytes(final Path filePath) throws NoSuchRepositoryFileException {
-		byte[] data = null;
-
-		try {
-			data = bytesStorageService.get(filePath);
-		} catch (final IOException e) {
-			e.printStackTrace();
-		}
-
-		return data;
-	}
-
 	/*
 	 * (non-Javadoc)
 	 * @see
diff --git a/file-repository-core/src/test/java/org/genesys/filerepository/service/ImageGalleryThumbnailsTest.java b/file-repository-core/src/test/java/org/genesys/filerepository/service/ImageGalleryThumbnailsTest.java
index ff9b5f0..a51743c 100644
--- a/file-repository-core/src/test/java/org/genesys/filerepository/service/ImageGalleryThumbnailsTest.java
+++ b/file-repository-core/src/test/java/org/genesys/filerepository/service/ImageGalleryThumbnailsTest.java
@@ -67,6 +67,9 @@ public class ImageGalleryThumbnailsTest extends RepositoryServiceTest {
 	/** The file repo service. */
 	@Autowired
 	private RepositoryService fileRepoService;
+	
+	@Autowired
+	private BytesStorageService bytesStorageService;
 
 	/**
 	 * After test.
@@ -120,7 +123,7 @@ public class ImageGalleryThumbnailsTest extends RepositoryServiceTest {
 
 		imageGalleryService.ensureThumbnails(imageGallery, 100, 200);
 
-		final byte[] thumbBytes1 = fileRepoService.getFileBytes(Paths.get(ImageGalleryService.THUMB_PATH, repoImage1.getThumbnailPath(), "100x200" + ".png"));
+		final byte[] thumbBytes1 = bytesStorageService.get(Paths.get(ImageGalleryService.THUMB_PATH, repoImage1.getThumbnailPath(), "100x200" + ".png"));
 		assertThat("Thumbnail must not be null", thumbBytes1, notNullValue());
 
 		try (InputStream is = new ByteArrayInputStream(thumbBytes1)) {
-- 
GitLab