lib(net.bndy.lib): upgrade to v1.0.5

Author: bndynet

pom.xml

@@ -111,7 +111,7 @@
 		<dependency>
 			<groupId>net.bndy</groupId>
 			<artifactId>lib</artifactId>
-			<version>1.0.4</version>
+			<version>1.0.5</version>
 		</dependency>
 		<dependency>
 			<groupId>org.webjars</groupId>

src/main/java/net/bndy/wf/modules/cms/services/ArticleService.java

@@ -6,6 +6,7 @@
 
 import javax.transaction.Transactional;
 
+import net.bndy.lib.CollectionHelper;
 import net.bndy.lib.IOHelper;
 import net.bndy.lib.StringHelper;
 import net.bndy.wf.ApplicationContext;
@@ -19,10 +20,8 @@
 import net.bndy.wf.modules.cms.models.*;
 import net.bndy.wf.modules.cms.services.repositories.*;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 @Service
 @Transactional
@@ -47,19 +46,14 @@ public Article save(Article entity) {
             List<File> filesToDelete = new ArrayList<>();
             if (origin != null && origin.getAttachments() != null) {
                 for (File f: origin.getAttachments()) {
-                    if (entity.getAttachments() == null || !entity.getAttachments().stream().anyMatch((item) -> item.getId() == f.getId())) {
+                    if (entity.getAttachments() == null || !CollectionHelper.contains(entity.getAttachments(),(item) -> item.getId() == f.getId())) {
                         filesToDelete.add(f);
                     }
                 }
             }
 
             for (File f: filesToDelete) {
-                try {
-                    IOHelper.forceDelete(ApplicationContext.getFileFullPath(f.getPath()));
-                } catch (IOException ex) {
-                    // TODO: exception handling
-                    ex.printStackTrace();
-                }
+                IOHelper.forceDelete(ApplicationContext.getFileFullPath(f.getPath()));
                 this.fileService.delete(f.getId());
             }
         }
@@ -72,7 +66,10 @@ public Article save(Article entity) {
             complexKey = false;
         }
         entity = super.save(entity);
-        this.fileService.setRef(entity.getAttachments().stream().map(x -> x.getId()).collect(Collectors.toList()));
+
+        if (!CollectionHelper.isNullOrEmpty(entity.getAttachments())) {
+            this.fileService.setRef(CollectionHelper.convert(entity.getAttachments(), (x -> x.getId())));
+        }
 
         if (complexKey) {
             entity.setTitleKey(key + "-" + entity.getId());

src/main/java/net/bndy/wf/modules/cms/services/PageService.java

@@ -6,6 +6,7 @@
 
 import javax.transaction.Transactional;
 
+import net.bndy.lib.CollectionHelper;
 import net.bndy.lib.IOHelper;
 import net.bndy.wf.ApplicationContext;
 import net.bndy.wf.modules.core.models.File;
@@ -16,10 +17,8 @@
 import net.bndy.wf.modules.cms.models.*;
 import net.bndy.wf.modules.cms.services.repositories.*;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 @Service
 @Transactional
@@ -69,24 +68,21 @@ public Page save(Page entity) {
             List<File> filesToDelete = new ArrayList<>();
             if (origin != null && origin.getAttachments() != null) {
                 for (File f: origin.getAttachments()) {
-                    if (entity.getAttachments() == null || !entity.getAttachments().stream().anyMatch((item) -> item.getId() == f.getId())) {
+                    if (entity.getAttachments() == null || !CollectionHelper.contains(entity.getAttachments(), (item) -> item.getId() == f.getId())) {
                        filesToDelete.add(f);
                     }
                 }
             }
 
             for (File f: filesToDelete) {
-                try {
-                    IOHelper.forceDelete(ApplicationContext.getFileFullPath(f.getPath()));
-                } catch (IOException ex) {
-                    // TODO: exception handling
-                    ex.printStackTrace();
-                }
+                IOHelper.forceDelete(ApplicationContext.getFileFullPath(f.getPath()));
                 this.fileService.delete(f.getId());
             }
         }
 
-        this.fileService.setRef(entity.getAttachments().stream().map(x -> x.getId()).collect(Collectors.toList()));
+        if (!CollectionHelper.isNullOrEmpty(entity.getAttachments())) {
+            this.fileService.setRef(CollectionHelper.convert(entity.getAttachments(), (x -> x.getId())));
+        }
 
         return super.save(entity);
     }