From 177888e1b4efe0ee853b63977b0ae6ba0b4fc73f Mon Sep 17 00:00:00 2001 From: lucio Date: Wed, 11 Mar 2020 15:00:40 +0100 Subject: [PATCH] - openByPath added - replaced some warning log with debug --- .../storagehub/handlers/Item2NodeConverter.java | 10 +++++----- .../storagehub/handlers/Node2ItemConverter.java | 8 ++++---- .../data/access/storagehub/services/ItemsManager.java | 11 +++++++---- .../access/storagehub/services/WorkspaceManager.java | 7 ++----- src/main/webapp/WEB-INF/README | 2 +- src/main/webapp/WEB-INF/gcube-app.xml | 2 +- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/main/java/org/gcube/data/access/storagehub/handlers/Item2NodeConverter.java b/src/main/java/org/gcube/data/access/storagehub/handlers/Item2NodeConverter.java index 68e4e09..902f9ac 100644 --- a/src/main/java/org/gcube/data/access/storagehub/handlers/Item2NodeConverter.java +++ b/src/main/java/org/gcube/data/access/storagehub/handlers/Item2NodeConverter.java @@ -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); } } diff --git a/src/main/java/org/gcube/data/access/storagehub/handlers/Node2ItemConverter.java b/src/main/java/org/gcube/data/access/storagehub/handlers/Node2ItemConverter.java index bddef6b..0c3e677 100644 --- a/src/main/java/org/gcube/data/access/storagehub/handlers/Node2ItemConverter.java +++ b/src/main/java/org/gcube/data/access/storagehub/handlers/Node2ItemConverter.java @@ -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()); } } } diff --git a/src/main/java/org/gcube/data/access/storagehub/services/ItemsManager.java b/src/main/java/org/gcube/data/access/storagehub/services/ItemsManager.java index d5e9e5e..e74275a 100644 --- a/src/main/java/org/gcube/data/access/storagehub/services/ItemsManager.java +++ b/src/main/java/org/gcube/data/access/storagehub/services/ItemsManager.java @@ -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); + if (excludes.containsAll(Excludes.ALL)) + return new ItemWrapper(item); + else + return new ItemWrapper(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())); diff --git a/src/main/java/org/gcube/data/access/storagehub/services/WorkspaceManager.java b/src/main/java/org/gcube/data/access/storagehub/services/WorkspaceManager.java index 2f9fa10..70fe48b 100644 --- a/src/main/java/org/gcube/data/access/storagehub/services/WorkspaceManager.java +++ b/src/main/java/org/gcube/data/access/storagehub/services/WorkspaceManager.java @@ -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 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 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{ diff --git a/src/main/webapp/WEB-INF/README b/src/main/webapp/WEB-INF/README index 4651c9b..4eb8a4b 100644 --- a/src/main/webapp/WEB-INF/README +++ b/src/main/webapp/WEB-INF/README @@ -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. diff --git a/src/main/webapp/WEB-INF/gcube-app.xml b/src/main/webapp/WEB-INF/gcube-app.xml index 57df01d..7213f32 100644 --- a/src/main/webapp/WEB-INF/gcube-app.xml +++ b/src/main/webapp/WEB-INF/gcube-app.xml @@ -1,7 +1,7 @@ StorageHub DataAccess - 1.1.0 + 1.1.0-SNAPSHOT Storage Hub webapp \ No newline at end of file