gCubeSystem
/
storagehub
16
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

- openByPath added 

- replaced some warning log with debug
This commit is contained in:
lucio 2020-03-11 15:00:40 +01:00
parent 868eadfdaa
commit 177888e1b4
6 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/org/gcube/data/access/storagehub/handlers/Item2NodeConverter.java
View File

@ -74,7 +74,7 @@ public class Item2NodeConverter {
if (obj!=null)
iterateItemNodeAttributeFields(obj, newNode, nodeName);
} catch (Exception e ) {
logger.warn("error setting value",e);
logger.debug("error setting value",e);
}
@ -113,7 +113,7 @@ public class Item2NodeConverter {
if (values.isMulti()) newNode.setProperty(attribute.value(), values.getValues());
else newNode.setProperty(attribute.value(), values.getValue());
} catch (Exception e ) {
logger.warn("error setting value",e);
logger.debug("error setting value",e);
}
} else if (field.isAnnotationPresent(MapAttribute.class)){
//logger.debug("found field {} of type annotated as MapAttribute in class {}", field.getName(), clazz.getName());
@ -125,7 +125,7 @@ public class Item2NodeConverter {
if (values.isMulti()) newNode.setProperty(entry.getKey(), values.getValues());
else newNode.setProperty(entry.getKey(), values.getValue());
} catch (Exception e ) {
logger.warn("error setting value",e);
logger.debug("error setting value",e);
}
} else if (field.isAnnotationPresent(ListNodes.class)){
@ -204,7 +204,7 @@ public class Item2NodeConverter {
else contentNode.setProperty(attribute.value(), values.getValue());
} catch (Exception e ) {
logger.warn("error setting value for attribute "+attribute.value(),e);
logger.debug("error setting value for attribute "+attribute.value(),e);
}
}
}
@ -246,7 +246,7 @@ public class Item2NodeConverter {
}
} catch (Exception e ) {
logger.warn("error setting value",e);
logger.debug("error setting value",e);
}
}

8
src/main/java/org/gcube/data/access/storagehub/handlers/Node2ItemConverter.java
View File

@ -131,7 +131,7 @@ public class Node2ItemConverter {
}catch(PathNotFoundException e){
logger.trace("the current node dosn't contain {} property",attribute.value());
} catch (Exception e ) {
logger.warn("error setting value for property {} ",attribute.value());
logger.debug("error setting value for property {} ",attribute.value());
}
} else if (field.isAnnotationPresent(NodeAttribute.class)){
String fieldNodeName = field.getAnnotation(NodeAttribute.class).value();
@ -146,7 +146,7 @@ public class Node2ItemConverter {
}catch(PathNotFoundException e){
logger.trace("the current node dosn't contain {} node",fieldNodeName);
} catch (Exception e ) {
logger.warn("error setting value",e);
logger.debug("error setting value",e);
}
@ -169,7 +169,7 @@ public class Node2ItemConverter {
}catch(PathNotFoundException e){
logger.trace("the current node dosn't contain {} property",attribute.value());
} catch (Exception e ) {
logger.warn("error setting value {}",e.getMessage());
logger.debug("error setting value {}",e.getMessage());
}
} else if (field.isAnnotationPresent(MapAttribute.class)){
logger.trace("found field {} of type annotated as MapAttribute in class {} and node name {}", field.getName(), clazz.getName(), node.getName());
@ -188,7 +188,7 @@ public class Node2ItemConverter {
}catch(PathNotFoundException e){
logger.warn("the property {} is not mapped",prop.getName());
} catch (Exception e ) {
logger.warn("error setting value {}",e.getMessage());
logger.debug("error setting value {}",e.getMessage());
}
}
}

11
src/main/java/org/gcube/data/access/storagehub/services/ItemsManager.java
View File

@ -170,16 +170,19 @@ public class ItemsManager {
String nextId = id;
String[] paths = relativePath.split("/");
for (String actualPath: paths) {
item = getChildrenMatchingName(ses, nextId, actualPath, excludes);
item = getChildrenMatchingName(ses, nextId, actualPath, Excludes.ALL);
if (item ==null) throw new InvalidCallParameters("relative path "+actualPath+" not found under item with id "+nextId);
authChecker.checkReadAuthorizationControl(ses, item.getId());
nextId = item.getId();
}
return new ItemWrapper<Item>(item);
if (excludes.containsAll(Excludes.ALL))
return new ItemWrapper<Item>(item);
else
return new ItemWrapper<Item>(node2Item.getItem(ses.getNodeByIdentifier(item.getId()), excludes));
}catch(RepositoryException re){
log.error("jcr error getting item", re);
GXOutboundErrorResponse.throwException(new BackendGenericError("jcr error searching item", re));
log.error("jcr error getting item by path", re);
GXOutboundErrorResponse.throwException(new BackendGenericError("jcr error getting item by path", re));
}catch(StorageHubException she ){
log.error(she.getErrorMessage(), she);
GXOutboundErrorResponse.throwException(she, Response.Status.fromStatusCode(she.getStatus()));

7
src/main/java/org/gcube/data/access/storagehub/services/WorkspaceManager.java
View File

@ -27,9 +27,6 @@ import javax.ws.rs.core.Response;
import org.gcube.common.authorization.library.provider.AuthorizationProvider;
import org.gcube.common.gxrest.response.outbound.GXOutboundErrorResponse;
import org.gcube.common.scope.api.ScopeProvider;
import org.gcube.common.scope.impl.ScopeBean;
import org.gcube.common.scope.impl.ScopeBean.Type;
import org.gcube.common.storagehub.model.Excludes;
import org.gcube.common.storagehub.model.Paths;
import org.gcube.common.storagehub.model.exceptions.BackendGenericError;
@ -189,7 +186,7 @@ public class WorkspaceManager {
Session ses = null;
List<Item> recentItems = Collections.emptyList();
try{
String login = AuthorizationProvider.instance.get().getClient().getId();
//String login = AuthorizationProvider.instance.get().getClient().getId();
ses = repository.getRepository().login(CredentialHandler.getAdminCredentials(context));
VRE vre = Utils.getVreFolderItem(ses, node2Item, vreManager, excludes);
@ -220,7 +217,7 @@ public class WorkspaceManager {
public ItemWrapper<Item> getTrashRootFolder(){
InnerMethodName.instance.set("getTrashRootFolder");
Session ses = null;
String user = AuthorizationProvider.instance.get().getClient().getId();
//String user = AuthorizationProvider.instance.get().getClient().getId();
org.gcube.common.storagehub.model.Path trashPath = Paths.append(Utils.getWorkspacePath(), Constants.TRASH_ROOT_FOLDER_NAME);
Item item = null;
try{

2
src/main/webapp/WEB-INF/README
View File

@ -25,7 +25,7 @@ The projects leading to this software have received funding from a series of
Version
--------------------------------------------------
1.1.0 (2020-03-03)
1.1.0-SNAPSHOT (2020-03-11)
Please see the file named "changelog.xml" in this directory for the release notes.

2
src/main/webapp/WEB-INF/gcube-app.xml
View File

@ -1,7 +1,7 @@
<application mode='online'>
<name>StorageHub</name>
<group>DataAccess</group>
<version>1.1.0</version>
<version>1.1.0-SNAPSHOT</version>
<description>Storage Hub webapp</description>
<local-persistence location='target' />
</application>