Compare commits
31 Commits
16
.classpath
16
.classpath
|
@ -13,9 +13,10 @@
|
|||
<attribute name="maven.pomderived" value="true"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
|
||||
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
|
||||
<attributes>
|
||||
<attribute name="maven.pomderived" value="true"/>
|
||||
<attribute name="test" value="true"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
|
||||
|
@ -24,21 +25,20 @@
|
|||
<attribute name="org.eclipse.jst.component.nondependency" value=""/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry kind="src" path="target/generated-sources/annotations">
|
||||
<classpathentry kind="src" path=".apt_generated">
|
||||
<attributes>
|
||||
<attribute name="ignore_optional_problems" value="true"/>
|
||||
<attribute name="optional" value="true"/>
|
||||
<attribute name="maven.pomderived" value="true"/>
|
||||
<attribute name="m2e-apt" value="true"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
|
||||
<classpathentry kind="src" output="target/test-classes" path=".apt_generated_tests">
|
||||
<attributes>
|
||||
<attribute name="ignore_optional_problems" value="true"/>
|
||||
<attribute name="test" value="true"/>
|
||||
<attribute name="optional" value="true"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
|
||||
<attributes>
|
||||
<attribute name="maven.pomderived" value="true"/>
|
||||
<attribute name="m2e-apt" value="true"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry kind="output" path="target/classes"/>
|
||||
|
|
|
@ -1 +1,3 @@
|
|||
/target/
|
||||
/.apt_generated/
|
||||
/.apt_generated_tests/
|
||||
|
|
|
@ -6,7 +6,7 @@ org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
|
|||
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
|
||||
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
|
||||
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
|
||||
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
|
||||
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
|
||||
org.eclipse.jdt.core.compiler.processAnnotations=enabled
|
||||
org.eclipse.jdt.core.compiler.release=disabled
|
||||
org.eclipse.jdt.core.compiler.source=1.8
|
||||
|
|
|
@ -1,6 +1,31 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
|
||||
|
||||
|
||||
|
||||
|
||||
<wb-module deploy-name="storagehub-client-wrapper">
|
||||
|
||||
|
||||
|
||||
|
||||
<wb-resource deploy-path="/" source-path="/src/main/java"/>
|
||||
|
||||
|
||||
|
||||
|
||||
<wb-resource deploy-path="/" source-path="/src/main/resources"/>
|
||||
|
||||
|
||||
|
||||
|
||||
<wb-resource deploy-path="/" source-path="/.apt_generated"/>
|
||||
|
||||
|
||||
|
||||
|
||||
</wb-module>
|
||||
|
||||
|
||||
|
||||
|
||||
</project-modules>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<faceted-project>
|
||||
<installed facet="java" version="1.8"/>
|
||||
<installed facet="jst.utility" version="1.0"/>
|
||||
<installed facet="java" version="1.8"/>
|
||||
</faceted-project>
|
||||
|
|
|
@ -0,0 +1,119 @@
|
|||
# Changelog for storagehub-client-wrapper
|
||||
|
||||
All notable changes to this project will be documented in this file.
|
||||
This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||
|
||||
## [v1.2.1] - 2023-04-04
|
||||
|
||||
- [#24597] Fixed no notification sent for items updated in the VRE Folder with score char in the name
|
||||
|
||||
## [v1.2.0] - 2022-05-02
|
||||
|
||||
#### Enhancements
|
||||
|
||||
- [#23225] Updated the method to read the members of (VRE or Simple) shared folders
|
||||
|
||||
## [v1-1-0] - 2021-05-12
|
||||
|
||||
#### Enhancements
|
||||
|
||||
[#21412] Added some methods that were missing
|
||||
|
||||
|
||||
## [v1-0-1-SNAPSHOT] - 2021-03-03
|
||||
|
||||
Improved JUnit Test
|
||||
|
||||
|
||||
## [v1-0-0]- 2020-07-15
|
||||
|
||||
#### Enhancements
|
||||
|
||||
[#19317] component moved from 0.y.z to 1.y.z version
|
||||
|
||||
[#19668] add the method updateDescriptionForItem
|
||||
|
||||
|
||||
## [v0-7-1] - 2020-05-18
|
||||
|
||||
#### Enhancements
|
||||
|
||||
[#19058] added the folder destination Id to restore operation
|
||||
|
||||
|
||||
## [v0-7-0] - 2020-04-16
|
||||
|
||||
#### Enhancements
|
||||
|
||||
[#19087] provide a getItem (without getRoot inside) for Workspace-Explorer-App
|
||||
|
||||
|
||||
|
||||
## [v0-6-2] - 2020-03-11
|
||||
|
||||
#### New features
|
||||
|
||||
[#18174] Moved to new search facility provided by SHUB
|
||||
|
||||
|
||||
|
||||
## [v0-6-1] - 2019-12-19
|
||||
|
||||
Ported to Git and Jenkins
|
||||
|
||||
|
||||
|
||||
## [v0-6-0] - 2019-10-01
|
||||
|
||||
[Task #16688] Integrating new method added into SHUB
|
||||
|
||||
|
||||
|
||||
## [v0-5-0] - 2019-08-01
|
||||
|
||||
Released due to exceptions thrown by SHUB
|
||||
|
||||
|
||||
|
||||
## [v0-4-0] - 2019-06-01
|
||||
|
||||
Updated to new SHub interface
|
||||
|
||||
Added method getMetadata
|
||||
|
||||
|
||||
|
||||
## [v0-3-0] - 2018-03-01
|
||||
|
||||
[Task #12059] added delete item
|
||||
|
||||
[Task #12533] added trash operations
|
||||
|
||||
[Task #12556] added download facility
|
||||
|
||||
[Task #12601] added download folder facility
|
||||
|
||||
[Task #12604] added Move operation to StorageHub
|
||||
|
||||
[Task #12603] added Copy operation to StorageHub
|
||||
|
||||
[Task #12603] added Rename facility to StorageHub
|
||||
|
||||
[Task #12603] added Public Link facility to StorageHub
|
||||
|
||||
[Task #12664] added Versions facility to StorageHub
|
||||
|
||||
[Task #12720] added Image Preview to StorageHub
|
||||
|
||||
|
||||
|
||||
## [v0-2-0] - 2018-06-20
|
||||
|
||||
minor fixes
|
||||
|
||||
|
||||
|
||||
## [v0-1-0] - 2018-06-20
|
||||
|
||||
[Task #12059] first release
|
||||
|
|
@ -1,53 +0,0 @@
|
|||
<ReleaseNotes>
|
||||
<Changeset
|
||||
component="org.gcube.common.storagehubwrapper.0-7-0" date="2020-04-16">
|
||||
<Change>[Task #19087] provide a getItem (without getRoot inside) for Workspace-Explorer-App
|
||||
</Change>
|
||||
</Changeset>
|
||||
<Changeset
|
||||
component="org.gcube.common.storagehubwrapper.0-6-2" date="2020-03-11">
|
||||
<Change>[Feature #18174] Moved to new search facility provided by SHUB
|
||||
</Change>
|
||||
</Changeset>
|
||||
<Changeset
|
||||
component="org.gcube.common.storagehubwrapper.0-6-1" date="2019-12-19">
|
||||
<Change>Updated to Git and Jenkins</Change>
|
||||
</Changeset>
|
||||
<Changeset
|
||||
component="org.gcube.common.storagehubwrapper.0-6-0" date="2019-10-01">
|
||||
<Change>[Task #16688] Integrating new method added into SHUB</Change>
|
||||
</Changeset>
|
||||
<Changeset
|
||||
component="org.gcube.common.storagehubwrapper.0-5-0" date="2019-08-01">
|
||||
<Change>Released due to exceptions thrown by SHUB</Change>
|
||||
</Changeset>
|
||||
<Changeset
|
||||
component="org.gcube.common.storagehubwrapper.0-4-0" date="2019-06-01">
|
||||
<Change>Updated to new SHub interface</Change>
|
||||
<Change>Added method getMetadata</Change>
|
||||
</Changeset>
|
||||
<Changeset
|
||||
component="org.gcube.common.storagehubwrapper.0-3-0" date="2018-03-01">
|
||||
<Change>[Task #12059] added delete item</Change>
|
||||
<Change>[Task #12533] added trash operations</Change>
|
||||
<Change>[Task #12556] added download facility</Change>
|
||||
<Change>[Task #12601] added download folder facility</Change>
|
||||
<Change>[Task #12604] added Move operation to StorageHub</Change>
|
||||
<Change>[Task #12603] added Copy operation to StorageHub</Change>
|
||||
<Change>[Task #12603] added Rename facility to StorageHub</Change>
|
||||
<Change>[Task #12603] added Public Link facility to StorageHub
|
||||
</Change>
|
||||
<Change>[Task #12664] added Versions facility to StorageHub
|
||||
</Change>
|
||||
<Change>[Task #12720] added Image Preview to StorageHub
|
||||
</Change>
|
||||
</Changeset>
|
||||
<Changeset
|
||||
component="org.gcube.common.storagehubwrapper.0-2-0" date="2018-06-20">
|
||||
<Change>minor fixes</Change>
|
||||
</Changeset>
|
||||
<Changeset
|
||||
component="org.gcube.common.storagehubwrapper.0-1-0" date="2018-06-20">
|
||||
<Change>[Task #12059] first release</Change>
|
||||
</Changeset>
|
||||
</ReleaseNotes>
|
|
@ -14,8 +14,8 @@
|
|||
<includes>
|
||||
<include>README.md</include>
|
||||
<include>LICENSE.md</include>
|
||||
<include>changelog.xml</include>
|
||||
<include>profile.xml</include>
|
||||
<include>CHANGELOG.md</include>
|
||||
</includes>
|
||||
<fileMode>755</fileMode>
|
||||
<filtered>true</filtered>
|
||||
|
|
44
pom.xml
44
pom.xml
|
@ -1,5 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
|
@ -10,7 +11,7 @@
|
|||
</parent>
|
||||
<groupId>org.gcube.common</groupId>
|
||||
<artifactId>storagehub-client-wrapper</artifactId>
|
||||
<version>0.7.0</version>
|
||||
<version>1.2.1</version>
|
||||
<name>storagehub-client-wrapper</name>
|
||||
<description>This is a wrapper of storagehub-client library. It allows to interact with storagehub in a simplified way by exposing several utilities. Moreover, It exposes by another inteface java beans as defined in (the old) HL interfaces</description>
|
||||
<scm>
|
||||
|
@ -19,15 +20,18 @@
|
|||
<url>https://code-repo.d4science.org/gCubeSystem/${project.artifactId}</url>
|
||||
</scm>
|
||||
<properties>
|
||||
<maven.compiler.source>1.8</maven.compiler.source>
|
||||
<maven.compiler.target>1.8</maven.compiler.target>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<distroDirectory>distro</distroDirectory>
|
||||
</properties>
|
||||
|
||||
<dependencyManagement>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.gcube.distribution</groupId>
|
||||
<artifactId>gcube-bom</artifactId>
|
||||
<version>1.4.0</version>
|
||||
<version>2.3.0</version>
|
||||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
</dependency>
|
||||
|
@ -51,13 +55,21 @@
|
|||
<dependency>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok</artifactId>
|
||||
<version>1.14.8</version>
|
||||
<version>1.18.4</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.gcube.common</groupId>
|
||||
<artifactId>storagehub-model</artifactId>
|
||||
<!--<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version> -->
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.gcube.common</groupId>
|
||||
<artifactId>storagehub-client-library</artifactId>
|
||||
<version>[1.0.0,2.0.0-SNAPSHOT)</version>
|
||||
<!--<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version> -->
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
|
||||
|
@ -89,6 +101,7 @@
|
|||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-log4j12</artifactId>
|
||||
<version>1.6.4</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
|
@ -97,6 +110,7 @@
|
|||
<version>4.12</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
<build>
|
||||
<resources>
|
||||
|
@ -143,6 +157,24 @@
|
|||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
<configuration>
|
||||
<additionalparam>-Xdoclint:none</additionalparam>
|
||||
<additionalJOption>-Xdoclint:none</additionalJOption>
|
||||
</configuration>
|
||||
<version>3.1.0</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>generate-doc</id>
|
||||
<phase>install</phase>
|
||||
<goals>
|
||||
<goal>jar</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
||||
</project>
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -11,6 +11,7 @@ import java.util.Arrays;
|
|||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import org.apache.commons.lang.Validate;
|
||||
import org.gcube.common.storagehub.client.StreamDescriptor;
|
||||
|
@ -26,9 +27,9 @@ import org.gcube.common.storagehub.model.service.Version;
|
|||
import org.gcube.common.storagehubwrapper.server.converter.HLMapper;
|
||||
import org.gcube.common.storagehubwrapper.server.tohl.Workspace;
|
||||
import org.gcube.common.storagehubwrapper.shared.ACLType;
|
||||
import org.gcube.common.storagehubwrapper.shared.Member;
|
||||
import org.gcube.common.storagehubwrapper.shared.tohl.WorkspaceItem;
|
||||
import org.gcube.common.storagehubwrapper.shared.tohl.WorkspaceSharedFolder;
|
||||
import org.gcube.common.storagehubwrapper.shared.tohl.WorkspaceVREFolder;
|
||||
import org.gcube.common.storagehubwrapper.shared.tohl.exceptions.InsufficientPrivilegesException;
|
||||
import org.gcube.common.storagehubwrapper.shared.tohl.exceptions.InternalErrorException;
|
||||
import org.gcube.common.storagehubwrapper.shared.tohl.exceptions.ItemAlreadyExistException;
|
||||
|
@ -348,6 +349,33 @@ public final class WorkspaceStorageHubClientService implements Workspace{
|
|||
return toChildren;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Gets the children.
|
||||
*
|
||||
* @param id the id
|
||||
* @return the children
|
||||
* @throws Exception the exception
|
||||
*/
|
||||
/* (non-Javadoc)
|
||||
* @see org.gcube.portal.storagehubwrapper.shared.tohl.Workspace#getChildren(java.lang.String)
|
||||
*/
|
||||
public List<? extends WorkspaceItem> getChildren(String id, boolean includeHidden)throws Exception{
|
||||
|
||||
LOGGER.debug("called get Children include hidden");
|
||||
Validate.notNull(id,"The input id is null");
|
||||
List<? extends Item> children = storageHubClientService.getChildren(id, withAccounting, withMapProperties, includeHidden);
|
||||
List<WorkspaceItem> toChildren = new ArrayList<WorkspaceItem>(children.size());
|
||||
|
||||
for (Item item : children) {
|
||||
WorkspaceItem child = HLMapper.toWorkspaceItem(item, withAccounting, withFileDetails, withMapProperties);
|
||||
toChildren.add(child);
|
||||
}
|
||||
|
||||
return toChildren;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Gets the filtered children.
|
||||
*
|
||||
|
@ -526,6 +554,23 @@ public final class WorkspaceStorageHubClientService implements Workspace{
|
|||
return workspaceItem;
|
||||
}
|
||||
|
||||
@Override
|
||||
public WorkspaceItem getItemByPath(String folderId, String relativePath) throws ItemNotFoundException, InternalErrorException, Exception {
|
||||
LOGGER.debug("called get getItemByPath");
|
||||
Validate.notNull(folderId,"The input folderId is null");
|
||||
Item item;
|
||||
try {
|
||||
item = storageHubClientService.getItemByPath(folderId, relativePath);
|
||||
}
|
||||
catch (Exception e) {
|
||||
LOGGER.error("Error during get item with id: "+folderId,e);
|
||||
throw new InternalErrorException(e.getMessage());
|
||||
}
|
||||
WorkspaceItem workspaceItem = HLMapper.toWorkspaceItem(item, withAccounting, withFileDetails, withMapProperties);
|
||||
setIsRoot((org.gcube.common.storagehubwrapper.shared.tohl.impl.WorkspaceItem) workspaceItem);
|
||||
return workspaceItem;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the item. This call is the same of {@link WorkspaceStorageHubClientService#getItem(String, boolean, boolean, boolean)}
|
||||
* except to getRoot called inside (to check if an item is root or not). {@link WorkspaceItem#isRoot()} returns always false.
|
||||
|
@ -640,7 +685,7 @@ public final class WorkspaceStorageHubClientService implements Workspace{
|
|||
* @see org.gcube.portal.storagehubwrapper.server.tohl.Workspace#getSharedFolderMembers(java.lang.String)
|
||||
*/
|
||||
@Override
|
||||
public List<String> getSharedFolderMembers(String folderId) throws Exception {
|
||||
public List<Member> getSharedFolderMembers(String folderId) throws Exception {
|
||||
|
||||
try{
|
||||
LOGGER.debug("called Shared Folder Members");
|
||||
|
@ -669,7 +714,6 @@ public final class WorkspaceStorageHubClientService implements Workspace{
|
|||
public boolean exists(String name, String folderId)
|
||||
throws InternalErrorException, ItemNotFoundException,
|
||||
WrongItemTypeException {
|
||||
|
||||
LOGGER.debug("called exists");
|
||||
List<WorkspaceItem> foundItems = find(name, folderId);
|
||||
|
||||
|
@ -694,7 +738,7 @@ public final class WorkspaceStorageHubClientService implements Workspace{
|
|||
throws InternalErrorException, ItemNotFoundException,
|
||||
WrongItemTypeException {
|
||||
|
||||
LOGGER.debug("called find");
|
||||
LOGGER.debug("called find ");
|
||||
Validate.notNull(folderId,"The input folderid is null");
|
||||
try {
|
||||
List<? extends Item> items = storageHubClientService.findByName(name, folderId);
|
||||
|
@ -792,8 +836,8 @@ public final class WorkspaceStorageHubClientService implements Workspace{
|
|||
storageHubClientService.deleteItemById(itemId);
|
||||
|
||||
}catch(Exception e){
|
||||
LOGGER.error("Delete item by id error: "+e.getMessage());
|
||||
throw new Exception("Erro on deleting the item. "+e.getMessage());
|
||||
LOGGER.error("Error on deleting the trash item by id: "+itemId,e);
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -910,7 +954,6 @@ public final class WorkspaceStorageHubClientService implements Workspace{
|
|||
try{
|
||||
Item baseFolderTrash = storageHubClientService.openTrash();
|
||||
return HLMapper.toWorkspaceItem(baseFolderTrash);
|
||||
|
||||
}catch(Exception e){
|
||||
throw new Exception("Error on getting the Trash content: "+e.getMessage());
|
||||
}
|
||||
|
@ -934,25 +977,25 @@ public final class WorkspaceStorageHubClientService implements Workspace{
|
|||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Restore thrash item.
|
||||
*
|
||||
* @param itemId the item id
|
||||
* @param destinationFolderId the destination folder id
|
||||
* @return the workspace item
|
||||
* @throws Exception the exception
|
||||
*/
|
||||
/* (non-Javadoc)
|
||||
* @see org.gcube.common.storagehubwrapper.server.tohl.Workspace#restoreThrashItem(java.lang.String)
|
||||
*/
|
||||
@Override
|
||||
public WorkspaceItem restoreThrashItem(String itemId) throws Exception{
|
||||
public WorkspaceItem restoreThrashItem(String itemId, String destinationFolderId) throws Exception{
|
||||
|
||||
try{
|
||||
Item theItem = storageHubClientService.restoreThrashItem(itemId);
|
||||
Item theItem = storageHubClientService.restoreThrashItem(itemId,destinationFolderId);
|
||||
return HLMapper.toWorkspaceItem(theItem);
|
||||
|
||||
}catch(Exception e){
|
||||
throw new Exception("Error on restoring the Trash Item: "+e.getMessage());
|
||||
LOGGER.error("Error on restoring the trash item by id: "+itemId,e);
|
||||
throw e;
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -1501,356 +1544,38 @@ public final class WorkspaceStorageHubClientService implements Workspace{
|
|||
throw new Exception("The item with id '"+folderId+"' is not a folder");
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
* TODO
|
||||
*
|
||||
* FOLLOWING METHODS ARE NOT IMPLEMENTED;
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Change description.
|
||||
*
|
||||
* @param itemId the item id
|
||||
* @param newDescription the new description
|
||||
* @throws ItemNotFoundException the item not found exception
|
||||
* @throws InternalErrorException the internal error exception
|
||||
*/
|
||||
/* (non-Javadoc)
|
||||
* @see org.gcube.portal.storagehubwrapper.shared.Workspace#changeDescription(java.lang.String, java.lang.String)
|
||||
*/
|
||||
@Override
|
||||
public void changeDescription(String itemId, String newDescription)
|
||||
throws ItemNotFoundException, InternalErrorException {
|
||||
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
public String updateDescriptionForItem(String itemId, String newDescription) throws Exception {
|
||||
|
||||
String updatedDescription = null;
|
||||
try{
|
||||
updatedDescription = storageHubClientService.updateDescriptionForItem(itemId, newDescription);
|
||||
}catch(Exception e){
|
||||
String error = "Error on updating the description for item with id: "+itemId;
|
||||
LOGGER.error(error, e);
|
||||
throw new Exception(e);
|
||||
}
|
||||
|
||||
return updatedDescription;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Search by mime type.
|
||||
*
|
||||
* @param mimeType the mime type
|
||||
* @return the list
|
||||
* @throws InternalErrorException the internal error exception
|
||||
*/
|
||||
/* (non-Javadoc)
|
||||
* @see org.gcube.portal.storagehubwrapper.shared.Workspace#searchByMimeType(java.lang.String)
|
||||
*/
|
||||
@Override
|
||||
public List<WorkspaceItem> searchByMimeType(String mimeType)
|
||||
throws InternalErrorException {
|
||||
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates the shared folder.
|
||||
*
|
||||
* @param name the name
|
||||
* @param description the description
|
||||
* @param users the users
|
||||
* @param destinationFolderId the destination folder id
|
||||
* @return the workspace shared folder
|
||||
* @throws InternalErrorException the internal error exception
|
||||
* @throws InsufficientPrivilegesException the insufficient privileges exception
|
||||
* @throws ItemAlreadyExistException the item already exist exception
|
||||
* @throws WrongDestinationException the wrong destination exception
|
||||
* @throws ItemNotFoundException the item not found exception
|
||||
* @throws WorkspaceFolderNotFoundException the workspace folder not found exception
|
||||
*/
|
||||
/* (non-Javadoc)
|
||||
* @see org.gcube.portal.storagehubwrapper.shared.Workspace#createSharedFolder(java.lang.String, java.lang.String, java.util.List, java.lang.String)
|
||||
*/
|
||||
@Override
|
||||
public WorkspaceSharedFolder createSharedFolder(
|
||||
String name, String description, List<String> users,
|
||||
String destinationFolderId)
|
||||
throws InternalErrorException, InsufficientPrivilegesException,
|
||||
ItemAlreadyExistException, WrongDestinationException,
|
||||
ItemNotFoundException, WorkspaceFolderNotFoundException {
|
||||
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Share folder.
|
||||
*
|
||||
* @param users the users
|
||||
* @param destinationFolderId the destination folder id
|
||||
* @return the workspace shared folder
|
||||
* @throws InternalErrorException the internal error exception
|
||||
* @throws InsufficientPrivilegesException the insufficient privileges exception
|
||||
* @throws ItemAlreadyExistException the item already exist exception
|
||||
* @throws WrongDestinationException the wrong destination exception
|
||||
* @throws ItemNotFoundException the item not found exception
|
||||
* @throws WorkspaceFolderNotFoundException the workspace folder not found exception
|
||||
*/
|
||||
/* (non-Javadoc)
|
||||
* @see org.gcube.portal.storagehubwrapper.shared.Workspace#shareFolder(java.util.List, java.lang.String)
|
||||
*/
|
||||
@Override
|
||||
public WorkspaceSharedFolder shareFolder(
|
||||
List<String> users, String destinationFolderId)
|
||||
throws InternalErrorException, InsufficientPrivilegesException,
|
||||
ItemAlreadyExistException, WrongDestinationException,
|
||||
ItemNotFoundException, WorkspaceFolderNotFoundException {
|
||||
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Share.
|
||||
*
|
||||
* @param users the users
|
||||
* @param itemId the item id
|
||||
* @return the workspace shared folder
|
||||
* @throws InternalErrorException the internal error exception
|
||||
* @throws InsufficientPrivilegesException the insufficient privileges exception
|
||||
* @throws ItemAlreadyExistException the item already exist exception
|
||||
* @throws WrongDestinationException the wrong destination exception
|
||||
* @throws ItemNotFoundException the item not found exception
|
||||
* @throws WorkspaceFolderNotFoundException the workspace folder not found exception
|
||||
*/
|
||||
/* (non-Javadoc)
|
||||
* @see org.gcube.portal.storagehubwrapper.shared.Workspace#share(java.util.List, java.lang.String)
|
||||
*/
|
||||
@Override
|
||||
public WorkspaceSharedFolder share(List<String> users, String itemId)
|
||||
throws InternalErrorException, InsufficientPrivilegesException,
|
||||
ItemAlreadyExistException, WrongDestinationException,
|
||||
ItemNotFoundException, WorkspaceFolderNotFoundException {
|
||||
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates the gcube item.
|
||||
*
|
||||
* @param name the name
|
||||
* @param description the description
|
||||
* @param scopes the scopes
|
||||
* @param creator the creator
|
||||
* @param itemType the item type
|
||||
* @param properties the properties
|
||||
* @param destinationFolderId the destination folder id
|
||||
* @return the workspace item
|
||||
* @throws InsufficientPrivilegesException the insufficient privileges exception
|
||||
* @throws WorkspaceFolderNotFoundException the workspace folder not found exception
|
||||
* @throws InternalErrorException the internal error exception
|
||||
* @throws ItemAlreadyExistException the item already exist exception
|
||||
* @throws WrongDestinationException the wrong destination exception
|
||||
* @throws ItemNotFoundException the item not found exception
|
||||
*/
|
||||
/* (non-Javadoc)
|
||||
* @see org.gcube.portal.storagehubwrapper.shared.Workspace#createGcubeItem(java.lang.String, java.lang.String, java.util.List, java.lang.String, java.lang.String, java.util.Map, java.lang.String)
|
||||
*/
|
||||
@Override
|
||||
public WorkspaceItem createGcubeItem(
|
||||
String name, String description, List<String> scopes, String creator,
|
||||
String itemType, Map<String, String> properties,
|
||||
String destinationFolderId)
|
||||
throws InsufficientPrivilegesException,
|
||||
WorkspaceFolderNotFoundException, InternalErrorException,
|
||||
ItemAlreadyExistException, WrongDestinationException,
|
||||
ItemNotFoundException {
|
||||
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Unshare.
|
||||
*
|
||||
* @param itemId the item id
|
||||
* @return the workspace item
|
||||
* @throws InternalErrorException the internal error exception
|
||||
* @throws ItemNotFoundException the item not found exception
|
||||
*/
|
||||
/* (non-Javadoc)
|
||||
* @see org.gcube.portal.storagehubwrapper.shared.Workspace#unshare(java.lang.String)
|
||||
*/
|
||||
@Override
|
||||
public WorkspaceItem unshare(String itemId)
|
||||
throws InternalErrorException, ItemNotFoundException {
|
||||
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
public void setFolderAsHidden(String folderId, boolean hide) throws Exception {
|
||||
storageHubClientService.setFolderAsHidden(folderId, hide);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Gets the my special folders.
|
||||
*
|
||||
* @return the my special folders
|
||||
* @throws InternalErrorException the internal error exception
|
||||
* @throws ItemNotFoundException the item not found exception
|
||||
*/
|
||||
/* (non-Javadoc)
|
||||
* @see org.gcube.portal.storagehubwrapper.shared.Workspace#getMySpecialFolders()
|
||||
*/
|
||||
@Override
|
||||
public WorkspaceFolder getMySpecialFolders()
|
||||
throws InternalErrorException, ItemNotFoundException {
|
||||
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Search by properties.
|
||||
*
|
||||
* @param properties the properties
|
||||
* @return the list
|
||||
* @throws InternalErrorException the internal error exception
|
||||
*/
|
||||
/* (non-Javadoc)
|
||||
* @see org.gcube.portal.storagehubwrapper.shared.Workspace#searchByProperties(java.util.List)
|
||||
*/
|
||||
@Override
|
||||
public List<WorkspaceItem> searchByProperties(List<String> properties)
|
||||
throws InternalErrorException {
|
||||
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates the VRE folder.
|
||||
*
|
||||
* @param scope the scope
|
||||
* @param description the description
|
||||
* @param displayName the display name
|
||||
* @param privilege the privilege
|
||||
* @return the workspace VRE folder
|
||||
* @throws InternalErrorException the internal error exception
|
||||
* @throws InsufficientPrivilegesException the insufficient privileges exception
|
||||
* @throws ItemAlreadyExistException the item already exist exception
|
||||
* @throws WrongDestinationException the wrong destination exception
|
||||
* @throws ItemNotFoundException the item not found exception
|
||||
* @throws WorkspaceFolderNotFoundException the workspace folder not found exception
|
||||
*/
|
||||
/* (non-Javadoc)
|
||||
* @see org.gcube.portal.storagehubwrapper.shared.Workspace#createVREFolder(java.lang.String, java.lang.String, java.lang.String, org.gcube.portal.storagehubwrapper.shared.ACLType)
|
||||
*/
|
||||
@Override
|
||||
public WorkspaceVREFolder createVREFolder(
|
||||
String scope, String description, String displayName, ACLType privilege)
|
||||
throws InternalErrorException, InsufficientPrivilegesException,
|
||||
ItemAlreadyExistException, WrongDestinationException,
|
||||
ItemNotFoundException, WorkspaceFolderNotFoundException {
|
||||
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
public WorkspaceSharedFolder shareFolder(String folderId, Set<String> users, ACLType type) throws Exception {
|
||||
return storageHubClientService.shareFolder(folderId, users, type);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Gets the public folders.
|
||||
*
|
||||
* @return the public folders
|
||||
* @throws InternalErrorException the internal error exception
|
||||
*/
|
||||
/* (non-Javadoc)
|
||||
* @see org.gcube.portal.storagehubwrapper.shared.Workspace#getPublicFolders()
|
||||
*/
|
||||
@Override
|
||||
public List<WorkspaceItem> getPublicFolders()
|
||||
throws InternalErrorException {
|
||||
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
public WorkspaceSharedFolder unshareFolder(String folderId, Set<String> users) throws Exception {
|
||||
return storageHubClientService.unshareFolder(folderId, users);
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
|
@ -12,9 +12,13 @@ import org.slf4j.Logger;
|
|||
import org.slf4j.LoggerFactory;
|
||||
|
||||
/**
|
||||
* The Class WrapperUtility.
|
||||
*
|
||||
* @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it Oct 17, 2018
|
||||
*/
|
||||
public class WrapperUtility {
|
||||
|
||||
public static final String SCOPE_SEPARATOR = "/";
|
||||
|
||||
private static Logger logger = LoggerFactory.getLogger(WrapperUtility.class);
|
||||
|
||||
|
@ -47,4 +51,35 @@ public class WrapperUtility {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the infrastructure name from scope.
|
||||
*
|
||||
* @param scope the scope
|
||||
* @return the infrastructure name from scope
|
||||
* @throws Exception the exception
|
||||
*/
|
||||
public static String getInfrastructureNameFromScope(String scope) throws Exception{
|
||||
|
||||
if(scope==null || scope.isEmpty()){
|
||||
throw new Exception("Scope is null or empty");
|
||||
}
|
||||
|
||||
if(!scope.startsWith(SCOPE_SEPARATOR)){
|
||||
logger.warn("Input scope: "+scope+" not have / is a really scope?");
|
||||
scope = SCOPE_SEPARATOR+scope;
|
||||
logger.warn("Tentative as scope: "+scope);
|
||||
}
|
||||
|
||||
String[] splitScope = scope.split(SCOPE_SEPARATOR);
|
||||
|
||||
String rootScope = SCOPE_SEPARATOR + splitScope[1];
|
||||
|
||||
if(rootScope.length()<2){
|
||||
throw new Exception("Infrastructure name not found in "+scope);
|
||||
}
|
||||
|
||||
return rootScope;
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
@ -39,30 +39,16 @@ import org.gcube.common.storagehubwrapper.shared.tohl.items.FileItemType;
|
|||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
|
||||
/**
|
||||
* The Class HLMapper.
|
||||
*
|
||||
* @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapa@isti.cnr.it)
|
||||
* Jun 20, 2018
|
||||
* Jun 20, 2018
|
||||
*/
|
||||
public class HLMapper {
|
||||
|
||||
private static Logger logger = LoggerFactory.getLogger(HLMapper.class);
|
||||
|
||||
// public static Function<org.gcube.common.storagehub.model.items.nodes.accounting.AccountEntry, AccountingEntry> toAccountingEntry = new Function<org.gcube.common.storagehub.model.items.nodes.accounting.AccountEntry, AccountingEntry>() {
|
||||
//
|
||||
// public AccountingEntry apply(org.gcube.common.storagehub.model.items.nodes.accounting.AccountEntry accountingEntry) {
|
||||
//
|
||||
// return new AccountingEntry(
|
||||
// accountingEntry.getUser(),
|
||||
// accountingEntry.getDate(),
|
||||
// accountingEntry.getType(),
|
||||
// accountingEntry.getVersion(),
|
||||
// accountingEntry.getPrimaryType());
|
||||
// }
|
||||
// }
|
||||
|
||||
/**
|
||||
* To URL file.
|
||||
*
|
||||
|
@ -74,231 +60,227 @@ public class HLMapper {
|
|||
return (URLFile) toWorkspaceItem(extLink, false, false, false);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* To workspace item.
|
||||
*
|
||||
* @param <T> the generic type
|
||||
* @param <T> the generic type
|
||||
* @param item the item
|
||||
* @return the t
|
||||
* @throws Exception the exception
|
||||
*/
|
||||
public static<T extends WorkspaceItem> T toWorkspaceItem(Item item) throws Exception{
|
||||
public static <T extends WorkspaceItem> T toWorkspaceItem(Item item) throws Exception {
|
||||
|
||||
return toWorkspaceItem(item, false, false, false);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* To accounting entries.
|
||||
*
|
||||
* @param item the item
|
||||
* @return the list
|
||||
*/
|
||||
public static List<AccountEntry> toAccountingEntries(Item item){
|
||||
public static List<AccountEntry> toAccountingEntries(Item item) {
|
||||
|
||||
List<AccountEntry> accountingEntries = null;
|
||||
List<AccountEntry> accountingEntries = null;
|
||||
|
||||
Accounting accounting = item.getAccounting();
|
||||
if(accounting!=null){
|
||||
accountingEntries = accounting.getEntries();
|
||||
// for (AccountEntry ae : accounting.getEntries()) {
|
||||
// accountingEntries.add(toAccountingEntry.apply(ae));
|
||||
// }
|
||||
}
|
||||
if (accounting != null) {
|
||||
accountingEntries = accounting.getEntries();
|
||||
}
|
||||
|
||||
return accountingEntries;
|
||||
return accountingEntries;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* To property map.
|
||||
*
|
||||
* @param metadata the metadata
|
||||
* @return the property map
|
||||
*/
|
||||
public static PropertyMap toPropertyMap(Metadata metadata){
|
||||
public static PropertyMap toPropertyMap(Metadata metadata) {
|
||||
|
||||
PropertyMap pm = null;
|
||||
if(metadata!=null)
|
||||
PropertyMap pm = null;
|
||||
if (metadata != null)
|
||||
pm = new PropertyMap(metadata.getMap());
|
||||
|
||||
//IN CASE OF EMPTY MAP RETURNS NULL
|
||||
if(pm!=null && pm.getValues()!=null && pm.getValues().isEmpty())
|
||||
// IN CASE OF EMPTY MAP RETURNS NULL
|
||||
if (pm != null && pm.getValues() != null && pm.getValues().isEmpty())
|
||||
pm = null;
|
||||
|
||||
return pm;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* To workspace file version.
|
||||
*
|
||||
* @param fileVersion the file version
|
||||
* @return the workspace file version
|
||||
*/
|
||||
public static WorkspaceFileVersion toWorkspaceFileVersion(Version fileVersion){
|
||||
public static WorkspaceFileVersion toWorkspaceFileVersion(Version fileVersion) {
|
||||
WorkspaceFileVersion wsFileVersion = new WorkspaceFileVersion();
|
||||
wsFileVersion.setId(fileVersion.getId());
|
||||
wsFileVersion.setName(fileVersion.getName());
|
||||
wsFileVersion.setCreated(fileVersion.getCreated());
|
||||
wsFileVersion.setCurrentVersion(fileVersion.isCurrent());
|
||||
//TODO MUST BE TERMINATED
|
||||
// TODO MUST BE TERMINATED
|
||||
return wsFileVersion;
|
||||
}
|
||||
|
||||
/**
|
||||
* To workspace item.
|
||||
*
|
||||
* @param <T> the generic type
|
||||
* @param item the item
|
||||
* @param withAccounting the with accounting
|
||||
* @param withFileDetails the with file details
|
||||
* @param <T> the generic type
|
||||
* @param item the item
|
||||
* @param withAccounting the with accounting
|
||||
* @param withFileDetails the with file details
|
||||
* @param withMapProperties the with map properties
|
||||
* @return the t
|
||||
* @throws Exception the exception
|
||||
*/
|
||||
public static<T extends WorkspaceItem> T toWorkspaceItem(Item item, boolean withAccounting, boolean withFileDetails, boolean withMapProperties) throws Exception{
|
||||
public static <T extends WorkspaceItem> T toWorkspaceItem(Item item, boolean withAccounting,
|
||||
boolean withFileDetails, boolean withMapProperties) throws Exception {
|
||||
|
||||
try{
|
||||
List<AccountEntry> accountingEntries = null;
|
||||
try {
|
||||
List<AccountEntry> accountingEntries = null;
|
||||
|
||||
if(withAccounting)
|
||||
if (withAccounting)
|
||||
accountingEntries = toAccountingEntries(item);
|
||||
|
||||
org.gcube.common.storagehubwrapper.shared.tohl.impl.WorkspaceItem theItem = null;
|
||||
WorkspaceItemType type = null;
|
||||
Boolean isFolder = false;
|
||||
org.gcube.common.storagehubwrapper.shared.tohl.impl.WorkspaceItem theItem = null;
|
||||
WorkspaceItemType type = null;
|
||||
Boolean isFolder = false;
|
||||
|
||||
String itemName = item.getName();
|
||||
boolean isRoot = false;
|
||||
String itemName = item.getName();
|
||||
boolean isRoot = false;
|
||||
|
||||
logger.trace("The item: "+item);
|
||||
logger.trace("Converting Item: "+item.getName() + " with id: "+item.getId());
|
||||
logger.trace("The item: " + item);
|
||||
logger.trace("Converting Item: " + item.getName() + " with id: " + item.getId());
|
||||
|
||||
//THE ITEM IS A KIND OF FOLDER
|
||||
if (item instanceof FolderItem){
|
||||
isFolder = true;
|
||||
FolderItem folderItem = (FolderItem) item; //??
|
||||
// THE ITEM IS A KIND OF FOLDER
|
||||
if (item instanceof FolderItem) {
|
||||
isFolder = true;
|
||||
FolderItem folderItem = (FolderItem) item; // ??
|
||||
theItem = new WorkspaceFolder();
|
||||
type = WorkspaceItemType.FOLDER;
|
||||
if (item instanceof SharedFolder || item instanceof VreFolder) {
|
||||
SharedFolder sharedfolder = (SharedFolder) item; //??
|
||||
theItem = new WorkspaceSharedFolder();
|
||||
if (item instanceof SharedFolder || item instanceof VreFolder) {
|
||||
SharedFolder sharedfolder = (SharedFolder) item; // ??
|
||||
theItem = new WorkspaceSharedFolder();
|
||||
type = WorkspaceItemType.SHARED_FOLDER;
|
||||
itemName = sharedfolder.getTitle(); //IN CASE OF SHARED FOLDER THE NAME IS AN UUID, I'M USING THE TITLE
|
||||
itemName = sharedfolder.getTitle(); // IN CASE OF SHARED FOLDER THE NAME IS AN UUID, I'M USING THE
|
||||
// TITLE
|
||||
|
||||
if (sharedfolder.isVreFolder()){
|
||||
//logger.debug("Converting shared folder: "+theItem.getClass());
|
||||
//VreFolder vreFolder = (VreFolder) item;
|
||||
//theItem = new WorkspaceVREFolder(); //NEVER INSTANCE THE WorkspaceVREFolder because VreFolder is never used by HL/StorageHub
|
||||
itemName = sharedfolder.getDisplayName(); //IN CASE OF VRE FOLDER I'M USING THE DISPLAYNAME
|
||||
if (sharedfolder.isVreFolder()) {
|
||||
// logger.debug("Converting shared folder: "+theItem.getClass());
|
||||
// VreFolder vreFolder = (VreFolder) item;
|
||||
// theItem = new WorkspaceVREFolder(); //NEVER INSTANCE THE WorkspaceVREFolder
|
||||
// because VreFolder is never used by HL/StorageHub
|
||||
itemName = sharedfolder.getDisplayName(); // IN CASE OF VRE FOLDER I'M USING THE DISPLAYNAME
|
||||
((WorkspaceSharedFolder) theItem).setVreFolder(true);
|
||||
type = WorkspaceItemType.VRE_FOLDER;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
boolean isPublicItem = folderItem.isPublicItem();
|
||||
//((WorkspaceFolder) theItem).setPublicFolder(folderItem.isPublicItem());
|
||||
//logger.debug("Wrapped as Folder");
|
||||
boolean isPublicItem = folderItem.isPublicItem();
|
||||
// ((WorkspaceFolder) theItem).setPublicFolder(folderItem.isPublicItem());
|
||||
// logger.debug("Wrapped as Folder");
|
||||
|
||||
//TODO THIS MUST BE REMOVED. Checking the old property isPublic added as "<boolean>true</boolean>" by HL
|
||||
if(!isPublicItem){
|
||||
try{
|
||||
//Map<String, Object> map = item.getPropertyMap().getValues();
|
||||
// TODO THIS MUST BE REMOVED. Checking the old property isPublic added as
|
||||
// "<boolean>true</boolean>" by HL
|
||||
if (!isPublicItem) {
|
||||
try {
|
||||
// Map<String, Object> map = item.getPropertyMap().getValues();
|
||||
// logger.debug("Property Map size: "+map.size());
|
||||
// for (String key : map.keySet()) {
|
||||
// logger.debug("Key: "+key+ "value: "+map.get(key));
|
||||
// }
|
||||
String isPublic = (String) item.getMetadata().getMap().get("isPublic");
|
||||
logger.debug("The item name: "+item.getName()+ " has isPublic property like: "+isPublic);
|
||||
isPublicItem = isPublic!=null?isPublic.toLowerCase().contains("true"):false;
|
||||
}catch(Exception e){
|
||||
//silent
|
||||
}
|
||||
}
|
||||
String isPublic = (String) item.getMetadata().getMap().get("isPublic");
|
||||
logger.debug("The item name: " + item.getName() + " has isPublic property like: " + isPublic);
|
||||
isPublicItem = isPublic != null ? isPublic.toLowerCase().contains("true") : false;
|
||||
} catch (Exception e) {
|
||||
// silent
|
||||
}
|
||||
}
|
||||
|
||||
((WorkspaceFolder) theItem).setPublicFolder(isPublicItem);
|
||||
((WorkspaceFolder) theItem).setPublicFolder(isPublicItem);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
//THE ITEM IS A KIND OF FILE
|
||||
if(item instanceof AbstractFileItem){
|
||||
theItem = new FileItem();
|
||||
type = WorkspaceItemType.FILE_ITEM;
|
||||
FileItemType fileItemType = null;
|
||||
if(item instanceof ExternalURL){
|
||||
theItem = new URLFileItem();
|
||||
fileItemType = FileItemType.URL_DOCUMENT;
|
||||
}else if(item instanceof GenericFileItem){
|
||||
GenericFileItem gFI = (GenericFileItem) item; //??
|
||||
fileItemType = FileItemType.DOCUMENT;
|
||||
}else if(item instanceof PDFFileItem){
|
||||
theItem = new PDFFile();
|
||||
fileItemType = FileItemType.PDF_DOCUMENT;
|
||||
if(withFileDetails){
|
||||
PDFFileItem pdfFI = (PDFFileItem) item;
|
||||
PDFContent pdfContent = pdfFI.getContent();
|
||||
PDFFile thePDFFileItem = (PDFFile) theItem;
|
||||
thePDFFileItem.setNumberOfPages(pdfContent.getNumberOfPages());
|
||||
thePDFFileItem.setProducer(pdfContent.getProducer());
|
||||
thePDFFileItem.setVersion(pdfContent.getVersion());
|
||||
thePDFFileItem.setTitle(pdfContent.getTitle());
|
||||
thePDFFileItem.setAuthor(pdfContent.getAuthor());
|
||||
}
|
||||
}else if(item instanceof org.gcube.common.storagehub.model.items.ImageFile){
|
||||
theItem = new ImageFile();
|
||||
fileItemType = FileItemType.IMAGE_DOCUMENT;
|
||||
if(withFileDetails){
|
||||
org.gcube.common.storagehub.model.items.ImageFile imgFI = (org.gcube.common.storagehub.model.items.ImageFile) item; //??
|
||||
ImageFile theImageFileItem = (ImageFile) theItem;
|
||||
ImageContent content = imgFI.getContent();
|
||||
theImageFileItem.setHeight(content.getHeight());
|
||||
theImageFileItem.setWidth(content.getWidth());
|
||||
theImageFileItem.setThumbnailWidth(content.getThumbnailHeight());
|
||||
theImageFileItem.setThumbnailHeight(content.getThumbnailHeight());
|
||||
}
|
||||
}
|
||||
// THE ITEM IS A KIND OF FILE
|
||||
if (item instanceof AbstractFileItem) {
|
||||
theItem = new FileItem();
|
||||
type = WorkspaceItemType.FILE_ITEM;
|
||||
FileItemType fileItemType = null;
|
||||
if (item instanceof ExternalURL) {
|
||||
theItem = new URLFileItem();
|
||||
fileItemType = FileItemType.URL_DOCUMENT;
|
||||
} else if (item instanceof GenericFileItem) {
|
||||
GenericFileItem gFI = (GenericFileItem) item; // ??
|
||||
fileItemType = FileItemType.DOCUMENT;
|
||||
} else if (item instanceof PDFFileItem) {
|
||||
theItem = new PDFFile();
|
||||
fileItemType = FileItemType.PDF_DOCUMENT;
|
||||
if (withFileDetails) {
|
||||
PDFFileItem pdfFI = (PDFFileItem) item;
|
||||
PDFContent pdfContent = pdfFI.getContent();
|
||||
PDFFile thePDFFileItem = (PDFFile) theItem;
|
||||
thePDFFileItem.setNumberOfPages(pdfContent.getNumberOfPages());
|
||||
thePDFFileItem.setProducer(pdfContent.getProducer());
|
||||
thePDFFileItem.setVersion(pdfContent.getVersion());
|
||||
thePDFFileItem.setTitle(pdfContent.getTitle());
|
||||
thePDFFileItem.setAuthor(pdfContent.getAuthor());
|
||||
}
|
||||
} else if (item instanceof org.gcube.common.storagehub.model.items.ImageFile) {
|
||||
theItem = new ImageFile();
|
||||
fileItemType = FileItemType.IMAGE_DOCUMENT;
|
||||
if (withFileDetails) {
|
||||
org.gcube.common.storagehub.model.items.ImageFile imgFI = (org.gcube.common.storagehub.model.items.ImageFile) item; // ??
|
||||
ImageFile theImageFileItem = (ImageFile) theItem;
|
||||
ImageContent content = imgFI.getContent();
|
||||
theImageFileItem.setHeight(content.getHeight());
|
||||
theImageFileItem.setWidth(content.getWidth());
|
||||
theImageFileItem.setThumbnailWidth(content.getThumbnailHeight());
|
||||
theImageFileItem.setThumbnailHeight(content.getThumbnailHeight());
|
||||
}
|
||||
}
|
||||
|
||||
AbstractFileItem itemAb = (AbstractFileItem) item;
|
||||
Content aC = itemAb.getContent();
|
||||
FileItem theFileItem = (FileItem) theItem;
|
||||
theFileItem.setFileItemType(fileItemType);
|
||||
AbstractFileItem itemAb = (AbstractFileItem) item;
|
||||
Content aC = itemAb.getContent();
|
||||
FileItem theFileItem = (FileItem) theItem;
|
||||
theFileItem.setFileItemType(fileItemType);
|
||||
|
||||
if(aC!=null){
|
||||
logger.debug("The content is not null for item: "+itemAb.getId());
|
||||
theFileItem.setMimeType(aC.getMimeType());
|
||||
theFileItem.setSize(aC.getSize());
|
||||
}else
|
||||
logger.warn("The content is null for item: "+itemAb.getId());
|
||||
if (aC != null) {
|
||||
logger.debug("The content is not null for item: " + itemAb.getId());
|
||||
theFileItem.setMimeType(aC.getMimeType());
|
||||
theFileItem.setSize(aC.getSize());
|
||||
} else
|
||||
logger.warn("The content is null for item: " + itemAb.getId());
|
||||
|
||||
//TODO ADD VERSION NAME
|
||||
// TODO ADD VERSION NAME
|
||||
|
||||
}
|
||||
|
||||
//ADDING (GCUBE) PROPERTIES
|
||||
PropertyMap pm = null;
|
||||
if(withMapProperties || isFolder){
|
||||
//System.out.println("Setting map: "+item.getPropertyMap().getValues());
|
||||
pm = toPropertyMap(item.getMetadata());
|
||||
}
|
||||
|
||||
//CONVERTING EXTERNALLINK
|
||||
if(item instanceof ExternalLink) {
|
||||
logger.trace("FOUND an ExternalLink...");
|
||||
type = WorkspaceItemType.URL_ITEM;
|
||||
ExternalLink extLink = (ExternalLink) item;
|
||||
theItem = new URLFile();
|
||||
URLFile theURLFile = (URLFile) theItem;
|
||||
theURLFile.setValue(extLink.getValue());
|
||||
}
|
||||
}
|
||||
|
||||
//CONVERTING TRASH ITEM
|
||||
if(item.isTrashed() && item instanceof TrashItem){
|
||||
// ADDING (GCUBE) PROPERTIES
|
||||
PropertyMap pm = null;
|
||||
if (withMapProperties || isFolder) {
|
||||
// System.out.println("Setting map: "+item.getPropertyMap().getValues());
|
||||
pm = toPropertyMap(item.getMetadata());
|
||||
}
|
||||
|
||||
// CONVERTING EXTERNALLINK
|
||||
if (item instanceof ExternalLink) {
|
||||
logger.trace("FOUND an ExternalLink...");
|
||||
type = WorkspaceItemType.URL_ITEM;
|
||||
ExternalLink extLink = (ExternalLink) item;
|
||||
theItem = new URLFile();
|
||||
URLFile theURLFile = (URLFile) theItem;
|
||||
theURLFile.setValue(extLink.getValue());
|
||||
}
|
||||
|
||||
// CONVERTING TRASH ITEM
|
||||
if (item.isTrashed() && item instanceof TrashItem) {
|
||||
type = WorkspaceItemType.TRASH_ITEM;
|
||||
TrashItem trashItem = (TrashItem) item; //??
|
||||
TrashItem trashItem = (TrashItem) item;
|
||||
itemName = trashItem.getTitle(); // IN CASE OF TRASHED ITEM THE NAME IS THE ID, SO I'M USING THE TITLE
|
||||
theItem = new org.gcube.common.storagehubwrapper.shared.tohl.impl.TrashItem();
|
||||
org.gcube.common.storagehubwrapper.shared.tohl.impl.TrashItem theTrashItem = (org.gcube.common.storagehubwrapper.shared.tohl.impl.TrashItem) theItem;
|
||||
theTrashItem.setDeletedBy(trashItem.getDeletedBy());
|
||||
|
@ -307,16 +289,17 @@ public class HLMapper {
|
|||
theTrashItem.setDeletedFrom(trashItem.getDeletedFrom());
|
||||
theTrashItem.setLenght(trashItem.getLenght());
|
||||
theTrashItem.setMimeType(trashItem.getMimeType());
|
||||
isFolder = trashItem.isFolder(); //DO NOT MOVE THIS SET
|
||||
if(isFolder) //Avoiding null exception on
|
||||
|
||||
isFolder = trashItem.isFolder(); // DO NOT MOVE THIS SET
|
||||
if (isFolder) // Avoiding null exception on
|
||||
type = WorkspaceItemType.TRASH_FOLDER;
|
||||
|
||||
logger.debug("Wrapped as TrashItem");
|
||||
}
|
||||
|
||||
if(item instanceof GCubeItem){
|
||||
if (item instanceof GCubeItem) {
|
||||
type = WorkspaceItemType.FILE_ITEM;
|
||||
GCubeItem gcubeItem = (GCubeItem) item; //??
|
||||
GCubeItem gcubeItem = (GCubeItem) item; // ??
|
||||
theItem = new GcubeItem();
|
||||
GcubeItem theGcubeItem = (GcubeItem) theItem;
|
||||
theGcubeItem.setFileItemType(FileItemType.GCUBE_ITEM);
|
||||
|
@ -324,7 +307,7 @@ public class HLMapper {
|
|||
theGcubeItem.setCreator(gcubeItem.getCreator());
|
||||
theGcubeItem.setItemType(gcubeItem.getItemType());
|
||||
theGcubeItem.setShared(gcubeItem.isShared());
|
||||
if(withMapProperties){
|
||||
if (withMapProperties) {
|
||||
PropertyMap property = toPropertyMap(gcubeItem.getProperty());
|
||||
theGcubeItem.setProperty(property);
|
||||
}
|
||||
|
@ -332,12 +315,12 @@ public class HLMapper {
|
|||
logger.debug("Wrapped as GcubeItem");
|
||||
}
|
||||
|
||||
if(theItem==null){
|
||||
if (theItem == null) {
|
||||
logger.info("Mapping unknown object as simple FileItem");
|
||||
theItem = new FileItem();
|
||||
type = WorkspaceItemType.FILE_ITEM;
|
||||
FileItem theFileItem = (FileItem) theItem;
|
||||
theFileItem.setFileItemType(FileItemType.DOCUMENT);
|
||||
theFileItem.setFileItemType(FileItemType.DOCUMENT);
|
||||
}
|
||||
|
||||
theItem.setId(item.getId());
|
||||
|
@ -357,23 +340,19 @@ public class HLMapper {
|
|||
theItem.setAccounting(accountingEntries);
|
||||
theItem.setType(type);
|
||||
theItem.setFolder(isFolder);
|
||||
theItem.setRoot(isRoot); //THIS IS ALWAYS FALSE. SHUB DOES NOT RETURN THIS INFORMATION
|
||||
theItem.setRoot(isRoot); // THIS IS ALWAYS FALSE. SHUB DOES NOT RETURN THIS INFORMATION
|
||||
theItem.setPropertyMap(pm);
|
||||
|
||||
logger.debug("Wrapped WsItem: "+theItem);
|
||||
logger.debug("Wrapped WsItem has type: "+theItem.getClass().getName());
|
||||
logger.debug("Wrapped WsItem: " + theItem);
|
||||
logger.debug("Wrapped WsItem has type: " + theItem.getClass().getName());
|
||||
|
||||
return (T) theItem;
|
||||
|
||||
}catch (Exception e){
|
||||
logger.error("Error on converting the item with id: "+item.getId(), e);
|
||||
} catch (Exception e) {
|
||||
logger.error("Error on converting the item with id: " + item.getId(), e);
|
||||
throw e;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
|
@ -12,32 +12,29 @@ import org.gcube.common.storagehub.model.items.SharedFolder;
|
|||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* The Class ObjectMapper.
|
||||
*
|
||||
* @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapa@isti.cnr.it)
|
||||
* Jun 26, 2018
|
||||
* Jun 26, 2018
|
||||
*/
|
||||
public class ObjectMapper {
|
||||
|
||||
private static Logger logger = LoggerFactory.getLogger(ObjectMapper.class);
|
||||
|
||||
|
||||
/**
|
||||
* To list logins.
|
||||
*
|
||||
* @param sharedfolder the sharedfolder
|
||||
* @return the list
|
||||
*/
|
||||
public static List<String> toListLogins(SharedFolder sharedfolder){
|
||||
|
||||
@Deprecated
|
||||
public static List<String> toListLogins(SharedFolder sharedfolder) {
|
||||
Metadata users = sharedfolder.getUsers();
|
||||
Map<String, Object> mapMember = users.getMap();
|
||||
List<String> listUsers = new ArrayList<String>(mapMember.size());
|
||||
listUsers.addAll(mapMember.keySet());
|
||||
logger.debug("Returning "+listUsers.size()+" member/s for sharedFolder with id: "+sharedfolder.getId());
|
||||
logger.debug("Returning " + listUsers.size() + " member/s for sharedFolder with id: " + sharedfolder.getId());
|
||||
return listUsers;
|
||||
}
|
||||
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,125 @@
|
|||
package org.gcube.common.storagehubwrapper.shared;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* The Class Member.
|
||||
*
|
||||
* @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it
|
||||
*
|
||||
* Apr 29, 2022
|
||||
*/
|
||||
public class Member implements Serializable {
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
private static final long serialVersionUID = 1454948336452658186L;
|
||||
|
||||
/**
|
||||
* The Enum TYPE.
|
||||
*
|
||||
* @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it
|
||||
*
|
||||
* Apr 29, 2022
|
||||
*/
|
||||
public static enum TYPE {
|
||||
USER, GROUP
|
||||
}
|
||||
|
||||
private String identity;
|
||||
private String name;
|
||||
private TYPE memberType = TYPE.USER;
|
||||
|
||||
/**
|
||||
* Instantiates a new member.
|
||||
*/
|
||||
public Member() {
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Instantiates a new member.
|
||||
*
|
||||
* @param identity the identity is the username of a User or the name of a
|
||||
* Group. In general is key to identify he/she/it in the in
|
||||
* the infrastructure
|
||||
* @param name the name is the name of a User or the name of a Group
|
||||
* @param memberType the member type
|
||||
*/
|
||||
public Member(String identity, String name, TYPE memberType) {
|
||||
super();
|
||||
this.identity = identity;
|
||||
this.name = name;
|
||||
this.memberType = memberType;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the identity.
|
||||
*
|
||||
* @return the login in case of user and the groupName stored in SHUB (e.g.
|
||||
* gcube-devsec-devVRE) in case of group
|
||||
*/
|
||||
public String getIdentity() {
|
||||
return identity;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the name.
|
||||
*
|
||||
* @return the login in case of user and the groupName in case of group
|
||||
*/
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the member type.
|
||||
*
|
||||
* @return the member type
|
||||
*/
|
||||
public TYPE getMemberType() {
|
||||
return memberType;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the identity.
|
||||
*
|
||||
* @param identity the new identity
|
||||
*/
|
||||
public void setIdentity(String identity) {
|
||||
this.identity = identity;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the name.
|
||||
*
|
||||
* @param name the new name
|
||||
*/
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the member type.
|
||||
*
|
||||
* @param memberType the new member type
|
||||
*/
|
||||
public void setMemberType(TYPE memberType) {
|
||||
this.memberType = memberType;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
StringBuilder builder = new StringBuilder();
|
||||
builder.append("Member [identity=");
|
||||
builder.append(identity);
|
||||
builder.append(", name=");
|
||||
builder.append(name);
|
||||
builder.append(", memberType=");
|
||||
builder.append(memberType);
|
||||
builder.append("]");
|
||||
return builder.toString();
|
||||
}
|
||||
|
||||
}
|
|
@ -0,0 +1 @@
|
|||
/resources/
|
|
@ -3,9 +3,14 @@ import java.util.HashMap;
|
|||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
|
||||
import org.gcube.common.scope.api.ScopeProvider;
|
||||
import org.gcube.common.storagehub.client.dsl.FolderContainer;
|
||||
import org.gcube.common.storagehub.client.dsl.StorageHubClient;
|
||||
import org.gcube.common.storagehubwrapper.server.StorageHubWrapper;
|
||||
import org.gcube.common.storagehubwrapper.server.WorkspaceStorageHubClientService;
|
||||
import org.gcube.common.storagehubwrapper.server.tohl.Workspace;
|
||||
import org.gcube.common.storagehubwrapper.shared.Member;
|
||||
import org.gcube.common.storagehubwrapper.shared.tohl.WorkspaceFolder;
|
||||
import org.gcube.common.storagehubwrapper.shared.tohl.WorkspaceItem;
|
||||
import org.gcube.common.storagehubwrapper.shared.tohl.exceptions.InternalErrorException;
|
||||
|
@ -14,29 +19,26 @@ import org.gcube.common.storagehubwrapper.shared.tohl.exceptions.WrongItemTypeEx
|
|||
import org.gcube.common.storagehubwrapper.shared.tohl.impl.FileItem;
|
||||
import org.gcube.common.storagehubwrapper.shared.tohl.impl.ImageFile;
|
||||
import org.gcube.common.storagehubwrapper.shared.tohl.impl.PDFFile;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
/**
|
||||
*
|
||||
* @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it
|
||||
* Jun 20, 2018
|
||||
* @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it Jun 20, 2018
|
||||
*/
|
||||
public class WorkspaceInstance {
|
||||
|
||||
public static String SCOPE = "/gcube";
|
||||
public static String SCOPE = "/gcube/devsec/devVRE";
|
||||
//public static String SCOPE = "/d4science.research-infrastructures.eu";
|
||||
|
||||
|
||||
//public static String USERNAME = "massimiliano.assante";
|
||||
// public static String USERNAME = "massimiliano.assante";
|
||||
public static String USERNAME = "francesco.mangiacrapa";
|
||||
|
||||
public static String TOKEN; //YOU MUST SET THIS AS VM PARAMETER
|
||||
|
||||
//public static String TOKEN = System.getenv("TOKEN_gcube"); // YOU MUST SET THIS AS Environment variable
|
||||
|
||||
public static String TOKEN = "";
|
||||
|
||||
public static String FIND_FILE_NAME = "francesco";
|
||||
public static String rootId = null;
|
||||
|
@ -44,18 +46,23 @@ public class WorkspaceInstance {
|
|||
|
||||
private WorkspaceStorageHubClientService workspace;
|
||||
|
||||
@Before
|
||||
public void init(){
|
||||
//@Before
|
||||
public void init() {
|
||||
|
||||
TOKEN = System.getProperty("token");
|
||||
if (TOKEN == null) {
|
||||
System.err.println("You must set the token as Environment variable");
|
||||
}
|
||||
|
||||
System.out.println("Read TOKEN: "+TOKEN);
|
||||
System.out.println("Read TOKEN_gcube: " + TOKEN);
|
||||
|
||||
ScopeProvider.instance.set(SCOPE);
|
||||
SecurityTokenProvider.instance.set(TOKEN);
|
||||
|
||||
//METHOD 1
|
||||
// METHOD 1
|
||||
storageHubWrapper = new StorageHubWrapper(SCOPE, TOKEN, false, false, true);
|
||||
//workspace = storageHubWrapper.getWorkspace();
|
||||
// workspace = storageHubWrapper.getWorkspace();
|
||||
|
||||
//METHOD 2
|
||||
// METHOD 2
|
||||
// StorageHubClientService storageHubClientService = new StorageHubClientService(SCOPE, TOKEN);
|
||||
// workspace = new WorkspaceStorageHubClientService.WorkspaceStorageHubClientServiceBuilder(storageHubClientService).
|
||||
// withAccounting(false).
|
||||
|
@ -63,66 +70,82 @@ public class WorkspaceInstance {
|
|||
// build();
|
||||
}
|
||||
|
||||
//@Test
|
||||
// @Test
|
||||
public void getRoot() {
|
||||
System.out.println("Get Root test");
|
||||
WorkspaceFolder root;
|
||||
try {
|
||||
root = storageHubWrapper.getWorkspace().getRoot();
|
||||
rootId = root.getId();
|
||||
System.out.println("The root is:"+root);
|
||||
}
|
||||
catch (Exception e) {
|
||||
System.out.println("The root is:" + root);
|
||||
} catch (Exception e) {
|
||||
// TODO Auto-generated catch block
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getChildren() throws Exception{
|
||||
// @Test
|
||||
public void getChildren() throws Exception {
|
||||
System.out.println("Get children test");
|
||||
|
||||
WorkspaceFolder root = storageHubWrapper.getWorkspace().getRoot();
|
||||
List<? extends WorkspaceItem> children = storageHubWrapper.getWorkspace().getChildren(root.getId());
|
||||
|
||||
//WorkspaceFolder root = workspace.getRoot();
|
||||
//List<? extends WorkspaceItem> children = workspace.getChildren(root.getId());
|
||||
// WorkspaceFolder root = workspace.getRoot();
|
||||
// List<? extends WorkspaceItem> children = workspace.getChildren(root.getId());
|
||||
|
||||
int i = 0;
|
||||
for (WorkspaceItem workspaceItem : children) {
|
||||
System.out.println(++i+")"+workspaceItem.getId() + " name: "+workspaceItem.getName() + " type: "+workspaceItem.getType() +" class: "+workspaceItem.getClass());
|
||||
//System.out.println(workspaceItem.getType() +" "+workspaceItem.getClass());
|
||||
|
||||
|
||||
// System.out.println(++i+")");
|
||||
// if(workspaceItem.isFolder()){
|
||||
// WorkspaceFolder folder = (WorkspaceFolder) workspaceItem;
|
||||
// System.out.println("is public? "+folder.isPublicFolder());
|
||||
// }
|
||||
|
||||
//printMap(workspaceItem);
|
||||
System.out.println(++i + ")" + workspaceItem.getId() + " name: " + workspaceItem.getName() + " type: "
|
||||
+ workspaceItem.getType() + " class: " + workspaceItem.getClass());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// @Test
|
||||
public void getPathOnShared() throws Exception {
|
||||
System.out.println("Get Path on Shared");
|
||||
|
||||
WorkspaceFolder root = storageHubWrapper.getWorkspace().getRoot();
|
||||
List<? extends WorkspaceItem> children = storageHubWrapper.getWorkspace().getChildren(root.getId());
|
||||
|
||||
int i = 0;
|
||||
for (WorkspaceItem workspaceItem : children) {
|
||||
if (workspaceItem.isShared()) {
|
||||
System.out.println(++i + ")" + workspaceItem.getId() + " name: " + workspaceItem.getName() + " type: "
|
||||
+ workspaceItem.getPath());
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
//@Test
|
||||
public void getFilteredChildren() throws Exception{
|
||||
public void getVREFolder() throws Exception {
|
||||
System.out.println("Get VRE Folder");
|
||||
|
||||
StorageHubClient shClient = new StorageHubClient();
|
||||
FolderContainer vre= shClient.openVREFolder();
|
||||
System.out.println("VRE folder: "+vre.getId() + " ACLs: "+vre.getAcls());
|
||||
}
|
||||
|
||||
|
||||
// @Test
|
||||
public void getFilteredChildren() throws Exception {
|
||||
System.out.println("Get children test");
|
||||
|
||||
WorkspaceFolder root = storageHubWrapper.getWorkspace().getRoot();
|
||||
Class filterClass = org.gcube.common.storagehub.model.items.FolderItem.class;
|
||||
List<? extends WorkspaceItem> children = storageHubWrapper.getWorkspace().getFilteredChildren(root.getId(), filterClass);
|
||||
List<? extends WorkspaceItem> children = storageHubWrapper.getWorkspace().getFilteredChildren(root.getId(),
|
||||
filterClass);
|
||||
|
||||
//WorkspaceFolder root = workspace.getRoot();
|
||||
//List<? extends WorkspaceItem> children = workspace.getChildren(root.getId());
|
||||
// WorkspaceFolder root = workspace.getRoot();
|
||||
// List<? extends WorkspaceItem> children = workspace.getChildren(root.getId());
|
||||
|
||||
int i = 0;
|
||||
for (WorkspaceItem workspaceItem : children) {
|
||||
System.out.println(++i+")"+workspaceItem);
|
||||
System.out.println(workspaceItem.getType() +" "+workspaceItem.getClass());
|
||||
|
||||
System.out.println(++i + ")" + workspaceItem);
|
||||
System.out.println(workspaceItem.getType() + " " + workspaceItem.getClass());
|
||||
|
||||
// System.out.println(++i+")");
|
||||
// if(workspaceItem.isFolder()){
|
||||
|
@ -136,33 +159,61 @@ public class WorkspaceInstance {
|
|||
|
||||
}
|
||||
|
||||
public static void printMap(WorkspaceItem workspaceItem){
|
||||
if(workspaceItem.getPropertyMap()!=null){
|
||||
System.out.println(workspaceItem.getId() + " name: "+workspaceItem.getName() + " isFolder: "+workspaceItem.isFolder());
|
||||
System.out.println("Property Map: "+workspaceItem.getPropertyMap().getValues().toString());
|
||||
public static void printMap(WorkspaceItem workspaceItem) {
|
||||
if (workspaceItem.getPropertyMap() != null) {
|
||||
System.out.println(workspaceItem.getId() + " name: " + workspaceItem.getName() + " isFolder: "
|
||||
+ workspaceItem.isFolder());
|
||||
System.out.println("Property Map: " + workspaceItem.getPropertyMap().getValues().toString());
|
||||
}
|
||||
}
|
||||
|
||||
//@Test
|
||||
public void getWorkspaceId() {
|
||||
// @Test
|
||||
public void getWorkspaceId() {
|
||||
System.out.println("Getting the workspaceId test");
|
||||
try {
|
||||
|
||||
Workspace ws = storageHubWrapper.getWorkspace();
|
||||
|
||||
//Workspace ws = workspace;
|
||||
// Workspace ws = workspace;
|
||||
|
||||
if(ws!=null){
|
||||
if (ws != null) {
|
||||
WorkspaceFolder root = ws.getRoot();
|
||||
System.out.println("Retrieve the root "+root.getId()+" correctly");
|
||||
System.out.println("Retrieve the root " + root.getId() + " correctly");
|
||||
}
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
//@Test
|
||||
public void getChildrenPerWorkspaceItem() throws InternalErrorException{
|
||||
@Test
|
||||
public void getSharedFolderMembers() {
|
||||
System.out.println("Getting getSharedFolderMembers");
|
||||
try {
|
||||
|
||||
//String sharedFolderId = "7e3c6636-927c-4139-9fcc-64986ea70cbf"; // devVRE (VRE Folder)
|
||||
String sharedFolderId = "f8275521-5da1-4501-8385-bb9c79055aa6"; // PROD - d4science.research-infrastructures.eu-D4OS-Blue-Cloud2026Project (VRE Folder)
|
||||
//String sharedFolderId = "4d6f1fe9-8f04-45c9-a87e-ee6093553d77"; // PROD - AriadnePlus-LiDAR Dataset (simple Shared Folder)
|
||||
//String sharedFolderId = "a4837a77-c1d0-4ea4-9f9d-c4bd5cf07e9a"; // PROD - Sample Reports and Templates (private Folder)
|
||||
//sharedFolderId = "c141d53d-4cae-4bfc-a6f7-9b8bbd8c0e2b"; //NextNext
|
||||
SCOPE = "/gcube";
|
||||
SCOPE = "/d4science.research-infrastructures.eu";
|
||||
TOKEN = "";
|
||||
storageHubWrapper = new StorageHubWrapper(SCOPE, TOKEN);
|
||||
List<Member> listMembers = storageHubWrapper.getWorkspace().getSharedFolderMembers(sharedFolderId);
|
||||
|
||||
System.out.println("Foud " + listMembers.size() + " member/s");
|
||||
|
||||
for (Member member : listMembers) {
|
||||
System.out.println(member);
|
||||
}
|
||||
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
// @Test
|
||||
public void getChildrenPerWorkspaceItem() throws InternalErrorException {
|
||||
System.out.println("Get children test per workspace item");
|
||||
|
||||
try {
|
||||
|
@ -174,11 +225,11 @@ public class WorkspaceInstance {
|
|||
// List<? extends WorkspaceItem> children = workspace.getChildren(root.getId());
|
||||
|
||||
int i = 0;
|
||||
Map<String, List<WorkspaceItem>> map = new HashMap<String,List<WorkspaceItem>>();
|
||||
Map<String, List<WorkspaceItem>> map = new HashMap<String, List<WorkspaceItem>>();
|
||||
for (WorkspaceItem workspaceItem : children) {
|
||||
String key = workspaceItem.getType().name();
|
||||
List<WorkspaceItem> list = map.get(key);
|
||||
if(list==null){
|
||||
if (list == null) {
|
||||
list = new ArrayList<WorkspaceItem>();
|
||||
}
|
||||
|
||||
|
@ -195,20 +246,20 @@ public class WorkspaceInstance {
|
|||
switch (fileItem.getFileItemType()) {
|
||||
case PDF_DOCUMENT:
|
||||
PDFFile pdfFile = (PDFFile) fileItem;
|
||||
System.out.println("PDF_DOCUMENT "+pdfFile);
|
||||
PDFFile completeItem = (PDFFile) storageHubWrapper.getWorkspace().getItem(fileItem.getId(), true, true, true);
|
||||
System.out.println("PDF_DOCUMENT " + pdfFile);
|
||||
PDFFile completeItem = (PDFFile) storageHubWrapper.getWorkspace().getItem(fileItem.getId(),
|
||||
true, true, true);
|
||||
System.out.println(completeItem);
|
||||
break;
|
||||
case IMAGE_DOCUMENT:
|
||||
ImageFile imageFile = (ImageFile) fileItem;
|
||||
System.out.println("IMAGE_DOCUMENT "+imageFile);
|
||||
System.out.println("IMAGE_DOCUMENT " + imageFile);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
System.out.println(fileItem.getFileItemType() +" "+workspaceItem.getClass());
|
||||
|
||||
System.out.println(fileItem.getFileItemType() + " " + workspaceItem.getClass());
|
||||
|
||||
break;
|
||||
default:
|
||||
|
@ -216,33 +267,32 @@ public class WorkspaceInstance {
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception e) {
|
||||
} catch (Exception e) {
|
||||
// TODO Auto-generated catch block
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
//@Test
|
||||
public void findFileName() throws InternalErrorException{
|
||||
// @Test
|
||||
public void findFileName() throws InternalErrorException {
|
||||
System.out.println("Find file name test");
|
||||
getRoot();
|
||||
try {
|
||||
//List<WorkspaceItem> foundItems = storageHubWrapper.getWorkspace().find(FIND_FILE_NAME,rootId);
|
||||
List<? extends WorkspaceItem> foundItems = workspace.find(FIND_FILE_NAME,rootId);
|
||||
// List<WorkspaceItem> foundItems =
|
||||
// storageHubWrapper.getWorkspace().find(FIND_FILE_NAME,rootId);
|
||||
List<? extends WorkspaceItem> foundItems = workspace.find(FIND_FILE_NAME, rootId);
|
||||
|
||||
if(foundItems==null || foundItems.size()==0){
|
||||
System.out.println("No Items found with name: "+FIND_FILE_NAME+ " in the parent: "+rootId);
|
||||
if (foundItems == null || foundItems.size() == 0) {
|
||||
System.out.println("No Items found with name: " + FIND_FILE_NAME + " in the parent: " + rootId);
|
||||
return;
|
||||
}
|
||||
|
||||
System.out.println("Items found with name: "+FIND_FILE_NAME+ " in the parent: "+rootId +" are:");
|
||||
System.out.println("Items found with name: " + FIND_FILE_NAME + " in the parent: " + rootId + " are:");
|
||||
for (WorkspaceItem workspaceItem : foundItems) {
|
||||
System.out.println(workspaceItem);
|
||||
}
|
||||
}
|
||||
catch (ItemNotFoundException | WrongItemTypeException e) {
|
||||
} catch (ItemNotFoundException | WrongItemTypeException e) {
|
||||
// TODO Auto-generated catch block
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue