ref 11724: SAI - Update to StorageHUB
https://support.d4science.org/issues/11724 Updated to StorageHub git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/statistical-algorithms-importer@171966 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
33f3904032
commit
9c480e2c84
|
@ -158,6 +158,7 @@ public class ProjectBuilder {
|
|||
|
||||
private void repackageProjectPackage() throws StatAlgoImporterServiceException {
|
||||
List<String> idsToExclude = new ArrayList<String>();
|
||||
logger.debug("Exclude Backup Folder Id: "+backupFolderId);
|
||||
idsToExclude.add(backupFolderId);
|
||||
|
||||
FilesStorage filesStorage = new FilesStorage();
|
||||
|
@ -165,7 +166,9 @@ public class ProjectBuilder {
|
|||
if (project.getProjectTarget() != null && project.getProjectTarget().getFolder() != null
|
||||
&& project.getProjectTarget().getFolder().getId() != null
|
||||
&& !project.getProjectTarget().getFolder().getId().isEmpty()) {
|
||||
idsToExclude.add(project.getProjectTarget().getFolder().getId());
|
||||
String targetFolderId=project.getProjectTarget().getFolder().getId();
|
||||
logger.debug("Exclude Target Folder Id: "+targetFolderId);
|
||||
idsToExclude.add(targetFolderId);
|
||||
}
|
||||
|
||||
File projectPackageFile = filesStorage.zipFolder(serviceCredentials.getUserName(),
|
||||
|
@ -425,7 +428,10 @@ public class ProjectBuilder {
|
|||
}
|
||||
|
||||
private void createProjectPackage() throws StatAlgoImporterServiceException {
|
||||
|
||||
|
||||
List<String> idsToExclude = new ArrayList<String>();
|
||||
logger.debug("Exclude Backup Folder Id: "+backupFolderId);
|
||||
idsToExclude.add(backupFolderId);
|
||||
|
||||
FilesStorage filesStorage = new FilesStorage();
|
||||
|
@ -433,7 +439,9 @@ public class ProjectBuilder {
|
|||
if (project.getProjectTarget() != null && project.getProjectTarget().getFolder() != null
|
||||
&& project.getProjectTarget().getFolder().getId() != null
|
||||
&& !project.getProjectTarget().getFolder().getId().isEmpty()) {
|
||||
idsToExclude.add(project.getProjectTarget().getFolder().getId());
|
||||
String targetFolderId=project.getProjectTarget().getFolder().getId();
|
||||
logger.debug("Exclude Target Folder Id: "+targetFolderId);
|
||||
idsToExclude.add(targetFolderId);
|
||||
}
|
||||
|
||||
File projectPackageFile = filesStorage.zipFolder(serviceCredentials.getUserName(),
|
||||
|
|
|
@ -684,7 +684,8 @@ public class FilesStorage {
|
|||
public File zipFolder(String user, String folderId, List<String> idsToExclude)
|
||||
throws StatAlgoImporterServiceException {
|
||||
try {
|
||||
logger.info("Zip folder with exclude: [user=" + user + ", folderId=" + folderId + "]");
|
||||
logger.info("Zip folder with exclude: [user=" + user + ", folderId=" + folderId + ", idsToExclude="
|
||||
+ idsToExclude + "]");
|
||||
String[] idsArray = new String[idsToExclude.size()];
|
||||
idsArray = idsToExclude.toArray(idsArray);
|
||||
|
||||
|
|
Loading…
Reference in New Issue