EPMRPP-82591 || Logs with attachments null pointer

src/main/java/com/epam/ta/reportportal/filesystem/LocalDataStore.java

@@ -52,6 +52,9 @@ public LocalDataStore(BlobStore blobStore, FeatureFlagHandler featureFlagHandler
 
   @Override
   public String save(String filePath, InputStream inputStream) {
+    if (filePath == null){
+      return "";
+    }
     StoredFile storedFile = getStoredFile(filePath);
     try {
       if (!blobStore.containerExists(storedFile.getBucket())) {
@@ -69,6 +72,9 @@ public String save(String filePath, InputStream inputStream) {
 
   @Override
   public InputStream load(String filePath) {
+    if (filePath == null){
+      throw new ReportPortalException(ErrorType.UNABLE_TO_LOAD_BINARY_DATA, "Unable to find file");
+    }
     StoredFile storedFile = getStoredFile(filePath);
     Blob fileBlob = blobStore.getBlob(storedFile.getBucket(), storedFile.getFilePath());
     if (fileBlob != null) {
@@ -83,6 +89,9 @@ public InputStream load(String filePath) {
 
   @Override
   public boolean exists(String filePath) {
+    if (filePath == null){
+      return false;
+    }
     StoredFile storedFile = getStoredFile(filePath);
     if (blobStore.containerExists(storedFile.getBucket())) {
       return blobStore.blobExists(storedFile.getBucket(), storedFile.getFilePath());
@@ -94,6 +103,9 @@ public boolean exists(String filePath) {
 
   @Override
   public void delete(String filePath) {
+    if (filePath == null){
+      return;
+    }
     StoredFile storedFile = getStoredFile(filePath);
     try {
       blobStore.removeBlob(storedFile.getBucket(), storedFile.getFilePath());

src/main/java/com/epam/ta/reportportal/filesystem/distributed/s3/S3DataStore.java

@@ -77,6 +77,9 @@ public S3DataStore(BlobStore blobStore, String bucketPrefix, String bucketPostfi
 
   @Override
   public String save(String filePath, InputStream inputStream) {
+    if (filePath == null){
+      return "";
+    }
     StoredFile storedFile = getStoredFile(filePath);
     try {
       if (!blobStore.containerExists(storedFile.getBucket())) {
@@ -102,6 +105,10 @@ public String save(String filePath, InputStream inputStream) {
 
   @Override
   public InputStream load(String filePath) {
+    if (filePath == null){
+      LOGGER.error("Unable to find file");
+      throw new ReportPortalException(ErrorType.UNABLE_TO_LOAD_BINARY_DATA, "Unable to find file");
+    }
     StoredFile storedFile = getStoredFile(filePath);
     Blob fileBlob = blobStore.getBlob(storedFile.getBucket(), storedFile.getFilePath());
     if (fileBlob != null) {
@@ -117,12 +124,18 @@ public InputStream load(String filePath) {
 
   @Override
   public boolean exists(String filePath) {
+    if (filePath == null){
+      return false;
+    }
     StoredFile storedFile = getStoredFile(filePath);
     return blobStore.blobExists(storedFile.getBucket(), storedFile.getFilePath());
   }
 
   @Override
   public void delete(String filePath) {
+    if (filePath == null){
+      return;
+    }
     StoredFile storedFile = getStoredFile(filePath);
     try {
       blobStore.removeBlob(storedFile.getBucket(), storedFile.getFilePath());