From 142a296166fedf2105173b65f5d22ad7d1e41170 Mon Sep 17 00:00:00 2001 From: Enrico Ottonello Date: Thu, 24 Sep 2020 12:53:08 +0200 Subject: [PATCH] changed exception type, if collection indexing failes --- .../dnetlib/ariadneplus/graphdb/GraphDBClient.java | 13 +++++++++---- .../ariadneplus/reader/RunSPARQLQueryService.java | 5 ++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dnet-ariadneplus-graphdb-publisher/src/main/java/eu/dnetlib/ariadneplus/graphdb/GraphDBClient.java b/dnet-ariadneplus-graphdb-publisher/src/main/java/eu/dnetlib/ariadneplus/graphdb/GraphDBClient.java index de4635d..533c0d0 100644 --- a/dnet-ariadneplus-graphdb-publisher/src/main/java/eu/dnetlib/ariadneplus/graphdb/GraphDBClient.java +++ b/dnet-ariadneplus-graphdb-publisher/src/main/java/eu/dnetlib/ariadneplus/graphdb/GraphDBClient.java @@ -350,10 +350,15 @@ public class GraphDBClient { List collectionResourceIds = runSPQRLQuery.selectCollectionIds(datasource, collectionId); log.info(String.format("Found %d collections to index for datasource %s - %s", collectionResourceIds.size(), datasource, collectionId)); - if(!collectionResourceIds.isEmpty()) { - final ClassPathResource selectCollectionTemplateRes = new ClassPathResource("eu/dnetlib/ariadneplus/sparql/read_collection_data_template.sparql"); - String selectCollectionTemplate = IOUtils.toString(selectCollectionTemplateRes.getInputStream(), StandardCharsets.UTF_8.name()); - collectionIndexReport = runSPQRLQuery.executeMultipleQueryGraph(selectCollectionTemplate, collectionResourceIds, datasource, collectionId, true); + try { + if (!collectionResourceIds.isEmpty()) { + final ClassPathResource selectCollectionTemplateRes = new ClassPathResource("eu/dnetlib/ariadneplus/sparql/read_collection_data_template.sparql"); + String selectCollectionTemplate = IOUtils.toString(selectCollectionTemplateRes.getInputStream(), StandardCharsets.UTF_8.name()); + collectionIndexReport = runSPQRLQuery.executeMultipleQueryGraph(selectCollectionTemplate, collectionResourceIds, datasource, collectionId, true); + } + } + catch (RuntimeException re) { + throw new AriadnePlusPublisherException(re); } List recordIds = runSPQRLQuery.selectRecordIds(datasource, collectionId); diff --git a/dnet-ariadneplus-graphdb-publisher/src/main/java/eu/dnetlib/ariadneplus/reader/RunSPARQLQueryService.java b/dnet-ariadneplus-graphdb-publisher/src/main/java/eu/dnetlib/ariadneplus/reader/RunSPARQLQueryService.java index cc4a731..b29be6e 100644 --- a/dnet-ariadneplus-graphdb-publisher/src/main/java/eu/dnetlib/ariadneplus/reader/RunSPARQLQueryService.java +++ b/dnet-ariadneplus-graphdb-publisher/src/main/java/eu/dnetlib/ariadneplus/reader/RunSPARQLQueryService.java @@ -61,8 +61,7 @@ public class RunSPARQLQueryService { manager.shutDown(); } - public String executeMultipleQueryGraph(String queryTemplate, List recordIds, String datasource, String collectionId, boolean isCollection) - throws AriadnePlusPublisherException { + public String executeMultipleQueryGraph(String queryTemplate, List recordIds, String datasource, String collectionId, boolean isCollection) { if (queryTemplate==null) return null; final String selectQueryTemplate = queryTemplate.replaceAll("%datasource", datasource).replaceAll("%collectionId", collectionId); @@ -77,7 +76,7 @@ public class RunSPARQLQueryService { if (operationResult!=200) { log.error(recordId + " error_code: "+ operationResult); if (isCollection) { - throw new AriadnePlusPublisherException("Collection indexing problem - errcode: "+operationResult); + throw new RuntimeException("Collection indexing problem - errcode: "+operationResult); } int currentErrorsCount = errorCodesCount.get(0).intValue(); currentErrorsCount+=1;