This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 120c49ba95f28b624637c307fbcc9de95b1c6427
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Fri Apr 28 16:08:17 2023 +0700
[OPENMEETINGS-2758] some Sonar issues are addressed
---
.../openmeetings/core/converter/BaseConverter.java | 13 +++++--------
.../openmeetings/core/converter/ImageConverter.java | 3 ++-
.../openmeetings/core/data/file/FileProcessor.java | 3 ++-
.../org/apache/openmeetings/db/dao/label/LabelDao.java | 5 ++---
.../org/apache/openmeetings/db/dao/user/UserDao.java | 8 +++++++-
.../src/main/java/org/apache/openmeetings/cli/Admin.java | 1 -
.../openmeetings/service/scheduler/CleanupJob.java | 16 +++++++++++-----
.../web/common/UploadableProfileImagePanel.java | 5 ++---
.../apache/openmeetings/webservice/TestFileService.java | 5 +++--
9 files changed, 34 insertions(+), 25 deletions(-)
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
index e62d3b1b5..ee05ba3b7 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
@@ -34,6 +34,7 @@ import static
org.apache.openmeetings.util.OpenmeetingsVariables.getVideoPreset;
import java.io.File;
import java.io.IOException;
+import java.nio.file.Files;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -118,10 +119,8 @@ public abstract class BaseConverter {
r.setDuration(formatMillis(diff(r.getRecordEnd(),
r.getRecordStart())));
}
- protected void deleteFileIfExists(File f) {
- if (f.exists()) {
- f.delete();
- }
+ protected void deleteFileIfExists(File f) throws IOException {
+ Files.deleteIfExists(f.toPath());
}
private List<String> mergeAudioToWaves(List<File> waveFiles, File wav)
throws IOException {
@@ -375,12 +374,10 @@ public abstract class BaseConverter {
}
}
- protected void postProcess(List<File> waveFiles) {
+ protected void postProcess(List<File> waveFiles) throws IOException {
// Delete Wave Files
for (File audio : waveFiles) {
- if (audio.exists()) {
- audio.delete();
- }
+ Files.deleteIfExists(audio.toPath());
}
}
}
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ImageConverter.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ImageConverter.java
index a6dc99380..0402a00b8 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ImageConverter.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ImageConverter.java
@@ -33,6 +33,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.nio.file.Files;
import java.util.List;
import java.util.Optional;
import java.util.function.DoubleConsumer;
@@ -106,7 +107,7 @@ public class ImageConverter extends BaseConverter {
if (!skipConvertion) {
// Delete old one
- file.delete();
+ Files.deleteIfExists(file.toPath());
}
String img = destinationFile.getName();
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
index 901f7d007..e4ac79b52 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
@@ -25,6 +25,7 @@ import static
org.apache.openmeetings.util.OmFileHelper.getFileExt;
import java.io.File;
import java.io.InputStream;
+import java.nio.file.Files;
import java.util.Optional;
import java.util.function.DoubleConsumer;
@@ -94,7 +95,7 @@ public class FileProcessor {
throw e;
} finally {
if (temp != null && temp.exists() && temp.isFile()) {
- log.debug("Clean up was successful ? {}",
temp.delete());
+ log.debug("Clean up was successful ? {}",
Files.deleteIfExists(temp.toPath()));
}
}
return logs;
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
index 1f5ecf394..150e434a8 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
@@ -31,6 +31,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.Serializable;
import java.net.URL;
+import java.nio.file.Files;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@ -308,9 +309,7 @@ public class LabelDao implements
IDataProviderDao<StringLabel>{
URL u = appClass.getResource(getLabelFileName(l));
if (u != null) {
File f = new File(u.toURI());
- if (f.exists()) {
- f.delete();
- }
+ Files.deleteIfExists(f.toPath());
}
} catch (Exception e) {
log.error("Unexpected error while deleting language",
e);
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
index 4923f71bf..6a0eb6497 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
@@ -31,6 +31,8 @@ import static
org.apache.openmeetings.util.OpenmeetingsVariables.getDefaultTimez
import static
org.apache.openmeetings.util.OpenmeetingsVariables.getMinLoginLength;
import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
import java.security.NoSuchAlgorithmException;
import java.time.LocalDate;
import java.util.ArrayList;
@@ -374,7 +376,11 @@ public class UserDao implements
IGroupAdminDataProviderDao<User> {
update(u, userId);
// this should be last action, so file will be deleted
in case there were no errors
if (pic != null) {
- pic.delete();
+ try {
+ Files.deleteIfExists(pic.toPath());
+ } catch (IOException e) {
+ log.error("Unexpected exception while
delete pic");
+ }
}
}
}
diff --git
a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
index 36f9b2188..549d993ff 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
@@ -366,7 +366,6 @@ public class Admin {
BackupExport export =
getApplicationContext().getBean(BackupExport.class);
export.performExport(f, includeFiles, new AtomicInteger());
FileUtils.deleteDirectory(backupDir);
- backupDir.delete();
}
private void processFiles() throws IOException {
diff --git
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/scheduler/CleanupJob.java
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/scheduler/CleanupJob.java
index 5a8ba8e66..b446320df 100644
---
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/scheduler/CleanupJob.java
+++
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/scheduler/CleanupJob.java
@@ -24,6 +24,8 @@ import static
org.apache.openmeetings.util.OmFileHelper.getStreamsDir;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.isInitComplete;
import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
import java.util.List;
import org.apache.openmeetings.db.dao.log.ConferenceLogDao;
@@ -75,7 +77,7 @@ public class CleanupJob extends AbstractJob {
}
for (File file : files) {
log.debug("expired TEST SETUP found:
{}", file.getCanonicalPath());
- file.delete();
+ Files.deleteIfExists(file.toPath());
}
}
} catch (Exception e) {
@@ -91,7 +93,7 @@ public class CleanupJob extends AbstractJob {
try {
sessionDao.clearSessionTable(sessionTimeout);
} catch (Exception err){
- log.error("execute",err);
+ log.error("execute", err);
}
}
@@ -101,9 +103,13 @@ public class CleanupJob extends AbstractJob {
if (days < 0) {
log.debug("cleanExpiredRecordings:: following
recording will be deleted {}", rec);
File f = rec.getFile(EXTENSION_MP4);
- if (f != null && f.exists()) {
- f.delete();
- }
+ if (f != null) {
+ try {
+
Files.deleteIfExists(f.toPath());
+ } catch (IOException err){
+ log.error("Unexpected exception
while clen-up expired recording", err);
+ }
+ }
recordingDao.delete(rec);
}
});
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java
index a2249b11a..2361e7209 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java
@@ -24,6 +24,7 @@ import static
org.apache.openmeetings.util.OmFileHelper.getUploadProfilesUserDir
import static
org.apache.openmeetings.web.util.ProfileImageResourceReference.getUrl;
import java.io.File;
+import java.nio.file.Files;
import org.apache.openmeetings.core.converter.ImageConverter;
import org.apache.openmeetings.db.dao.user.UserDao;
@@ -59,9 +60,7 @@ public class UploadableProfileImagePanel extends
UploadableImagePanel {
@Override
protected void deleteImage() throws Exception {
File f = new File(getUploadProfilesUserDir(userId),
OmFileHelper.getName(PROFILE_FILE_NAME, EXTENSION_PNG));
- if (f.exists()) {
- f.delete();
- }
+ Files.deleteIfExists(f.toPath());
}
@Override
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestFileService.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestFileService.java
index dd94f4131..2a0c97341 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestFileService.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestFileService.java
@@ -31,6 +31,7 @@ import java.awt.Graphics;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException;
+import java.nio.file.Files;
import java.util.Collection;
import javax.imageio.ImageIO;
@@ -67,8 +68,8 @@ class TestFileService extends AbstractWebServiceTest {
assertEquals(width, cr.getObj().getWidth(), "Width
should be determined");
assertEquals(height, cr.getObj().getHeight(), "Height
should be Image");
} finally {
- if (img != null && img.exists()) {
- img.delete();
+ if (img != null) {
+ Files.deleteIfExists(img.toPath());
}
}
}
