- Replaced DSM's "AggregationInfo" with "CollectionInfoV2" in "eu.dnetlib.repo.manager.domain.AggregationInfo".

- Cleanup related dependencies.

Co-authored-by: Konstantinos Spyrou <spyroukon@gmail.com>

pom.xml

@@ -76,21 +76,16 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.solr</groupId>
-            <artifactId>solr-solrj</artifactId>
-            <version>9.4.0</version>
+            <groupId>eu.dnetlib.dhp</groupId>
+            <artifactId>dnet-exporter-model</artifactId>
+            <version>3.5.0</version>
         </dependency>
 
+        <!-- https://mvnrepository.com/artifact/io.micrometer/micrometer-registry-prometheus -->
         <dependency>
-            <groupId>eu.dnetlib.dhp</groupId>
-            <artifactId>dnet-exporter-api</artifactId>
-            <version>[3.3.3-SNAPSHOT, )</version>
-            <exclusions>
-            <exclusion>
-                <groupId>eu.dnetlib</groupId>
-                <artifactId>dnet-index-solr-common</artifactId>
-            </exclusion>
-            </exclusions>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-registry-prometheus</artifactId>
+            <version>1.12.4</version>
         </dependency>
 
         <dependency>

src/main/java/eu/dnetlib/repo/manager/controllers/DashboardController.java

@@ -1,10 +1,6 @@
 package eu.dnetlib.repo.manager.controllers;
 
-import eu.dnetlib.enabling.datasources.common.AggregationInfo;
-import eu.dnetlib.repo.manager.domain.BrokerSummary;
-import eu.dnetlib.repo.manager.domain.CollectionMonitorSummary;
-import eu.dnetlib.repo.manager.domain.RepositorySummaryInfo;
-import eu.dnetlib.repo.manager.domain.UsageSummary;
+import eu.dnetlib.repo.manager.domain.*;
 import eu.dnetlib.repo.manager.exception.BrokerException;
 import eu.dnetlib.repo.manager.exception.RepositoryServiceException;
 import eu.dnetlib.repo.manager.service.*;

src/main/java/eu/dnetlib/repo/manager/controllers/RepositoryController.java

@@ -1,7 +1,6 @@
 package eu.dnetlib.repo.manager.controllers;
 
 import eu.dnetlib.domain.data.PiwikInfo;
-import eu.dnetlib.enabling.datasources.common.AggregationInfo;
 import eu.dnetlib.repo.manager.domain.*;
 import eu.dnetlib.repo.manager.domain.dto.RepositoryTerms;
 import eu.dnetlib.repo.manager.domain.dto.User;
@@ -9,7 +8,6 @@ import eu.dnetlib.repo.manager.exception.RepositoryServiceException;
 import eu.dnetlib.repo.manager.exception.ResourceNotFoundException;
 import eu.dnetlib.repo.manager.service.AggregationService;
 import eu.dnetlib.repo.manager.service.PiWikService;
-import eu.dnetlib.repo.manager.service.PiWikServiceImpl;
 import eu.dnetlib.repo.manager.service.RepositoryService;
 import eu.dnetlib.repo.manager.service.security.AuthorizationService;
 import eu.dnetlib.repo.manager.utils.JsonUtils;

src/main/java/eu/dnetlib/repo/manager/domain/AggregationInfo.java

@@ -1,7 +1,8 @@
 package eu.dnetlib.repo.manager.domain;
 
-// TODO: this class must be replaced by common dnet class (CollectionInfo / TransformationInfo / AggregationInfo)
-public class AggregationInfo extends eu.dnetlib.enabling.datasources.common.AggregationInfo {
+import eu.dnetlib.openaire.exporter.model.dsm.CollectionInfoV2;
+
+public class AggregationInfo extends CollectionInfoV2 {
 
     public AggregationInfo() {
     }

src/main/java/eu/dnetlib/repo/manager/domain/CollectionMonitorSummary.java

@@ -1,7 +1,5 @@
 package eu.dnetlib.repo.manager.domain;
 
-import eu.dnetlib.enabling.datasources.common.AggregationInfo;
-
 import java.util.List;
 
 public class CollectionMonitorSummary {

src/main/java/eu/dnetlib/repo/manager/service/AggregationService.java

@@ -1,6 +1,6 @@
 package eu.dnetlib.repo.manager.service;
 
-import eu.dnetlib.enabling.datasources.common.AggregationInfo;
+import eu.dnetlib.repo.manager.domain.AggregationInfo;
 import org.json.JSONException;
 
 import java.util.List;

src/main/java/eu/dnetlib/repo/manager/service/AggregationServiceImpl.java

@@ -1,7 +1,7 @@
 package eu.dnetlib.repo.manager.service;
 
-import eu.dnetlib.enabling.datasources.common.AggregationInfo;
 import eu.dnetlib.repo.manager.domain.AggregationHistoryResponse;
+import eu.dnetlib.repo.manager.domain.AggregationInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;

src/main/java/eu/dnetlib/repo/manager/service/DashboardServiceImpl.java

@@ -1,6 +1,6 @@
 package eu.dnetlib.repo.manager.service;
 
-import eu.dnetlib.enabling.datasources.common.AggregationInfo;
+import eu.dnetlib.repo.manager.domain.AggregationInfo;
 import eu.dnetlib.repo.manager.domain.MetricsNumbers;
 import eu.dnetlib.repo.manager.domain.RepositorySnippet;
 import eu.dnetlib.repo.manager.domain.RepositorySummaryInfo;