gCubeSystem
/
workspace-explorer-app
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added more logs; update itemtype with serialize

This commit is contained in:
Francesco Mangiacrapa 2020-04-15 16:44:04 +02:00
parent 4f6e62a7c6
commit 6b2e211455
6 changed files with 27 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/gcube/portlets/user/workspaceexplorerapp/client/rpc/WorkspaceExplorerAppService.java
View File

@ -76,7 +76,7 @@ public interface WorkspaceExplorerAppService extends RemoteService {
* @return the breadcrumbs by item identifier
* @throws Exception the exception
*/
List<Item> getBreadcrumbsByItemIdentifier(String itemIdentifier, boolean includeItemAsParent) throws Exception;
//List<Item> getBreadcrumbsByItemIdentifier(String itemIdentifier, boolean includeItemAsParent) throws Exception;
/**
* Gets the public link for item id.

3
src/main/java/org/gcube/portlets/user/workspaceexplorerapp/client/rpc/WorkspaceExplorerAppServiceAsync.java
View File

@ -69,8 +69,7 @@ public interface WorkspaceExplorerAppServiceAsync {
* @param asyncCallback the async callback
* @return the breadcrumbs by item identifier
*/
public void getBreadcrumbsByItemIdentifier(String itemIdentifier, boolean includeItemAsParent,
AsyncCallback<List<Item>> asyncCallback);
//public void getBreadcrumbsByItemIdentifier(String itemIdentifier, boolean includeItemAsParent, AsyncCallback<List<Item>> asyncCallback);
/**
* Gets the my special folder.

30
src/main/java/org/gcube/portlets/user/workspaceexplorerapp/server/WorkspaceExplorerAppServiceImpl.java
View File

@ -2,7 +2,6 @@ package org.gcube.portlets.user.workspaceexplorerapp.server;
import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.TimeUnit;
@ -73,7 +72,7 @@ public class WorkspaceExplorerAppServiceImpl extends RemoteServiceServlet implem
*/
@Override
public Item getRoot(List<ItemType> showableTypes, boolean purgeEmpyFolders, FilterCriteria filterCriteria) throws WorkspaceNavigatorServiceException {
logger.debug("getRoot showableTypes: "+showableTypes+" purgeEmpyFolders: "+purgeEmpyFolders+" filterCriteria: "+ filterCriteria);
logger.info("getRoot showableTypes: "+showableTypes+" purgeEmpyFolders: "+purgeEmpyFolders+" filterCriteria: "+ filterCriteria);
try {
@ -106,7 +105,7 @@ public class WorkspaceExplorerAppServiceImpl extends RemoteServiceServlet implem
logger.trace("Returning:");
Long endTime = System.currentTimeMillis() - startTime;
String time = String.format("%d msc %d sec", endTime, TimeUnit.MILLISECONDS.toSeconds(endTime));
logger.info("end time - " + time);
logger.info("getRoot end time - " + time);
Collections.sort(rootItem.getChildren(), new ItemComparator());
logger.info("Returning children size: "+rootItem.getChildren().size());
@ -132,7 +131,7 @@ public class WorkspaceExplorerAppServiceImpl extends RemoteServiceServlet implem
*/
@Override
public Item getFolder(Item item, List<ItemType> showableTypes, boolean purgeEmpyFolders, FilterCriteria filterCriteria) throws WorkspaceNavigatorServiceException {
logger.debug("getFolder item: "+item+" showableTypes: "+showableTypes+" purgeEmpyFolders: "+purgeEmpyFolders+" filterCriteria: "+filterCriteria);
logger.info("called getFolder item: "+item+" showableTypes: "+showableTypes+" purgeEmpyFolders: "+purgeEmpyFolders+" filterCriteria: "+filterCriteria);
WorkspaceItem workspaceItem = null;
Workspace workspace = null;
@ -173,7 +172,7 @@ public class WorkspaceExplorerAppServiceImpl extends RemoteServiceServlet implem
logger.trace("Returning:");
Long endTime = System.currentTimeMillis() - startTime;
String time = String.format("%d msc %d sec", endTime, TimeUnit.MILLISECONDS.toSeconds(endTime));
logger.info("end time - " + time);
logger.info("getFolder end time - " + time);
Collections.sort(itemFolder.getChildren(), new ItemComparator());
@ -197,7 +196,7 @@ public class WorkspaceExplorerAppServiceImpl extends RemoteServiceServlet implem
*/
@Override
public Item getMySpecialFolder(List<ItemType> showableTypes, boolean purgeEmpyFolders, FilterCriteria filterCriteria) throws WorkspaceNavigatorServiceException {
logger.trace("GetMySpecialFolder showableTypes: "+showableTypes+" purgeEmpyFolders: "+purgeEmpyFolders+" filterCriteria: "+filterCriteria);
logger.info("called getMySpecialFolder showableTypes: "+showableTypes+" purgeEmpyFolders: "+purgeEmpyFolders+" filterCriteria: "+filterCriteria);
try {
@ -223,7 +222,7 @@ public class WorkspaceExplorerAppServiceImpl extends RemoteServiceServlet implem
logger.trace("Returning:");
Long endTime = System.currentTimeMillis() - startTime;
String time = String.format("%d msc %d sec", endTime, TimeUnit.MILLISECONDS.toSeconds(endTime));
logger.trace("end time - " + time);
logger.info("getMySpecialFolder end time - " + time);
Collections.sort(itemFolder.getChildren(), new ItemComparator());
return itemFolder;
@ -241,8 +240,8 @@ public class WorkspaceExplorerAppServiceImpl extends RemoteServiceServlet implem
* @return the list parents by item identifier
* @throws Exception the exception
*/
@Override
public List<Item> getBreadcrumbsByItemIdentifier(String itemIdentifier, boolean includeItemAsParent) throws Exception {
//@Override
/*public List<Item> getBreadcrumbsByItemIdentifier(String itemIdentifier, boolean includeItemAsParent) throws Exception {
logger.trace("ListParents By Item Identifier "+ itemIdentifier);
try {
@ -303,9 +302,8 @@ public class WorkspaceExplorerAppServiceImpl extends RemoteServiceServlet implem
}else
arrayParents = new Item[parents.size()-1];
/** HANDLE MY_SPECIAL_FOLDER TO AVOID COMPLETE PATH WORKSPACE/MY_SPECIAL_FOLDER
* BUT RETURNING ONLY /MY_SPECIAL_FOLDER
*/
// HANDLE MY_SPECIAL_FOLDER TO AVOID COMPLETE PATH WORKSPACE/MY_SPECIAL_FOLDER BUT RETURNING ONLY /MY_SPECIAL_FOLDER
if(wsItem.isFolder()){
if(ItemBuilder.isSpecialFolder((WorkspaceFolder) wsItem, lastItem.isRoot())){
return new ArrayList<Item>(Arrays.asList(arrayParents));
@ -348,7 +346,7 @@ public class WorkspaceExplorerAppServiceImpl extends RemoteServiceServlet implem
logger.error("Error in get List Parents By Item Identifier ", e);
throw new Exception("Sorry, an error occurred during path retrieving!");
}
}
}*/
/**
* Gets the parents by item identifier to limit.
@ -361,7 +359,7 @@ public class WorkspaceExplorerAppServiceImpl extends RemoteServiceServlet implem
*/
@Override
public List<Item> getBreadcrumbsByItemIdentifierToParentLimit(String itemIdentifier, String parentLimit, boolean includeItemAsParent) throws Exception {
logger.trace("getBreadcrumbsByItemIdentifierToParentLimit by Item Identifier " + itemIdentifier +" and limit: "+parentLimit + " and includeItemAsParent: "+includeItemAsParent);
logger.info("called getBreadcrumbsByItemIdentifierToParentLimit by Item Identifier " + itemIdentifier +" and limit: "+parentLimit + " and includeItemAsParent: "+includeItemAsParent);
try {
Workspace workspace = getWorkspace();
@ -371,7 +369,7 @@ public class WorkspaceExplorerAppServiceImpl extends RemoteServiceServlet implem
try{
parents = workspace.getParentsById(itemIdentifier);
}catch(Exception e){
logger.error("Error on getting list of parents from HL for id: "+itemIdentifier, e);
logger.error("Error on getting list of parents from SHUB for id: "+itemIdentifier, e);
parents = new ArrayList<WorkspaceItem>();
}
@ -513,8 +511,8 @@ public class WorkspaceExplorerAppServiceImpl extends RemoteServiceServlet implem
*/
@Override
public String getPublicLinkForItemId(String itemId) throws Exception{
logger.info("calle getPublicLinkForItemId: "+ itemId);
logger.trace("get Public Link For ItemId: "+ itemId);
try{
if(itemId==null)

2
src/main/java/org/gcube/portlets/user/workspaceexplorerapp/server/workspace/WsUtil.java
View File

@ -49,7 +49,7 @@ public class WsUtil {
}
return new StorageHubWrapper(scope, applicationToken, false, false, true);
return new StorageHubWrapper(scope, applicationToken, false, false, false);
} catch (Exception e) {
logger.error("Error when instancing the storageHub wrapper", e);
throw new Exception("Error on inizializing the StorageHub wrapper. Please contact the support!");

11
src/main/java/org/gcube/portlets/user/workspaceexplorerapp/shared/Item.java
View File

@ -3,11 +3,10 @@
*/
package org.gcube.portlets.user.workspaceexplorerapp.shared;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Date;
import com.google.gwt.user.client.rpc.IsSerializable;
/**
* The Class Item.
@ -15,13 +14,17 @@ import com.google.gwt.user.client.rpc.IsSerializable;
* @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it
* Dec 2, 2015
*/
public class Item implements IsSerializable, ItemInterface {
public class Item implements ItemInterface, Serializable {
/**
*
*/
private static final long serialVersionUID = 95739933872495958L;
protected Item parent;
protected String id;
protected String name;
protected ItemType type;
public ItemType type;
protected String path;
protected ArrayList<Item> children;
private String owner;

19
src/main/java/org/gcube/portlets/user/workspaceexplorerapp/shared/ItemType.java
View File

@ -14,30 +14,11 @@ public enum ItemType {
FOLDER,
// KINDS OF FILES
/**
* Document.
*/
DOCUMENT,
/**
* Image document.
*/
IMAGE_DOCUMENT,
/**
* PDF document.
*/
PDF_DOCUMENT,
/**
* Url document.
*/
URL_DOCUMENT,
/**
* Metadata.
*/
METADATA,
/**
* A gCube item.
*/
GCUBE_ITEM,
UNKNOWN_TYPE