diff --git a/pom.xml b/pom.xml index 24bd7e7..37f17fe 100644 --- a/pom.xml +++ b/pom.xml @@ -55,12 +55,6 @@ ${jsoup.version} compile - - - org.gcube.core - common-smartgears - provided - org.gcube.resources.discovery ic-client @@ -93,12 +87,6 @@ [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT) compile - - org.gcube.common - home-library - [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT) - compile - org.gcube.common common-authorization @@ -141,6 +129,18 @@ 3.0-alpha-1 compile + + + org.gcube.core + common-smartgears + provided + + + org.gcube.common + home-library + [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT) + compile + org.glassfish.jersey.test-framework.providers jersey-test-framework-provider-jetty diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/CommonServiceUtils.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/CommonServiceUtils.java index 734ea8a..207425f 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/CommonServiceUtils.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/CommonServiceUtils.java @@ -125,9 +125,9 @@ public class CommonServiceUtils { while((current = current.getSuperclass())!=null); // start from the inherited class up to the Object.class logger.info("Tags are " + tags); - logger.info("Groups is " + groups); - logger.info("Extras is " + extras); - logger.info("Resources " + resources); + logger.info("Groups are " + groups); + logger.info("Extras are " + extras); + logger.info("Resources without timeseries are " + resources); } /** @@ -172,7 +172,7 @@ public class CommonServiceUtils { } }catch(Exception e){ - logger.error("Failed ot read value for field " + field.getName() + " skipping", e); + logger.error("Failed to read value for field " + field.getName() + " skipping", e); } } } @@ -183,7 +183,7 @@ public class CommonServiceUtils { private static void getGroupsByField(Field field, Class current, Base record, Set groups, String groupPrefix){ if(field.isAnnotationPresent(Group.class)){ try{ - Object f = new PropertyDescriptor(field.getName(), current).getReadMethod().invoke(field); + Object f = new PropertyDescriptor(field.getName(), current).getReadMethod().invoke(record); if(f != null){ if(f instanceof List){ List asList = ((List) f); @@ -220,7 +220,7 @@ public class CommonServiceUtils { } }catch(Exception e){ - logger.error("Failed ot read value for field " + field.getName() + " skipping", e); + logger.error("Failed to read value for field " + field.getName() + " skipping", e); } } } @@ -273,7 +273,7 @@ public class CommonServiceUtils { extras.put(keyField, valuesForKey); } }catch(Exception e){ - logger.error("Failed ot read value for field " + field.getName() + " skipping", e); + logger.error("Failed to read value for field " + field.getName() + " skipping", e); } } } @@ -309,7 +309,7 @@ public class CommonServiceUtils { } } }catch(Exception e){ - logger.error("Failed ot read value for field " + field.getName() + " skipping", e); + logger.error("Failed to read value for field " + field.getName() + " skipping", e); } } }