fixed a NPE in aggregation history
This commit is contained in:
parent
8ed868c6fb
commit
70f25060d5
|
|
@ -2,7 +2,8 @@ FROM tomcat:7.0.90-jre8
|
|||
MAINTAINER "pkanakakis@di.uoa.gr"
|
||||
RUN ["rm", "-fr", "/usr/local/tomcat/webapps/ROOT"]
|
||||
COPY ./target/uoa-repository-manager-service.war /usr/local/tomcat/webapps/uoa-repository-manager-service.war
|
||||
COPY src/main/resources/dnet-override-new.properties /usr/local/tomcat/lib/dnet-override.properties
|
||||
#COPY src/main/resources/dnet-override-new.properties /usr/local/tomcat/lib/dnet-override.properties
|
||||
COPY src/main/resources/application.properties /usr/local/tomcat/lib/dnet-override.properties
|
||||
#COPY src/main/resources/application.properties /usr/local/tomcat/lib/application.properties
|
||||
#COPY src/main/resources/email-texts.properties /usr/local/tomcat/lib/email-texts.properties
|
||||
VOLUME /var/log/uoa-repository-manager-service:/var/log/uoa-repository-manager-service/
|
||||
|
|
|
|||
|
|
@ -38,6 +38,8 @@ public class DashboardServiceImpl implements DashboardService {
|
|||
|
||||
List<RepositorySummaryInfo> repositorySummaryInfoList = new ArrayList<>();
|
||||
|
||||
try {
|
||||
|
||||
List<Repository> repositoriesOfUser = repositoryService.getRepositoriesOfUser(userEmail, page, size);
|
||||
for(Repository repository: repositoriesOfUser) {
|
||||
|
||||
|
|
@ -82,6 +84,11 @@ public class DashboardServiceImpl implements DashboardService {
|
|||
repositorySummaryInfoList.add(repositorySummaryInfo);
|
||||
}
|
||||
|
||||
} catch (Exception e) {
|
||||
logger.error("Something baad happened!", e);
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
return repositorySummaryInfoList;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -368,11 +368,16 @@ public class Converter {
|
|||
}
|
||||
|
||||
public static List<AggregationDetails> getAggregationHistoryFromJson(JSONObject datasourceInfo) throws JSONException {
|
||||
|
||||
JSONArray rs = new JSONArray(datasourceInfo.get("aggregationHistory").toString());
|
||||
JSONArray rs;
|
||||
List<AggregationDetails> aggregationDetailsList = new ArrayList<>();
|
||||
for(int i=0;i<rs.length();i++)
|
||||
aggregationDetailsList.add(jsonToAggregationDetails(rs.getJSONObject(i)));
|
||||
|
||||
if (datasourceInfo.get("aggregationHistory") != null && !datasourceInfo.get("aggregationHistory").toString().equals("null")) {
|
||||
rs = new JSONArray(datasourceInfo.get("aggregationHistory").toString());
|
||||
|
||||
for (int i = 0; i < rs.length(); i++)
|
||||
aggregationDetailsList.add(jsonToAggregationDetails(rs.getJSONObject(i)));
|
||||
}
|
||||
|
||||
return aggregationDetailsList;
|
||||
}
|
||||
|
||||
|
|
@ -422,4 +427,4 @@ public class Converter {
|
|||
return null;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,9 +10,11 @@ ISLookUpService.url = ${IS.url}/isLookUp
|
|||
ISRegistryService.url = ${IS.url}/isRegistry
|
||||
ISSNService.url = ${IS.url}/services/isSN
|
||||
|
||||
#ValidatorService.url=http://adonis.athenarc.gr:8080/validator-service/services/validatorWebService
|
||||
ValidatorService.url=http://localhost:8080/validator-service/services/validatorWebService
|
||||
#ValidatorService.url=http://beta.services.openaire.eu/validator-service/services/validatorWebService
|
||||
ValidatorService.url=http://88.197.53.69:8080/validator-service/
|
||||
#ValidatorService.url=http://88.197.53.69:8080/validator-service/
|
||||
|
||||
services.provide.adminEmail=antleb@di.uoa.gr
|
||||
|
||||
## Broker Service
|
||||
services.broker.url = http://broker1-dev-dnet.d4science.org
|
||||
|
|
@ -29,7 +31,7 @@ services.repo-manager.baseUrl = http://${container.hostname}:${container.port}/$
|
|||
transport.soap.baseAddress = http://${container.hostname}:${container.port}/${container.context}
|
||||
transport.soap.force.local.address = false
|
||||
|
||||
services.repo-manager.adminEmail = pkanakakis@di.uoa.gr
|
||||
services.repo-manager.adminEmail = antleb@di.uoa.gr
|
||||
services.repo-manager.repository.testing.mode = false
|
||||
services.repo-manager.deploy.environment = development
|
||||
services.validator.mail.host = smtp.gmail.com
|
||||
|
|
@ -43,10 +45,10 @@ services.validator.mail.override = false
|
|||
services.validator.mail.logonly = false
|
||||
services.validator.mail.mode = ssl
|
||||
services.validator.mail.debug = false
|
||||
services.validator.mail.overrideEmail = pkanakakis@di.uoa.gr
|
||||
services.validator.mail.specialRecipients = pkanakakis@di.uoa.gr
|
||||
services.validator.mail.overrideEmail = antleb@di.uoa.gr
|
||||
services.validator.mail.specialRecipients = antleb@di.uoa.gr
|
||||
|
||||
services.validator.repoRegistration.override = pkanakakis@di.uoa.gr
|
||||
services.validator.repoRegistration.override = antleb@di.uoa.gr
|
||||
|
||||
repomanager.db.driverClassName = org.postgresql.Driver
|
||||
repomanager.db.url = jdbc:postgresql://194.177.192.119:5432/repomanager
|
||||
|
|
@ -66,14 +68,24 @@ webapp.dev.front = http://localhost:4200/landing
|
|||
|
||||
##REDIS-AAI
|
||||
|
||||
redis.host = aleka.athenarc.gr
|
||||
redis.port = 6379
|
||||
redis.password =
|
||||
aai.mode = develop
|
||||
redis.host=vereniki.athenarc.gr
|
||||
redis.port=6379
|
||||
redis.password=redis01041992s
|
||||
aai.mode=develop
|
||||
|
||||
#redis.host = aleka.athenarc.gr
|
||||
#redis.port = 6379
|
||||
#redis.password =
|
||||
#aai.mode = develop
|
||||
|
||||
#redis.host=localhost
|
||||
#redis.port=6379
|
||||
#redis.password=
|
||||
#aai.mode=develop
|
||||
|
||||
services.repomanager.usageStatisticsDiagramsBaseURL = https://beta.openaire.eu/stats3/
|
||||
services.repomanager.usageStatisticsNumbersBaseURL = https://beta.services.openaire.eu/usagestats/datasources/
|
||||
services.repomanager.usagestats.adminEmail = pkanakakis@di.uoa.gr
|
||||
services.repomanager.usagestats.adminEmail = antleb@di.uoa.gr
|
||||
|
||||
##SUSHI
|
||||
services.repomanager.usagestats.sushiliteEndpoint = http://beta.services.openaire.eu/usagestats/sushilite/
|
||||
|
|
@ -82,5 +94,3 @@ services.repomanager.usagestats.sushiliteEndpoint = http://beta.services.openair
|
|||
search.api.baseAddress=https://beta.services.openaire.eu/search/v2/api
|
||||
search.api.usagestats=https://services.openaire.eu/usagestats
|
||||
search.api.usageEvents=http://beta.lbs.openaire.eu:8080/ajax/summary
|
||||
|
||||
services.provide.adminEmail=provide-admin@openaire.eu
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ log4j.rootLogger = WARN, R
|
|||
|
||||
log4j.logger.eu.dnetlib = DEBUG
|
||||
log4j.logger.eu.dnetlib.clients.data.datasourcemanager.ws.Converter = FATAL
|
||||
log4j.logger.org.springframework = DEBUG, S
|
||||
log4j.logger.org.springframework = INFO, S
|
||||
log4j.additivity.org.springframework = false
|
||||
|
||||
log4j.logger.com.opensymphony.xwork2.ognl.OgnlValueStack = FATAL
|
||||
|
|
@ -42,4 +42,4 @@ log4j.appender.S.layout.ConversionPattern= %d %p %t [%c] - %m%n
|
|||
#
|
||||
#log4j.appender.S=org.apache.log4j.ConsoleAppender
|
||||
#log4j.appender.S.layout=org.apache.log4j.PatternLayout
|
||||
#log4j.appender.S.layout.ConversionPattern= %d %p %t [%c] - %m%n
|
||||
#log4j.appender.S.layout.ConversionPattern= %d %p %t [%c] - %m%n
|
||||
|
|
|
|||
Loading…
Reference in New Issue