diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1ac07659..7f51ecf6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,7 @@ commons-beanutils = "1.9.4" commons-csv = "1.11.0" cxf = "4.0.4" -guava = "33.2.0-jre" +guava = "33.2.1-jre" h2 = "2.2.224" httpclient = "5.3.1" jackson = "2.17.1" diff --git a/xroad-catalog-collector/src/main/java/fi/vrk/xroad/catalog/collector/XRoadCatalogCollector.java b/xroad-catalog-collector/src/main/java/fi/vrk/xroad/catalog/collector/XRoadCatalogCollector.java index a75d35f8..ce8eae83 100644 --- a/xroad-catalog-collector/src/main/java/fi/vrk/xroad/catalog/collector/XRoadCatalogCollector.java +++ b/xroad-catalog-collector/src/main/java/fi/vrk/xroad/catalog/collector/XRoadCatalogCollector.java @@ -115,6 +115,7 @@ public static void main(String[] args) throws MalformedURLException, URISyntaxEx final ListClientsTask listClientsTask = new ListClientsTask(context, listMethodsQueue, fetchCompaniesQueue, fetchOrganizationsQueue); + long collectorInterval = taskPoolConfiguration.getCollectorInterval(); log.info("Starting up catalog collector with collector interval of {}", collectorInterval); diff --git a/xroad-catalog-collector/src/main/java/fi/vrk/xroad/catalog/collector/tasks/FetchOrganizationsTask.java b/xroad-catalog-collector/src/main/java/fi/vrk/xroad/catalog/collector/tasks/FetchOrganizationsTask.java index 973b7c53..a0e61197 100644 --- a/xroad-catalog-collector/src/main/java/fi/vrk/xroad/catalog/collector/tasks/FetchOrganizationsTask.java +++ b/xroad-catalog-collector/src/main/java/fi/vrk/xroad/catalog/collector/tasks/FetchOrganizationsTask.java @@ -77,6 +77,7 @@ public class FetchOrganizationsTask implements Runnable { public FetchOrganizationsTask(final ApplicationContext applicationContext, final BlockingQueue fetchOrganizationsQueue) { + this.catalogService = applicationContext.getBean(CatalogService.class); this.organizationService = applicationContext.getBean(OrganizationService.class); diff --git a/xroad-catalog-collector/src/test/resources/mock/companies/getCompanies.json b/xroad-catalog-collector/src/test/resources/mock/companies/getCompanies.json new file mode 100644 index 00000000..d222774f --- /dev/null +++ b/xroad-catalog-collector/src/test/resources/mock/companies/getCompanies.json @@ -0,0 +1,39 @@ +{ + "type":"fi.prh.opendata.bis", + "version":"1", + "totalResults":4, + "resultsFrom":0, + "previousResultsUri":null, + "nextResultsUri":"http://localhost/v1?totalResults=true&maxResults=100&resultsFrom=100&companyRegistrationFrom=1970-01-01", + "exceptionNoticeUri":null, + "results":[ + { + "businessId":"1234567-1", + "name":"Test Company 1", + "registrationDate":"2020-01-01", + "companyForm":"OY", + "detailsUri":"http://localhost/v1/1234567-1" + }, + { + "businessId":"1234567-2", + "name":"Test Company 2", + "registrationDate":"2022-02-09", + "companyForm":"OY", + "detailsUri":"http://localhost/v1/1234567-2" + }, + { + "businessId":"1234567-3", + "name":"Test Company 3", + "registrationDate":"2012-06-08", + "companyForm":"OY", + "detailsUri":"http://localhost/v1/1234567-3" + }, + { + "businessId":"1234567-4", + "name":"Test Company 4", + "registrationDate":"2019-05-09", + "companyForm":"OY", + "detailsUri":"http://localhost/v1/1234567-4" + } + ] +}