minor fixes

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135277 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Costantino Perciante 2016-12-04 13:53:15 +00:00
parent b47e21b4f4
commit cb11117297
2 changed files with 20 additions and 20 deletions

24
pom.xml
View File

@ -55,12 +55,6 @@
<version>${jsoup.version}</version> <version>${jsoup.version}</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<!-- SmartGears -->
<dependency>
<groupId>org.gcube.core</groupId>
<artifactId>common-smartgears</artifactId>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>org.gcube.resources.discovery</groupId> <groupId>org.gcube.resources.discovery</groupId>
<artifactId>ic-client</artifactId> <artifactId>ic-client</artifactId>
@ -93,12 +87,6 @@
<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version> <version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency>
<groupId>org.gcube.common</groupId>
<artifactId>home-library</artifactId>
<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
<scope>compile</scope>
</dependency>
<dependency> <dependency>
<groupId>org.gcube.common</groupId> <groupId>org.gcube.common</groupId>
<artifactId>common-authorization</artifactId> <artifactId>common-authorization</artifactId>
@ -141,6 +129,18 @@
<version>3.0-alpha-1</version> <version>3.0-alpha-1</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<!-- SmartGears -->
<dependency>
<groupId>org.gcube.core</groupId>
<artifactId>common-smartgears</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.gcube.common</groupId>
<artifactId>home-library</artifactId>
<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
<scope>compile</scope>
</dependency>
<dependency> <dependency>
<groupId>org.glassfish.jersey.test-framework.providers</groupId> <groupId>org.glassfish.jersey.test-framework.providers</groupId>
<artifactId>jersey-test-framework-provider-jetty</artifactId> <artifactId>jersey-test-framework-provider-jetty</artifactId>

View File

@ -125,9 +125,9 @@ public class CommonServiceUtils {
while((current = current.getSuperclass())!=null); // start from the inherited class up to the Object.class while((current = current.getSuperclass())!=null); // start from the inherited class up to the Object.class
logger.info("Tags are " + tags); logger.info("Tags are " + tags);
logger.info("Groups is " + groups); logger.info("Groups are " + groups);
logger.info("Extras is " + extras); logger.info("Extras are " + extras);
logger.info("Resources " + resources); logger.info("Resources without timeseries are " + resources);
} }
/** /**
@ -172,7 +172,7 @@ public class CommonServiceUtils {
} }
}catch(Exception e){ }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<String> groups, String groupPrefix){ private static void getGroupsByField(Field field, Class<?> current, Base record, Set<String> groups, String groupPrefix){
if(field.isAnnotationPresent(Group.class)){ if(field.isAnnotationPresent(Group.class)){
try{ 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 != null){
if(f instanceof List<?>){ if(f instanceof List<?>){
List asList = ((List) f); List asList = ((List) f);
@ -220,7 +220,7 @@ public class CommonServiceUtils {
} }
}catch(Exception e){ }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); extras.put(keyField, valuesForKey);
} }
}catch(Exception e){ }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){ }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);
} }
} }
} }