ref 11491: Fixed [ error as indicated in the test
https://support.d4science.org/issues/11491 git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/statistical-algorithms-importer@165575 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
307d8f9fe5
commit
e3438dab75
|
@ -286,39 +286,39 @@ public class AlgorithmGenerator {
|
||||||
if (serviceCredentials.getUserName() != null && !serviceCredentials.getUserName().isEmpty()) {
|
if (serviceCredentials.getUserName() != null && !serviceCredentials.getUserName().isEmpty()) {
|
||||||
if (serviceCredentials.getFullName() != null && !serviceCredentials.getFullName().isEmpty()) {
|
if (serviceCredentials.getFullName() != null && !serviceCredentials.getFullName().isEmpty()) {
|
||||||
algorithmDescription = project.getInputData().getProjectInfo().getAlgorithmDescription()
|
algorithmDescription = project.getInputData().getProjectInfo().getAlgorithmDescription()
|
||||||
+ " [Published by " + serviceCredentials.getFullName() + " ("
|
+ " {Published by " + serviceCredentials.getFullName() + " ("
|
||||||
+ serviceCredentials.getUserName() + ") on " + sdf.format(Calendar.getInstance().getTime())
|
+ serviceCredentials.getUserName() + ") on " + sdf.format(Calendar.getInstance().getTime())
|
||||||
+ "]";
|
+ "}";
|
||||||
} else {
|
} else {
|
||||||
algorithmDescription = project.getInputData().getProjectInfo().getAlgorithmDescription()
|
algorithmDescription = project.getInputData().getProjectInfo().getAlgorithmDescription()
|
||||||
+ " [Published on " + sdf.format(Calendar.getInstance().getTime()) + "]";
|
+ " {Published on " + sdf.format(Calendar.getInstance().getTime()) + "}";
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (serviceCredentials.getFullName() != null && !serviceCredentials.getFullName().isEmpty()) {
|
if (serviceCredentials.getFullName() != null && !serviceCredentials.getFullName().isEmpty()) {
|
||||||
algorithmDescription = project.getInputData().getProjectInfo().getAlgorithmDescription()
|
algorithmDescription = project.getInputData().getProjectInfo().getAlgorithmDescription()
|
||||||
+ " [Published by " + serviceCredentials.getFullName() + " on "
|
+ " {Published by " + serviceCredentials.getFullName() + " on "
|
||||||
+ sdf.format(Calendar.getInstance().getTime()) + "]";
|
+ sdf.format(Calendar.getInstance().getTime()) + "}";
|
||||||
} else {
|
} else {
|
||||||
algorithmDescription = project.getInputData().getProjectInfo().getAlgorithmDescription()
|
algorithmDescription = project.getInputData().getProjectInfo().getAlgorithmDescription()
|
||||||
+ " [Published on " + sdf.format(Calendar.getInstance().getTime()) + "]";
|
+ " {Published on " + sdf.format(Calendar.getInstance().getTime()) + "}";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
if (serviceCredentials.getUserName() != null && !serviceCredentials.getUserName().isEmpty()) {
|
if (serviceCredentials.getUserName() != null && !serviceCredentials.getUserName().isEmpty()) {
|
||||||
if (serviceCredentials.getFullName() != null && !serviceCredentials.getFullName().isEmpty()) {
|
if (serviceCredentials.getFullName() != null && !serviceCredentials.getFullName().isEmpty()) {
|
||||||
algorithmDescription = " [Published by " + serviceCredentials.getFullName() + " ("
|
algorithmDescription = " {Published by " + serviceCredentials.getFullName() + " ("
|
||||||
+ serviceCredentials.getUserName() + ") on " + sdf.format(Calendar.getInstance().getTime())
|
+ serviceCredentials.getUserName() + ") on " + sdf.format(Calendar.getInstance().getTime())
|
||||||
+ "]";
|
+ "}";
|
||||||
} else {
|
} else {
|
||||||
algorithmDescription = " [Published on " + sdf.format(Calendar.getInstance().getTime()) + "]";
|
algorithmDescription = " {Published on " + sdf.format(Calendar.getInstance().getTime()) + "}";
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (serviceCredentials.getFullName() != null && !serviceCredentials.getFullName().isEmpty()) {
|
if (serviceCredentials.getFullName() != null && !serviceCredentials.getFullName().isEmpty()) {
|
||||||
algorithmDescription = " [Published by " + serviceCredentials.getFullName() + " on "
|
algorithmDescription = " {Published by " + serviceCredentials.getFullName() + " on "
|
||||||
+ sdf.format(Calendar.getInstance().getTime()) + "]";
|
+ sdf.format(Calendar.getInstance().getTime()) + "}";
|
||||||
} else {
|
} else {
|
||||||
algorithmDescription = " [Published on " + sdf.format(Calendar.getInstance().getTime()) + "]";
|
algorithmDescription = " {Published on " + sdf.format(Calendar.getInstance().getTime()) + "}";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -193,39 +193,39 @@ public class InfoGenerator {
|
||||||
if (serviceCredentials.getUserName() != null && !serviceCredentials.getUserName().isEmpty()) {
|
if (serviceCredentials.getUserName() != null && !serviceCredentials.getUserName().isEmpty()) {
|
||||||
if (serviceCredentials.getFullName() != null && !serviceCredentials.getFullName().isEmpty()) {
|
if (serviceCredentials.getFullName() != null && !serviceCredentials.getFullName().isEmpty()) {
|
||||||
algorithmDescription = project.getInputData().getProjectInfo().getAlgorithmDescription()
|
algorithmDescription = project.getInputData().getProjectInfo().getAlgorithmDescription()
|
||||||
+ " [Published by " + serviceCredentials.getFullName() + " ("
|
+ " {Published by " + serviceCredentials.getFullName() + " ("
|
||||||
+ serviceCredentials.getUserName() + ") on " + sdf.format(Calendar.getInstance().getTime())
|
+ serviceCredentials.getUserName() + ") on " + sdf.format(Calendar.getInstance().getTime())
|
||||||
+ "]";
|
+ "}";
|
||||||
} else {
|
} else {
|
||||||
algorithmDescription = project.getInputData().getProjectInfo().getAlgorithmDescription()
|
algorithmDescription = project.getInputData().getProjectInfo().getAlgorithmDescription()
|
||||||
+ " [Published on " + sdf.format(Calendar.getInstance().getTime()) + "]";
|
+ " {Published on " + sdf.format(Calendar.getInstance().getTime()) + "}";
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (serviceCredentials.getFullName() != null && !serviceCredentials.getFullName().isEmpty()) {
|
if (serviceCredentials.getFullName() != null && !serviceCredentials.getFullName().isEmpty()) {
|
||||||
algorithmDescription = project.getInputData().getProjectInfo().getAlgorithmDescription()
|
algorithmDescription = project.getInputData().getProjectInfo().getAlgorithmDescription()
|
||||||
+ " [Published by " + serviceCredentials.getFullName() + " on "
|
+ " {Published by " + serviceCredentials.getFullName() + " on "
|
||||||
+ sdf.format(Calendar.getInstance().getTime()) + "]";
|
+ sdf.format(Calendar.getInstance().getTime()) + "}";
|
||||||
} else {
|
} else {
|
||||||
algorithmDescription = project.getInputData().getProjectInfo().getAlgorithmDescription()
|
algorithmDescription = project.getInputData().getProjectInfo().getAlgorithmDescription()
|
||||||
+ " [Published on " + sdf.format(Calendar.getInstance().getTime()) + "]";
|
+ " {Published on " + sdf.format(Calendar.getInstance().getTime()) + "}";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
if (serviceCredentials.getUserName() != null && !serviceCredentials.getUserName().isEmpty()) {
|
if (serviceCredentials.getUserName() != null && !serviceCredentials.getUserName().isEmpty()) {
|
||||||
if (serviceCredentials.getFullName() != null && !serviceCredentials.getFullName().isEmpty()) {
|
if (serviceCredentials.getFullName() != null && !serviceCredentials.getFullName().isEmpty()) {
|
||||||
algorithmDescription = " [Published by " + serviceCredentials.getFullName() + " ("
|
algorithmDescription = " {Published by " + serviceCredentials.getFullName() + " ("
|
||||||
+ serviceCredentials.getUserName() + ") on " + sdf.format(Calendar.getInstance().getTime())
|
+ serviceCredentials.getUserName() + ") on " + sdf.format(Calendar.getInstance().getTime())
|
||||||
+ "]";
|
+ "}";
|
||||||
} else {
|
} else {
|
||||||
algorithmDescription = " [Published on " + sdf.format(Calendar.getInstance().getTime()) + "]";
|
algorithmDescription = " {Published on " + sdf.format(Calendar.getInstance().getTime()) + "}";
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (serviceCredentials.getFullName() != null && !serviceCredentials.getFullName().isEmpty()) {
|
if (serviceCredentials.getFullName() != null && !serviceCredentials.getFullName().isEmpty()) {
|
||||||
algorithmDescription = " [Published by " + serviceCredentials.getFullName() + " on "
|
algorithmDescription = " {Published by " + serviceCredentials.getFullName() + " on "
|
||||||
+ sdf.format(Calendar.getInstance().getTime()) + "]";
|
+ sdf.format(Calendar.getInstance().getTime()) + "}";
|
||||||
} else {
|
} else {
|
||||||
algorithmDescription = " [Published on " + sdf.format(Calendar.getInstance().getTime()) + "]";
|
algorithmDescription = " {Published on " + sdf.format(Calendar.getInstance().getTime()) + "}";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -236,8 +236,8 @@ public class InfoGenerator {
|
||||||
if (project.getInputData().getProjectInfo().getProjectShareInfo().getUsers() != null
|
if (project.getInputData().getProjectInfo().getProjectShareInfo().getUsers() != null
|
||||||
&& !project.getInputData().getProjectInfo().getProjectShareInfo().getUsers().isEmpty()) {
|
&& !project.getInputData().getProjectInfo().getProjectShareInfo().getUsers().isEmpty()) {
|
||||||
StringBuilder userList = new StringBuilder();
|
StringBuilder userList = new StringBuilder();
|
||||||
String startTag = "-[";
|
String startTag = "-#";
|
||||||
String endTag = "]";
|
String endTag = "#";
|
||||||
String separator = ",";
|
String separator = ",";
|
||||||
boolean first = true;
|
boolean first = true;
|
||||||
userList.append(startTag);
|
userList.append(startTag);
|
||||||
|
|
Loading…
Reference in New Issue