gCubeSystem
/
gcube-cms-suite
14
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

#22461 #1

Merged
fabio.sinibaldi merged 27 commits from #22461 into master 2022-01-14 12:43:19 +01:00
Conversation 0 Commits 27 Files Changed 131 +6
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 41af4e3bc9 - Show all commits

4
geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/report/ConstraintCheck.java
View File

@ -7,9 +7,11 @@ import java.util.List;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
@Getter @Getter
@Setter @Setter
@Slf4j
public class ConstraintCheck<T> { public class ConstraintCheck<T> {
public static <T> ConstraintCheck<T> defaultFor(T toCheck,T defaultValue){ public static <T> ConstraintCheck<T> defaultFor(T toCheck,T defaultValue){
@ -55,6 +57,8 @@ public class ConstraintCheck<T> {
T result=theObject; T result=theObject;
if(isError()) { if(isError()) {
result=theDefault; result=theDefault;
log.debug("Applying default {} for current value {}",theDefault,theObject);
if(theDefault!=null && theDefault instanceof Collection) { if(theDefault!=null && theDefault instanceof Collection) {
Collection defaultCollection=(Collection) theDefault; Collection defaultCollection=(Collection) theDefault;
ArrayList target=new ArrayList(defaultCollection); ArrayList target=new ArrayList(defaultCollection);

2
geoportal-common/src/main/java/org/gcube/application/geoportal/common/utils/Files.java
View File

@ -85,6 +85,8 @@ public class Files {
} }
public static String fixFilename(String toFix) { public static String fixFilename(String toFix) {
if(toFix.startsWith("\\."))
toFix=toFix.replaceFirst("\\.","_");
String extension=""; String extension="";
if(toFix.contains(".")) { if(toFix.contains(".")) {
//preserve extension //preserve extension