gCubeSystem
/
statistical-algorithms-importer
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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@171795 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2018-10-01 16:47:19 +00:00
parent 45fd539fa8
commit 37f4e4d69e
5 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/server/StatAlgoImporterServiceImpl.java
View File

@ -315,8 +315,8 @@ public class StatAlgoImporterServiceImpl extends RemoteServiceServlet implements
Project project = SessionUtil.getProjectSession(httpRequest, serviceCredentials);
if (project != null) {
FilesStorage filesStorage = new FilesStorage();
String link = filesStorage.getPublicLink(serviceCredentials.getUserName(), itemDescription.getId());
itemDescription.setPublicLink(link);
String pLink = filesStorage.getPublicLink(serviceCredentials.getUserName(), itemDescription.getId());
itemDescription.setPublicLink(pLink);
project.setMainCode(new MainCode(itemDescription));
InputData inputData=project.getInputData();
if(inputData!=null){
@ -356,8 +356,8 @@ public class StatAlgoImporterServiceImpl extends RemoteServiceServlet implements
ProjectSupportBlackBox projectSupportBlackBox = (ProjectSupportBlackBox) project
.getProjectConfig().getProjectSupport();
FilesStorage filesStorage = new FilesStorage();
String link = filesStorage.getPublicLink(serviceCredentials.getUserName(), itemDescription.getId());
itemDescription.setPublicLink(link);
String pLink = filesStorage.getPublicLink(serviceCredentials.getUserName(), itemDescription.getId());
itemDescription.setPublicLink(pLink);
projectSupportBlackBox.setBinaryItem(itemDescription);
SessionUtil.setProjectSession(httpRequest, serviceCredentials, project);
logger.debug("Project: " + project);

2
src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/server/blackbox/MainGenerator.java
View File

@ -105,6 +105,8 @@ public class MainGenerator {
"Main.R", R_DESCRIPTION + project.getProjectConfig().getLanguage(), R_MIMETYPE,
project.getProjectFolder().getFolder().getId());
String pLink=filesStorage.getPublicLink(serviceCredentials.getUserName(), mainItemDescription.getId());
mainItemDescription.setPublicLink(pLink);
} catch (IOException e) {
logger.error(e.getLocalizedMessage());
e.printStackTrace();

19
src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/server/generator/ProjectBuilder.java
View File

@ -187,9 +187,9 @@ public class ProjectBuilder {
serviceCredentials.getUserName(),
project.getProjectTarget().getProjectDeploy().getPackageProject().getId());
String pLink = filesStorage.getPublicLink(serviceCredentials.getUserName(),
project.getProjectTarget().getProjectDeploy().getPackageProject().getId());
packageProjectItemDescription.getId());
packageProjectItemDescription.setPublicLink(pLink);
project.getProjectTarget().getProjectDeploy().setPackageProject(packageProjectItemDescription);
logger.debug("ProjectDeploy: " + project.getProjectTarget().getProjectDeploy());
@ -241,6 +241,8 @@ public class ProjectBuilder {
project.getProjectTarget().getProjectCompile().getCodeJar().getId(),
project.getProjectTarget().getProjectDeploy().getFolder().getId());
String pLink = filesStorage.getPublicLink(serviceCredentials.getUserName(), dCodeJar.getId());
dCodeJar.setPublicLink(pLink);
logger.debug("DeployableCodeJarItem:" + dCodeJar);
project.getProjectTarget().getProjectDeploy().setCodeJar(dCodeJar);
@ -445,13 +447,12 @@ public class ProjectBuilder {
throw new StatAlgoImporterServiceException(e.getLocalizedMessage());
}
ItemDescription packageUrl;
packageUrl = filesStorage.createItemOnWorkspace(serviceCredentials.getUserName(), inputStream,
ItemDescription packageUrl = filesStorage.createItemOnWorkspace(serviceCredentials.getUserName(), inputStream,
project.getInputData().getProjectInfo().getAlgorithmNameToClassName() + PROJECT_PACKAGE_EXTENTION,
PROJECT_PACKAGE_DESCRIPTION, PROJECT_PACKAGE_MIMETYPE,
project.getProjectTarget().getProjectDeploy().getFolder().getId());
String pLink=filesStorage.getPublicLink(serviceCredentials.getUserName(), packageUrl.getId());
packageUrl.setPublicLink(pLink);
logger.debug("ProjectPackageItem:" + packageUrl);
project.getProjectTarget().getProjectDeploy().setPackageProject(packageUrl);
@ -530,6 +531,8 @@ public class ProjectBuilder {
project.getInputData().getProjectInfo().getAlgorithmNameToClassName() + ALGORITHM_EXTENTION,
ALGORITHM_DESCRIPTION, ALGORITHM_MIMETYPE,
project.getProjectTarget().getProjectCompile().getFolder().getId());
String pLink=filesStorage.getPublicLink(serviceCredentials.getUserName(), codeSource.getId());
codeSource.setPublicLink(pLink);
} catch (IOException e) {
logger.error(e.getLocalizedMessage());
e.printStackTrace();
@ -553,6 +556,8 @@ public class ProjectBuilder {
Files.newInputStream(infoTXT, StandardOpenOption.READ), INFO_NAME + INFO_EXTENTION,
INFO_DESCRIPTION, INFO_MIMETYPE,
project.getProjectTarget().getProjectCompile().getFolder().getId());
String pLink=filesStorage.getPublicLink(serviceCredentials.getUserName(), integrationItemDescription.getId());
integrationItemDescription.setPublicLink(pLink);
} catch (IOException e) {
logger.error(e.getLocalizedMessage(), e);
throw new StatAlgoImporterServiceException(e.getLocalizedMessage(), e);
@ -643,6 +648,8 @@ public class ProjectBuilder {
project.getInputData().getProjectInfo().getAlgorithmNameToClassName() + JAR_EXTENTION,
CODE_JAR_DESCRIPTION, CODE_JAR_MIMETYPE,
project.getProjectTarget().getProjectCompile().getFolder().getId());
String pLink=filesStorage.getPublicLink(serviceCredentials.getUserName(), codeJarItemDescription.getId());
codeJarItemDescription.setPublicLink(pLink);
} catch (IOException e) {
logger.error(e.getLocalizedMessage(), e);
throw new StatAlgoImporterServiceException(e.getLocalizedMessage(), e);

12
src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/server/storage/FilesStorage.java
View File

@ -70,7 +70,7 @@ public class FilesStorage {
}
/**
* TODO
*
*
* @param user
* User
@ -96,8 +96,6 @@ public class FilesStorage {
AbstractFileItem item = fileCreatedContainer.get();
ItemDescription itemDescription = new ItemDescription(item.getId(), item.getName(), item.getOwner(),
item.getPath(), item.getClass().getSimpleName());
itemDescription.setPublicLink(fileCreatedContainer.getPublicLink().toString());
return itemDescription;
} catch (Throwable e) {
logger.error("Copy item on folder on workspace: " + e.getLocalizedMessage(), e);
@ -108,7 +106,7 @@ public class FilesStorage {
/**
*
* TODO
*
*
* @param user
* User
@ -137,8 +135,7 @@ public class FilesStorage {
AbstractFileItem item = fileCreatedContainer.get();
ItemDescription itemDescription = new ItemDescription(item.getId(), item.getName(), item.getOwner(),
item.getPath(), item.getClass().getSimpleName());
itemDescription.setPublicLink(fileCreatedContainer.getPublicLink().toString());
logger.debug("File created: " + itemDescription);
return itemDescription;
} catch (Throwable e) {
@ -417,8 +414,7 @@ public class FilesStorage {
ItemDescription itemDescription = new ItemDescription(fileCreated.getId(), fileCreated.getName(),
fileCreated.getOwner(), fileCreated.getPath(), fileCreated.getClass().getSimpleName());
itemDescription.setPublicLink(fileContainerNew.getPublicLink().toString());
return itemDescription;
} catch (Throwable e) {
logger.error("Create item on workspace: " + e.getLocalizedMessage(), e);

2
src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/server/storage/ProjectArchiver.java
View File

@ -73,7 +73,7 @@ public class ProjectArchiver {
ItemDescription newMainCodeItemDescription = filesStorage.getFileInfoOnWorkspace(
serviceCredentials.getUserName(), project.getMainCode().getItemDescription().getId());
String pLink = filesStorage.getPublicLink(serviceCredentials.getUserName(),
project.getMainCode().getItemDescription().getId());
newMainCodeItemDescription.getId());
newMainCodeItemDescription.setPublicLink(pLink);
if (newMainCodeItemDescription.compareInfo(project.getMainCode().getItemDescription())) {
} else {