gCubeSystem
/
storagehub-client-wrapper
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[#19058] added the folder destination Id to restore operation, removed 

changelog.xml, added changelog.md
This commit is contained in:
Francesco Mangiacrapa 2020-05-18 16:53:59 +02:00
parent 7792737ae1
commit 807ea16878
7 changed files with 110 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
changelog.md Normal file
View File

@ -0,0 +1,88 @@
# 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).
## [v0-7-1] [r4-23-0] - [2020-05-18]
** Enhancements **
[#19058] added the folder destination Id to restore operation
## [v0-7-0] [r4-22-0] - [2020-04-16]
** Enhancements **
[Task #19087] provide a getItem (without getRoot inside) for Workspace-Explorer-App
## [v0-6-2] [r4-21-0] - [2020-03-11]
** New features **
[#18174] Moved to new search facility provided by SHUB
## [0-6-1] - [2019-12-19]
Ported to Git and Jenkins
## [0-6-0] - [2019-10-01]
[Task #16688] Integrating new method added into SHUB
## [0-5-0] - [2019-08-01]
Released due to exceptions thrown by SHUB
## [0-4-0] - [2019-06-01]
Updated to new SHub interface
Added method getMetadata
## [0-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
## [0-2-0] - [2018-06-20]
minor fixes
## [0-1-0] - [2018-06-20]
[Task #12059] first release

53
changelog.xml
View File

@ -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>

2
descriptor.xml
View File

@ -14,7 +14,7 @@
<includes>
<include>README.md</include>
<include>LICENSE.md</include>
<include>changelog.xml</include>
<include>changelog.md</include>
<include>profile.xml</include>
</includes>
<fileMode>755</fileMode>

2
pom.xml
View File

@ -10,7 +10,7 @@
</parent>
<groupId>org.gcube.common</groupId>
<artifactId>storagehub-client-wrapper</artifactId>
<version>0.7.0</version>
<version>0.7.1-SNAPSHOT</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>

16
src/main/java/org/gcube/common/storagehubwrapper/server/StorageHubClientService.java
View File

@ -638,21 +638,27 @@ public class StorageHubClientService {
shcClient.emptyTrash();
}
/**
* Restore thrash item.
*
* @param itemId the item id
* @param destinationFolderId the destination folder id
* @return the item
* @throws Exception the exception
*/
public Item restoreThrashItem(String itemId) throws Exception{
public Item restoreThrashItem(String itemId, String destinationFolderId) throws Exception{
Validate.notNull(itemId, "Bad request to restoreThrashItem, the itemId is null");
setContextProviders(scope, authorizationToken);
GenericItemContainer container = shcClient.restoreThrashItem(itemId);
GenericItemContainer container = null;
if(destinationFolderId==null)
container = shcClient.restoreThrashItem(itemId);
else
container = shcClient.restoreThrashItem(itemId, destinationFolderId);
if(container!=null){
Item item = container.get();
if(item!=null){

9
src/main/java/org/gcube/common/storagehubwrapper/server/WorkspaceStorageHubClientService.java
View File

@ -934,21 +934,20 @@ 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){

11
src/main/java/org/gcube/common/storagehubwrapper/server/tohl/Workspace.java
View File

@ -236,18 +236,17 @@ public interface Workspace{
public void emptyTrash() throws Exception;
/**
* Restore thrash item.
*
* @param itemId the item id
* @return the item
* @param destinationFolderId the destination folder id
* @return the workspace item
* @throws Exception the exception
*/
public WorkspaceItem restoreThrashItem(String itemId) throws Exception;
public WorkspaceItem restoreThrashItem(String itemId, String destinationFolderId) throws Exception;
/**
* Gets the filtered children.
*
@ -515,7 +514,7 @@ public interface Workspace{
throws InternalErrorException, ItemNotFoundException, WrongItemTypeException;
/**
* Gets the item for Explorer
* Gets the item for Explorer.
*
* @param itemId the item id
* @param withAccounting the with accounting