From 63b99ea68ebbecc31702d0e3939d22b485a8f46e Mon Sep 17 00:00:00 2001 From: Konstantinos Spyrou Date: Fri, 20 Jan 2023 19:17:06 +0200 Subject: [PATCH 1/7] base url can be altered only if existing is null or empty --- .../dnetlib/repo/manager/service/RepositoryServiceImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/eu/dnetlib/repo/manager/service/RepositoryServiceImpl.java b/src/main/java/eu/dnetlib/repo/manager/service/RepositoryServiceImpl.java index 04ad975..a62efd3 100644 --- a/src/main/java/eu/dnetlib/repo/manager/service/RepositoryServiceImpl.java +++ b/src/main/java/eu/dnetlib/repo/manager/service/RepositoryServiceImpl.java @@ -656,6 +656,12 @@ public class RepositoryServiceImpl implements RepositoryService { String desiredCompatibilityLevel) throws Exception { Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); Repository repository = this.getRepositoryById(repoId); + if (repositoryInterface.getId() != null) { + RepositoryInterface existing = getRepositoryInterface(repoId).stream().filter(iFace -> iFace.getId().equals(repositoryInterface.getId())).findFirst().orElse(null); + if (existing != null && (existing.getBaseurl() == null || "".equals(existing.getBaseurl()))) { + this.updateBaseUrl(repoId, repositoryInterface.getId(), repositoryInterface.getBaseurl()); + } + } this.updateValidationSet(repoId, repositoryInterface.getId(), repositoryInterface.getAccessSet()); From 6041bb8f1f295f6fdad73d44f3926f99b506f832 Mon Sep 17 00:00:00 2001 From: Antonis Lempesis Date: Tue, 14 Feb 2023 20:39:36 +0100 Subject: [PATCH 2/7] Add 'LICENSE.txt' --- LICENSE.txt | 176 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 176 insertions(+) create mode 100644 LICENSE.txt diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..2bb9ad2 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,176 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS \ No newline at end of file From 19fcda5ae19a412c5d9eee5facd68c234641b293 Mon Sep 17 00:00:00 2001 From: LSmyrnaios Date: Wed, 15 Feb 2023 17:14:02 +0200 Subject: [PATCH 3/7] Update the "getRepositoriesByCountry"-endpoint to return up to 10_000 repositories. --- .../eu/dnetlib/repo/manager/service/RepositoryServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/eu/dnetlib/repo/manager/service/RepositoryServiceImpl.java b/src/main/java/eu/dnetlib/repo/manager/service/RepositoryServiceImpl.java index 00eeeda..effafa5 100644 --- a/src/main/java/eu/dnetlib/repo/manager/service/RepositoryServiceImpl.java +++ b/src/main/java/eu/dnetlib/repo/manager/service/RepositoryServiceImpl.java @@ -228,7 +228,7 @@ public class RepositoryServiceImpl implements RepositoryService { Boolean managed) { logger.debug("Getting repositories by country!"); int page = 0; - int size = 100; + int size = 10_000; // Include all repositories. Some countries have more than a thousand. String filterKey = "UNKNOWN"; if (mode.equalsIgnoreCase("repository")) From 3684f099707f24c91af015c91096659e91ca197c Mon Sep 17 00:00:00 2001 From: LSmyrnaios Date: Wed, 15 Feb 2023 18:03:20 +0200 Subject: [PATCH 4/7] Update application.yml --- src/main/resources/application.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 409f18f..93e95cb 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -14,10 +14,11 @@ spring: driverClassName: ${services.provide.db.driverClassName} services: + openaireServicesBaseUrl: https://beta.services.openaire.eu provide: dev-machine: 88.197.53.71 # VM-71 aai: - baseURL: https://aai.openaire.eu + baseURL: https://beta.aai.openaire.eu oidc: domain: .openaire.eu # use empty value for local, otherwise: ".openaire.eu" id: XX @@ -27,10 +28,10 @@ services: webURL: http://localhost:4200/join registry: coid: XX + username: XX password: XX production: false url: ${services.provide.aai.baseURL}/registry/ - username: provide_openaire adminEmail: XX analyticsURL: https://analytics.openaire.eu/addsite.php? baseUrl: https://dev-openaire.d4science.org/openaire @@ -41,9 +42,9 @@ services: url: https://beta.broker.openaire.eu clients: dsm: https://dev-openaire.d4science.org/openaire - search: https://beta.services.openaire.eu/search/v2/api + search: ${services.openaireServicesBaseUrl}/search/v2/api usageEvents: http://beta.lbs.openaire.eu:8080/ajax/summary - usagestats: https://beta.services.openaire.eu/usagestats + usagestats: ${services.openaireServicesBaseUrl}/usagestats db: driverClassName: org.postgresql.Driver password: dnetPwd @@ -66,12 +67,12 @@ services: password: XX port: 6379 topic_types: - url: https://beta.services.openaire.eu/provision/mvc/vocabularies/dnet:topic_types.json + url: ${services.openaireServicesBaseUrl}/provision/mvc/vocabularies/dnet:topic_types.json usageStatisticsDiagramsBaseURL: https://beta.openaire.eu/stats3/ - usageStatisticsNumbersBaseURL: https://beta.services.openaire.eu/usagestats/datasources/ + usageStatisticsNumbersBaseURL: ${services.openaireServicesBaseUrl}/usagestats/datasources/ usagestats: adminEmail: XX - sushiliteEndpoint: https://beta.services.openaire.eu/usagestats/sushilite/ + sushiliteEndpoint: ${services.openaireServicesBaseUrl}/usagestats/sushilite/ validator: results: url: https://beta.provide.openaire.eu/compatibility/browseHistory/ From fe1a3987732c24ccc07960220f18bb75f71442f1 Mon Sep 17 00:00:00 2001 From: LSmyrnaios Date: Wed, 15 Feb 2023 18:31:13 +0200 Subject: [PATCH 5/7] - Show error-messages for Broker's errors. - Code polishing. --- .../dnetlib/repo/manager/service/BrokerServiceImpl.java | 8 ++++++++ .../repo/manager/service/DashboardServiceImpl.java | 8 ++++---- .../repo/manager/service/RepositoryServiceImpl.java | 2 -- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/main/java/eu/dnetlib/repo/manager/service/BrokerServiceImpl.java b/src/main/java/eu/dnetlib/repo/manager/service/BrokerServiceImpl.java index d4506d2..de2d52e 100644 --- a/src/main/java/eu/dnetlib/repo/manager/service/BrokerServiceImpl.java +++ b/src/main/java/eu/dnetlib/repo/manager/service/BrokerServiceImpl.java @@ -114,6 +114,7 @@ public class BrokerServiceImpl implements BrokerService { new ParameterizedTypeReference>() { }); } catch (RestClientException e) { + logger.error(e.getMessage()); throw new BrokerException(e); } @@ -146,6 +147,7 @@ public class BrokerServiceImpl implements BrokerService { new ParameterizedTypeReference() {} ); } catch (RestClientException e) { + logger.error(e.getMessage()); throw new BrokerException(e); } return resp.getBody(); @@ -195,6 +197,7 @@ public class BrokerServiceImpl implements BrokerService { new ParameterizedTypeReference() { }); } catch (RestClientException e) { + logger.error(e.getMessage()); throw new BrokerException(e); } return resp.getBody(); @@ -219,6 +222,7 @@ public class BrokerServiceImpl implements BrokerService { new ParameterizedTypeReference>>() { }); } catch (RestClientException e) { + logger.error(e.getMessage()); throw new BrokerException(e); } return resp.getBody(); @@ -252,6 +256,7 @@ public class BrokerServiceImpl implements BrokerService { new ParameterizedTypeReference() { }); } catch (RestClientException e) { + logger.error(e.getMessage()); throw new BrokerException(e); } @@ -274,6 +279,7 @@ public class BrokerServiceImpl implements BrokerService { new ParameterizedTypeReference() { }); } catch (RestClientException e) { + logger.error(e.getMessage()); throw new BrokerException(e); } return new ResponseEntity<>("OK", HttpStatus.OK); @@ -296,6 +302,7 @@ public class BrokerServiceImpl implements BrokerService { new ParameterizedTypeReference() { }); } catch (RestClientException e) { + logger.error(e.getMessage()); throw new BrokerException(e); } return resp.getBody(); @@ -325,6 +332,7 @@ public class BrokerServiceImpl implements BrokerService { new ParameterizedTypeReference() { }); } catch (RestClientException e) { + logger.error(e.getMessage()); throw new BrokerException(e); } return resp.getBody(); diff --git a/src/main/java/eu/dnetlib/repo/manager/service/DashboardServiceImpl.java b/src/main/java/eu/dnetlib/repo/manager/service/DashboardServiceImpl.java index 38f15cc..c84bb03 100644 --- a/src/main/java/eu/dnetlib/repo/manager/service/DashboardServiceImpl.java +++ b/src/main/java/eu/dnetlib/repo/manager/service/DashboardServiceImpl.java @@ -1,7 +1,7 @@ package eu.dnetlib.repo.manager.service; import eu.dnetlib.enabling.datasources.common.AggregationInfo; -import eu.dnetlib.repo.manager.domain.MetricsInfo; +import eu.dnetlib.repo.manager.domain.MetricsNumbers; import eu.dnetlib.repo.manager.domain.RepositorySnippet; import eu.dnetlib.repo.manager.domain.RepositorySummaryInfo; import eu.dnetlib.repo.manager.domain.broker.BrowseEntry; @@ -68,9 +68,9 @@ public class DashboardServiceImpl implements DashboardService { logger.warn("Could not find repo aggregations, after " + (end - start) + "ms!"); try { - MetricsInfo metricsInfo = repositoryService.getMetricsInfoForRepository(repoId); - repositorySummaryInfo.setTotalDownloads(metricsInfo.getMetricsNumbers().getTotalDownloads()); - repositorySummaryInfo.setTotalViews(metricsInfo.getMetricsNumbers().getTotalViews()); + MetricsNumbers metricsNumbers = repositoryService.getMetricsInfoForRepository(repoId).getMetricsNumbers(); + repositorySummaryInfo.setTotalDownloads(metricsNumbers.getTotalDownloads()); + repositorySummaryInfo.setTotalViews(metricsNumbers.getTotalViews()); } catch (RepositoryServiceException e) { logger.error("Exception getting metrics info for repository: {}, {} ", repoId, repoOfficialName, e); } diff --git a/src/main/java/eu/dnetlib/repo/manager/service/RepositoryServiceImpl.java b/src/main/java/eu/dnetlib/repo/manager/service/RepositoryServiceImpl.java index effafa5..e05c9cc 100644 --- a/src/main/java/eu/dnetlib/repo/manager/service/RepositoryServiceImpl.java +++ b/src/main/java/eu/dnetlib/repo/manager/service/RepositoryServiceImpl.java @@ -776,12 +776,10 @@ public class RepositoryServiceImpl implements RepositoryService { @Override public MetricsInfo getMetricsInfoForRepository(String repoId) throws RepositoryServiceException { try { - MetricsInfo metricsInfo = new MetricsInfo(); metricsInfo.setDiagramsBaseURL(this.usageStatisticsDiagramsBaseURL); metricsInfo.setMetricsNumbers(getMetricsNumbers(getOpenAIREId(repoId))); return metricsInfo; - } catch (Exception e) { logger.error("Error while getting metrics info for repository: ", e); throw new RepositoryServiceException("General error", RepositoryServiceException.ErrorCode.GENERAL_ERROR); From 6024e0c5b5d4309b4ca96870460a9502a6a71c5c Mon Sep 17 00:00:00 2001 From: Konstantinos Spyrou Date: Tue, 4 Apr 2023 18:43:48 +0300 Subject: [PATCH 6/7] changed application type and replaced counters with gauges --- .../manager/controllers/PrometheusController.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/eu/dnetlib/repo/manager/controllers/PrometheusController.java b/src/main/java/eu/dnetlib/repo/manager/controllers/PrometheusController.java index 28102ea..b644641 100644 --- a/src/main/java/eu/dnetlib/repo/manager/controllers/PrometheusController.java +++ b/src/main/java/eu/dnetlib/repo/manager/controllers/PrometheusController.java @@ -23,8 +23,8 @@ import java.io.File; @RestController -@RequestMapping("/actuator/prometheus") -public class PrometheusController { // TODO: remove this with migration to Spring Boot 2 +@RequestMapping(value = "/actuator/prometheus", produces = "application/openmetrics-text; version=1.0.0; charset=utf-8") +public class PrometheusController { private static final Logger logger = LoggerFactory.getLogger(PrometheusController.class); private final PiWikService piWikService; @@ -36,12 +36,12 @@ public class PrometheusController { // TODO: remove this with migration to Sprin this.repositoryService = repositoryService; } - @RequestMapping(method = RequestMethod.GET, path = "", produces = MediaType.TEXT_PLAIN_VALUE) + @RequestMapping(method = RequestMethod.GET) public String getPiwikMetrics() { PrometheusMeterRegistry registry = new PrometheusMeterRegistry(PrometheusConfig.DEFAULT); - registry.counter("provide_repositories_registered").increment(repositoryService.getTotalRegisteredRepositories()); - registry.counter("provide_usagecounts_repositories_registered").increment(piWikService.getTotal()); - registry.counter("provide_usagecounts_repositories_validated").increment(piWikService.getValidated(true)); + registry.gauge("provide_repositories_registered", repositoryService.getTotalRegisteredRepositories()); + registry.gauge("provide_usagecounts_repositories_registered", piWikService.getTotal()); + registry.gauge("provide_usagecounts_repositories_validated", piWikService.getValidated(true)); return registry.scrape(TextFormat.CONTENT_TYPE_OPENMETRICS_100); } From 4e1f9cb965786fa0100fc4582a53c2eb6b494089 Mon Sep 17 00:00:00 2001 From: LSmyrnaios Date: Mon, 24 Jul 2023 13:45:24 +0300 Subject: [PATCH 7/7] Disable sending emails about compliance failure. --- .../repo/manager/service/InterfaceComplianceService.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/eu/dnetlib/repo/manager/service/InterfaceComplianceService.java b/src/main/java/eu/dnetlib/repo/manager/service/InterfaceComplianceService.java index 2a59c31..ddbeaa3 100644 --- a/src/main/java/eu/dnetlib/repo/manager/service/InterfaceComplianceService.java +++ b/src/main/java/eu/dnetlib/repo/manager/service/InterfaceComplianceService.java @@ -39,7 +39,9 @@ public class InterfaceComplianceService { @Scheduled(cron = "0 0 0 * * *") // every day at 00:00 public void cleanUp() { Set requests = getOutdated(); - for (InterfaceComplianceRequest request : requests) { + + // TODO - In case we want to send the emails, uncomment the following code. + /*for (InterfaceComplianceRequest request : requests) { try { Map repositoryInterfaceMap = repositoryService.getRepositoryInterface(request.getRepositoryId()) .stream() @@ -52,7 +54,8 @@ public class InterfaceComplianceService { } catch (ResourceNotFoundException e) { logger.error("Error", e); } - } + }*/ + repository.deleteAll(requests); }