reportItems = new ArrayList();
+// usageStatsRepository.executeBatchItemsTR(reportItems, repositoryIdentifier, itemIdentifier,beginDateParsed, endDateParsed, metricType, dataType, granularity);
+//
+// if (reportItems.isEmpty()) {
+// reportExceptions.add(new SUSHI_Error_Model("3030", "Error", "usagecounts.openaire.eu", "No Usage Available for Requested Dates", "Service did not find any data"));
+// }
+//
+// if (reportExceptions.size() == 0) {
+// reportExceptions = null;
+// }
+// COUNTER_Title_Report reportTR = new COUNTER_Title_Report(dateTime.format(formatter), customerID, reportID, reportName, institutionName, institutionIdD, reportExceptions, reportFilters, reportItems);
+// return reportTR;
+// }
@Override
- public String displayReportPR(String repositoryIdentifier, String beginDate,
+ public String displayReportPR(String customerID, String repositoryIdentifier, String beginDate,
String endDate, String metricType, String dataType, String granularity) {
ObjectMapper objectMapper = new ObjectMapper();
log.info((beginDate + " " + endDate));
try {
- return "" + objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(buildReportPR(repositoryIdentifier, beginDate, endDate, metricType, dataType, granularity)) + "
";
+ return "" + objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(buildReportPR(customerID, repositoryIdentifier, beginDate, endDate, metricType, dataType, granularity)) + "
";
} catch (JsonProcessingException ex) {
java.util.logging.Logger.getLogger(SushiLiteServiceImpl.class.getName()).log(Level.SEVERE, null, ex);
}
@@ -549,26 +745,27 @@ public class SushiLiteServiceImpl implements SushiLiteService {
}
@Override
- public String displayReportPR_P1(String repositoryIdentifier,
+ public String displayReportPR_P1(String customerID, String repositoryIdentifier,
String beginDate,
String endDate) {
ObjectMapper objectMapper = new ObjectMapper();
log.info((beginDate + " " + endDate));
try {
- return "" + objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(buildReportPR_P1(repositoryIdentifier, beginDate, endDate)) + "
";
+ return "" + objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(buildReportPR_P1(customerID, repositoryIdentifier, beginDate, endDate)) + "
";
} catch (JsonProcessingException ex) {
java.util.logging.Logger.getLogger(SushiLiteServiceImpl.class.getName()).log(Level.SEVERE, null, ex);
}
return null;
}
+
@Override
- public String displayReportTR(String repositoryIdentifier, String itemIdentifier,String beginDate,
+ public String displayReportIR(String customerID, String repositoryIdentifier, String itemIdentifier, String beginDate,
String endDate, String metricType, String dataType, String granularity) {
ObjectMapper objectMapper = new ObjectMapper();
log.info((beginDate + " " + endDate));
try {
- return "" + objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(buildReportPR(repositoryIdentifier, beginDate, endDate, metricType, dataType, granularity)) + "
";
+ return "" + objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(buildReportIR(customerID, repositoryIdentifier, itemIdentifier, beginDate, endDate, metricType, dataType, granularity)) + "
";
} catch (JsonProcessingException ex) {
java.util.logging.Logger.getLogger(SushiLiteServiceImpl.class.getName()).log(Level.SEVERE, null, ex);
}
diff --git a/src/main/resources/usageStatsAPI.properties b/src/main/resources/usageStatsAPI.properties
index 0e6c1ae..76d7a14 100644
--- a/src/main/resources/usageStatsAPI.properties
+++ b/src/main/resources/usageStatsAPI.properties
@@ -1,10 +1,9 @@
name=usageStatsAPI
logging.config=log4j.properties
-usagestats.driverClassName=com.cloudera.impala.jdbc41.Driver
+#usagestats.driverClassName=com.cloudera.impala.jdbc41.Driver
+spring.datasource.driverClassName=com.cloudera.impala.jdbc41.Driver
spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.HSQLDialect
usagestats.url=jdbc:impala://iis-cdh5-test-gw.ocean.icm.edu.pl:21050/;UseNativeQuery=1;AutoReconnect=1
-usagestats.username=sqoop
-usagestats.password=sqoop
usagestats.redis.hostname=localhost
usagestats.redis.port=6379
spring.jackson.serialization.INDENT_OUTPUT=true
@@ -13,7 +12,7 @@ prod.usagestatsImpalaDB=openaire_prod_usage_stats
compression.max_number_of_records=100
download.folder=/Users/dpie/Desktop/DownloadSushiLite
sushi-lite.server=http://localhost:8080/usagestats
-server.context-path=/usagestats_r5
+server.servlet.context-path.=/usagestats_r5
server.port=8080
#spring.datasource.testWhileIdle = true
#spring.datasource.timeBetweenEvictionRunsMillis = 60000