From eef35e304791120371274c70a1731ae3a103e51a Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Thu, 13 Jun 2024 13:30:43 +0300 Subject: [PATCH] Add open access field in stakeholderExtended and change endpoint URL. --- .../configuration/properties/Indicators.java | 31 ++++++++++ .../properties/StatsToolProperties.java | 27 ++++++--- .../StakeholderExtendedController.java | 27 +++++++++ .../StakeholderPublicationsController.java | 48 --------------- .../irishmonitorservice/entities/Data.java | 6 +- .../irishmonitorservice/entities/SortBy.java | 6 ++ .../entities/StakeholderExtended.java | 27 +++++++++ .../entities/StakeholderPublications.java | 20 ------- .../services/CacheService.java | 20 ++++--- .../services/StakeholderExtendedService.java | 58 +++++++++++++++++++ .../services/StatsToolService.java | 54 ++++++++++------- .../resources/irishmonitorservice.properties | 11 +++- src/main/resources/log4j2.xml | 39 ------------- 13 files changed, 223 insertions(+), 151 deletions(-) create mode 100644 src/main/java/eu/dnetlib/irishmonitorservice/configuration/properties/Indicators.java create mode 100644 src/main/java/eu/dnetlib/irishmonitorservice/controllers/StakeholderExtendedController.java delete mode 100644 src/main/java/eu/dnetlib/irishmonitorservice/controllers/StakeholderPublicationsController.java create mode 100644 src/main/java/eu/dnetlib/irishmonitorservice/entities/SortBy.java create mode 100644 src/main/java/eu/dnetlib/irishmonitorservice/entities/StakeholderExtended.java delete mode 100644 src/main/java/eu/dnetlib/irishmonitorservice/entities/StakeholderPublications.java create mode 100644 src/main/java/eu/dnetlib/irishmonitorservice/services/StakeholderExtendedService.java delete mode 100644 src/main/resources/log4j2.xml diff --git a/src/main/java/eu/dnetlib/irishmonitorservice/configuration/properties/Indicators.java b/src/main/java/eu/dnetlib/irishmonitorservice/configuration/properties/Indicators.java new file mode 100644 index 0000000..f16fe3c --- /dev/null +++ b/src/main/java/eu/dnetlib/irishmonitorservice/configuration/properties/Indicators.java @@ -0,0 +1,31 @@ +package eu.dnetlib.irishmonitorservice.configuration.properties; + +public class Indicators { + String publications; + String publicationsPR; + String publicationsPROA; + + public String getPublications() { + return publications; + } + + public void setPublications(String publications) { + this.publications = publications; + } + + public String getPublicationsPR() { + return publicationsPR; + } + + public void setPublicationsPR(String publicationsPR) { + this.publicationsPR = publicationsPR; + } + + public String getPublicationsPROA() { + return publicationsPROA; + } + + public void setPublicationsPROA(String publicationsPROA) { + this.publicationsPROA = publicationsPROA; + } +} diff --git a/src/main/java/eu/dnetlib/irishmonitorservice/configuration/properties/StatsToolProperties.java b/src/main/java/eu/dnetlib/irishmonitorservice/configuration/properties/StatsToolProperties.java index b4e3530..52da695 100644 --- a/src/main/java/eu/dnetlib/irishmonitorservice/configuration/properties/StatsToolProperties.java +++ b/src/main/java/eu/dnetlib/irishmonitorservice/configuration/properties/StatsToolProperties.java @@ -4,34 +4,43 @@ import org.springframework.boot.context.properties.ConfigurationProperties; @ConfigurationProperties("stats-tool") public class StatsToolProperties { - private String rpo; - private String rfo; - private String repository; + private String host; + private Indicators rpo; + private Indicators rfo; + private Indicators repository; public StatsToolProperties() { } - public String getRpo() { + public String getHost() { + return host; + } + + public void setHost(String host) { + this.host = host; + } + + public Indicators getRpo() { return rpo; } - public void setRpo(String rpo) { + public void setRpo(Indicators rpo) { this.rpo = rpo; } - public String getRfo() { + public Indicators getRfo() { return rfo; } - public void setRfo(String rfo) { + public void setRfo(Indicators rfo) { this.rfo = rfo; } - public String getRepository() { + public Indicators getRepository() { return repository; } - public void setRepository(String repository) { + public void setRepository(Indicators repository) { this.repository = repository; } } diff --git a/src/main/java/eu/dnetlib/irishmonitorservice/controllers/StakeholderExtendedController.java b/src/main/java/eu/dnetlib/irishmonitorservice/controllers/StakeholderExtendedController.java new file mode 100644 index 0000000..766284f --- /dev/null +++ b/src/main/java/eu/dnetlib/irishmonitorservice/controllers/StakeholderExtendedController.java @@ -0,0 +1,27 @@ +package eu.dnetlib.irishmonitorservice.controllers; + +import eu.dnetlib.irishmonitorservice.entities.SortBy; +import eu.dnetlib.irishmonitorservice.entities.StakeholderExtended; +import eu.dnetlib.irishmonitorservice.services.StakeholderExtendedService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.io.UnsupportedEncodingException; +import java.util.List; + +@RestController +@CrossOrigin(origins = "*") +@RequestMapping("stakeholder/extended") +public class StakeholderExtendedController { + private final StakeholderExtendedService service; + + @Autowired + public StakeholderExtendedController(StakeholderExtendedService service) { + this.service = service; + } + + @RequestMapping(value = "/{type}", method = RequestMethod.GET) + public List getStakeholders(@PathVariable String type, @RequestParam(value = "sort", required = false) SortBy sort) throws UnsupportedEncodingException { + return this.service.sortBy(this.service.getStakeholdersExtended(type), sort); + } +} diff --git a/src/main/java/eu/dnetlib/irishmonitorservice/controllers/StakeholderPublicationsController.java b/src/main/java/eu/dnetlib/irishmonitorservice/controllers/StakeholderPublicationsController.java deleted file mode 100644 index b5967b4..0000000 --- a/src/main/java/eu/dnetlib/irishmonitorservice/controllers/StakeholderPublicationsController.java +++ /dev/null @@ -1,48 +0,0 @@ -package eu.dnetlib.irishmonitorservice.controllers; - -import eu.dnetlib.irishmonitorservice.entities.StakeholderPublications; -import eu.dnetlib.irishmonitorservice.services.CacheService; -import eu.dnetlib.irishmonitorservice.services.StatsToolService; -import eu.dnetlib.uoamonitorservice.entities.Stakeholder; -import eu.dnetlib.uoamonitorservice.service.StakeholderService; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.io.UnsupportedEncodingException; -import java.util.ArrayList; -import java.util.List; - -@RestController -@CrossOrigin(origins = "*") -@RequestMapping("publications") -public class StakeholderPublicationsController { - private final StakeholderService service; - private final CacheService cacheService; - - @Autowired - public StakeholderPublicationsController(StakeholderService service, CacheService cacheService) { - this.service = service; - this.cacheService = cacheService; - } - - @RequestMapping(value = "/{type}", method = RequestMethod.GET) - public List getStakeholders(@PathVariable String type) throws UnsupportedEncodingException, InterruptedException { - List stakeholders = this.service.getVisibleStakeholders(type, null); - List stakeholderPublications = new ArrayList<>(); - List> data = this.cacheService.getResponse(type); - List remain = new ArrayList<>(stakeholders); - if (data != null) { - data.forEach(entity -> { - String id = entity.get(1); - stakeholders.stream().filter(stakeholder -> stakeholder.getIndex_id().equals(id)).findFirst().ifPresent(stakeholder -> { - remain.remove(stakeholder); - stakeholderPublications.add(new StakeholderPublications(stakeholder, Integer.parseInt(entity.get(0)))); - }); - }); - } - remain.forEach(stakeholder -> stakeholderPublications.add(new StakeholderPublications(stakeholder, 0))); - return stakeholderPublications; - } -} diff --git a/src/main/java/eu/dnetlib/irishmonitorservice/entities/Data.java b/src/main/java/eu/dnetlib/irishmonitorservice/entities/Data.java index 773bf95..b9a9cd5 100644 --- a/src/main/java/eu/dnetlib/irishmonitorservice/entities/Data.java +++ b/src/main/java/eu/dnetlib/irishmonitorservice/entities/Data.java @@ -1,14 +1,16 @@ package eu.dnetlib.irishmonitorservice.entities; +import java.util.ArrayList; import java.util.List; import java.util.Map; public class Data { List>> data; - public Data() {} - public List> getData() { + if(data.isEmpty()) { + return new ArrayList<>(); + } return data.get(0); } } diff --git a/src/main/java/eu/dnetlib/irishmonitorservice/entities/SortBy.java b/src/main/java/eu/dnetlib/irishmonitorservice/entities/SortBy.java new file mode 100644 index 0000000..5f34cfd --- /dev/null +++ b/src/main/java/eu/dnetlib/irishmonitorservice/entities/SortBy.java @@ -0,0 +1,6 @@ +package eu.dnetlib.irishmonitorservice.entities; + +public enum SortBy { + OPEN_ACCESS, + PUBLICATIONS +} diff --git a/src/main/java/eu/dnetlib/irishmonitorservice/entities/StakeholderExtended.java b/src/main/java/eu/dnetlib/irishmonitorservice/entities/StakeholderExtended.java new file mode 100644 index 0000000..d991114 --- /dev/null +++ b/src/main/java/eu/dnetlib/irishmonitorservice/entities/StakeholderExtended.java @@ -0,0 +1,27 @@ +package eu.dnetlib.irishmonitorservice.entities; + +import eu.dnetlib.uoamonitorservice.entities.Stakeholder; + +public class StakeholderExtended extends Stakeholder { + private final Integer publications; + private final Float publicationPR; + private final Float publicationPROA; + + public StakeholderExtended(Stakeholder stakeholder, String publications, String publicationPR, String publicationPROA) { + super(stakeholder); + this.publications = publications != null ? Integer.parseInt(publications) : null; + this.publicationPR = publicationPR != null ? Float.parseFloat(publicationPR) : null; + this.publicationPROA = publicationPROA != null ? Float.parseFloat(publicationPROA) : null; + } + + public Integer getPublications() { + return publications; + } + + public Number getOpenAccess() { + if( publicationPR != null && publicationPROA != null && publicationPR > 0) { + return (publicationPROA / publicationPR) * 100; + } + return 0; + } +} diff --git a/src/main/java/eu/dnetlib/irishmonitorservice/entities/StakeholderPublications.java b/src/main/java/eu/dnetlib/irishmonitorservice/entities/StakeholderPublications.java deleted file mode 100644 index 4d32551..0000000 --- a/src/main/java/eu/dnetlib/irishmonitorservice/entities/StakeholderPublications.java +++ /dev/null @@ -1,20 +0,0 @@ -package eu.dnetlib.irishmonitorservice.entities; - -import eu.dnetlib.uoamonitorservice.entities.Stakeholder; - -public class StakeholderPublications extends Stakeholder { - private Number publications; - - public StakeholderPublications(Stakeholder stakeholder, Number publications) { - super(stakeholder); - this.publications = publications; - } - - public Number getPublications() { - return publications; - } - - public void setPublications(Number publications) { - this.publications = publications; - } -} diff --git a/src/main/java/eu/dnetlib/irishmonitorservice/services/CacheService.java b/src/main/java/eu/dnetlib/irishmonitorservice/services/CacheService.java index 0ceb03f..56e4b3b 100644 --- a/src/main/java/eu/dnetlib/irishmonitorservice/services/CacheService.java +++ b/src/main/java/eu/dnetlib/irishmonitorservice/services/CacheService.java @@ -1,5 +1,6 @@ package eu.dnetlib.irishmonitorservice.services; +import eu.dnetlib.irishmonitorservice.entities.Data; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -18,15 +19,16 @@ public class CacheService { @Autowired private StatsToolService statsToolService; - public List> getResponse(String type) throws UnsupportedEncodingException { - if (type.equals("funder")) { - return this.statsToolService.getFunders(); - } else if (type.equals("organization")) { - return this.statsToolService.getOrganizations(); - } else if (type.equals("datasource")) { - return this.statsToolService.getDataSources(); - } else { - return null; + public List>> getResponse(String type) throws UnsupportedEncodingException { + switch (type) { + case "funder": + return this.statsToolService.getFunders(); + case "organization": + return this.statsToolService.getOrganizations(); + case "datasource": + return this.statsToolService.getDataSources(); + default: + return null; } } diff --git a/src/main/java/eu/dnetlib/irishmonitorservice/services/StakeholderExtendedService.java b/src/main/java/eu/dnetlib/irishmonitorservice/services/StakeholderExtendedService.java new file mode 100644 index 0000000..e0cea2e --- /dev/null +++ b/src/main/java/eu/dnetlib/irishmonitorservice/services/StakeholderExtendedService.java @@ -0,0 +1,58 @@ +package eu.dnetlib.irishmonitorservice.services; + +import eu.dnetlib.irishmonitorservice.entities.Data; +import eu.dnetlib.irishmonitorservice.entities.SortBy; +import eu.dnetlib.irishmonitorservice.entities.StakeholderExtended; +import eu.dnetlib.uoamonitorservice.entities.Stakeholder; +import eu.dnetlib.uoamonitorservice.service.StakeholderService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.io.UnsupportedEncodingException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; +import java.util.stream.Collectors; + +@Service +public class StakeholderExtendedService { + private final StakeholderService service; + private final CacheService cacheService; + + @Autowired + public StakeholderExtendedService(StakeholderService service, CacheService cacheService) { + this.service = service; + this.cacheService = cacheService; + } + + public List getStakeholdersExtended(String type) throws UnsupportedEncodingException { + List stakeholders = this.service.getVisibleStakeholders(type, null); + List>> results = this.cacheService.getResponse(type); + if(results != null) { + return stakeholders.stream().map(stakeholder -> + new StakeholderExtended(stakeholder, + getNumber(results, 0, stakeholder.getIndex_id()), + getNumber(results, 1, stakeholder.getIndex_id()), + getNumber(results, 2, stakeholder.getIndex_id()))).collect(Collectors.toList()); + } + else { + return stakeholders.stream().map(stakeholder -> new StakeholderExtended(stakeholder, "0", "0", "0")).collect(Collectors.toList()); + } + } + + public String getNumber(List>> results, int index, String id) { + if(results != null && index < results.size()) { + return results.get(index).stream().filter(list -> list.get(1).equals(id)).findFirst().orElse(Collections.singletonList("0")).get(0); + } + return "0"; + } + + public List sortBy(List stakeholders, SortBy sort) { + stakeholders.sort(Comparator.comparingInt(StakeholderExtended::getPublications).reversed()); + if(sort == SortBy.OPEN_ACCESS) { + stakeholders.sort(Comparator.comparingDouble((StakeholderExtended a) -> a.getOpenAccess().doubleValue()).reversed()); + } + return stakeholders; + } +} diff --git a/src/main/java/eu/dnetlib/irishmonitorservice/services/StatsToolService.java b/src/main/java/eu/dnetlib/irishmonitorservice/services/StatsToolService.java index a4a4a06..bd1177d 100644 --- a/src/main/java/eu/dnetlib/irishmonitorservice/services/StatsToolService.java +++ b/src/main/java/eu/dnetlib/irishmonitorservice/services/StatsToolService.java @@ -1,5 +1,6 @@ package eu.dnetlib.irishmonitorservice.services; +import eu.dnetlib.irishmonitorservice.configuration.properties.Indicators; import eu.dnetlib.irishmonitorservice.configuration.properties.StatsToolProperties; import eu.dnetlib.irishmonitorservice.entities.Data; import org.springframework.beans.factory.annotation.Autowired; @@ -14,6 +15,7 @@ import org.springframework.web.util.UriComponentsBuilder; import java.io.UnsupportedEncodingException; import java.net.URI; import java.net.URLDecoder; +import java.util.ArrayList; import java.util.List; @Service @@ -26,37 +28,45 @@ public class StatsToolService { private RestTemplate restTemplate; @Cacheable(value = "funders") - public List> getFunders() throws UnsupportedEncodingException { - String url = this.properties.getRfo(); - return this.getData(url); + public List>> getFunders() throws UnsupportedEncodingException { + return this.getData(this.properties.getRfo()); } @Cacheable(value = "organizations") - public List> getOrganizations() throws UnsupportedEncodingException { - String url = this.properties.getRpo(); - return this.getData(url); + public List>> getOrganizations() throws UnsupportedEncodingException { + return this.getData(this.properties.getRpo()); } @Cacheable(value = "datasources") - public List> getDataSources() throws UnsupportedEncodingException { - String url = this.properties.getRepository(); - return this.getData(url); + public List>> getDataSources() throws UnsupportedEncodingException { + return this.getData(this.properties.getRepository()); } - private List> getData(String url) throws UnsupportedEncodingException { - if(url != null) { - String service = url.substring(0, url.indexOf('=') + 1); - String json = URLDecoder.decode(url.substring(url.indexOf('=') + 1), "UTF-8"); - URI uri = UriComponentsBuilder.fromUriString(service + json).build().encode().toUri(); - try { - ResponseEntity data = restTemplate.getForEntity(uri, Data.class); - if(data.getStatusCode() == HttpStatus.OK) { - return data.getBody().getData(); - } - } catch (RestClientException e) { - return null; - } + public List>> getData(Indicators indicators) throws UnsupportedEncodingException { + if(indicators != null) { + List>> data = new ArrayList<>(); + data.add(this.getData(properties.getHost(), indicators.getPublications())); + data.add(this.getData(properties.getHost(), indicators.getPublicationsPR())); + data.add(this.getData(properties.getHost(), indicators.getPublicationsPROA())); + return data; } return null; } + + private List> getData(String service, String json) throws UnsupportedEncodingException { + if(service == null || json == null) { + return new ArrayList<>(); + } else { + URI uri = UriComponentsBuilder.fromUriString(service + URLDecoder.decode(json, "UTF-8")).build().encode().toUri(); + try { + ResponseEntity response = restTemplate.getForEntity(uri, Data.class); + if(response.getStatusCode() == HttpStatus.OK) { + return response.getBody().getData(); + } + return new ArrayList<>(); + } catch (RestClientException e) { + return new ArrayList<>(); + } + } + } } diff --git a/src/main/resources/irishmonitorservice.properties b/src/main/resources/irishmonitorservice.properties index 0eb78d8..66c8568 100644 --- a/src/main/resources/irishmonitorservice.properties +++ b/src/main/resources/irishmonitorservice.properties @@ -1,5 +1,12 @@ irishmonitorservice.globalVars.buildDate=@timestamp@ irishmonitorservice.globalVars.version=@version@ -stats-tool.rfo=https://stats.madgik.di.uoa.gr/stats-api/raw?json=%7B%22orderBy%22%3A%22yAxis%22%2C%22verbose%22%3Afalse%2C%22series%22%3A%5B%7B%22query%22%3A%7B%22parameters%22%3A%5B%5D%2C%22select%22%3A%5B%7B%22field%22%3A%22publication%22%2C%22aggregate%22%3A%22count%22%7D%2C%7B%22field%22%3A%22publication.project.funder.id%22%2C%22aggregate%22%3Anull%7D%5D%2C%22filters%22%3A%5B%7B%22groupFilters%22%3A%5B%7B%22field%22%3A%22publication.project.funder.country%22%2C%22type%22%3A%22%3D%22%2C%22values%22%3A%5B%22IE%22%5D%7D%5D%2C%22op%22%3A%22AND%22%7D%5D%2C%22entity%22%3A%22publication%22%2C%22profile%22%3A%22ie_monitor%22%2C%22useCache%22%3Afalse%7D%7D%5D%7D -stats-tool.rpo=https://stats.madgik.di.uoa.gr/stats-api/raw?json=%7B%22orderBy%22%3A%22yAxis%22%2C%22verbose%22%3Afalse%2C%22series%22%3A%5B%7B%22query%22%3A%7B%22parameters%22%3A%5B%5D%2C%22select%22%3A%5B%7B%22field%22%3A%22publication%22%2C%22aggregate%22%3A%22count%22%7D%2C%7B%22field%22%3A%22publication.organization.id%22%2C%22aggregate%22%3Anull%7D%5D%2C%22filters%22%3A%5B%7B%22groupFilters%22%3A%5B%7B%22field%22%3A%22publication.organization.country%22%2C%22type%22%3A%22%3D%22%2C%22values%22%3A%5B%22IE%22%5D%7D%5D%2C%22op%22%3A%22AND%22%7D%5D%2C%22entity%22%3A%22publication%22%2C%22profile%22%3A%22ie_monitor%22%2C%22useCache%22%3Afalse%7D%7D%5D%7D +stats-tool.host=https://stats.madgik.di.uoa.gr/stats-api/raw?json= +stats-tool.rfo.publications=%7B%22orderBy%22%3A%22yAxis%22%2C%22verbose%22%3Afalse%2C%22series%22%3A%5B%7B%22query%22%3A%7B%22parameters%22%3A%5B%5D%2C%22select%22%3A%5B%7B%22field%22%3A%22publication%22%2C%22aggregate%22%3A%22count%22%7D%2C%7B%22field%22%3A%22publication.project.funder.id%22%2C%22aggregate%22%3Anull%7D%5D%2C%22filters%22%3A%5B%7B%22groupFilters%22%3A%5B%7B%22field%22%3A%22publication.project.funder.country%22%2C%22type%22%3A%22%3D%22%2C%22values%22%3A%5B%22IE%22%5D%7D%5D%2C%22op%22%3A%22AND%22%7D%5D%2C%22entity%22%3A%22publication%22%2C%22profile%22%3A%22ie_monitor%22%2C%22useCache%22%3Afalse%7D%7D%5D%7D +stats-tool.rpo.publications=%7B%22orderBy%22%3A%22yAxis%22%2C%22verbose%22%3Afalse%2C%22series%22%3A%5B%7B%22query%22%3A%7B%22parameters%22%3A%5B%5D%2C%22select%22%3A%5B%7B%22field%22%3A%22publication%22%2C%22aggregate%22%3A%22count%22%7D%2C%7B%22field%22%3A%22publication.organization.id%22%2C%22aggregate%22%3Anull%7D%5D%2C%22filters%22%3A%5B%7B%22groupFilters%22%3A%5B%7B%22field%22%3A%22publication.organization.country%22%2C%22type%22%3A%22%3D%22%2C%22values%22%3A%5B%22IE%22%5D%7D%5D%2C%22op%22%3A%22AND%22%7D%5D%2C%22entity%22%3A%22publication%22%2C%22profile%22%3A%22ie_monitor%22%2C%22useCache%22%3Afalse%7D%7D%5D%7D + +stats-tool.rfo.publicationsPR=%7B"orderBy"%3A"yAxis"%2C"verbose"%3Afalse%2C"series"%3A%5B%7B"query"%3A%7B"parameters"%3A%5B%5D%2C"select"%3A%5B%7B"field"%3A"publication"%2C"aggregate"%3A"count"%7D%2C%7B"field"%3A"publication.project.funder.id"%2C"aggregate"%3Anull%7D%5D%2C"filters"%3A%5B%7B"groupFilters"%3A%5B%7B"field"%3A"publication.project.funder.country"%2C"type"%3A"%3D"%2C"values"%3A%5B"IE"%5D%7D%2C%7B"field"%3A"publication.result_refereed.refereed"%2C"type"%3A"%3D"%2C"values"%3A%5B"peerReviewed"%5D%7D%5D%2C"op"%3A"AND"%7D%5D%2C"entity"%3A"publication"%2C"profile"%3A"ie_monitor"%2C"useCache"%3Afalse%7D%7D%5D%7D +stats-tool.rpo.publicationsPR=%7B%22orderBy%22%3A%22yAxis%22%2C%22verbose%22%3Afalse%2C%22series%22%3A%5B%7B%22query%22%3A%7B%22parameters%22%3A%5B%5D%2C%22select%22%3A%5B%7B%22field%22%3A%22publication%22%2C%22aggregate%22%3A%22count%22%7D%2C%7B%22field%22%3A%22publication.organization.id%22%2C%22aggregate%22%3Anull%7D%5D%2C%22filters%22%3A%5B%7B%22groupFilters%22%3A%5B%7B%22field%22%3A%22publication.organization.country%22%2C%22type%22%3A%22%3D%22%2C%22values%22%3A%5B%22IE%22%5D%7D%2C%7B%22field%22%3A%22publication.result_refereed.refereed%22%2C%22type%22%3A%22%3D%22%2C%22values%22%3A%5B%22peerReviewed%22%5D%7D%5D%2C%22op%22%3A%22AND%22%7D%5D%2C%22entity%22%3A%22publication%22%2C%22profile%22%3A%22ie_monitor%22%2C%22useCache%22%3Afalse%7D%7D%5D%7D + +stats-tool.rfo.publicationsPROA=%7B%22orderBy%22%3A%22yAxis%22%2C%22verbose%22%3Afalse%2C%22series%22%3A%5B%7B%22query%22%3A%7B%22parameters%22%3A%5B%5D%2C%22select%22%3A%5B%7B%22field%22%3A%22publication%22%2C%22aggregate%22%3A%22count%22%7D%2C%7B%22field%22%3A%22publication.project.funder.id%22%2C%22aggregate%22%3Anull%7D%5D%2C%22filters%22%3A%5B%7B%22groupFilters%22%3A%5B%7B%22field%22%3A%22publication.project.funder.country%22%2C%22type%22%3A%22%3D%22%2C%22values%22%3A%5B%22IE%22%5D%7D%2C%7B%22field%22%3A%22publication.result_refereed.refereed%22%2C%22type%22%3A%22%3D%22%2C%22values%22%3A%5B%22peerReviewed%22%5D%7D%2C%7B%22field%22%3A%22publication.indi_result_oa_with_license.oa_with_license%22%2C%22type%22%3A%22%3D%22%2C%22values%22%3A%5B%221%22%5D%7D%5D%2C%22op%22%3A%22AND%22%7D%5D%2C%22entity%22%3A%22publication%22%2C%22profile%22%3A%22ie_monitor%22%2C%22useCache%22%3Afalse%7D%7D%5D%7D%0A +stats-tool.rpo.publicationsPROA=%7B"orderBy"%3A"yAxis"%2C"verbose"%3Afalse%2C"series"%3A%5B%7B"query"%3A%7B"parameters"%3A%5B%5D%2C"select"%3A%5B%7B"field"%3A"publication"%2C"aggregate"%3A"count"%7D%2C%7B"field"%3A"publication.organization.id"%2C"aggregate"%3Anull%7D%5D%2C"filters"%3A%5B%7B"groupFilters"%3A%5B%7B"field"%3A"publication.organization.country"%2C"type"%3A"%3D"%2C"values"%3A%5B"IE"%5D%7D%2C%7B"field"%3A"publication.result_refereed.refereed"%2C"type"%3A"%3D"%2C"values"%3A%5B"peerReviewed"%5D%7D%2C%7B"field"%3A"publication.indi_result_oa_with_license.oa_with_license"%2C"type"%3A"%3D"%2C"values"%3A%5B"1"%5D%7D%5D%2C"op"%3A"AND"%7D%5D%2C"entity"%3A"publication"%2C"profile"%3A"ie_monitor"%2C"useCache"%3Afalse%7D%7D%5D%7D diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml deleted file mode 100644 index 1949895..0000000 --- a/src/main/resources/log4j2.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - %d %p %t [%c] - %m%n - - - - - - - ${LOG_PATTERN} - - - - - - - - - ${LOG_PATTERN} - - - - - - - - - - - - - - - - \ No newline at end of file