first implementation of the new oai-pmh client

creating new branch to change oai-pmh version
2020-07-14 11:55:45 +00:00 · 2020-07-14 11:54:54 +00:00
138 changed files with 4405 additions and 7462 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,4 +0,0 @@
-# Ignore directories
-.idea
-target
-
--- a/5
+++ b/5
@ -1,10 +1,9 @@
-#FROM tomcat:7.0.90-jre8
-FROM tomcat:8.5.71-jre8-openjdk-bullseye
+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 validator.env /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/
--- a/LICENSE.txt
+++ b/LICENSE.txt
@ -1,176 +0,0 @@
-                                 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
--- a/README.md
+++ b/README.md
@ -1,218 +0,0 @@
-# OpenAIRE Provide - backend service
-
-## Introduction
-OpenAIRE PROVIDE is the content gateway service of OpenAIRE, where data providers are invited to connect scholarly content with OpenAIRE.<br>
-OpenAIRE PROVIDE allows repositories, data archives, journals, aggregators, CRIS systems, to enter the OpenAIRE and European Open Science (EOSC) ecosystem and be accessible by millions of researchers, research institutes and networks, research funders, policy makers and citizens.<br>
-OpenAIRE PROVIDE lowers any technological barriers, by supporting a series of integrations, therefore, enabling its users to visually access OpenAIRE's services that are responsible for the data harvesting process.
-<br><br>
-There are four distinctive steps from the initial express of interest for OpenAIRE PROVIDE to the actual content availability on OpenAIRE and EOSC. 
-<br>
-The steps indicate the important subservices of OpenAIRE that perform the following functionalities:
- Validation of data sources with the OpenAIRE guidelines (via the OpenAIRE Validator)
- Registration of data sources to OpenAIRE and global interlinked networks provides links to content for text and data mining, view history of validations, status of harvesting Enrichment of metadata information that describes the data sources to be available through OpenAIRE.
- Subscribe and view/receive notifications to enrich the metadata or the content of the data source (via the OpenAIRE Broker)
- View usage statistics of Open research impact by subscribing to the OpenAIRE UsageCounts service; view aggregated, cleaned usage stats for repository access and broaden your mechanisms for impact assessment.
-
-<br>
-
-## Architecture
-[...]
-
-<br>
-
-## Building
-The backend is a [Maven](https://maven.apache.org/index.html) project. It has been tested using Java 8.
-<br>
-
-#### Manual Build Instructions
-
-###### Requirements:
- Java 8
- Apache Maven 3+
-
-###### Build Instructions:
-1. Clone the repository and move inside the directory
-   <br> `git clone https://code-repo.d4science.org/MaDgIK/uoa-repository-manager-service.git && cd uoa-repository-manager-service`
-2. Provide all not-set or redacted configurations, inside the **src/main/resources/application.yml** file.
-3. Build Maven project
-   <br> `mvn clean package`
-   <br> Produces the file "./target/**uoa-repository-manager-service.jar**" which can be run with: - Run the app with: `java -jar ./target/uoa-repository-manager-service.jar`
-
-#### Build using Docker
-The repository contains a **Dockerfile** which can be used to build an image containing the compiled project.
-
-###### Requirements:
- Docker
-
-###### Build Instructions:
-1. Clone the repository and move inside the directory
-   <br> `git clone https://code-repo.d4science.org/MaDgIK/uoa-repository-manager-service.git && cd uoa-repository-manager-service`
-2. Provide all not-set or redacted configurations, inside the **src/main/resources/application.yml** file.
-3. Build Docker image
-   <br> `docker build . -t <docker-image-name>`
-
-<br>
-
-## Configuration
-The configuration can be set inside the **src/main/resources/application.yml** file.
-
-### Server-related configuration.
-```
-server:
-   port: 8480
-   servlet:
-      context-path: /uoa-repository-manager-service
-```
-
-### Swagger UI - related configuration
-```
-springdoc:
-   swagger-ui:
-      disable-swagger-default-url: true
-      path: /swagger-ui.html
-      displayRequestDuration: true
-   api-docs:
-      path: /api-docs
-```
-
-### Datasource -related configuration
-```
-spring:
-   jpa:
-      hibernate:
-         ddl-auto: update
-    datasource:
-        url: ${services.provide.db.url}
-        username: ${services.provide.db.username}
-        password: ${services.provide.db.password}
-        driverClassName: ${services.provide.db.driverClassName}
-```
-
-### Configurations about the provide service.
-```
-services:
-   openaireServicesBaseUrl: https://beta.services.openaire.eu
-   provide:
-      dev-machine: 88.197.53.71   # VM-71
-```
-
-### Configuration about Authentication and authorization infrastructure (AAI).
-```
-      aai:
-         baseURL: https://aai.openaire.eu
-         oidc:
-            domain: .openaire.eu # use empty value for local, otherwise: ".openaire.eu"
-            id: XX
-            issuer: ${services.provide.aai.baseURL}/oidc/
-            redirectURL: http://localhost:${server.port}${server.servlet.context-path}/openid_connect_login
-            secret: XX
-            webURL: http://localhost:4200/join
-         registry:
-            coid: XX
-            username: XX
-            password: XX
-            production: false
-            url: ${services.provide.aai.baseURL}/registry/
-```
-
-### Broker's configuration
-```
-      broker:
-         api: api/
-         openaire: openaireBroker
-         port: 443
-         url: https://beta.broker.openaire.eu
-```
-
-### Client's configuration
-```
-      clients:
-         dsm: ${services.provide.baseUrl}
-         search: ${services.openaireServicesBaseUrl}/search/v2/api
-         usageEvents: http://beta.lbs.openaire.eu:8080/ajax/summary
-         usagestats: ${services.openaireServicesBaseUrl}/usagestats
-```
-
-### Database configuration for Provide.
-```
-      db:
-         driverClassName: org.postgresql.Driver
-         password: dnetPwd
-         url: jdbc:postgresql://${services.provide.dev-machine}:5432/repomanager
-         username: dnet
-```
-
-### Configuration for the IS LookUp service.
-```
-      iSLookUpService:
-         url: https://dev-openaire.d4science.org:443/is/services/isLookUp
-```
-
-### Mail-server configuration.
-```
-      mail:
-         authenticate: true
-         debug: false
-         from: XX
-         host: smtp.gmail.com
-         mode: ssl
-         password: XX
-         port: 465
-         replyTo: XX
-         username: XX
-```
-
-### Redis's configuration
-```
-      redis:
-         host: vereniki.athenarc.gr
-         password: XX
-         port: 6379
-```
-
-### Usage statistics
-```
-      usageStatisticsDiagramsBaseURL: https://beta.openaire.eu/stats3/
-      usageStatisticsNumbersBaseURL: ${services.openaireServicesBaseUrl}/usagestats/datasources/
-      usagestats:
-         adminEmail: XX
-         sushiliteEndpoint: ${services.openaireServicesBaseUrl}/usagestats/sushilite/
-         sushiliteR5Endpoint: ${services.openaireServicesBaseUrl}/usagestats_r5/sushilite/r5/
-```
-
-### Validator - related configuration.
-```
-      validator:
-         results:
-            url: https://beta.provide.openaire.eu/compatibility/browseHistory/
-      validatorService:
-         url: http://${services.provide.dev-machine}:8080/uoa-validator-service/services/validatorWebService
-```
-
-### Miscellaneous
-```
-      topic_types:
-         url: ${services.openaireServicesBaseUrl}/provision/mvc/vocabularies/dnet:topic_types.json
-      adminEmail: XX
-      analyticsURL: https://analytics.openaire.eu/addsite.php?
-      baseUrl: ${services.openaireServicesBaseUrl}/openaire
-```
-
-<br>
-
-## Deployment
-
-
-### Prerequisites
-* install [PostgreSQL 9.5+](https://www.postgresql.org/)
-*  Run the app with: `java -jar ./target/uoa-repository-manager-service.jar --spring.config.location=application.yml`
-
-<br>
-
-
-## misc
-
-### Notes for Swagger-UI:
- Access it through this url: http://localhost:8480/uoa-repository-manager-service/swagger-ui/index.html
- In order to request data from most endpoints, you have to be a "REGISTERED_USER", otherwise you will get a 403 error code.
- In order to be a registered user, you have to run the [UI-service](https://code-repo.d4science.org/MaDgIK/uoa-repository-manager-ui) , in the same machine, at the same time and login through a browser, using the following url: http://localhost:8480/uoa-repository-manager-service/openid_connect_login
--- a/pom.xml
+++ b/pom.xml
@ -4,155 +4,67 @@
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

    <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.18</version>
-        <relativePath></relativePath>
+        <groupId>eu.dnetlib</groupId>
+        <artifactId>dnet45-parent</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
    </parent>
-
    <modelVersion>4.0.0</modelVersion>
    <groupId>eu.dnetlib</groupId>
    <artifactId>uoa-repository-manager-service</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
+    <version>1.0.0-SNAPSHOT</version>
+    <packaging>war</packaging>

-    <properties>
-        <spring.boot.version>2.7.18</spring.boot.version>
-    </properties>

    <dependencies>
+
        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-            <version>${spring.boot.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-logging</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-log4j2</artifactId>
-            <version>${spring.boot.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-jdbc</artifactId>
-            <version>${spring.boot.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-jpa</artifactId>
-            <version>${spring.boot.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-actuator-autoconfigure</artifactId>
-            <version>${spring.boot.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
-            <version>${spring.boot.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-validation</artifactId>
-            <version>${spring.boot.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <version>${spring.boot.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-configuration-processor</artifactId>
-            <version>${spring.boot.version}</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-devtools</artifactId>
-            <version>${spring.boot.version}</version>
-            <optional>true</optional>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+            <version>${spring.version}</version>
        </dependency>

        <dependency>
-            <groupId>org.springdoc</groupId>
-            <artifactId>springdoc-openapi-ui</artifactId>
-            <version>1.8.0</version>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator-annotation-processor</artifactId>
+            <version>4.1.0.Final</version>
        </dependency>

        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <version>2.2.224</version>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>${log4j.version}</version>
        </dependency>

-        <dependency>
-            <groupId>eu.dnetlib.dhp</groupId>
-            <artifactId>dnet-exporter-model</artifactId>
-            <version>[3.5.1, )</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springdoc</groupId>
-                    <artifactId>springdoc-openapi-common</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <!-- https://mvnrepository.com/artifact/io.micrometer/micrometer-registry-prometheus -->
-        <dependency>
-            <groupId>io.micrometer</groupId>
-            <artifactId>micrometer-registry-prometheus</artifactId>
-            <version>1.12.4</version>
-        </dependency>
-
-        <dependency>
-            <groupId>eu.dnetlib</groupId>
-            <artifactId>uoa-clients</artifactId>
-            <version>[2.0.0-SNAPSHOT, 3.0.0)</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>javax.servlet</groupId>
-                    <artifactId>javax.servlet-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.google.gwt</groupId>
-                    <artifactId>gwt-user</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
        <dependency>
            <groupId>eu.dnetlib</groupId>
            <artifactId>dnet-runtime</artifactId>
-            <version>1.0.2-SNAPSHOT</version>
+            <version>[1.0.0-SNAPSHOT, 2.0.0)</version>
            <exclusions>
-                <exclusion>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
+                <exclusion>  <!-- declare the exclusion here -->
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-javamail_1.4_spec</artifactId>
                </exclusion>
            </exclusions>
        </dependency>
+
        <dependency>
            <groupId>eu.dnetlib</groupId>
-            <artifactId>uoa-hcm</artifactId>
+            <artifactId>uoa-utils</artifactId>
+            <version>[2.0.0-SNAPSHOT, 3.0.0)</version>
+        </dependency>
+
+        <dependency>
+            <groupId>eu.dnetlib</groupId>
+            <artifactId>uoa-domain</artifactId>
            <version>[2.0.0-SNAPSHOT, 3.0.0)</version>
            <exclusions>
-                <exclusion>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
+                <exclusion>  <!-- declare the exclusion here -->
+                    <groupId>cglib</groupId>
+                    <artifactId>cglib</artifactId>
                </exclusion>
            </exclusions>
        </dependency>
+
        <dependency>
            <groupId>eu.dnetlib</groupId>
            <artifactId>dnet-openaire-usage-stats-sushilite</artifactId>
@ -160,31 +72,35 @@
        </dependency>
        <dependency>
            <groupId>eu.dnetlib</groupId>
-            <artifactId>dnet-openaire-usage-stats-sushilite-r5</artifactId>
-            <version>1.1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>eu.dnetlib.dhp</groupId>
            <artifactId>dnet-openaire-broker-common</artifactId>
-            <version>3.1.1-SNAPSHOT</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.validation</groupId>
-                    <artifactId>validation-api</artifactId>
-                </exclusion>
-            </exclusions>
+            <version>1.0.2-SNAPSHOT</version>
        </dependency>
-
        <dependency>
            <groupId>cglib</groupId>
            <artifactId>cglib-nodep</artifactId>
-            <version>3.3.0</version>
+            <version>2.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>eu.dnetlib</groupId>
+            <artifactId>uoa-commons</artifactId>
+            <version>[2.0.0-SNAPSHOT, 3.0.0)</version>
+        </dependency>
+        <dependency>
+            <groupId>eu.dnetlib</groupId>
+            <artifactId>uoa-clients</artifactId>
+            <version>[2.0.0-SNAPSHOT, 3.0.0)</version>
+        </dependency>
+        <dependency>
+            <groupId>eu.dnetlib</groupId>
+            <artifactId>uoa-hcm</artifactId>
+            <version>[2.0.0-SNAPSHOT, 3.0.0)</version>
        </dependency>

        <dependency>
            <groupId>commons-io</groupId>
            <artifactId>commons-io</artifactId>
-            <version>2.16.0</version>
+            <version>2.4</version>
        </dependency>

        <dependency>
@ -192,58 +108,101 @@
            <artifactId>oai4j</artifactId>
            <version>[0.6b1,)</version>
        </dependency>
-
-        <!-- TODO - Do we need this? -->
        <dependency>
            <groupId>xalan</groupId>
            <artifactId>xalan</artifactId>
-            <version>2.7.3</version>
+            <version>2.7.2</version>
        </dependency>

-        <!-- https://mvnrepository.com/artifact/org.glassfish.jersey.core/jersey-client -->
        <dependency>
-            <groupId>org.glassfish.jersey.core</groupId>
-            <artifactId>jersey-client</artifactId>
-            <version>2.42</version>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+            <version>2.11.0</version>
        </dependency>

+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>2.5.1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.5.1</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-jdbc</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.sun.jersey</groupId>
+            <artifactId>jersey-client</artifactId>
+            <version>1.19.3</version>
+        </dependency>

-        <!-- TODO - Do we need this? We already have: "com.google.code.gson:gson" -->
        <dependency>
            <groupId>org.aksw.gson</groupId>
            <artifactId>gson-utils-core</artifactId>
-            <version>1.0.1</version>
+            <version>1.0.0</version>
        </dependency>
-
        <dependency>
            <groupId>org.json</groupId>
            <artifactId>json</artifactId>
-            <version>20240303</version>
+            <version>20080701</version>
        </dependency>

        <dependency>
            <groupId>com.sun.mail</groupId>
            <artifactId>javax.mail</artifactId>
-            <version>1.6.2</version>
+            <version>1.6.0</version>
        </dependency>

-        <!-- https://mvnrepository.com/artifact/org.postgresql/postgresql -->
        <dependency>
-            <groupId>org.postgresql</groupId>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>2.7.0</version>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>2.7.0</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/postgresql/postgresql -->
+        <dependency>
+            <groupId>postgresql</groupId>
            <artifactId>postgresql</artifactId>
-            <version>42.7.3</version>
+            <version>9.1-901.jdbc3</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/org.apache.tomcat/tomcat-catalina -->
+        <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tomcat-catalina</artifactId>
+            <version>9.0.22</version>
        </dependency>

        <dependency>
            <groupId>commons-fileupload</groupId>
            <artifactId>commons-fileupload</artifactId>
-            <version>1.5</version>
+            <version>1.4</version>
        </dependency>

        <dependency>
            <groupId>org.mitre</groupId>
            <artifactId>openid-connect-client</artifactId>
-            <version>1.3.4</version>
+            <version>1.3.0</version>
            <exclusions>
                <exclusion>
                    <groupId>org.slf4j</groupId>
@ -251,43 +210,49 @@
                </exclusion>
            </exclusions>
        </dependency>
+
+
        <dependency>
            <groupId>org.springframework.session</groupId>
            <artifactId>spring-session-data-redis</artifactId>
-            <version>2.7.4</version>
+            <version>1.3.1.RELEASE</version>
+            <type>pom</type>
        </dependency>
-
        <!-- https://mvnrepository.com/artifact/redis.clients/jedis -->
        <dependency>
            <groupId>redis.clients</groupId>
            <artifactId>jedis</artifactId>
-            <version>${jedis.version}</version> <!-- This property comes from the parent-pom. -->
-            <!--<version>3.7.0</version>-->
+            <version>2.9.0</version>
        </dependency>
-        <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-pool2 -->
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-pool2</artifactId>
-            <version>2.12.0</version>
-        </dependency>
-
        <dependency>
            <groupId>com.google.code.gson</groupId>
            <artifactId>gson</artifactId>
-            <version>2.10.1</version>
+            <version>2.6.2</version>
        </dependency>

        <dependency>
            <groupId>com.thetransactioncompany</groupId>
            <artifactId>cors-filter</artifactId>
-            <version>3.0</version>
+            <version>2.5</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-hystrix</artifactId>
+            <version>1.1.5.RELEASE</version>
+<!--            <exclusions>-->
+<!--                <exclusion>-->
+<!--                    <groupId>org.springframework.boot</groupId>-->
+<!--                    <artifactId>spring-boot-starter-logging</artifactId>-->
+<!--                </exclusion>-->
+<!--            </exclusions>-->
        </dependency>

        <!-- https://mvnrepository.com/artifact/javax.xml.ws/jaxws-api -->
        <dependency>
            <groupId>javax.xml.ws</groupId>
            <artifactId>jaxws-api</artifactId>
-            <version>2.3.1</version>
+            <version>2.3.0</version>
        </dependency>
        <!-- https://mvnrepository.com/artifact/javax.jws/javax.jws-api -->
        <dependency>
@ -298,23 +263,23 @@
        <dependency>
            <groupId>javax.xml.bind</groupId>
            <artifactId>jaxb-api</artifactId>
-            <version>2.3.1</version>
+            <version>2.3.0</version>
        </dependency>
        <dependency>
            <groupId>com.sun.xml.bind</groupId>
            <artifactId>jaxb-impl</artifactId>
-            <version>2.3.9</version>
+            <version>2.3.0</version>
        </dependency>
        <!-- https://mvnrepository.com/artifact/com.sun.xml.bind/jaxb-core -->
        <dependency>
            <groupId>com.sun.xml.bind</groupId>
            <artifactId>jaxb-core</artifactId>
-            <version>2.3.0.1</version>
+            <version>2.3.0</version>
        </dependency>
        <dependency>
            <groupId>javax.activation</groupId>
            <artifactId>activation</artifactId>
-            <version>1.1.1</version>
+            <version>1.1-rev-1</version>
        </dependency>

        <dependency>
@ -329,55 +294,44 @@
 <!--            </exclusions>-->
        </dependency>

+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>2.26.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.3</version>
+        </dependency>
    </dependencies>

-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework.session</groupId>
-                <artifactId>spring-session-bom</artifactId>
-                <version>2021.2.3</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
    <build>
        <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
        <plugins>
-<!--
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.11.0</version>
+                <version>3.7.0</version>
                <configuration>
                    <source>1.8</source>
                    <target>1.8</target>
                    <encoding>UTF-8</encoding>
                </configuration>
            </plugin>
+
            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-war-plugin</artifactId>
-                <version>3.4.0</version>
+                <version>2.6</version>
                <configuration>
                    <failOnMissingWebXml>false</failOnMissingWebXml>
                </configuration>
            </plugin>
-            -->
-
-            <plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${spring.boot.version}</version>
-			</plugin>
-
            <plugin>
                <groupId>cz.habarta.typescript-generator</groupId>
                <artifactId>typescript-generator-maven-plugin</artifactId>
-                <version>2.37.1128</version>
+                <version>2.16.538</version>
                <executions>
                    <execution>
                        <id>java to typeScript</id>
@ -407,76 +361,5 @@
        </resources>
    </build>

-    <repositories>
-        <repository>
-            <id>central</id>
-            <name>Maven Central</name>
-            <url>https://repo.maven.apache.org/maven2</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>dnet45-bootstrap-snapshot</id>
-            <name>D-Net 45 Bootstrap Snapshot</name>
-            <url>https://maven.research-infrastructures.eu/nexus/content/repositories/dnet45-bootstrap-snapshot</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <layout>default</layout>
-        </repository>
-        <repository>
-            <id>dnet45-bootstrap-release</id>
-            <name>D-Net 45 Bootstrap Release</name>
-            <url>https://maven.research-infrastructures.eu/nexus/content/repositories/dnet45-bootstrap-release</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <layout>default</layout>
-        </repository>
-        <repository>
-            <id>dnet-deps</id>
-            <name>dnet-dependencies</name>
-            <url>https://maven.d4science.org/nexus/content/repositories/dnet-deps</url>
-            <layout>default</layout>
-        </repository>
-        <repository>
-            <id>dnet45-releases</id>
-            <name>D-Net 45 releases</name>
-            <url>https://maven.d4science.org/nexus/content/repositories/dnet45-releases</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-        </repository>
-        <repository>
-            <id>dnet45-snapshots</id>
-            <name>D-Net 45 snapshots</name>
-            <url>https://maven.d4science.org/nexus/content/repositories/dnet45-snapshots</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-
-        <!-- Use this when testing local JARs. -->
-        <!--<repository>
-            <id>libs</id>
-            <url>file:///${project.basedir}/libs</url>
-        </repository>-->
-    </repositories>

 </project>
--- a/src/main/java/eu/dnetlib/repo/manager/Application.java
+++ b/src/main/java/eu/dnetlib/repo/manager/Application.java
@ -1,16 +0,0 @@
-package eu.dnetlib.repo.manager;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
-import org.springframework.scheduling.annotation.EnableScheduling;
-
-@SpringBootApplication
-@EnableJpaRepositories
-@EnableScheduling
-public class Application {
-
-    public static void main(String[] args) {
-        SpringApplication.run(Application.class, args);
-    }
-}
--- a/src/main/java/eu/dnetlib/repo/manager/components/ScheduledTasks.java
+++ b/src/main/java/eu/dnetlib/repo/manager/components/ScheduledTasks.java
@ -1,20 +0,0 @@
-package eu.dnetlib.repo.manager.components;
-
-
-import eu.dnetlib.repo.manager.service.PendingUserRoleService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-@Component
-public class ScheduledTasks {
-
-    @Autowired
-    PendingUserRoleService pendingUserRoleService;
-
-    @Scheduled(fixedRate = 3_600_000)
-    public void assignPendingRoles() {
-        pendingUserRoleService.assignRoles();
-    }
-
-}
--- a/src/main/java/eu/dnetlib/repo/manager/config/AaiSecurityConfiguration.java
+++ b/src/main/java/eu/dnetlib/repo/manager/config/AaiSecurityConfiguration.java
@ -15,6 +15,7 @@ import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.builders.WebSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.web.authentication.LoginUrlAuthenticationEntryPoint;
 import org.springframework.security.web.authentication.preauth.AbstractPreAuthenticatedProcessingFilter;

 import java.util.*;
@ -23,24 +24,29 @@ import java.util.*;
@EnableWebSecurity
 public class AaiSecurityConfiguration extends WebSecurityConfigurerAdapter {

-    @Value("${services.provide.aai.oidc.webURL}")
+    @Value("${webapp.dev.front}")
    private String logoutSuccessUrl;

-    @Value("${services.provide.aai.oidc.issuer}")
+    @Value("${oidc.issuer}")
    private String oidcIssuer;

-    @Value("${services.provide.aai.oidc.id}")
+    @Value("${oidc.id}")
    private String oidcId;

-    @Value("${services.provide.aai.oidc.secret}")
+    @Value("${oidc.secret}")
    private String oidcSecret;

-    @Value("${services.provide.aai.oidc.redirectURL}")
+    @Value("${oidc.dev.home}")
    private String oidcDevHome;

-    @Value("${services.provide.aai.oidc.webURL}")
+    @Value("${webapp.dev.front}")
    private String webAppFrontEnd;

+    private Map<String, String> userRoles = new HashMap<String, String>(){{
+        put("urn:geant:openaire.eu:group:Super+Administrator#aai.openaire.eu", "ROLE_ADMIN");
+        put("urn:geant:openaire.eu:group:Content+Provider+Dashboard+Administrator#aai.openaire.eu","ROLE_PROVIDE_ADMIN");
+    }};
+
    @Bean
    @Override
    public AuthenticationManager authenticationManagerBean() throws Exception {
@ -48,51 +54,49 @@ public class AaiSecurityConfiguration extends WebSecurityConfigurerAdapter {
    }

    @Override
-    protected void configure(AuthenticationManagerBuilder auth) {
+    protected void configure(AuthenticationManagerBuilder auth) throws Exception {
        auth.authenticationProvider(openIdConnectAuthenticationProvider());
    }

    @Override
-    public void configure(WebSecurity web) {
+    public void configure(WebSecurity web) throws Exception {
        web.ignoring().antMatchers("/stats/**");
    }

    @Override
    protected void configure(HttpSecurity http) throws Exception {
-        http
-                .csrf().disable()
+        http.csrf().disable()
+                .anonymous().disable()
                .authorizeRequests()
-                    .regexMatchers("/actuator/.*").permitAll()
-                    .regexMatchers("/repositories/.*/metrics/?.*").permitAll()
-                    .regexMatchers("/metrics").permitAll()
-                    .antMatchers("/api-docs/**","/swagger-ui/**").permitAll()
-                    .anyRequest().authenticated()
+                .anyRequest().authenticated()
                .and()
-                .logout().logoutUrl("/openid_logout")
-                .clearAuthentication(true)
-                .invalidateHttpSession(true)
-                .deleteCookies()
-                .logoutSuccessUrl(logoutSuccessUrl)
+                    .httpBasic()
+                    .authenticationEntryPoint(authenticationEntryPoint())
                .and()
-                .addFilterBefore(openIdConnectAuthenticationFilter(), AbstractPreAuthenticatedProcessingFilter.class)
+                    .logout().logoutUrl("/openid_logout")
+                    .invalidateHttpSession(true)
+                    .deleteCookies("openAIRESession")
+                    .logoutSuccessUrl(logoutSuccessUrl)
+                .and()
+                    .addFilterBefore(openIdConnectAuthenticationFilter(), AbstractPreAuthenticatedProcessingFilter.class)
        ;
    }

    @Bean
-    public OIDCAuthenticationProvider openIdConnectAuthenticationProvider() {
+    public OIDCAuthenticationProvider openIdConnectAuthenticationProvider(){
        OIDCAuthenticationProvider oidcProvider = new OIDCAuthenticationProvider();
        oidcProvider.setAuthoritiesMapper(authoritiesMapper());
        return oidcProvider;
    }

    @Bean
-    public OpenAIREAuthoritiesMapper authoritiesMapper() {
-        OpenAIREAuthoritiesMapper authoritiesMapper = new OpenAIREAuthoritiesMapper();
+    public OpenAireProviderAuthoritiesMapper authoritiesMapper(){
+        OpenAireProviderAuthoritiesMapper authoritiesMapper = new OpenAireProviderAuthoritiesMapper(userRoles);
        return authoritiesMapper;
    }

    @Bean
-    public StaticServerConfigurationService staticServerConfigurationService() {
+    public StaticServerConfigurationService staticServerConfigurationService(){
        StaticServerConfigurationService staticServerConfigurationService = new StaticServerConfigurationService();
        Map<String, ServerConfiguration> servers = new HashMap<>();
        servers.put(oidcIssuer, serverConfiguration());
@ -101,47 +105,53 @@ public class AaiSecurityConfiguration extends WebSecurityConfigurerAdapter {
    }

    @Bean
-    public StaticClientConfigurationService staticClientConfigurationService() {
+    public StaticClientConfigurationService staticClientConfigurationService(){
        StaticClientConfigurationService staticClientConfigurationService = new StaticClientConfigurationService();
        Map<String, RegisteredClient> clients = new HashMap<>();
-        clients.put(oidcIssuer, registeredClient());
+        clients.put(oidcIssuer,registeredClient());
        staticClientConfigurationService.setClients(clients);
        return staticClientConfigurationService;
    }

    @Bean
-    public RegisteredClient registeredClient() {
+    public RegisteredClient registeredClient(){
        RegisteredClient registeredClient = new RegisteredClient();
        registeredClient.setClientId(oidcId);
        registeredClient.setClientSecret(oidcSecret);
-        registeredClient.setScope(new HashSet<>(Arrays.asList("openid", "eduperson_entitlement", "profile", "email")));
+        registeredClient.setScope(new HashSet<>(Arrays.asList("openid","eduperson_entitlement","profile", "email")));
        registeredClient.setTokenEndpointAuthMethod(AuthMethod.SECRET_BASIC);
        registeredClient.setRedirectUris(new HashSet<>(Collections.singletonList(oidcDevHome)));
        return registeredClient;
    }

    @Bean
-    public StaticAuthRequestOptionsService staticAuthRequestOptionsService() {
+    public StaticAuthRequestOptionsService staticAuthRequestOptionsService(){
        return new StaticAuthRequestOptionsService();
    }

    @Bean
-    public PlainAuthRequestUrlBuilder plainAuthRequestUrlBuilder() {
+    public PlainAuthRequestUrlBuilder plainAuthRequestUrlBuilder(){
        return new PlainAuthRequestUrlBuilder();
    }

    @Bean
-    public ServerConfiguration serverConfiguration() {
+    public ServerConfiguration serverConfiguration(){
        ServerConfiguration serverConfiguration = new ServerConfiguration();
        serverConfiguration.setIssuer(oidcIssuer);
-        serverConfiguration.setAuthorizationEndpointUri(oidcIssuer + "authorize");
-        serverConfiguration.setTokenEndpointUri(oidcIssuer + "token");
-        serverConfiguration.setUserInfoUri(oidcIssuer + "userinfo");
-        serverConfiguration.setJwksUri(oidcIssuer + "jwk");
-        serverConfiguration.setRevocationEndpointUri(oidcIssuer + "revoke");
+        serverConfiguration.setAuthorizationEndpointUri(oidcIssuer+"authorize");
+        serverConfiguration.setTokenEndpointUri(oidcIssuer+"token");
+        serverConfiguration.setUserInfoUri(oidcIssuer+"userinfo");
+        serverConfiguration.setJwksUri(oidcIssuer+"jwk");
+        serverConfiguration.setRevocationEndpointUri(oidcIssuer+"revoke");
        return serverConfiguration;
    }

+    @Bean
+    public LoginUrlAuthenticationEntryPoint authenticationEntryPoint(){
+        return new LoginUrlAuthenticationEntryPoint("/openid_connect_login");
+    }
+
+
    @Bean
    public OIDCAuthenticationFilter openIdConnectAuthenticationFilter() throws Exception {
        OIDCAuthenticationFilter oidc = new OIDCAuthenticationFilter();
@ -156,14 +166,14 @@ public class AaiSecurityConfiguration extends WebSecurityConfigurerAdapter {
    }

    @Bean
-    public StaticSingleIssuerService staticSingleIssuerService() {
+    public StaticSingleIssuerService staticSingleIssuerService(){
        StaticSingleIssuerService staticSingleIssuerService = new StaticSingleIssuerService();
        staticSingleIssuerService.setIssuer(oidcIssuer);
        return staticSingleIssuerService;
    }

    @Bean(initMethod = "init")
-    public FrontEndLinkURIAuthenticationSuccessHandler frontEndRedirect() {
+    public FrontEndLinkURIAuthenticationSuccessHandler frontEndRedirect(){
        FrontEndLinkURIAuthenticationSuccessHandler frontEnd = new FrontEndLinkURIAuthenticationSuccessHandler();
        frontEnd.setFrontEndURI(webAppFrontEnd);
        return frontEnd;
--- a/src/main/java/eu/dnetlib/repo/manager/config/AsyncConfiguration.java
+++ b/src/main/java/eu/dnetlib/repo/manager/config/AsyncConfiguration.java
@ -1,27 +0,0 @@
-package eu.dnetlib.repo.manager.config;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.annotation.AsyncConfigurer;
-import org.springframework.scheduling.annotation.EnableAsync;
-
-import java.lang.reflect.Method;
-
-@Configuration
-@EnableAsync
-public class AsyncConfiguration implements AsyncConfigurer {
-
-    @Override
-    public AsyncUncaughtExceptionHandler getAsyncUncaughtExceptionHandler() {
-        return new AsyncUncaughtExceptionHandler() {
-            private final Logger logger = LoggerFactory.getLogger(getClass());
-
-            @Override
-            public void handleUncaughtException(Throwable throwable, Method method, Object... objects) {
-                logger.error("Async error", throwable);
-            }
-        };
-    }
-}
--- a/src/main/java/eu/dnetlib/repo/manager/config/CascadingPropertyLoader.java
+++ b/src/main/java/eu/dnetlib/repo/manager/config/CascadingPropertyLoader.java
@ -0,0 +1,56 @@
+package eu.dnetlib.repo.manager.config;
+
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
+import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
+
+import java.util.Properties;
+
+/**
+ * CascadingPropertyLoader loads a number of property files and mergers them together, so that the last properties
+ * override the previous. It also supports property expansion like:
+ * 
+ * <code>
+ *   something = 1
+ *   somethingelse = 2
+ *   test = ${something}/${somethingelse}
+ *  </code>
+ * 
+ * <p>
+ * And if you override something to XX, then test will become XX/2
+ * </p>
+ * 
+ * 
+ * @author marko
+ * 
+ */
+public class CascadingPropertyLoader extends PropertyPlaceholderConfigurer implements InitializingBean {
+
+	private Properties properties;
+
+	public void afterPropertiesSet() throws Exception {
+		this.properties = mergeProperties();
+
+		// Convert the merged properties, if necessary.
+		convertProperties(this.properties);
+		
+		logger.debug("Properties: " + properties);
+	}
+
+	@Override
+	protected void processProperties(final ConfigurableListableBeanFactory beanFactoryToProcess, final Properties props) throws BeansException {
+		super.processProperties(beanFactoryToProcess, props);
+	}
+
+	public Properties getProperties() {
+		return properties;
+	}
+
+	public void setProperties(final Properties properties) {
+		super.setProperties(properties);
+		
+		this.properties = properties;
+	}
+}
+
--- a/src/main/java/eu/dnetlib/repo/manager/config/Config.java
+++ b/src/main/java/eu/dnetlib/repo/manager/config/Config.java
@ -1,84 +1,78 @@
-package eu.dnetlib.repo.manager.config;
-
-import eu.dnetlib.api.enabling.ISLookUpService;
-import eu.dnetlib.api.functionality.ValidatorService;
-import eu.dnetlib.clients.enabling.islookup.ws.ISLookUpClient;
-import eu.dnetlib.clients.functionality.validator.ws.ValidatorWebService;
-import eu.dnetlib.clients.functionality.validator.ws.ValidatorWebServiceClient;
-import eu.dnetlib.domain.enabling.Vocabulary;
-import gr.uoa.di.driver.enabling.ISLookUp;
-import gr.uoa.di.driver.enabling.islookup.ISLookUpImpl;
-import gr.uoa.di.driver.enabling.vocabulary.ISVocabularyLoader;
-import gr.uoa.di.driver.enabling.vocabulary.VocabularyLoader;
-import gr.uoa.di.driver.util.ServiceLocator;
-import gr.uoa.di.driver.util.StaticServiceLocator;
-import gr.uoa.di.driver.xml.VocabularyXmlConverter;
-import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-@ComponentScan(basePackages = {"org.eurocris.openaire.cris.validator.service"})
-public class Config {
-
-    @Value("${services.provide.iSLookUpService.url}")
-    private String lookupURL;
-
-    @Value("${services.provide.validatorService.url}")
-    private String validatorUrl;
-
-    @Bean(name = "vocabularyLoader")
-    public VocabularyLoader createVocabularyLoader() throws Exception {
-        ISVocabularyLoader loader = new ISVocabularyLoader();
-
-        loader.setLookUp(createVocabularyLookUp());
-
-        return loader;
-    }
-
-    @Bean("validatorServiceLocator")
-    public ServiceLocator<ValidatorService> createValidatorServiceLocator() {
-        JaxWsProxyFactoryBean factory = new JaxWsProxyFactoryBean();
-
-        factory.setServiceClass(ValidatorWebService.class);
-        factory.setAddress(validatorUrl);
-
-        ValidatorWebService service = (ValidatorWebService) factory.create();
-
-        ValidatorWebServiceClient client = new ValidatorWebServiceClient();
-        client.setWebService(service);
-
-        StaticServiceLocator<ValidatorService> locator = new StaticServiceLocator<>();
-        locator.setService(client);
-
-        return locator;
-    }
-
-    //    @Bean(name="vocabularyLookUp")
-    private ISLookUp<Vocabulary> createVocabularyLookUp() throws Exception {
-        ISLookUpImpl<Vocabulary> lookUp = new ISLookUpImpl<>();
-
-        lookUp.setLookupLocator(createIsLookupServiceLocator());
-        lookUp.setConverter(new VocabularyXmlConverter());
-
-        return lookUp;
-    }
-
-    private ServiceLocator<ISLookUpService> createIsLookupServiceLocator() throws Exception {
-        JaxWsProxyFactoryBean factory = new JaxWsProxyFactoryBean();
-
-        factory.setServiceClass(eu.dnetlib.enabling.is.lookup.rmi.ISLookUpService.class);
-        factory.setAddress(lookupURL);
-        eu.dnetlib.enabling.is.lookup.rmi.ISLookUpService client = (eu.dnetlib.enabling.is.lookup.rmi.ISLookUpService) factory.create();
-
-        ISLookUpClient service = new ISLookUpClient();
-        service.setWebService(client);
-
-        StaticServiceLocator<ISLookUpService> locator = new StaticServiceLocator<>();
-        locator.setService(service);
-
-        return locator;
-    }
-}
+package eu.dnetlib.repo.manager.config;
+
+import org.apache.log4j.Logger;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
+import org.springframework.context.annotation.*;
+import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
+import org.springframework.session.web.http.CookieSerializer;
+import org.springframework.session.web.http.DefaultCookieSerializer;
+import org.springframework.web.client.RestTemplate;
+
+import javax.annotation.PostConstruct;
+
+@Configuration
+@EnableRedisHttpSession
+@EnableAspectJAutoProxy
+@EnableCircuitBreaker
+@PropertySource(value = {"classpath:application.properties"} )
+@ComponentScan(basePackages = {
+        "org.eurocris.openaire.cris.validator.service",
+        "eu.dnetlib.repo.manager.*"})
+public class Config {
+
+    private static Logger LOGGER = Logger.getLogger(Config.class);
+
+    @Value("${redis.host}")
+    private String host;
+
+    @Value("${redis.port:6379}")
+    private String port;
+
+    @Value("${redis.password}")
+    private String password;
+
+    @Value("${aai.mode}")
+    private String aai_mode;
+
+    @PostConstruct
+    private void init(){
+        LOGGER.info(String.format("Redis : %s Port : %s Password : %s",host,port,password));
+    }
+
+    @Bean
+    public JedisConnectionFactory connectionFactory() {
+        LOGGER.info(String.format("Redis : %s Port : %s Password : %s",host,port,password));
+        JedisConnectionFactory jedisConnectionFactory = new JedisConnectionFactory();
+        jedisConnectionFactory.setHostName(host);
+        jedisConnectionFactory.setPort(Integer.parseInt(port));
+        jedisConnectionFactory.setUsePool(true);
+        if(password != null) jedisConnectionFactory.setPassword(password);
+        return jedisConnectionFactory;
+    }
+
+    @Bean
+    public CookieSerializer cookieSerializer() {
+        DefaultCookieSerializer serializer = new DefaultCookieSerializer();
+        serializer.setCookieName("openAIRESession");
+        serializer.setCookiePath("/");
+        if(aai_mode.equalsIgnoreCase("production") || aai_mode.equalsIgnoreCase("beta"))
+            serializer.setDomainName(".openaire.eu");
+//        serializer.setDomainName(".athenarc.gr");
+        LOGGER.info("Serializer : " + serializer);
+        return serializer;
+    }
+
+    @Bean
+    public RestTemplate restTemplate() {
+        RestTemplate restTemplate = new RestTemplate();
+        restTemplate.getMessageConverters().add(new MappingJackson2HttpMessageConverter());
+        HttpHeaders httpHeaders = new HttpHeaders();
+        httpHeaders.set("Content-Type", "application/json");
+        return restTemplate;
+    }
+
+}
--- a/src/main/java/eu/dnetlib/repo/manager/config/CustomRestTemplateConfig.java
+++ b/src/main/java/eu/dnetlib/repo/manager/config/CustomRestTemplateConfig.java
@ -1,40 +0,0 @@
-package eu.dnetlib.repo.manager.config;
-
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.MapperFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
-import org.springframework.web.client.RestTemplate;
-
-@Configuration
-public class CustomRestTemplateConfig {
-
-    @Bean
-    public RestTemplate restTemplate() {
-        RestTemplate restTemplate = new RestTemplate();
-        restTemplate.getMessageConverters().add(0, mappingJacksonHttpMessageConverter());
-        return restTemplate;
-    }
-
-    @Bean
-    public MappingJackson2HttpMessageConverter mappingJacksonHttpMessageConverter() {
-        MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
-        converter.setObjectMapper(customObjectMapper());
-        return converter;
-    }
-
-    @Bean
-    public ObjectMapper customObjectMapper() {
-        ObjectMapper objectMapper = new ObjectMapper();
-
-        // Do not fail when reading unknown properties
-        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-        // Do not fail when reading properties of different case
-        objectMapper.configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES, true);
-
-        return objectMapper;
-    }
-
-}
--- a/src/main/java/eu/dnetlib/repo/manager/config/DatasourceConfiguration.java
+++ b/src/main/java/eu/dnetlib/repo/manager/config/DatasourceConfiguration.java
@ -0,0 +1,59 @@
+package eu.dnetlib.repo.manager.config;
+
+import org.apache.commons.dbcp.BasicDataSource;
+import org.apache.log4j.Logger;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+@Configuration
+@EnableTransactionManagement
+public class DatasourceConfiguration {
+
+    private static Logger LOGGER = Logger.getLogger(DatasourceConfiguration.class);
+
+    @Value("${repomanager.db.driverClassName}")
+    private String driverClassname;
+
+    @Value("${repomanager.db.url}")
+    private String URL;
+
+    @Value("${repomanager.db.username}")
+    private String username;
+
+    @Value("${repomanager.db.password}")
+    private String password;
+
+    @Bean
+    public BasicDataSource dataSource(){
+        BasicDataSource basicDataSource = new BasicDataSource();
+        basicDataSource.setDriverClassName(driverClassname);
+        basicDataSource.setUrl(URL);
+        basicDataSource.setUsername(username);
+        basicDataSource.setPassword(password);
+        basicDataSource.setMaxIdle(10);
+        basicDataSource.setMaxActive(100);
+        basicDataSource.setMaxWait(1000);
+        basicDataSource.setValidationQuery("SELECT 1;");
+        basicDataSource.setTestOnBorrow(true);
+        basicDataSource.setTestOnReturn(true);
+        basicDataSource.setTestWhileIdle(true);
+        basicDataSource.setTimeBetweenEvictionRunsMillis(1200000);
+        basicDataSource.setMinEvictableIdleTimeMillis(1800000);
+        basicDataSource.setMinEvictableIdleTimeMillis(5);
+        basicDataSource.setPoolPreparedStatements(true);
+        basicDataSource.setDefaultAutoCommit(true);
+
+        return basicDataSource;
+    }
+
+    @Bean
+    public DataSourceTransactionManager txManager(){
+        DataSourceTransactionManager txManager = new DataSourceTransactionManager();
+        txManager.setDataSource(dataSource());
+        return txManager;
+    }
+
+}
--- a/src/main/java/eu/dnetlib/repo/manager/config/FrontEndLinkURIAuthenticationSuccessHandler.java
+++ b/src/main/java/eu/dnetlib/repo/manager/config/FrontEndLinkURIAuthenticationSuccessHandler.java
@ -1,57 +1,84 @@
 package eu.dnetlib.repo.manager.config;

-import com.google.gson.JsonParser;
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import org.apache.log4j.Logger;
 import org.mitre.openid.connect.model.OIDCAuthenticationToken;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
-import org.springframework.session.FindByIndexNameSessionRepository;

 import javax.servlet.ServletException;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.Base64;
-import java.util.Date;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+import java.net.URLEncoder;

 public class FrontEndLinkURIAuthenticationSuccessHandler implements AuthenticationSuccessHandler {

    private String frontEndURI;

-    private static final Logger logger = LoggerFactory.getLogger(FrontEndLinkURIAuthenticationSuccessHandler.class);
+    private static final Logger LOGGER = Logger
+            .getLogger(FrontEndLinkURIAuthenticationSuccessHandler.class);

-    public void init() {
-        logger.debug("Front end uri : {}", frontEndURI);
+    public void init(){
+        LOGGER.debug("Front end uri : " + frontEndURI);
    }


-    @Value("${services.provide.aai.oidc.domain}")
-    private String domain;
-
-
-    private static final Pattern AUTH_REGEX = Pattern.compile("^([A-Za-z0-9-_=]+)\\.([A-Za-z0-9-_=]+)\\.?([A-Za-z0-9-_.+=]*)$");
+    @Value("${aai.mode}")
+    private String aai_mode;

    @Override
    public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws IOException, ServletException {
+
        OIDCAuthenticationToken authOIDC = (OIDCAuthenticationToken) authentication;
-        request.getSession().setAttribute(FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME, authOIDC.getUserInfo().getSub());
+        JsonObject userInfo = new JsonObject();
+
+        if (authOIDC.getUserInfo().getSub() == null)
+            userInfo.addProperty("sub", "");
+        else
+            userInfo.addProperty("sub", URLEncoder.encode(authOIDC.getUserInfo().getSub(), "UTF-8"));
+
+
+        if(authOIDC.getUserInfo().getName() != null)
+            userInfo.addProperty("fullname", URLEncoder.encode(authOIDC.getUserInfo().getName(), "UTF-8"));
+
+        if (authOIDC.getUserInfo().getGivenName() == null)
+            userInfo.addProperty("firstname", "");
+        else
+            userInfo.addProperty("firstname", URLEncoder.encode(authOIDC.getUserInfo().getGivenName(), "UTF-8") + "");
+
+        if (authOIDC.getUserInfo().getFamilyName() == null)
+            userInfo.addProperty("lastname",  "");
+        else
+            userInfo.addProperty("lastname", URLEncoder.encode(authOIDC.getUserInfo().getFamilyName(), "UTF-8") + "");
+
+        userInfo.addProperty("email", authOIDC.getUserInfo().getEmail() + "");
+        if (authOIDC.getUserInfo().getSource().getAsJsonArray("edu_person_entitlements") == null)
+            userInfo.addProperty("role",  "");
+        else
+            userInfo.addProperty("role", URLEncoder.encode(authOIDC.getUserInfo()
+                    .getSource().getAsJsonArray("edu_person_entitlements").toString(), "UTF-8") + "");
+
+
+        Cookie openAIREUser = new Cookie("openAIREUser", new Gson().toJson(userInfo) );
+        openAIREUser.setMaxAge(14400);
+        openAIREUser.setPath("/");
+        if(aai_mode.equalsIgnoreCase("production") || aai_mode.equalsIgnoreCase("beta"))
+            openAIREUser .setDomain(".openaire.eu");
+//        openAIREUser.setDomain(".athenarc.gr");
+        response.addCookie(openAIREUser);
+

        Cookie accessToken = new Cookie("AccessToken", authOIDC.getAccessTokenValue());
-        Matcher matcher = AUTH_REGEX.matcher(authOIDC.getAccessTokenValue());
-        if (matcher.find()) {
-            long exp = new JsonParser().parse(new String(Base64.getDecoder().decode(matcher.group(2)))).getAsJsonObject().get("exp").getAsLong();
-            accessToken.setMaxAge((int) (exp - (new Date().getTime() / 1000)));
-        } else {
-            accessToken.setMaxAge(3600);
-        }
-        accessToken.setDomain(domain);
+        accessToken.setMaxAge(14400);
+        if(aai_mode.equalsIgnoreCase("production") || aai_mode.equalsIgnoreCase("beta"))
+            accessToken.setDomain(".openaire.eu");
        accessToken.setPath("/");

+//        accessToken.setDomain(".athenarc.gr");
        response.addCookie(accessToken);
        response.sendRedirect(frontEndURI);
    }
--- a/src/main/java/eu/dnetlib/repo/manager/config/JPAConfig.java
+++ b/src/main/java/eu/dnetlib/repo/manager/config/JPAConfig.java
@ -1,17 +0,0 @@
-package eu.dnetlib.repo.manager.config;
-
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.orm.jpa.JpaTransactionManager;
-import org.springframework.transaction.PlatformTransactionManager;
-
-@Configuration
-public class JPAConfig {
-
-    @Bean
-    public PlatformTransactionManager transactionManager() {
-        return new JpaTransactionManager();
-    }
-
-}
--- a/src/main/java/eu/dnetlib/repo/manager/config/MailConfig.java
+++ b/src/main/java/eu/dnetlib/repo/manager/config/MailConfig.java
@ -1,57 +0,0 @@
-package eu.dnetlib.repo.manager.config;
-
-import eu.dnetlib.utils.MailLibrary;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class MailConfig {
-
-    @Value("${services.provide.mail.host}")
-    private String host;
-
-    @Value("${services.provide.mail.port}")
-    private int port;
-
-    @Value("${services.provide.mail.authenticate}")
-    private boolean authenticate;
-
-    @Value("${services.provide.mail.username}")
-    private String username;
-
-    @Value("${services.provide.mail.password}")
-    private String password;
-
-    @Value("${services.provide.mail.from}")
-    private String from;
-
-    @Value("${services.provide.mail.replyTo}")
-    private String replyTo;
-
-    @Value("${services.provide.mail.mode}")
-    private String mode;
-
-    @Value("${services.provide.mail.debug}")
-    private boolean debug;
-
-    @Bean
-    public MailLibrary createMailLibrary() {
-        MailLibrary lib = new MailLibrary();
-
-        lib.setAuthenticate(authenticate);
-        lib.setDebug(debug);
-        lib.setFrom(from);
-        lib.setMailhost(host);
-        lib.setSmtpPort(port);
-        lib.setMode(mode);
-        lib.setReplyTo(replyTo);
-        lib.setUsername(username);
-        lib.setPassword(password);
-        lib.setMode(mode);
-
-        lib.init();
-
-        return  lib;
-    }
-}
--- a/src/main/java/eu/dnetlib/repo/manager/config/OpenAIREAuthoritiesMapper.java
+++ b/src/main/java/eu/dnetlib/repo/manager/config/OpenAIREAuthoritiesMapper.java
@ -1,49 +0,0 @@
-package eu.dnetlib.repo.manager.config;
-
-import com.google.gson.JsonArray;
-import com.nimbusds.jwt.JWT;
-import eu.dnetlib.repo.manager.service.security.AuthoritiesMapper;
-import org.mitre.openid.connect.client.OIDCAuthoritiesMapper;
-import org.mitre.openid.connect.model.UserInfo;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.stereotype.Component;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-@Component
-public class OpenAIREAuthoritiesMapper implements OIDCAuthoritiesMapper {
-
-    private static final Logger logger = LoggerFactory.getLogger(OpenAIREAuthoritiesMapper.class);
-
-    @Value("${services.provide.adminEmail}")
-    String adminEmail;
-
-    @Override
-    public Collection<? extends GrantedAuthority> mapAuthorities(JWT jwtToken, UserInfo userInfo) {
-        JsonArray entitlements = null;
-        Set<GrantedAuthority> authorities = new HashSet<>();
-        if (userInfo != null && userInfo.getSource() != null) {
-            if (userInfo.getSource().getAsJsonArray("edu_person_entitlements") != null) {
-                entitlements = userInfo.getSource().getAsJsonArray("edu_person_entitlements");
-            } else if (userInfo.getSource().getAsJsonArray("eduperson_entitlement") != null) {
-                entitlements = userInfo.getSource().getAsJsonArray("eduperson_entitlement");
-            }
-            logger.debug("user info: {}\nentitlements: {}", userInfo, entitlements);
-
-            // FIXME: delete this if statement when super administrators are set
-            if (userInfo.getEmail() != null && userInfo.getEmail().equals(adminEmail)) {
-                authorities.add(new SimpleGrantedAuthority("SUPER_ADMINISTRATOR"));
-            }
-
-            authorities.addAll(AuthoritiesMapper.map(entitlements));
-        }
-        return authorities;
-    }
-}
-
--- a/src/main/java/eu/dnetlib/repo/manager/config/OpenAPIConfiguration.java
+++ b/src/main/java/eu/dnetlib/repo/manager/config/OpenAPIConfiguration.java
@ -1,23 +0,0 @@
-package eu.dnetlib.repo.manager.config;
-
-
-import io.swagger.v3.oas.annotations.OpenAPIDefinition;
-import io.swagger.v3.oas.annotations.info.Contact;
-import io.swagger.v3.oas.annotations.info.Info;
-import io.swagger.v3.oas.annotations.info.License;
-
-@OpenAPIDefinition(
-        info = @Info(
-                title = "Repository Manager Dashboard API Documentation",
-                description = "Repository Manager Dashboard API Documentation",
-                version = "1.0",
-                termsOfService = "urn:tos",
-                license = @License(
-                        name = "Apache 2.0",
-                        url = "https://www.apache.org/licenses/LICENSE-2.0.html"
-                ),
-                contact = @Contact(name = "", url = "", email = "")
-        )
-)
-public class OpenAPIConfiguration {
-}
--- a/src/main/java/eu/dnetlib/repo/manager/config/OpenAireProviderAuthoritiesMapper.java
+++ b/src/main/java/eu/dnetlib/repo/manager/config/OpenAireProviderAuthoritiesMapper.java
@ -0,0 +1,42 @@
+package eu.dnetlib.repo.manager.config;
+
+import com.nimbusds.jwt.JWT;
+import org.mitre.openid.connect.client.OIDCAuthoritiesMapper;
+import org.mitre.openid.connect.model.UserInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+
+import java.util.*;
+
+public class OpenAireProviderAuthoritiesMapper implements OIDCAuthoritiesMapper {
+
+    private static Logger logger = LoggerFactory.getLogger(OpenAireProviderAuthoritiesMapper.class);
+
+    final private static String ROLE_CLAIMS = "edu_person_entitlements";
+
+    private Map<String,SimpleGrantedAuthority> userRolesMap;
+
+    OpenAireProviderAuthoritiesMapper(Map<String,String> userRoles) {
+        userRolesMap = new HashMap<>();
+        userRoles.forEach((openaireRole, appRole) -> userRolesMap.put(openaireRole, new SimpleGrantedAuthority(appRole)));
+    }
+
+    @Override
+    public Collection<? extends GrantedAuthority> mapAuthorities(JWT idToken, UserInfo userInfo) {
+        Set<GrantedAuthority> out = new HashSet<>();
+        out.add(new SimpleGrantedAuthority("ROLE_USER"));
+
+        if(userInfo.getSource().getAsJsonArray(ROLE_CLAIMS) != null) {
+            userInfo.getSource().getAsJsonArray(ROLE_CLAIMS).forEach(role -> {
+                SimpleGrantedAuthority authority = userRolesMap.get(role.getAsString());
+                if (authority != null) {
+                    logger.debug("Role mapped " + role);
+                    out.add(authority);
+                }
+            });
+        }
+        return out;
+    }
+}
--- a/src/main/java/eu/dnetlib/repo/manager/config/RedisConfiguration.java
+++ b/src/main/java/eu/dnetlib/repo/manager/config/RedisConfiguration.java
@ -1,48 +1,56 @@
 package eu.dnetlib.repo.manager.config;

-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
+import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
+import org.springframework.context.annotation.*;
 import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
 import org.springframework.session.web.http.CookieSerializer;
 import org.springframework.session.web.http.DefaultCookieSerializer;
+import org.springframework.web.client.RestTemplate;

 import javax.annotation.PostConstruct;

@Configuration
@EnableRedisHttpSession
+@EnableAspectJAutoProxy
+@EnableCircuitBreaker
+@PropertySource(value = {"classpath:application.properties"} )
+@ComponentScan(basePackages = {
+        "org.eurocris.openaire.cris.validator.service",
+        "eu.dnetlib.repo.manager.*"})
 public class RedisConfiguration {

-    private static final Logger logger = LoggerFactory.getLogger(RedisConfiguration.class);
+    private static Logger LOGGER = Logger.getLogger(RedisConfiguration.class);

-    @Value("${services.provide.redis.host}")
+    @Value("${redis.host}")
    private String host;

-    @Value("${services.provide.redis.port:6379}")
+    @Value("${redis.port:6379}")
    private String port;

-    @Value("${services.provide.redis.password}")
+    @Value("${redis.password}")
    private String password;

-    @Value("${services.provide.aai.oidc.domain}")
-    private String domain;
+    @Value("${aai.mode}")
+    private String aai_mode;

    @PostConstruct
-    private void init() {
-        logger.info(String.format("Redis : %s Port : %s Password : %s", host, port, password));
+    private void init(){
+        LOGGER.info(String.format("Redis : %s Port : %s Password : %s",host,port,password));
    }

    @Bean
    public JedisConnectionFactory connectionFactory() {
-        logger.info(String.format("Redis : %s Port : %s Password : %s", host, port, password));
+        LOGGER.info(String.format("Redis : %s Port : %s Password : %s",host,port,password));
        JedisConnectionFactory jedisConnectionFactory = new JedisConnectionFactory();
        jedisConnectionFactory.setHostName(host);
        jedisConnectionFactory.setPort(Integer.parseInt(port));
        jedisConnectionFactory.setUsePool(true);
-        if (password != null) jedisConnectionFactory.setPassword(password);
+        if(password != null) jedisConnectionFactory.setPassword(password);
        return jedisConnectionFactory;
    }

@ -51,9 +59,21 @@ public class RedisConfiguration {
        DefaultCookieSerializer serializer = new DefaultCookieSerializer();
        serializer.setCookieName("openAIRESession");
        serializer.setCookiePath("/");
-        serializer.setDomainName(domain);
-        logger.info("Cookie Serializer : {}", serializer);
+        if(aai_mode.equalsIgnoreCase("production") || aai_mode.equalsIgnoreCase("beta"))
+            serializer.setDomainName(".openaire.eu");
+//        serializer.setDomainName(".athenarc.gr");
+        LOGGER.info("Serializer : " + serializer);
        return serializer;
    }

+    @Bean
+    public RestTemplate restTemplate() {
+        RestTemplate restTemplate = new RestTemplate();
+        restTemplate.getMessageConverters().add(new MappingJackson2HttpMessageConverter());
+        HttpHeaders httpHeaders = new HttpHeaders();
+        httpHeaders.set("Content-Type", "application/json");
+        return restTemplate;
+    }
+
+
 }
--- a/src/main/java/eu/dnetlib/repo/manager/config/RepoManagerContextLoaderListener.java
+++ b/src/main/java/eu/dnetlib/repo/manager/config/RepoManagerContextLoaderListener.java
@ -0,0 +1,109 @@
+package eu.dnetlib.repo.manager.config;
+
+import org.apache.commons.lang.ArrayUtils;
+import org.apache.log4j.Logger;
+import org.springframework.beans.BeansException;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.web.context.ContextLoaderListener;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.XmlWebApplicationContext;
+
+import javax.servlet.ServletContext;
+import java.util.Properties;
+
+public class RepoManagerContextLoaderListener extends ContextLoaderListener {
+	private static Logger logger = Logger.getLogger(RepoManagerContextLoaderListener.class);
+
+
+	public RepoManagerContextLoaderListener() {
+		super();
+	}
+
+	public RepoManagerContextLoaderListener(WebApplicationContext context) {
+		super(context);
+	}
+
+	@Override
+	protected WebApplicationContext createWebApplicationContext(
+			ServletContext servletContext)
+			throws BeansException {
+		logger.debug("Creating web application context");
+		Properties props = this.loadProperties();
+		String repoMode = props.getProperty("services.validator.mode.repo");
+		String userMode = props.getProperty("services.validator.mode.user");
+		Boolean standaloneMode = Boolean.parseBoolean(props.getProperty("services.validator.mode.standalone"));
+
+		logger.info("User mode: " + userMode);
+		logger.info("Repo mode: " + repoMode);
+		logger.info("Standalone mode: " + standaloneMode);
+//		logger.info("Dnet workflow enabled: " + repoMode);
+		XmlWebApplicationContext ctx = new XmlWebApplicationContext();
+
+		ctx.setServletContext(servletContext);
+
+		String userApiContext = null;
+		if (userMode.equalsIgnoreCase("local"))
+			userApiContext = "eu/dnetlib/validator/web/api/impls/users/springContext-validator-user-local.xml";
+		else if (userMode.equalsIgnoreCase("ldap"))
+			userApiContext = "eu/dnetlib/users/springContext-users-ldap.xml";
+
+		String[] springContextCore = new  String[] {
+				"classpath:META-INF/cxf/cxf.xml",
+				"classpath:META-INF/cxf/cxf-extension-soap.xml",
+				"classpath:META-INF/cxf/cxf-extension-jaxws.xml",
+				"classpath:META-INF/cxf/cxf-servlet.xml",
+				"classpath*:/cxf.xml",
+				"classpath*:/eu/dnetlib/repos/ehcacher/springContext-repos-ehcacher.xml",
+				"classpath*:/eu/dnetlib/clients/ws/springContext-locatorFactory.xml",
+				"classpath*:/eu/dnetlib/soap/cxf/applicationContext-eprbuilders.xml",
+//				"classpath*:/eu/dnetlib/validator/web/actions/springContext-validator-struts.xml",
+//				"classpath*:/eu/dnetlib/validator/web/actions/springContext-validator-emailer.xml",
+//				"classpath*:/eu/dnetlib/validator/web/config/springContext-validator.xml",
+				"classpath*:/eu/dnetlib/repo/manager/server/config/springContext-repo-manager-config.xml",
+//				"classpath*:/eu/dnetlib/validator/commons/dao/springContext-*.xml",
+				"classpath*:/eu/dnetlib/repos/springContext-repos-" + repoMode + ".xml",
+				"classpath*:/" + userApiContext
+		};
+
+
+		String[] springContextForStandalone = new String[] {
+		};
+
+		String[] springContextForIS = new String[] {
+				"classpath*:/gr/uoa/di/driver/util/springContext-locators.xml",
+				"classpath*:/gr/uoa/di/driver/app/springContext-lookupFactory.xml",
+				"classpath*:/gr/uoa/di/driver/app/springContext-lookupClients.xml",
+				"classpath*:/eu/dnetlib/enabling/hcm/springContext-hcmService.xml",
+				"classpath*:/gr/uoa/di/driver/app/springContext-commons.xml",
+				"classpath*:/gr/uoa/di/driver/app/springContext-registrator.xml"
+		};
+
+		if (standaloneMode) {
+			logger.debug("Loading contexts for standalone mode");
+			ctx.setConfigLocations((String[])ArrayUtils.addAll(springContextCore,springContextForStandalone));
+		} else {
+			logger.debug("Loading contexts for dnet");
+			ctx.setConfigLocations((String[])ArrayUtils.addAll(springContextCore,springContextForIS));
+		}
+
+		ctx.refresh();
+
+		logger.debug("done");
+
+		return ctx;
+	}
+
+	private Properties loadProperties() {
+		ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext(new String[] {
+				"classpath*:/eu/dnetlib/repo/manager/server/config/springContext-repo-manager-config.xml"
+		});
+
+		CascadingPropertyLoader pLoader = (CascadingPropertyLoader) ctx.getBean("propertyLoader");
+		Properties props = pLoader.getProperties();
+
+		ctx.destroy();
+		ctx.close();
+		return props;
+	}
+
+}
--- a/src/main/java/eu/dnetlib/repo/manager/config/SwaggerConfig.java
+++ b/src/main/java/eu/dnetlib/repo/manager/config/SwaggerConfig.java
@ -0,0 +1,61 @@
+package eu.dnetlib.repo.manager.config;
+
+import eu.dnetlib.repo.manager.controllers.*;
+import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.Contact;
+import springfox.documentation.service.VendorExtension;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+import java.util.ArrayList;
+
+
+/**
+ * Created by panagiotis on 16/11/2017.
+ */
+@Configuration
+@EnableSwagger2
+@EnableWebMvc
+@EnableCircuitBreaker
+@ComponentScan(basePackageClasses = {
+        RepositoryController.class,
+        MonitorController.class,
+        ValidatorController.class,
+        PiWikController.class,
+        BrokerController.class,
+        StatsController.class,
+        UserController.class,
+        SushiliteController.class
+},basePackages = "eu.dnetlib.repo.manager.*")
+public class SwaggerConfig  {
+
+    @Bean
+    public Docket productApi() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                .select()
+                .apis(RequestHandlerSelectors.any())
+                .paths(PathSelectors.any())
+                .build()
+                .pathMapping("/")
+                .apiInfo(getApiInfo());
+    }
+
+    private ApiInfo getApiInfo() {
+        return new ApiInfo("Repository Manager Dashboard API Documentation",
+                "Repository Manager Dashboard API Documentation",
+                "1.0",
+                "urn:tos",
+                new Contact("", "", ""),
+                "Apache 2.0", "http://www.apache.org/licenses/LICENSE-2.0",
+                new ArrayList<VendorExtension>());
+    }
+
+}
--- a/src/main/java/eu/dnetlib/repo/manager/controllers/BrokerController.java
+++ b/src/main/java/eu/dnetlib/repo/manager/controllers/BrokerController.java
@ -1,11 +1,11 @@
 package eu.dnetlib.repo.manager.controllers;

+import eu.dnetlib.repo.manager.domain.BrokerException;
 import eu.dnetlib.repo.manager.domain.Term;
 import eu.dnetlib.repo.manager.domain.broker.*;
-import eu.dnetlib.repo.manager.exception.BrokerException;
 import eu.dnetlib.repo.manager.service.BrokerServiceImpl;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
 import org.json.JSONException;
 import org.mitre.openid.connect.model.OIDCAuthenticationToken;
 import org.springframework.beans.factory.annotation.Autowired;
@ -21,7 +21,7 @@ import java.util.Map;

@RestController
@RequestMapping(value = "/broker")
-@Tag(name="broker", description="Broker API")
+@Api(description = "Broker API",  tags = {"broker"})
 public class BrokerController{

    @Autowired
@ -30,12 +30,12 @@ public class BrokerController{
    @RequestMapping(value = "/getDatasourcesOfUser" , method = RequestMethod.GET,
            produces = MediaType.APPLICATION_JSON_VALUE)
    @ResponseBody
-    @PreAuthorize("hasAuthority('REGISTERED_USER')")
+    @PreAuthorize("hasRole('ROLE_USER')")
    public DatasourcesBroker getDatasourcesOfUser(
                                           @RequestParam("includeShared")
-                                           @Parameter(description = "Include shared datasources (default = false)", required = true) String includeShared,
+                                           @ApiParam(value = "Include shared datasources", required = true , defaultValue = "false") String includeShared,
                                           @RequestParam("includeByOthers")
-                                           @Parameter(description = "Include datasources of other (default = false)", required = true) String includeByOthers) throws JSONException {
+                                           @ApiParam(value = "Include datasources of other", required = true,defaultValue = "false") String includeByOthers) throws JSONException {
        return brokerService.getDatasourcesOfUser(((OIDCAuthenticationToken) SecurityContextHolder.getContext().getAuthentication()).getUserInfo().getEmail(), includeShared, includeByOthers);
    }

@ -51,7 +51,7 @@ public class BrokerController{
            method = RequestMethod.POST,
            produces = MediaType.APPLICATION_JSON_VALUE)
    @ResponseBody
-    @PreAuthorize("hasAuthority('REGISTERED_USER')")
+    @PreAuthorize("hasRole('ROLE_USER')")
    public EventsPage advancedShowEvents(@PathVariable("page") String page,
                                  @PathVariable("size") String size,
                                  @RequestBody AdvQueryObject advQueryObject) throws BrokerException, JSONException ,IOException{
@ -62,7 +62,7 @@ public class BrokerController{
            method = RequestMethod.GET,
            produces = MediaType.APPLICATION_JSON_VALUE)
    @ResponseBody
-    @PreAuthorize("hasAuthority('REGISTERED_USER')")
+    @PreAuthorize("hasRole('ROLE_USER')")
    public EventsPage showEvents(@RequestParam("datasourceName") String datasourceName,
                          @RequestParam("topic") String topic,
                          @RequestParam("page") String page,
@ -74,7 +74,7 @@ public class BrokerController{
            method = RequestMethod.GET,
            produces = MediaType.APPLICATION_JSON_VALUE)
    @ResponseBody
-    @PreAuthorize("hasAuthority('REGISTERED_USER')")
+    @PreAuthorize("hasRole('ROLE_USER')")
    public Map<String, List<SimpleSubscriptionDesc>> getSimpleSubscriptionsOfUser() throws BrokerException{
        return brokerService.getSimpleSubscriptionsOfUser(((OIDCAuthenticationToken) SecurityContextHolder.getContext().getAuthentication()).getUserInfo().getEmail());
    }
@ -83,7 +83,7 @@ public class BrokerController{
            consumes = MediaType.APPLICATION_JSON_VALUE,
            produces = MediaType.APPLICATION_JSON_VALUE)
    @ResponseBody
-    @PreAuthorize("hasAuthority('REGISTERED_USER') ")
+    @PreAuthorize("hasRole('ROLE_USER') ")
    public Subscription subscribe(@RequestBody OpenaireSubscription obj) throws BrokerException{
        return brokerService.subscribe(obj);
    }
@ -92,7 +92,7 @@ public class BrokerController{
            consumes = MediaType.APPLICATION_JSON_VALUE,
            produces = MediaType.APPLICATION_JSON_VALUE)
    @ResponseBody
-    @PreAuthorize("hasAuthority('REGISTERED_USER')")
+    @PreAuthorize("hasRole('ROLE_USER')")
    public ResponseEntity<Object> unsubscribe(@PathVariable("subscriptionId") String subscriptionId) throws BrokerException{
        return brokerService.unsubscribe(subscriptionId);
    }
@ -100,7 +100,7 @@ public class BrokerController{
    @RequestMapping(value = "/getSubscription/{subscriptionId}" , method = RequestMethod.GET,
            produces = MediaType.APPLICATION_JSON_VALUE)
    @ResponseBody
-    @PreAuthorize("hasAuthority('REGISTERED_USER')")
+    @PreAuthorize("hasRole('ROLE_USER')")
    public Subscription getSubscription(@PathVariable("subscriptionId") String subscriptionId) throws BrokerException{
        return brokerService.getSubscription(subscriptionId);
    }
@ -116,7 +116,7 @@ public class BrokerController{
    @RequestMapping(value = "/getNotificationsBySubscriptionId/{subscriptionId}/{page}/{size}" , method = RequestMethod.GET
            ,produces = MediaType.APPLICATION_JSON_VALUE)
    @ResponseBody
-    @PreAuthorize("hasAuthority('REGISTERED_USER')")
+    @PreAuthorize("hasRole('ROLE_USER')")
    public EventsPage getNotificationsBySubscriptionId(@PathVariable("subscriptionId") String subscriptionId,
                                                @PathVariable("page") String page,
                                                @PathVariable("size") String size) throws BrokerException{
--- a/src/main/java/eu/dnetlib/repo/manager/controllers/DashboardController.java
+++ b/src/main/java/eu/dnetlib/repo/manager/controllers/DashboardController.java
@ -1,14 +1,11 @@
 package eu.dnetlib.repo.manager.controllers;

-import eu.dnetlib.openaire.exporter.model.dsm.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.exception.BrokerException;
-import eu.dnetlib.repo.manager.exception.RepositoryServiceException;
-import eu.dnetlib.repo.manager.service.*;
-import io.swagger.v3.oas.annotations.tags.Tag;
+import eu.dnetlib.repo.manager.domain.*;
+import eu.dnetlib.repo.manager.service.BrokerService;
+import eu.dnetlib.repo.manager.service.DashboardService;
+import eu.dnetlib.repo.manager.service.PiWikService;
+import eu.dnetlib.repo.manager.service.RepositoryService;
+import io.swagger.annotations.Api;
 import org.json.JSONException;
 import org.mitre.openid.connect.model.OIDCAuthenticationToken;
 import org.springframework.beans.factory.annotation.Autowired;
@ -21,7 +18,7 @@ import java.util.List;

@RestController
@RequestMapping(value = "/dashboard")
-@Tag(name="dashboard", description = "Dashboard API")
+@Api(description = "Dashboard API",  tags = {"dashboard"})
 public class DashboardController {

    @Autowired
@ -30,67 +27,68 @@ public class DashboardController {
    @Autowired
    private RepositoryService repositoryService;

-    @Autowired
-    private AggregationService aggregationService;
-
    @Autowired
    private BrokerService brokerService;

    @Autowired
    private PiWikService piWikService;

-    @RequestMapping(value = "/getRepositoriesSummary/{page}/{size}", method = RequestMethod.GET,
+    @RequestMapping(value = "/getRepositoriesSummary/{page}/{size}" , method = RequestMethod.GET,
            produces = MediaType.APPLICATION_JSON_VALUE)
    @ResponseBody
-    @PreAuthorize("hasAuthority('REGISTERED_USER')")
+    @PreAuthorize("hasRole('ROLE_USER')")
    public List<RepositorySummaryInfo> getRepositoriesSummaryInfo(
-            @PathVariable("page") String page,
-            @PathVariable("size") String size) throws JSONException {
+                                                                  @PathVariable("page") String page,
+                                                                  @PathVariable("size") String size) throws JSONException {
        return dashboardService.getRepositoriesSummaryInfo(((OIDCAuthenticationToken) SecurityContextHolder.getContext().getAuthentication()).getUserInfo().getEmail(), page, size);
    }

-    @RequestMapping(value = "/collectionMonitorSummary/{repoId}", method = RequestMethod.GET,
+    @RequestMapping(value = "/collectionMonitorSummary/{repoId}" , method = RequestMethod.GET,
            produces = MediaType.APPLICATION_JSON_VALUE)
    @ResponseBody
-    @PreAuthorize("hasAuthority('REGISTERED_USER')")
+    @PreAuthorize("hasRole('ROLE_USER')")
    public CollectionMonitorSummary getCollectionMonitorSummary(
            @PathVariable("repoId") String repoId,
-            @RequestParam(name = "size", required = false, defaultValue = "20") int summarySize) throws JSONException {
-
-        List<AggregationInfo> aggregationInfoList = aggregationService.getRepositoryAggregations(repoId);
+            @RequestParam(name = "size", required = false, defaultValue = "20") int size) throws JSONException {

+        List<AggregationDetails> aggregationDetails = repositoryService.getRepositoryAggregations(repoId,0,size);
        CollectionMonitorSummary collectionMonitorSummary = new CollectionMonitorSummary();
-        // Set the "aggregationInfo" for the first <number of> requested aggregations, in order to create a "summary".
-        collectionMonitorSummary.setAggregationInfo(aggregationInfoList.subList(0, Math.min(summarySize, aggregationInfoList.size())));
-
-        // Search for the last indexed version and set the "collectionMonitorSummary".
-        for ( AggregationInfo aggregationInfo : aggregationInfoList ) {
-            if ( aggregationInfo.isIndexedVersion() ) {
-                collectionMonitorSummary.setLastIndexedVersion(aggregationInfo);
-                break;
+        collectionMonitorSummary.setAggregationDetails(aggregationDetails);
+        size=0;
+        do {
+            aggregationDetails = repositoryService.getRepositoryAggregations(repoId,size,size+50);
+            for(AggregationDetails aggregationDetail : aggregationDetails){
+                if(aggregationDetail.getIndexedVersion()){
+                    collectionMonitorSummary.setLastIndexedVersion(aggregationDetail);
+                    break;
+                }
            }
-        }
+            size+=30;
+        }while (aggregationDetails.size() != 0 && collectionMonitorSummary.getLastIndexedVersion()==null);

        return collectionMonitorSummary;
    }

-    @RequestMapping(value = "/usageSummary/{repoId}", method = RequestMethod.GET,
+    @RequestMapping(value = "/usageSummary/{repoId}" , method = RequestMethod.GET,
            produces = MediaType.APPLICATION_JSON_VALUE)
    @ResponseBody
-    @PreAuthorize("hasAuthority('REGISTERED_USER')")
+    @PreAuthorize("hasRole('ROLE_USER')")
    public UsageSummary getUsageSummary(
            @PathVariable("repoId") String repoId
    ) throws RepositoryServiceException {
        return new UsageSummary(repositoryService.getMetricsInfoForRepository(repoId), piWikService.getPiwikSiteForRepo(repoId));
    }

-    @RequestMapping(value = "/brokerSummary/{ds_name}", method = RequestMethod.GET,
+    @RequestMapping(value = "/brokerSummary/{ds_name}" , method = RequestMethod.GET,
            produces = MediaType.APPLICATION_JSON_VALUE)
    @ResponseBody
-    @PreAuthorize("hasAuthority('REGISTERED_USER')")
+    @PreAuthorize("hasRole('ROLE_USER')")
    public BrokerSummary getBrokerSummary(
            @PathVariable("ds_name") String datasourceName) throws BrokerException {
-        return new BrokerSummary(brokerService.getSimpleSubscriptionsOfUser(((OIDCAuthenticationToken) SecurityContextHolder.getContext().getAuthentication()).getUserInfo().getEmail()), brokerService.getTopicsForDatasource(datasourceName));
+        return new BrokerSummary(brokerService.getSimpleSubscriptionsOfUser( ((OIDCAuthenticationToken) SecurityContextHolder.getContext().getAuthentication()).getUserInfo().getEmail()), brokerService.getTopicsForDatasource(datasourceName));
    }

+
+
+
 }
--- a/src/main/java/eu/dnetlib/repo/manager/controllers/GenericControllerAdvice.java
+++ b/src/main/java/eu/dnetlib/repo/manager/controllers/GenericControllerAdvice.java
@ -2,13 +2,13 @@ package eu.dnetlib.repo.manager.controllers;


 import eu.dnetlib.api.functionality.ValidatorServiceException;
-import eu.dnetlib.repo.manager.exception.BrokerException;
+import eu.dnetlib.repo.manager.domain.BrokerException;
 import eu.dnetlib.repo.manager.exception.EndPointException;
 import eu.dnetlib.repo.manager.exception.ResourceNotFoundException;
 import eu.dnetlib.repo.manager.exception.ServerError;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
 import org.json.JSONException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
 import org.springframework.http.HttpStatus;
@ -26,42 +26,42 @@ import java.net.UnknownHostException;
@Order(Ordered.HIGHEST_PRECEDENCE)
 public class GenericControllerAdvice {

-    private Logger logger = LoggerFactory.getLogger(GenericControllerAdvice.class);
+    private Logger logger = LogManager.getLogger(GenericControllerAdvice.class);


    @ResponseStatus(HttpStatus.NOT_FOUND)
    @ExceptionHandler(ResourceNotFoundException.class)
    @ResponseBody
    public ServerError securityException(HttpServletRequest req, Exception ex) {
-        return new ServerError(req.getRequestURL().toString(), ex);
+        return new ServerError(req.getRequestURL().toString(),ex);
    }

    @ResponseStatus(HttpStatus.FORBIDDEN)
    @ExceptionHandler(AccessDeniedException.class)
    @ResponseBody
    public ServerError accessDeniedException(HttpServletRequest req, Exception ex) {
-        return new ServerError(req.getRequestURL().toString(), ex);
+        return new ServerError(req.getRequestURL().toString(),ex);
    }

    @ResponseStatus(HttpStatus.NOT_FOUND)
    @ExceptionHandler(UnknownHostException.class)
    @ResponseBody
    public ServerError unknownHostException(HttpServletRequest req, Exception ex) {
-        return new ServerError(req.getRequestURL().toString(), ex);
+        return new ServerError(req.getRequestURL().toString(),ex);
    }

    @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
-    @ExceptionHandler({JSONException.class, BrokerException.class, ValidatorServiceException.class})
+    @ExceptionHandler({JSONException.class,BrokerException.class,ValidatorServiceException.class})
    @ResponseBody
    public ServerError internalException(HttpServletRequest req, Exception ex) {
-        return new ServerError(req.getRequestURL().toString(), ex);
+        return new ServerError(req.getRequestURL().toString(),ex);
    }

    @ResponseStatus(HttpStatus.GATEWAY_TIMEOUT)
    @ExceptionHandler(EndPointException.class)
    @ResponseBody
    public ServerError endPointException(HttpServletRequest req, Exception ex) {
-        return new ServerError(req.getRequestURL().toString(), ex);
+        return new ServerError(req.getRequestURL().toString(),ex);
    }

 }
--- a/src/main/java/eu/dnetlib/repo/manager/controllers/InterfaceComplianceRequestController.java
+++ b/src/main/java/eu/dnetlib/repo/manager/controllers/InterfaceComplianceRequestController.java
@ -1,47 +0,0 @@
-package eu.dnetlib.repo.manager.controllers;
-
-import eu.dnetlib.repo.manager.domain.InterfaceComplianceRequest;
-import eu.dnetlib.repo.manager.domain.InterfaceComplianceRequestId;
-import eu.dnetlib.repo.manager.domain.dto.InterfaceComplianceRequestDTO;
-import eu.dnetlib.repo.manager.service.InterfaceComplianceService;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Date;
-
-@RestController
-@RequestMapping("compliance")
-public class InterfaceComplianceRequestController {
-
-    private final InterfaceComplianceService service;
-
-    public InterfaceComplianceRequestController(InterfaceComplianceService service) {
-        this.service = service;
-    }
-
-    @GetMapping("{repositoryId}/{interfaceId}")
-    public InterfaceComplianceRequest get(@PathVariable("repositoryId") String repositoryId, @PathVariable("interfaceId") String interfaceId) {
-        InterfaceComplianceRequestId id = new InterfaceComplianceRequestId();
-        id.setRepositoryId(repositoryId);
-        id.setInterfaceId(interfaceId);
-        return service.getById(id).orElse(null);
-    }
-
-    @GetMapping()
-    public Iterable<InterfaceComplianceRequest> get() {
-        return service.get();
-    }
-
-    @PostMapping()
-    public InterfaceComplianceRequest add(@RequestBody InterfaceComplianceRequestDTO requestDTO) {
-        requestDTO.setSubmissionDate(new Date());
-        return service.create(InterfaceComplianceRequest.from(requestDTO));
-    }
-
-    @DeleteMapping("{repositoryId}/{interfaceId}")
-    public void delete(@PathVariable("repositoryId") String repositoryId, @PathVariable("interfaceId") String interfaceId) {
-        InterfaceComplianceRequestId id = new InterfaceComplianceRequestId();
-        id.setRepositoryId(repositoryId);
-        id.setInterfaceId(interfaceId);
-        this.service.delete(id);
-    }
-}
--- a/src/main/java/eu/dnetlib/repo/manager/controllers/MonitorController.java
+++ b/src/main/java/eu/dnetlib/repo/manager/controllers/MonitorController.java
@ -4,12 +4,11 @@ import eu.dnetlib.api.functionality.ValidatorServiceException;
 import eu.dnetlib.domain.functionality.validator.StoredJob;
 import eu.dnetlib.repo.manager.domain.JobsOfUser;
 import eu.dnetlib.repo.manager.service.MonitorServiceImpl;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import org.apache.log4j.Logger;
 import org.json.JSONException;
 import org.mitre.openid.connect.model.OIDCAuthenticationToken;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
@ -18,10 +17,11 @@ import org.springframework.web.bind.annotation.*;

@RestController
@RequestMapping(value = "/monitor")
-@Tag(name="monitor", description="Monitor API")
+@Api(description = "Monitor API",  tags = {"monitor"})
 public class MonitorController {

-    private static final Logger logger = LoggerFactory.getLogger(MonitorController.class);
+    private static final Logger LOGGER = Logger
+            .getLogger(MonitorController.class);

    @Autowired
    private MonitorServiceImpl monitorService;
@ -29,21 +29,21 @@ public class MonitorController {
    @RequestMapping(value = "/getJobsOfUser" , method = RequestMethod.GET,
            produces = MediaType.APPLICATION_JSON_VALUE)
    @ResponseBody
-    @PreAuthorize("hasAuthority('REGISTERED_USER')")
+    @PreAuthorize("hasRole('ROLE_USER')")
    public JobsOfUser getJobsOfUser(@RequestParam(value = "jobType", required = false)
-                                    @Parameter(description = "Equals to filter job type on validation history page") String jobType,
-                                    @RequestParam("offset") @Parameter(name = "Page number", required = true) String offset,
-                                    @RequestParam(value = "limit", required = false,defaultValue = "10") @Parameter(description = "Null value") String limit,
-                                    @RequestParam(value = "dateFrom", required = false) @Parameter(description = "Null value") String dateFrom,
-                                    @RequestParam(value = "dateTo", required = false) @Parameter(description = "Null value") String dateTo,
-                                    @RequestParam("validationStatus") @Parameter(description = "Equals to filter validation jobs", required = false) String validationStatus,
-                                    @RequestParam("includeJobsTotal") @Parameter(description = "Always true", required = true) String includeJobsTotal) throws JSONException, ValidatorServiceException {
+                                    @ApiParam(value = "Equals to filter job type on validation history page") String jobType,
+                                    @RequestParam("offset") @ApiParam(value = "Page number", required = true) String offset,
+                                    @RequestParam(value = "limit", required = false,defaultValue = "10") @ApiParam(value = "Null value") String limit,
+                                    @RequestParam(value = "dateFrom", required = false) @ApiParam(value = "Null value") String dateFrom,
+                                    @RequestParam(value = "dateTo", required = false) @ApiParam(value = "Null value") String dateTo,
+                                    @RequestParam("validationStatus") @ApiParam(value = "Equals to filter validation jobs", required = false) String validationStatus,
+                                    @RequestParam("includeJobsTotal") @ApiParam(value = "Always true", required = true) String includeJobsTotal) throws JSONException, ValidatorServiceException {
        return monitorService.getJobsOfUser(((OIDCAuthenticationToken) SecurityContextHolder.getContext().getAuthentication()).getUserInfo().getEmail(), jobType, offset, limit, dateFrom, dateTo, validationStatus, includeJobsTotal);
    }

    @RequestMapping(value = "/getJobsOfUserPerValidationStatus" , method = RequestMethod.GET,produces = MediaType.APPLICATION_JSON_VALUE)
    @ResponseBody
-    @PreAuthorize("hasAuthority('REGISTERED_USER')")
+    @PreAuthorize("hasRole('ROLE_USER')")
    public int getJobsOfUserPerValidationStatus(@RequestBody String jobType,
                                                @RequestBody String validationStatus) throws JSONException {
        return monitorService.getJobsOfUserPerValidationStatus(((OIDCAuthenticationToken) SecurityContextHolder.getContext().getAuthentication()).getUserInfo().getEmail(), jobType, validationStatus);
--- a/src/main/java/eu/dnetlib/repo/manager/controllers/PiWikController.java
+++ b/src/main/java/eu/dnetlib/repo/manager/controllers/PiWikController.java
@ -4,13 +4,13 @@ import eu.dnetlib.domain.data.PiwikInfo;
 import eu.dnetlib.repo.manager.domain.OrderByField;
 import eu.dnetlib.repo.manager.domain.OrderByType;
 import eu.dnetlib.repo.manager.domain.Paging;
-import eu.dnetlib.repo.manager.exception.RepositoryServiceException;
+import eu.dnetlib.repo.manager.domain.RepositoryServiceException;
 import eu.dnetlib.repo.manager.service.PiWikServiceImpl;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import eu.dnetlib.repo.manager.service.RepositoryService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.http.MediaType;
@ -31,49 +31,44 @@ import java.util.List;

@RestController
@RequestMapping(value = "/piwik")
-@Tag(name="piwik", description = "Piwik API")
+@Api(description = "Piwik API",  tags = {"piwik"})
 public class PiWikController {

-    private static final Logger logger = LoggerFactory.getLogger(PiWikController.class);
+    private static final Logger LOGGER = Logger
+            .getLogger(PiWikController.class);

    @Autowired
    private PiWikServiceImpl piWikService;

-    @RequestMapping(value = "/validated", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-    @ResponseBody
-    public Boolean isPiwikValidated(@RequestParam("repositoryId") String repositoryId) {
-        PiwikInfo info = piWikService.getPiwikSiteForRepo(repositoryId);
-        if (info != null) {
-            return info.isValidated();
-        }
-        return false;
-    }
+    @Autowired
+    private RepositoryService repositoryService;
+

    @RequestMapping(value = "/getPiwikSiteForRepo/{repositoryId}" , method = RequestMethod.GET,produces = MediaType.APPLICATION_JSON_VALUE)
    @ResponseBody
-    @PreAuthorize("hasAnyAuthority('SUPER_ADMINISTRATOR', 'CONTENT_PROVIDER_DASHBOARD_ADMINISTRATOR') or @authorizationService.isMemberOf(#repositoryId) or (@repositoryService.getRepositoryById(#repositoryId).registeredby==null and hasAuthority('REGISTERED_USER'))")
+    @PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_PROVIDE_ADMIN') or ((@repositoryService.getRepositoryById(#repositoryId).registeredBy==authentication.userInfo.email or @repositoryService.getRepositoryById(#repositoryId).registeredBy=='null') and hasRole('ROLE_USER'))")
    public PiwikInfo getPiwikSiteForRepo(@PathVariable("repositoryId") String repositoryId) {
        return piWikService.getPiwikSiteForRepo(repositoryId);
    }

    @RequestMapping(value = "/savePiwikInfo" , method = RequestMethod.POST,produces = MediaType.APPLICATION_JSON_VALUE)
-    @PreAuthorize("hasAnyAuthority('SUPER_ADMINISTRATOR', 'CONTENT_PROVIDER_DASHBOARD_ADMINISTRATOR') or @authorizationService.isMemberOf(#piwikInfo.repositoryId) or (@repositoryService.getRepositoryById(#piwikInfo.repositoryId).registeredby==null and hasAuthority('REGISTERED_USER'))")
+    @PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_PROVIDE_ADMIN') or ((@repositoryService.getRepositoryById(#piwikInfo.repositoryId).registeredBy==authentication.userInfo.email or @repositoryService.getRepositoryById(#piwikInfo.repositoryId).registeredBy=='null') and hasRole('ROLE_USER'))")
    public PiwikInfo savePiwikInfo(@RequestBody PiwikInfo piwikInfo) {
        return piWikService.savePiwikInfo(piwikInfo);
    }

    @RequestMapping(value = "/getPiwikSitesForRepos" , method = RequestMethod.GET,produces = MediaType.APPLICATION_JSON_VALUE)
-    @Parameters({
-            @Parameter(name = "from", description = "number"),
-            @Parameter(name = "quantity", description = "number"),
-            @Parameter(name = "order", description = "eu.dnetlib.repo.manager.domain.OrderByType"),
-            @Parameter(name = "orderField", description = "eu.dnetlib.repo.manager.domain.OrderByField"),
-            @Parameter(name = "searchField", description = "string")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "from", dataType = "number", paramType = "query"),
+            @ApiImplicitParam(name = "quantity", dataType = "number", paramType = "query"),
+            @ApiImplicitParam(name = "order", dataType = "eu.dnetlib.repo.manager.domain.OrderByType", paramType = "query"),
+            @ApiImplicitParam(name = "orderField", dataType = "eu.dnetlib.repo.manager.domain.OrderByField", paramType = "query"),
+            @ApiImplicitParam(name = "searchField", dataType = "string", paramType = "query"),
    })
    public Paging<PiwikInfo> getPiwikSitesForRepos(
-            @RequestParam(value = "from", required=false, defaultValue = "0") int from,
-            @RequestParam(value = "quantity", required=false, defaultValue = "100") int quantity,
-            @RequestParam(value = "order", required=false, defaultValue = "DSC") OrderByType orderType,
+            @RequestParam(value = "from",required=false,defaultValue = "0") int from,
+            @RequestParam(value = "quantity",required=false,defaultValue = "100") int quantity,
+            @RequestParam(value = "order",required=false,defaultValue = "DSC") OrderByType orderType,
            @RequestParam(value = "orderField", required = false, defaultValue = "REPOSITORY_NAME") OrderByField orderField,
            @RequestParam(value = "searchField", required = false, defaultValue = "") String searchField

@ -86,13 +81,12 @@ public class PiWikController {
        results.setResults(returning);
        return results;
    }
-
-    @Parameters({
-            @Parameter(name = "from", description = "number"),
-            @Parameter(name = "quantity", description = "number"),
-            @Parameter(name = "order", description = "eu.dnetlib.repo.manager.domain.OrderByType"),
-            @Parameter(name = "searchField", description = "eu.dnetlib.repo.manager.domain.OrderByField"),
-            @Parameter(name = "orderField", description = "string")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "from", dataType = "number", paramType = "query"),
+            @ApiImplicitParam(name = "quantity", dataType = "number", paramType = "query"),
+            @ApiImplicitParam(name = "order", dataType = "eu.dnetlib.repo.manager.domain.OrderByType", paramType = "query"),
+            @ApiImplicitParam(name = "searchField", dataType = "eu.dnetlib.repo.manager.domain.OrderByField", paramType = "query"),
+            @ApiImplicitParam(name = "orderField", dataType = "string", paramType = "query"),
    })
    @RequestMapping(value = "/getPiwikSitesForRepos/csv" , method = RequestMethod.GET,produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
    @ResponseBody
@ -114,22 +108,25 @@ public class PiWikController {
            sb.append(" Repository ID , Repository name, Country, Site ID, Authentication token, Creation date, Requestor full name, Requestor email, Validated, Validation date, Comment \n");

            for(PiwikInfo piwikInfo : returning){
-                sb.append(piwikInfo.getRepositoryId() == null ? "," : piwikInfo.getRepositoryId() + ",")
-                        .append(piwikInfo.getRepositoryName() == null ? "," : piwikInfo.getRepositoryName() + ",")
-                        .append(piwikInfo.getCountry() == null ? "," : piwikInfo.getCountry() + ",")
-                        .append(piwikInfo.getSiteId() == null ? "," : piwikInfo.getSiteId() + ",")
-                        .append(piwikInfo.getAuthenticationToken() == null ? "," : piwikInfo.getAuthenticationToken() + ",")
-                        .append(piwikInfo.getCreationDate() == null ? "," : piwikInfo.getCreationDate().toString() + ",")
-                        .append(piwikInfo.getRequestorName() == null ? "," : piwikInfo.getRequestorName() + ",")
-                        .append(piwikInfo.getRequestorEmail() == null ? "," : piwikInfo.getRequestorEmail() + ",")
-                        .append(piwikInfo.isValidated()).append(",")
-                        .append(piwikInfo.getValidationDate() == null ? "," : piwikInfo.getValidationDate().toString() + ",")
-                        .append(piwikInfo.getComment() == null ? "\n" : piwikInfo.getComment() + "\n");
+                sb.append(
+                        (piwikInfo.getRepositoryId() == null ? "," : piwikInfo.getRepositoryId()+ ",")+
+                                (piwikInfo.getRepositoryName() == null ? "," : piwikInfo.getRepositoryName()+ ",")+
+                                (piwikInfo.getCountry() == null ? "," : piwikInfo.getCountry()+ ",")+
+                                (piwikInfo.getSiteId() == null ? "," : piwikInfo.getSiteId()+ ",") +
+                                (piwikInfo.getAuthenticationToken() == null ? "," : piwikInfo.getAuthenticationToken()+ ",")+
+                                (piwikInfo.getCreationDate() == null ? "," : piwikInfo.getCreationDate().toString()+ ",") +
+                                (piwikInfo.getRequestorName() == null ? "," : piwikInfo.getRequestorName()+ ",") +
+                                (piwikInfo.getRequestorEmail() == null ? "," : piwikInfo.getRequestorEmail()+ ",")+
+                                piwikInfo.isValidated() + "," +
+                                (piwikInfo.getValidationDate() == null ? "," : piwikInfo.getValidationDate().toString()+ ",") +
+                                (piwikInfo.getComment() == null ? "\n" : piwikInfo.getComment()+ "\n")
+
+                );
            }
            writer.write(sb.toString());

        } catch (FileNotFoundException e) {
-            logger.error(e.getMessage());
+            LOGGER.error(e.getMessage());
        }


@ -149,6 +146,7 @@ public class PiWikController {
                strDate);
        response.setHeader(headerKey, headerValue);

+
        return new FileSystemResource(p.toFile());

    }
@ -156,14 +154,14 @@ public class PiWikController {

    @RequestMapping(value = "/approvePiwikSite/{repositoryId}" , method = RequestMethod.GET)
    @ResponseBody
-    @PreAuthorize("hasAuthority('SUPER_ADMINISTRATOR') or hasAuthority('CONTENT_PROVIDER_DASHBOARD_ADMINISTRATOR')")
+    @PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_PROVIDE_ADMIN')")
    public ResponseEntity<Object> approvePiwikSite(@PathVariable("repositoryId") String repositoryId) {
        return piWikService.approvePiwikSite(repositoryId);
    }

    @RequestMapping(value = "/getOpenaireId/{repositoryId}" , method = RequestMethod.GET,produces = MediaType.APPLICATION_JSON_VALUE)
    @ResponseBody
-    @PreAuthorize("hasAnyAuthority('SUPER_ADMINISTRATOR', 'CONTENT_PROVIDER_DASHBOARD_ADMINISTRATOR') or @authorizationService.isMemberOf(#repositoryId) or (@repositoryService.getRepositoryById(#repositoryId).registeredby==null and hasAuthority('REGISTERED_USER'))")
+    @PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_PROVIDE_ADMIN') or ((@repositoryService.getRepositoryById(#repositoryId).registeredBy==authentication.userInfo.email or @repositoryService.getRepositoryById(#repositoryId).registeredBy=='null') and hasRole('ROLE_USER'))")
    public String getOpenaireId(@PathVariable("repositoryId") String repositoryId){
        return piWikService.getOpenaireId(repositoryId);
    }
@ -171,14 +169,14 @@ public class PiWikController {
    @RequestMapping(value = "/markPiwikSiteAsValidated/{repositoryId}" , method = RequestMethod.POST,
            consumes = MediaType.APPLICATION_JSON_VALUE)
    @ResponseBody
-    @PreAuthorize("hasAuthority('SUPER_ADMINISTRATOR') or hasAuthority('CONTENT_PROVIDER_DASHBOARD_ADMINISTRATOR')")
+    @PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_PROVIDE_ADMIN')")
    public ResponseEntity<Object> markPiwikSiteAsValidated(@PathVariable("repositoryId") String repositoryId) throws RepositoryServiceException {
        return piWikService.markPiwikSiteAsValidated(repositoryId);
    }

    @RequestMapping(value = "/enableMetricsForRepository", method = RequestMethod.POST,
            consumes = MediaType.APPLICATION_JSON_VALUE)
-    @PreAuthorize("hasAuthority('SUPER_ADMINISTRATOR') or hasAuthority('CONTENT_PROVIDER_DASHBOARD_ADMINISTRATOR') or (hasAuthority('REGISTERED_USER') and #piwikInfo.requestorEmail == authentication.userInfo.email)")
+    @PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_PROVIDE_ADMIN') or (hasRole('ROLE_USER') and #piwikInfo.requestorEmail == authentication.userInfo.email)")
    public PiwikInfo enableMetricsForRepository(@RequestParam("officialName") String officialName,
                                                @RequestParam("repoWebsite") String repoWebsite,
                                                @RequestBody PiwikInfo piwikInfo) throws RepositoryServiceException {
--- a/src/main/java/eu/dnetlib/repo/manager/controllers/PrometheusController.java
+++ b/src/main/java/eu/dnetlib/repo/manager/controllers/PrometheusController.java
@ -1,66 +0,0 @@
-package eu.dnetlib.repo.manager.controllers;
-
-import eu.dnetlib.repo.manager.service.PiWikService;
-import eu.dnetlib.repo.manager.service.RepositoryService;
-import io.micrometer.core.instrument.binder.jvm.DiskSpaceMetrics;
-import io.micrometer.core.instrument.binder.jvm.JvmGcMetrics;
-import io.micrometer.core.instrument.binder.jvm.JvmMemoryMetrics;
-import io.micrometer.core.instrument.binder.jvm.JvmThreadMetrics;
-import io.micrometer.core.instrument.binder.system.ProcessorMetrics;
-import io.micrometer.core.instrument.binder.system.UptimeMetrics;
-import io.micrometer.prometheus.PrometheusConfig;
-import io.micrometer.prometheus.PrometheusMeterRegistry;
-import io.prometheus.client.exporter.common.TextFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.io.File;
-
-
-@RestController
-@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;
-    private final RepositoryService repositoryService;
-
-    @Autowired
-    public PrometheusController(PiWikService piWikService, RepositoryService repositoryService) {
-        this.piWikService = piWikService;
-        this.repositoryService = repositoryService;
-    }
-
-    @RequestMapping(method = RequestMethod.GET)
-    public String getPiwikMetrics() {
-        PrometheusMeterRegistry registry = new PrometheusMeterRegistry(PrometheusConfig.DEFAULT);
-        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);
-    }
-
-    @RequestMapping(method = RequestMethod.GET, path = "metrics", produces = MediaType.TEXT_PLAIN_VALUE)
-    public String getMetrics() {
-        PrometheusMeterRegistry registry = new PrometheusMeterRegistry(PrometheusConfig.DEFAULT);
-        new JvmThreadMetrics().bindTo(registry);
-        try (JvmGcMetrics jvmGcMetrics = new JvmGcMetrics() ) {
-            jvmGcMetrics.bindTo(registry);
-        } catch (Exception e) {
-            logger.error("", e);
-        }
-        new JvmMemoryMetrics().bindTo(registry);
-        new DiskSpaceMetrics(new File("/")).bindTo(registry);
-        new ProcessorMetrics().bindTo(registry); // metrics related to the CPU stats
-        new UptimeMetrics().bindTo(registry);
-
-        return registry.scrape(TextFormat.CONTENT_TYPE_OPENMETRICS_100);
-    }
-
-}
--- a/src/main/java/eu/dnetlib/repo/manager/controllers/RepositoryController.java
+++ b/src/main/java/eu/dnetlib/repo/manager/controllers/RepositoryController.java
@ -1,64 +1,37 @@
 package eu.dnetlib.repo.manager.controllers;

-import eu.dnetlib.domain.data.PiwikInfo;
-import eu.dnetlib.openaire.exporter.model.dsm.AggregationInfo;
+import eu.dnetlib.domain.data.Repository;
+import eu.dnetlib.domain.data.RepositoryInterface;
 import eu.dnetlib.repo.manager.domain.*;
-import eu.dnetlib.repo.manager.domain.dto.RepositoryTerms;
-import eu.dnetlib.repo.manager.domain.dto.User;
-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.RepositoryService;
-import eu.dnetlib.repo.manager.service.security.AuthorizationService;
-import eu.dnetlib.repo.manager.utils.JsonUtils;
-import io.swagger.v3.oas.annotations.tags.Tag;
+import eu.dnetlib.repo.manager.service.RepositoryServiceImpl;
+import io.swagger.annotations.Api;
+import org.apache.log4j.Logger;
 import org.json.JSONException;
 import org.mitre.openid.connect.model.OIDCAuthenticationToken;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PostAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.web.bind.annotation.*;

-import javax.ws.rs.core.Response;
-import java.util.Date;
+import java.io.IOException;
 import java.util.List;
 import java.util.Map;

@RestController
-@RequestMapping(value = "/repositories")
-@Tag(name="repositories", description="Repository API")
+@RequestMapping(value = "/repository")
+@Api(description = "Repository API",  tags = {"repository"})
 public class RepositoryController {

-    private static final Logger logger = LoggerFactory.getLogger(RepositoryController.class);
-
-    private final RepositoryService repositoryService;
-
-    private final AggregationService aggregationService;
-
-    private final AuthorizationService authorizationService;
-
-    private final PiWikService piWikService;
+    private static Logger logger = Logger.getLogger(RepositoryController.class);

    @Autowired
-    RepositoryController(RepositoryService repositoryService,
-                         AggregationService aggregationService,
-                         AuthorizationService authorizationService,
-                         PiWikService piWikService) {
-        this.repositoryService = repositoryService;
-        this.aggregationService = aggregationService;
-        this.authorizationService = authorizationService;
-        this.piWikService = piWikService;
-    }
+    private RepositoryServiceImpl repositoryService;

-    @RequestMapping(value = "/countries", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+    @RequestMapping(value = "/getCountries", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
    @ResponseBody
    public Country[] getCountries() {
        return repositoryService.getCountries();
@ -69,48 +42,32 @@ public class RepositoryController {
    @ResponseBody
    public List<RepositorySnippet> getRepositoriesByCountry(@PathVariable("country") String country,
                                                            @PathVariable("mode") String mode,
-                                                            @RequestParam(value = "managed", required = false) Boolean managed) {
+                                                            @RequestParam(value = "managed",required=false) Boolean managed) throws JSONException, IOException {
        return repositoryService.getRepositoriesByCountry(country, mode, managed);
    }

-    @RequestMapping(value = "/snippets/user", method = RequestMethod.GET,
+    @RequestMapping(value = "/getRepositoriesOfUser/{page}/{size}",method = RequestMethod.GET,
            produces = MediaType.APPLICATION_JSON_VALUE)
    @ResponseBody
-    @PreAuthorize("hasAuthority('REGISTERED_USER')")
-    public List<RepositorySnippet> getRepositoriesSnippetsOfUser(@RequestParam(name = "page", defaultValue = "0") int page,
-                                                                 @RequestParam(name = "size", defaultValue = "1000") int pageSize) throws Exception {
-        return repositoryService.getRepositoriesSnippetsOfUser(String.valueOf(page), String.valueOf(pageSize));
+    @PreAuthorize("hasRole('ROLE_USER')")
+    public List<RepositorySnippet> getRepositoriesOfUser(
+                                                  @PathVariable("page") String page,
+                                                  @PathVariable("size") String size) throws JSONException, IOException {
+       return repositoryService.getRepositoriesSnippetOfUser(((OIDCAuthenticationToken) SecurityContextHolder.getContext().getAuthentication()).getUserInfo().getEmail(), page, size);
    }

-    @RequestMapping(value = "/terms", method = RequestMethod.POST,
+    @RequestMapping(value = "/searchRegisteredRepositories/{page}/{size}",method = RequestMethod.GET,
            produces = MediaType.APPLICATION_JSON_VALUE)
    @ResponseBody
-    @PreAuthorize("hasAuthority('REGISTERED_USER')")
-    public void updateRepositoriesTerms(@RequestBody List<RepositoryTerms> repositoriesTerms) throws Exception {
-        Date date = new Date();
-        if (repositoriesTerms != null) {
-            for (RepositoryTerms terms : repositoriesTerms) {
-                Repository repository = repositoryService.getRepositoryById(terms.getId());
-                repository.setConsentTermsOfUse(terms.getConsentTermsOfUse());
-                repository.setFullTextDownload(terms.getFullTextDownload());
-                repository.setLastConsentTermsOfUseDate(date);
-                repositoryService.updateRepository(repository, SecurityContextHolder.getContext().getAuthentication());
-            }
-        }
-    }
-
-    @RequestMapping(value = "/searchRegisteredRepositories/{page}/{size}", method = RequestMethod.GET,
-            produces = MediaType.APPLICATION_JSON_VALUE)
-    @ResponseBody
-    @PreAuthorize("hasAuthority('SUPER_ADMINISTRATOR') or hasAuthority('CONTENT_PROVIDER_DASHBOARD_ADMINISTRATOR')")
-    public List<RepositorySnippet> searchRegisteredRepositories(@RequestParam(name = "country", required = false) String country,
-                                                                @RequestParam(name = "typology", required = false) String typology,
-                                                                @RequestParam(name = "englishName", required = false) String englishName,
-                                                                @RequestParam(name = "officialName", required = false) String officialName,
+    @PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_PROVIDE_ADMIN')")
+    public List<RepositorySnippet> searchRegisteredRepositories(@RequestParam(name="country", required=false) String country,
+                                                                @RequestParam(name="typology", required=false) String typology,
+                                                                @RequestParam(name="englishName", required=false) String englishName,
+                                                                @RequestParam(name="officialName", required=false) String officialName,
                                                                @RequestParam("requestSortBy") String requestSortBy,
                                                                @RequestParam("order") String order,
                                                                @PathVariable("page") int page,
-                                                                @PathVariable("size") int pageSize) {
+                                                                @PathVariable("size") int pageSize) throws Exception {

        return repositoryService.searchRegisteredRepositories(country, typology, englishName, officialName, requestSortBy, order, page, pageSize);
    }
@ -118,29 +75,29 @@ public class RepositoryController {
    @RequestMapping(value = "/getRepositoryById/{id}", method = RequestMethod.GET,
            produces = MediaType.APPLICATION_JSON_VALUE)
    @ResponseBody
-    @PostAuthorize("hasAnyAuthority('SUPER_ADMINISTRATOR', 'CONTENT_PROVIDER_DASHBOARD_ADMINISTRATOR') or @authorizationService.isMemberOf(#id) or (returnObject.registeredby==null and hasAuthority('REGISTERED_USER'))")
-    public Repository getRepositoryById(@PathVariable("id") String id) throws ResourceNotFoundException {
+    @PostAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_PROVIDE_ADMIN') or ((returnObject.registeredBy=='null' or returnObject.registeredBy==authentication.userInfo.email) and hasRole('ROLE_USER'))")
+    public Repository getRepositoryById(@PathVariable("id") String id) throws JSONException,ResourceNotFoundException {
        Repository repo = repositoryService.getRepositoryById(id);

-        if (repo != null)
-            logger.info("Returning repository {} registered by {}", repo.getId(), repo.getRegisteredby());
-        else
-            logger.info("Requested repository {} not found", id);
+	if (repo != null)
+        	logger.info("Returning repository " + repo.getId() + " registered by " + repo.getRegisteredBy());
+	else
+		logger.info("Requested repository " + id  + " not found");
        return repo;
    }

    @RequestMapping(value = "/getRepositoryAggregations/{id}", method = RequestMethod.GET,
            produces = MediaType.APPLICATION_JSON_VALUE)
    @ResponseBody
-    public List<AggregationInfo> getRepositoryAggregations(@PathVariable("id") String id) throws JSONException {
-        return aggregationService.getRepositoryAggregations(id, 0, 20);
+    public List<AggregationDetails> getRepositoryAggregations(@PathVariable("id") String id) throws JSONException {
+        return repositoryService.getRepositoryAggregations(id,0,20);
    }

    @RequestMapping(value = "/getRepositoryAggregationsByYear/{id}", method = RequestMethod.GET,
            produces = MediaType.APPLICATION_JSON_VALUE)
    @ResponseBody
-    public Map<String, List<AggregationInfo>> getRepositoryAggregationsByYear(@PathVariable("id") String id) throws JSONException {
-        return aggregationService.getRepositoryAggregationsByYear(id);
+    public Map<String, List<AggregationDetails>> getRepositoryAggregationsByYear(@PathVariable("id") String id) throws JSONException {
+        return repositoryService.getRepositoryAggregationsByYear(id);
    }

    @RequestMapping(value = "/getRepositoriesByName/{name:.+}/{page}/{size}/", method = RequestMethod.GET,
@ -148,180 +105,128 @@ public class RepositoryController {
    @ResponseBody
    public List<Repository> getRepositoriesByName(@PathVariable("name") String name,
                                                  @PathVariable("page") String page,
-                                                  @PathVariable("size") String size) {
+                                                  @PathVariable("size") String size) throws JSONException {
        return repositoryService.getRepositoriesByName(name, page, size);
    }

    @RequestMapping(value = "/getRepositoryInterface/{id}", method = RequestMethod.GET,
            produces = MediaType.APPLICATION_JSON_VALUE)
    @ResponseBody
-    @PostAuthorize("hasAuthority('SUPER_ADMINISTRATOR') or hasAuthority('CONTENT_PROVIDER_DASHBOARD_ADMINISTRATOR') or @authorizationService.isMemberOf(#id) or (@repositoryService.getRepositoryById(#id).registeredby==null and hasAuthority('REGISTERED_USER'))")
-    public List<RepositoryInterface> getRepositoryInterface(@PathVariable("id") String id) {
+    @PostAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_PROVIDE_ADMIN') or ((@repositoryService.getRepositoryById(#id).registeredBy==authentication.userInfo.email or @repositoryService.getRepositoryById(#id).registeredBy=='null' ) and hasRole('ROLE_USER'))")
+    public List<RepositoryInterface> getRepositoryInterface(@PathVariable("id") String id) throws JSONException {
        return repositoryService.getRepositoryInterface(id);
    }

    @RequestMapping(value = "/addRepository", method = RequestMethod.POST,
            consumes = MediaType.APPLICATION_JSON_VALUE)
    @ResponseBody
-//    @PreAuthorize("hasAuthority('SUPER_ADMINISTRATOR') or hasAuthority('CONTENT_PROVIDER_DASHBOARD_ADMINISTRATOR') or (hasAuthority(@authorizationService.convertRepoIdToRoleId(#repository.id)) or hasAuthority(@authorizationService.convertRepoIdToRoleId(returnObject.id)))")
-    @PreAuthorize("hasAuthority('SUPER_ADMINISTRATOR') or hasAuthority('CONTENT_PROVIDER_DASHBOARD_ADMINISTRATOR') or hasAuthority('REGISTERED_USER')")
+    @PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_PROVIDE_ADMIN') or ((#repository.registeredBy==authentication.userInfo.email or returnObject.registeredBy=='null') and hasRole('ROLE_USER'))")
    public Repository addRepository(@RequestParam("datatype") String datatype,
-                                    @RequestBody Repository repository) {
+                                    @RequestBody Repository repository) throws Exception {

        return repositoryService.addRepository(datatype, repository);
    }

-    @Deprecated
    @RequestMapping(value = "/getDnetCountries", method = RequestMethod.GET,
            produces = MediaType.APPLICATION_JSON_VALUE)
    @ResponseBody
-    public List<String> getDnetCountries() {
+    public List<String> getDnetCountries(){
        return repositoryService.getDnetCountries();
    }

-    @Deprecated
    @RequestMapping(value = "/getTypologies", method = RequestMethod.GET,
            produces = MediaType.APPLICATION_JSON_VALUE)
    @ResponseBody
-    public List<String> getTypologies() {
+    public List<String> getTypologies(){
        return repositoryService.getTypologies();
    }

-    @Deprecated
    @RequestMapping(value = "/getTimezones", method = RequestMethod.GET,
            produces = MediaType.APPLICATION_JSON_VALUE)
    @ResponseBody
-    public List<Timezone> getTimezones() {
+    public List<Timezone> getTimezones(){
        return repositoryService.getTimezones();
    }

    @RequestMapping(value = "/updateRepository", method = RequestMethod.POST,
            consumes = MediaType.APPLICATION_JSON_VALUE)
    @ResponseBody
-    @PreAuthorize("hasAuthority('SUPER_ADMINISTRATOR') or hasAuthority('CONTENT_PROVIDER_DASHBOARD_ADMINISTRATOR') or @authorizationService.isMemberOf(#repository.id)")
-    public Repository updateRepository(@RequestBody Repository repository, Authentication authentication) {
+    @PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_PROVIDE_ADMIN') or ((#repository.registeredBy==authentication.userInfo.email or #repository.registeredBy=='null') and hasRole('ROLE_USER'))")
+    public Repository updateRepository(@RequestBody Repository repository,Authentication authentication) throws Exception {
        return repositoryService.updateRepository(repository, authentication);
    }

    @RequestMapping(value = "/deleteInterface/", method = RequestMethod.DELETE)
-    @PreAuthorize("hasAuthority('SUPER_ADMINISTRATOR') or hasAuthority('CONTENT_PROVIDER_DASHBOARD_ADMINISTRATOR') or @authorizationService.isMemberOfInterface(#id)")
-    public void deleteRepositoryInterface(@RequestParam("id") String id,
-                                          @RequestParam("registeredBy") String registeredBy) {
-//        repositoryService.deleteRepositoryInterface(id, registeredBy);
-        logger.warn("User attempted delete on Interface with ID: {}", id);
+    @PreAuthorize("hasRole('ROLE_USER') and #registeredBy == authentication.userInfo.email")
+    public void deleteRepositoryInterface(@RequestParam("id") String id ,
+                                          @RequestParam("registeredBy") String registeredBy){
+        repositoryService.deleteRepositoryInterface(id, registeredBy);
    }

    @RequestMapping(value = "/addInterface", method = RequestMethod.POST,
            consumes = MediaType.APPLICATION_JSON_VALUE)
    @ResponseBody
-    @PreAuthorize("hasAuthority('SUPER_ADMINISTRATOR') or hasAuthority('CONTENT_PROVIDER_DASHBOARD_ADMINISTRATOR') or @authorizationService.isMemberOf(#id)")
+    @PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_PROVIDE_ADMIN') or ((@repositoryService.getRepositoryById(#repoId).registeredBy==authentication.userInfo.email or @repositoryService.getRepositoryById(#repoId).registeredBy=='null') and hasRole('ROLE_USER'))")
    public RepositoryInterface addRepositoryInterface(@RequestParam("datatype") String datatype,
-                                                      @RequestParam("repoId") String id,
-                                                      @RequestParam(required = false, name = "desiredCompatibilityLevel") String desiredCompatibilityLevel,
-                                                      @RequestParam(value = "comment", required = false) String comment,
+                                                      @RequestParam("repoId") String repoId,
+                                                      @RequestParam("registeredBy") String registeredBy,
                                                      @RequestBody RepositoryInterface repositoryInterface) throws Exception {
-        return repositoryService.addRepositoryInterface(datatype, id, comment, repositoryInterface, desiredCompatibilityLevel);
+        return repositoryService.addRepositoryInterface(datatype, repoId, registeredBy, repositoryInterface);
+    }
+
+    @RequestMapping(value = "/getUrlsOfUserRepos/{page}/{size}/",method = RequestMethod.GET,
+            produces = MediaType.APPLICATION_JSON_VALUE)
+    @ResponseBody
+    @PreAuthorize("hasRole('ROLE_USER')")
+    public List<String> getUrlsOfUserRepos(
+                                           @PathVariable("page") String page,
+                                           @PathVariable("size") String size) throws JSONException {
+        return repositoryService.getUrlsOfUserRepos(((OIDCAuthenticationToken) SecurityContextHolder.getContext().getAuthentication()).getUserInfo().getEmail(), page, size);
+    }
+
+    @RequestMapping(value = "/getDatasourceVocabularies/{mode}",method = RequestMethod.GET,
+            produces = MediaType.APPLICATION_JSON_VALUE)
+    @ResponseBody
+    public List<String> getDatasourceVocabularies(@PathVariable("mode") String mode) {
+       return repositoryService.getDatasourceVocabularies(mode);
+    }
+
+    @RequestMapping(value = "/getCompatibilityClasses/{mode}",method = RequestMethod.GET,
+            produces = MediaType.APPLICATION_JSON_VALUE)
+    @ResponseBody
+    public Map<String, String> getCompatibilityClasses(@PathVariable("mode") String mode)  {
+
+        return repositoryService.getCompatibilityClasses(mode);
+    }
+
+    @RequestMapping(value = "/getDatasourceClasses/{mode}",method = RequestMethod.GET,
+            produces = MediaType.APPLICATION_JSON_VALUE)
+    @ResponseBody
+    public Map<String, String> getDatasourceClasses(@PathVariable("mode") String mode)  {
+       return repositoryService.getDatasourceClasses(mode);
+    }
+
+    @RequestMapping(value = "/getMetricsInfoForRepository/{repoId}",method = RequestMethod.GET,
+            produces = MediaType.APPLICATION_JSON_VALUE)
+    @ResponseBody
+    public MetricsInfo getMetricsInfoForRepository(@PathVariable("repoId")  String repoId) throws RepositoryServiceException {
+        return repositoryService.getMetricsInfoForRepository(repoId);
+    }
+
+    @RequestMapping(value = "/getListLatestUpdate/{mode}",method = RequestMethod.GET,
+            produces = MediaType.APPLICATION_JSON_VALUE)
+    @ResponseBody
+    public Map<String, String> getListLatestUpdate(@PathVariable("mode")  String mode) throws JSONException {
+        return repositoryService.getListLatestUpdate(mode);
    }

    @RequestMapping(value = "/updateRepositoryInterface", method = RequestMethod.POST,
            consumes = MediaType.APPLICATION_JSON_VALUE)
    @ResponseBody
-    @PreAuthorize("hasAuthority('SUPER_ADMINISTRATOR') or hasAuthority('CONTENT_PROVIDER_DASHBOARD_ADMINISTRATOR') or @authorizationService.isMemberOf(#id)")
-    public RepositoryInterface updateRepositoryInterface(@RequestParam("repoId") String id,
-                                                         @RequestParam(required = false, name = "desiredCompatibilityLevel") String desiredCompatibilityLevel,
-                                                         @RequestParam(value = "comment", required = false) String comment,
+    @PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_PROVIDE_ADMIN') or ((@repositoryService.getRepositoryById(#repoId).registeredBy==authentication.userInfo.email or @repositoryService.getRepositoryById(#repoId).registeredBy=='null') and hasRole('ROLE_USER'))")
+    public RepositoryInterface updateRepositoryInterface(@RequestParam("repoId") String repoId,
+                                                         @RequestParam("registeredBy") String registeredBy,
                                                         @RequestBody RepositoryInterface repositoryInterface) throws Exception {
-        return repositoryService.updateRepositoryInterface(id, comment, repositoryInterface, desiredCompatibilityLevel);
+        return repositoryService.updateRepositoryInterface(repoId, registeredBy, repositoryInterface);
    }
-
-    @RequestMapping(value = "/getUrlsOfUserRepos/{page}/{size}/", method = RequestMethod.GET,
-            produces = MediaType.APPLICATION_JSON_VALUE)
-    @ResponseBody
-    @PreAuthorize("hasAuthority('REGISTERED_USER')")
-    public List<String> getUrlsOfUserRepos(@PathVariable("page") String page, @PathVariable("size") String size) {
-        return repositoryService.getUrlsOfUserRepos(((OIDCAuthenticationToken) SecurityContextHolder.getContext().getAuthentication()).getUserInfo().getEmail(), page, size);
-    }
-
-    @RequestMapping(value = "/getCompatibilityClasses/{mode}", method = RequestMethod.GET,
-            produces = MediaType.APPLICATION_JSON_VALUE)
-    @ResponseBody
-    public Map<String, String> getCompatibilityClasses(@PathVariable("mode") String mode) {
-
-        return repositoryService.getCompatibilityClasses(mode);
-    }
-
-    @RequestMapping(value = "/getDatasourceClasses/{mode}", method = RequestMethod.GET,
-            produces = MediaType.APPLICATION_JSON_VALUE)
-    @ResponseBody
-    public Map<String, String> getDatasourceClasses(@PathVariable("mode") String mode) {
-        return repositoryService.getDatasourceClasses(mode);
-    }
-
-    @RequestMapping(value = "/getMetricsInfoForRepository/{id}", method = RequestMethod.GET,
-            produces = MediaType.APPLICATION_JSON_VALUE)
-    @ResponseBody
-    public MetricsInfo getMetricsInfoForRepository(@PathVariable("id") String id) throws RepositoryServiceException {
-        return repositoryService.getMetricsInfoForRepository(id);
-    }
-
-    @RequestMapping(value = "/getListLatestUpdate/{mode}", method = RequestMethod.GET,
-            produces = MediaType.APPLICATION_JSON_VALUE)
-    @ResponseBody
-    public Map<String, String> getListLatestUpdate(@PathVariable("mode") String mode) {
-        return repositoryService.getListLatestUpdate(mode);
-    }
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////////////
-    ///////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    /**
-     * Get all the admins of the repository
-     */
-    @RequestMapping(method = RequestMethod.GET, path = "{id}/admins")
-    @PreAuthorize("hasAnyAuthority('SUPER_ADMINISTRATOR', 'CONTENT_PROVIDER_DASHBOARD_ADMINISTRATOR') or @authorizationService.isMemberOf(#id)")
-    public ResponseEntity<List<User>> getAdminsOfARepo(@PathVariable("id") String id) {
-        return new ResponseEntity<>(authorizationService.getAdminsOfRepo(id), HttpStatus.OK);
-    }
-
-    /**
-     * Subscribe to repo by email
-     */
-    @RequestMapping(method = RequestMethod.POST, path = "{id}/admins")
-    @PreAuthorize("hasAnyAuthority('SUPER_ADMINISTRATOR', 'CONTENT_PROVIDER_DASHBOARD_ADMINISTRATOR') or @authorizationService.isMemberOf(#id)")
-    public Response subscribeByEmail(@PathVariable("id") String id, @RequestBody String email) throws ResourceNotFoundException {
-        authorizationService.addAdmin(id, email);
-        return Response.status(HttpStatus.OK.value()).entity(JsonUtils.createResponse("Role has been assigned").toString()).type(javax.ws.rs.core.MediaType.APPLICATION_JSON).build();
-    }
-
-    /**
-     * Unsubscribe from repo by email
-     */
-    @RequestMapping(method = RequestMethod.DELETE, path = "{id}/admins/{email:.+}")
-    @PreAuthorize("hasAnyAuthority('SUPER_ADMINISTRATOR', 'CONTENT_PROVIDER_DASHBOARD_ADMINISTRATOR') or @authorizationService.isMemberOf(#id)")
-    public ResponseEntity<Void> unsubscribeByEmail(@PathVariable("id") String id, @PathVariable("email") String email) throws ResourceNotFoundException {
-        authorizationService.removeAdmin(id, email);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////////////
-    ///////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    /**
-     * Returns whether the Piwik Site of a repository is enabled and validated.
-     */
-    @RequestMapping(value = "{repositoryId}/metrics/valid", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-    public boolean getMetricsEnabledAndValidated(@PathVariable("repositoryId") String repositoryId) {
-        PiwikInfo info = piWikService.getPiwikSiteForRepo(repositoryId);
-        return info != null && info.isValidated();
-    }
-
-    /**
-     * Returns repository Metrics.
-     */
-    @RequestMapping(value = "{repositoryId}/metrics", method = RequestMethod.GET,
-            produces = MediaType.APPLICATION_JSON_VALUE)
-    public MetricsInfo getMetricsInfo(@PathVariable("repositoryId") String id) throws RepositoryServiceException {
-        return repositoryService.getMetricsInfoForRepository(id);
-    }
-
 }
--- a/src/main/java/eu/dnetlib/repo/manager/controllers/RestTemplateResponseErrorHandler.java
+++ b/src/main/java/eu/dnetlib/repo/manager/controllers/RestTemplateResponseErrorHandler.java
@ -1,4 +1,4 @@
-package eu.dnetlib.repo.manager.utils;
+package eu.dnetlib.repo.manager.controllers;

 import eu.dnetlib.repo.manager.exception.EndPointException;
 import org.springframework.http.HttpStatus;
@ -16,17 +16,19 @@ public class RestTemplateResponseErrorHandler implements ResponseErrorHandler {

    @Override
    public boolean hasError(ClientHttpResponse httpResponse) throws IOException {
-        HttpStatus.Series seriesError = httpResponse.getStatusCode().series();
-        return ( (seriesError == CLIENT_ERROR) || (seriesError == SERVER_ERROR) );
+        return (httpResponse.getStatusCode().series() == CLIENT_ERROR
+                || httpResponse.getStatusCode().series() == SERVER_ERROR);
    }

    @Override
    public void handleError(ClientHttpResponse httpResponse) throws IOException {

-        HttpStatus statusCode = httpResponse.getStatusCode();
-        if ( statusCode == HttpStatus.NOT_FOUND )
-            throw new IOException();
-        else if (statusCode.series() == SERVER_ERROR)
+        if (httpResponse.getStatusCode().series() == HttpStatus.Series.SERVER_ERROR) {
            throw new EndPointException();
+        } else if (httpResponse.getStatusCode().series() == HttpStatus.Series.CLIENT_ERROR) {
+            if (httpResponse.getStatusCode() == HttpStatus.NOT_FOUND) {
+                throw new IOException();
+            }
+        }
    }
 }
--- a/src/main/java/eu/dnetlib/repo/manager/controllers/StatsController.java
+++ b/src/main/java/eu/dnetlib/repo/manager/controllers/StatsController.java
@ -1,7 +1,7 @@
 package eu.dnetlib.repo.manager.controllers;

 import eu.dnetlib.repo.manager.service.StatsServiceImpl;
-import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
@ -13,13 +13,14 @@ import java.util.Map;

@RestController
@RequestMapping(value = "/stats")
-@Tag(name="statistics", description = "Stats API")
+@Api(description = "Stats API",  tags = {"statistics"})
 public class StatsController {

    @Autowired
    private StatsServiceImpl statsService;

-    @RequestMapping(value = "/getStatistics" , method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+    @RequestMapping(value = "/getStatistics" , method = RequestMethod.GET,
+            produces = MediaType.APPLICATION_JSON_VALUE)
    @ResponseBody
    public Map getStatistics(){
       return statsService.getStatistics();
--- a/src/main/java/eu/dnetlib/repo/manager/controllers/SushiliteController.java
+++ b/src/main/java/eu/dnetlib/repo/manager/controllers/SushiliteController.java
@ -1,8 +1,8 @@
 package eu.dnetlib.repo.manager.controllers;

-import eu.dnetlib.repo.manager.service.sushilite.SushiliteServiceImpl;
+import eu.dnetlib.repo.manager.service.SushiliteServiceImpl;
 import eu.dnetlib.usagestats.sushilite.domain.ReportResponseWrapper;
-import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
@ -10,15 +10,16 @@ import org.springframework.web.bind.annotation.*;

@RestController
@RequestMapping(value = "/sushilite")
-@Tag(name="sushilite", description = "Sushi-Lite API")
+@Api(description = "Sushi-Lite API",  tags = {"sushilite"})
 public class SushiliteController {

+
    @Autowired
    private SushiliteServiceImpl sushiliteService;

    @RequestMapping(value = "/getReportResults/{page}/{pageSize}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
    @ResponseBody
-    @PreAuthorize("hasAuthority('REGISTERED_USER')")
+    @PreAuthorize("hasRole('ROLE_USER')")
    public ReportResponseWrapper getReportResults(@PathVariable("page") String page,
                                                  @PathVariable("pageSize") String pageSize,
                                                  @RequestParam(value = "Report") String Report,
--- a/src/main/java/eu/dnetlib/repo/manager/controllers/SushiliteR5Controller.java
+++ b/src/main/java/eu/dnetlib/repo/manager/controllers/SushiliteR5Controller.java
@ -1,52 +0,0 @@
-package eu.dnetlib.repo.manager.controllers;
-
-import eu.dnetlib.repo.manager.service.sushilite.SushiliteR5ServiceImpl;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.json.JSONException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-
-@RestController
-@RequestMapping(value = "/sushiliteR5")
-@Tag(name="sushiliteR5", description = "Sushi-Lite R5 API")
-public class SushiliteR5Controller {
-
-
-    private static final Logger logger = LoggerFactory.getLogger(SushiliteR5Controller.class);
-
-
-    @Autowired
-    private SushiliteR5ServiceImpl sushiliteR5Service;
-
-    @RequestMapping(value = "/getReportResults", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-    @ResponseBody
-    @PreAuthorize("hasAuthority('REGISTERED_USER')")
-    public ResponseEntity<?> getReportResults(@RequestParam(value = "Report") String report,
-                                           @RequestParam(value = "Release", required=false, defaultValue="5") String release,
-                                           @RequestParam(value = "RequestorID",required=false, defaultValue="anonymous") String requestorID,
-                                           @RequestParam(value = "BeginDate",required=false, defaultValue="") String beginDate,
-                                           @RequestParam(value = "EndDate",required=false, defaultValue="") String endDate,
-                                           @RequestParam(value = "RepositoryIdentifier", required=false, defaultValue="") String repositoryIdentifier,
-                                           @RequestParam(value = "DatasetIdentifier", required=false, defaultValue="") String datasetIdentifier,
-                                           @RequestParam(value = "ItemIdentifier",required=false, defaultValue="") String itemIdentifier,
-                                           @RequestParam(value = "MetricType",required=false) List<String> metricTypes,
-                                           @RequestParam(value = "DataType",required=false, defaultValue="") String dataType,
-                                           @RequestParam(value = "Granularity", required = false, defaultValue ="Monthly") String granularity,
-                                           @RequestParam(value = "Pretty",required=false, defaultValue="") String pretty) {
-        try {
-            return sushiliteR5Service.getReportResults(report, release, requestorID, beginDate, endDate, repositoryIdentifier, datasetIdentifier, itemIdentifier, metricTypes, dataType, granularity, pretty);
-        } catch (JSONException je) {
-            logger.error("", je);
-            return ResponseEntity.internalServerError().build();
-        }
-    }
-
-}
--- a/src/main/java/eu/dnetlib/repo/manager/controllers/UserController.java
+++ b/src/main/java/eu/dnetlib/repo/manager/controllers/UserController.java
@ -1,7 +1,7 @@
 package eu.dnetlib.repo.manager.controllers;

 import eu.dnetlib.repo.manager.service.UserServiceImpl;
-import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
@ -11,14 +11,14 @@ import org.springframework.web.bind.annotation.RestController;

@RestController
@RequestMapping(value = "/user")
-@Tag(name="user", description = "User API")
+@Api(description = "User API",  tags = {"user"})
 public class UserController {

    @Autowired
    private UserServiceImpl userService;

    @RequestMapping(value = "/login" , method = RequestMethod.GET)
-    @PreAuthorize("hasAuthority('REGISTERED_USER')")
+    @PreAuthorize("hasRole('ROLE_USER')")
    public ResponseEntity<Object> login() {
        return userService.login();
    }
--- a/src/main/java/eu/dnetlib/repo/manager/controllers/UserRoleController.java
+++ b/src/main/java/eu/dnetlib/repo/manager/controllers/UserRoleController.java
@ -1,108 +0,0 @@
-//package eu.dnetlib.repo.manager.controllers;
-//
-//import eu.dnetlib.repo.manager.domain.dto.Role;
-//import eu.dnetlib.repo.manager.service.aai.registry.AaiRegistryService;
-//import eu.dnetlib.repo.manager.service.security.AuthoritiesUpdater;
-//import eu.dnetlib.repo.manager.service.security.AuthorizationService;
-//import eu.dnetlib.repo.manager.service.security.RoleMappingService;
-//import eu.dnetlib.repo.manager.utils.JsonUtils;
-//import io.swagger.annotations.ApiOperation;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.http.HttpStatus;
-//import org.springframework.http.ResponseEntity;
-//import org.springframework.security.access.prepost.PreAuthorize;
-//import org.springframework.web.bind.annotation.*;
-//
-//import javax.ws.rs.core.MediaType;
-//import javax.ws.rs.core.Response;
-//import java.util.Collection;
-//
-////@RestController
-////@RequestMapping(value = "/role-management")
-////@Api(description = "Role Management", value = "role-management")
-//public class UserRoleController {
-//
-//    private final AaiRegistryService aaiRegistryService;
-//    private final AuthoritiesUpdater authoritiesUpdater;
-//    private final RoleMappingService roleMappingService;
-//    private final AuthorizationService authorizationService;
-//
-//    @Autowired
-//    UserRoleController(AaiRegistryService aaiRegistryService,
-//                       AuthoritiesUpdater authoritiesUpdater,
-//                       RoleMappingService roleMappingService,
-//                       AuthorizationService authorizationService) {
-//        this.aaiRegistryService = aaiRegistryService;
-//        this.authoritiesUpdater = authoritiesUpdater;
-//        this.roleMappingService = roleMappingService;
-//        this.authorizationService = authorizationService;
-//    }
-//
-//    /**
-//     * Get the role with the given id.
-//     **/
-//    @RequestMapping(method = RequestMethod.GET, path = "/role/{id}")
-////    @PreAuthorize("hasAnyAuthority('REGISTERED_USER', 'SUPER_ADMINISTRATOR', 'CONTENT_PROVIDER_DASHBOARD_ADMINISTRATOR')")
-//    public Response getRole(@RequestParam(value = "type", defaultValue = "datasource") String type, @PathVariable("id") String id) {
-//        int roleId = aaiRegistryService.getCouId(type, id);
-//        return Response.status(HttpStatus.OK.value()).entity(JsonUtils.createResponse("Role id is: " + roleId).toString()).type(MediaType.APPLICATION_JSON).build();
-//    }
-//
-//    /**
-//     * Create a new role with the given name and description.
-//     **/
-//    @RequestMapping(method = RequestMethod.POST, path = "/role")
-//    @PreAuthorize("hasAnyAuthority('SUPER_ADMINISTRATOR')")
-//    public Response createRole(@RequestBody Role role) {
-//        aaiRegistryService.createRole(role);
-//        return Response.status(HttpStatus.OK.value()).entity(JsonUtils.createResponse("Role has been created").toString()).type(MediaType.APPLICATION_JSON).build();
-//    }
-//
-//    /**
-//     * Subscribe to a type(Community, etc.) with id(ee, egi, etc.)
-//     */
-//    @ApiOperation(value = "subscribe")
-//    @RequestMapping(method = RequestMethod.POST, path = "/subscribe/{type}/{id}")
-//    @PreAuthorize("hasAnyAuthority('SUPER_ADMINISTRATOR', 'CONTENT_PROVIDER_DASHBOARD_ADMINISTRATOR')")
-//    public Response subscribe(@PathVariable("type") String type, @PathVariable("id") String id) {
-//        Integer coPersonId = aaiRegistryService.getCoPersonIdByIdentifier();
-//        if (coPersonId == null) {
-//            coPersonId = aaiRegistryService.getCoPersonIdsByEmail();
-//        }
-//        Integer couId = aaiRegistryService.getCouId(type, id);
-//        if (couId != null) {
-//            aaiRegistryService.assignMemberRole(coPersonId, couId);
-//
-//            // Add role to current authorities
-//            authoritiesUpdater.addRole(roleMappingService.convertRepoIdToAuthority(id));
-//
-//            return Response.status(HttpStatus.OK.value()).entity(JsonUtils.createResponse("Role has been assigned").toString()).type(MediaType.APPLICATION_JSON).build();
-//        } else {
-//            return Response.status(HttpStatus.NOT_FOUND.value()).entity(JsonUtils.createResponse("Role has not been found").toString()).type(MediaType.APPLICATION_JSON).build();
-//        }
-//    }
-//    /////////////////////////////////////////////////////////////////////////////////////////////
-//    /////////////////////////////////////////////////////////////////////////////////////////////
-//
-//    @RequestMapping(method = RequestMethod.GET, path = "/users/couid/{id}")
-//    @PreAuthorize("hasAnyAuthority('SUPER_ADMINISTRATOR', 'CONTENT_PROVIDER_DASHBOARD_ADMINISTRATOR')")
-//    public ResponseEntity<String> getUsersByCouId(@PathVariable("id") Integer id) {
-////        calls.getUserByCoId()
-//        return ResponseEntity.ok(aaiRegistryService.getUsersByCouId(id).toString());
-//    }
-//
-//
-//    @RequestMapping(method = RequestMethod.GET, path = "/users/{email}/roles")
-//    @PreAuthorize("hasAnyAuthority('SUPER_ADMINISTRATOR', 'CONTENT_PROVIDER_DASHBOARD_ADMINISTRATOR') or hasAuthority('REGISTERED_USER') and authentication.userInfo.email==#email")
-//    public ResponseEntity<Collection<String>> getRolesByEmail(@PathVariable("email") String email) {
-//        return ResponseEntity.ok(authorizationService.getUserRolesByEmail(email));
-//    }
-//
-//
-//    @RequestMapping(method = RequestMethod.GET, path = "/user/roles/my")
-//    @PreAuthorize("hasAuthority('REGISTERED_USER')")
-//    public ResponseEntity<Collection<String>> getRoleNames() {
-//        return ResponseEntity.ok(authorizationService.getUserRoles());
-//    }
-//
-//}
--- a/src/main/java/eu/dnetlib/repo/manager/controllers/ValidatorController.java
+++ b/src/main/java/eu/dnetlib/repo/manager/controllers/ValidatorController.java
@ -5,12 +5,12 @@ import eu.dnetlib.domain.functionality.validator.JobForValidation;
 import eu.dnetlib.domain.functionality.validator.RuleSet;
 import eu.dnetlib.domain.functionality.validator.StoredJob;
 import eu.dnetlib.repo.manager.domain.InterfaceInformation;
+import eu.dnetlib.repo.manager.domain.ValidationServiceException;
 import eu.dnetlib.repo.manager.exception.ResourceNotFoundException;
-import eu.dnetlib.repo.manager.exception.ValidationServiceException;
 import eu.dnetlib.repo.manager.service.EmailUtils;
 import eu.dnetlib.repo.manager.service.ValidatorServiceImpl;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
 import org.json.JSONException;
 import org.mitre.openid.connect.model.OIDCAuthenticationToken;
 import org.springframework.beans.factory.annotation.Autowired;
@ -25,7 +25,7 @@ import java.util.List;

@RestController
@RequestMapping(value = "/validator")
-@Tag(name="validator", description = "Validator API")
+@Api(description = "Validator API",  tags = {"validator"})
 public class ValidatorController {

    @Autowired
@ -38,7 +38,7 @@ public class ValidatorController {
            consumes = MediaType.APPLICATION_JSON_VALUE,
            produces = MediaType.APPLICATION_JSON_VALUE)
    @ResponseBody
-    @PreAuthorize("hasAuthority('REGISTERED_USER') and #jobForValidation.userEmail == authentication.userInfo.email")
+    @PreAuthorize("hasRole('ROLE_USER') and #jobForValidation.userEmail == authentication.userInfo.email")
    public JobForValidation submitJobForValidation(@RequestBody JobForValidation jobForValidation) throws ValidatorServiceException {
        return validatorService.submitJobForValidation(jobForValidation);
    }
@ -47,7 +47,7 @@ public class ValidatorController {
            consumes = MediaType.APPLICATION_JSON_VALUE,
            produces = MediaType.APPLICATION_JSON_VALUE)
    @ResponseBody
-    @PreAuthorize("hasAuthority('REGISTERED_USER')")
+    @PreAuthorize("hasRole('ROLE_USER')")
    public ResponseEntity<Object> reSubmitJobForValidation(@PathVariable("jobId") String jobId) throws JSONException, ValidatorServiceException {
        return validatorService.reSubmitJobForValidation(((OIDCAuthenticationToken) SecurityContextHolder.getContext().getAuthentication()).getUserInfo().getEmail(), jobId);
    }
@ -78,14 +78,14 @@ public class ValidatorController {

    @RequestMapping(value = "/getStoredJobsNew" , method = RequestMethod.GET,produces = MediaType.APPLICATION_JSON_VALUE)
    @ResponseBody
-    @PreAuthorize("hasAuthority('REGISTERED_USER')")
+    @PreAuthorize("hasRole('ROLE_USER')")
    public List<StoredJob> getStoredJobsNew(@RequestParam(value = "jobType", required = false)
-                                            @Parameter(description = "Equals to filter job type on validation history page") String jobType,
-                                            @RequestParam("offset") @Parameter(description = "Page number", required = true) String offset,
-                                            @RequestParam(value = "limit", required = false,defaultValue = "10") @Parameter(description = "Null value") String limit,
-                                            @RequestParam(value = "dateFrom", required = false) @Parameter(description = "Null value") String dateFrom,
-                                            @RequestParam(value = "dateTo", required = false) @Parameter(description = "Null value") String dateTo,
-                                            @RequestParam("validationStatus") @Parameter(description = "Equals to filter validation jobs", required = true) String validationStatus
+                                            @ApiParam(value = "Equals to filter job type on validation history page") String jobType,
+                                            @RequestParam("offset") @ApiParam(value = "Page number", required = true) String offset,
+                                            @RequestParam(value = "limit", required = false,defaultValue = "10") @ApiParam(value = "Null value") String limit,
+                                            @RequestParam(value = "dateFrom", required = false) @ApiParam(value = "Null value") String dateFrom,
+                                            @RequestParam(value = "dateTo", required = false) @ApiParam(value = "Null value") String dateTo,
+                                            @RequestParam("validationStatus") @ApiParam(value = "Equals to filter validation jobs", required = true) String validationStatus
                                            ) throws ValidatorServiceException {
        return validatorService.getStoredJobsNew(((OIDCAuthenticationToken) SecurityContextHolder.getContext().getAuthentication()).getUserInfo().getEmail(), jobType, offset, limit, dateFrom, dateTo, validationStatus);
    }
@ -112,8 +112,8 @@ public class ValidatorController {
    @RequestMapping(value = "/complete" , method = RequestMethod.POST,  produces = MediaType.APPLICATION_JSON_VALUE)
    @ResponseBody
    public void validationCompleted(
-        @RequestParam(value = "repoId") String repoId,
        @RequestParam(value = "interfaceId") String interfaceId,
+        @RequestParam(value = "repoId") String repoId,
        @RequestParam(value = "jobId") String jobId,
        @RequestParam(value = "issuerEmail") String issuerEmail,
        @RequestParam(value = "isUpdate") boolean isUpdate,
@ -121,7 +121,7 @@ public class ValidatorController {
        @RequestParam(value = "scoreUsage") int scoreUsage,
        @RequestParam(value = "scoreContent") int scoreContent) throws Exception {

-        validatorService.onComplete(repoId, interfaceId, jobId, issuerEmail, isUpdate, isSuccess, scoreUsage, scoreContent);
+        emailUtils.sendUponJobCompletion(repoId,interfaceId,scoreUsage,scoreContent,isSuccess,isUpdate,issuerEmail, jobId);
    }


--- a/src/main/java/eu/dnetlib/repo/manager/domain/AggregationDetails.java
+++ b/src/main/java/eu/dnetlib/repo/manager/domain/AggregationDetails.java
@ -0,0 +1,63 @@
+package eu.dnetlib.repo.manager.domain;
+
+import java.util.Calendar;
+import java.util.Date;
+
+public class AggregationDetails{
+
+
+    private String aggregationStage;
+    private Date date;
+    private int numberOfRecords;
+    private String collectionMode;
+    private Boolean indexedVersion;
+
+    public AggregationDetails() {
+    }
+
+    public String getAggregationStage() {
+        return aggregationStage;
+    }
+
+    public String getCollectionMode() {
+        return collectionMode;
+    }
+
+    public void setCollectionMode(String collectionMode) {
+        this.collectionMode = collectionMode;
+    }
+
+    public void setAggregationStage(String aggregationStage) {
+        this.aggregationStage = aggregationStage;
+    }
+
+    public Date getDate() {
+        return date;
+    }
+
+    public void setDate(Date date) {
+        this.date = date;
+    }
+
+    public int getNumberOfRecords() {
+        return numberOfRecords;
+    }
+
+    public void setNumberOfRecords(int numberOfRecords) {
+        this.numberOfRecords = numberOfRecords;
+    }
+
+    public String getYear() {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(getDate());
+        return String.valueOf(calendar.get(Calendar.YEAR));
+    }
+
+    public Boolean getIndexedVersion() {
+        return indexedVersion;
+    }
+
+    public void setIndexedVersion(Boolean indexedVersion) {
+        this.indexedVersion = indexedVersion;
+    }
+}
--- a/src/main/java/eu/dnetlib/repo/manager/domain/Aggregations.java
+++ b/src/main/java/eu/dnetlib/repo/manager/domain/Aggregations.java
@ -0,0 +1,38 @@
+package eu.dnetlib.repo.manager.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Aggregations{
+
+    private List<AggregationDetails> aggregationHistory = new ArrayList<>();
+    private AggregationDetails lastCollection;
+    private AggregationDetails lastTransformation;
+
+    public Aggregations() {
+    }
+
+    public List<AggregationDetails> getAggregationHistory() {
+        return aggregationHistory;
+    }
+
+    public void setAggregationHistory(List<AggregationDetails> aggregationHistory) {
+        this.aggregationHistory = aggregationHistory;
+    }
+
+    public AggregationDetails getLastCollection() {
+        return lastCollection;
+    }
+
+    public void setLastCollection(AggregationDetails lastCollection) {
+        this.lastCollection = lastCollection;
+    }
+
+    public AggregationDetails getLastTransformation() {
+        return lastTransformation;
+    }
+
+    public void setLastTransformation(AggregationDetails lastTransformation) {
+        this.lastTransformation = lastTransformation;
+    }
+}
--- a/src/main/java/eu/dnetlib/repo/manager/domain/ApiDetails.java
+++ b/src/main/java/eu/dnetlib/repo/manager/domain/ApiDetails.java
@ -1,188 +0,0 @@
-package eu.dnetlib.repo.manager.domain;
-
-import java.util.Date;
-import java.util.Set;
-
-public class ApiDetails {
-    protected String id = null;
-    protected String protocol = null;
-    protected String datasource = null;
-    protected String contentdescription = null;
-    protected String eoscDatasourceType = null;
-    protected String compatibility;
-    protected String compatibilityOverride;
-    protected Integer lastCollectionTotal;
-    protected Date lastCollectionDate;
-    protected Integer lastAggregationTotal;
-    protected Date lastAggregationDate;
-    protected Integer lastDownloadTotal;
-    protected Date lastDownloadDate;
-    protected String baseurl;
-    protected Boolean removable = false;
-    protected Set<ApiParamDetails> apiParams;
-    protected String metadataIdentifierPath = "";
-    @Deprecated
-    protected String typology = null;
-
-
-    public String getId() {
-        return id;
-    }
-
-    public String getProtocol() {
-        return protocol;
-    }
-
-    public String getDatasource() {
-        return datasource;
-    }
-
-    public String getContentdescription() {
-        return contentdescription;
-    }
-
-    public String getCompatibility() {
-        return compatibility;
-    }
-
-    public Integer getLastCollectionTotal() {
-        return lastCollectionTotal;
-    }
-
-    public Date getLastCollectionDate() {
-        return lastCollectionDate;
-    }
-
-    public Integer getLastAggregationTotal() {
-        return lastAggregationTotal;
-    }
-
-    public Date getLastAggregationDate() {
-        return lastAggregationDate;
-    }
-
-    public Integer getLastDownloadTotal() {
-        return lastDownloadTotal;
-    }
-
-    public Date getLastDownloadDate() {
-        return lastDownloadDate;
-    }
-
-    public String getBaseurl() {
-        return baseurl;
-    }
-
-    public ApiDetails setId(final String id) {
-        this.id = id;
-        return this;
-    }
-
-    public ApiDetails setProtocol(final String protocol) {
-        this.protocol = protocol;
-        return this;
-    }
-
-    public ApiDetails setDatasource(final String datasource) {
-        this.datasource = datasource;
-        return this;
-    }
-
-    public ApiDetails setContentdescription(final String contentdescription) {
-        this.contentdescription = contentdescription;
-        return this;
-    }
-
-    public ApiDetails setCompatibility(final String compatibility) {
-        this.compatibility = compatibility;
-        return this;
-    }
-
-    public ApiDetails setLastCollectionTotal(final Integer lastCollectionTotal) {
-        this.lastCollectionTotal = lastCollectionTotal;
-        return this;
-    }
-
-    public ApiDetails setLastCollectionDate(final Date lastCollectionDate) {
-        this.lastCollectionDate = lastCollectionDate;
-        return this;
-    }
-
-    public ApiDetails setLastAggregationTotal(final Integer lastAggregationTotal) {
-        this.lastAggregationTotal = lastAggregationTotal;
-        return this;
-    }
-
-    public ApiDetails setLastAggregationDate(final Date lastAggregationDate) {
-        this.lastAggregationDate = lastAggregationDate;
-        return this;
-    }
-
-    public ApiDetails setLastDownloadTotal(final Integer lastDownloadTotal) {
-        this.lastDownloadTotal = lastDownloadTotal;
-        return this;
-    }
-
-    public ApiDetails setLastDownloadDate(final Date lastDownloadDate) {
-        this.lastDownloadDate = lastDownloadDate;
-        return this;
-    }
-
-    public ApiDetails setBaseurl(final String baseurl) {
-        this.baseurl = baseurl;
-        return this;
-    }
-
-    public Set<ApiParamDetails> getApiParams() {
-        return apiParams;
-    }
-
-    public void setApiParams(final Set<ApiParamDetails> apiParams) {
-        this.apiParams = apiParams;
-    }
-
-    public String getCompatibilityOverride() {
-        return compatibilityOverride;
-    }
-
-    public ApiDetails setCompatibilityOverride(final String compatibilityOverride) {
-        this.compatibilityOverride = compatibilityOverride;
-        return this;
-    }
-
-    public Boolean getRemovable() {
-        return removable;
-    }
-
-    public ApiDetails setRemovable(final Boolean removable) {
-        this.removable = removable;
-        return this;
-    }
-
-    public String getMetadataIdentifierPath() {
-        return metadataIdentifierPath;
-    }
-
-    public ApiDetails setMetadataIdentifierPath(final String metadataIdentifierPath) {
-        this.metadataIdentifierPath = metadataIdentifierPath;
-        return this;
-    }
-
-    public String getEoscDatasourceType() {
-        return eoscDatasourceType;
-    }
-
-    public ApiDetails setEoscDatasourceType(final String eoscDatasourceType) {
-        this.eoscDatasourceType = eoscDatasourceType;
-        return this;
-    }
-
-    public String getTypology() {
-        return typology;
-    }
-
-    public ApiDetails setTypology(final String typology) {
-        this.typology = typology;
-        return this;
-    }
-}
--- a/src/main/java/eu/dnetlib/repo/manager/domain/ApiDetailsResponse.java
+++ b/src/main/java/eu/dnetlib/repo/manager/domain/ApiDetailsResponse.java
@ -1,19 +0,0 @@
-package eu.dnetlib.repo.manager.domain;
-
-import java.util.List;
-
-public class ApiDetailsResponse extends Response {
-
-    private List<ApiDetails> api;
-
-
-    public List<ApiDetails> getApi() {
-        return api;
-    }
-
-    public ApiDetailsResponse setApi(final List<ApiDetails> api) {
-        this.api = api;
-        return this;
-    }
-}
-
--- a/src/main/java/eu/dnetlib/repo/manager/domain/ApiParamDetails.java
+++ b/src/main/java/eu/dnetlib/repo/manager/domain/ApiParamDetails.java
@ -1,25 +0,0 @@
-package eu.dnetlib.repo.manager.domain;
-
-public class ApiParamDetails {
-
-    protected String param;
-    protected String value;
-
-
-    public String getParam() {
-        return param;
-    }
-
-    public void setParam(final String param) {
-        this.param = param;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(final String value) {
-        this.value = value;
-    }
-}
-
--- a/src/main/java/eu/dnetlib/repo/manager/exception/BrokerException.java
+++ b/src/main/java/eu/dnetlib/repo/manager/exception/BrokerException.java
@ -1,4 +1,4 @@
-package eu.dnetlib.repo.manager.exception;
+package eu.dnetlib.repo.manager.domain;


 /**
--- a/src/main/java/eu/dnetlib/repo/manager/domain/CollectionMonitorSummary.java
+++ b/src/main/java/eu/dnetlib/repo/manager/domain/CollectionMonitorSummary.java
@ -1,34 +1,32 @@
 package eu.dnetlib.repo.manager.domain;

-import eu.dnetlib.openaire.exporter.model.dsm.AggregationInfo;
-
 import java.util.List;

 public class CollectionMonitorSummary {
-    private List<AggregationInfo> aggregationInfo;
+    private List<AggregationDetails> aggregationDetails;

-    private AggregationInfo lastIndexedVersion;
+    private AggregationDetails lastIndexedVersion;

    public CollectionMonitorSummary(){}

-    public CollectionMonitorSummary(List<AggregationInfo> aggregationInfo, AggregationInfo lastIndexedVersion) {
-        this.aggregationInfo = aggregationInfo;
+    public CollectionMonitorSummary(List<AggregationDetails> aggregationDetails, AggregationDetails lastIndexedVersion) {
+        this.aggregationDetails = aggregationDetails;
        this.lastIndexedVersion = lastIndexedVersion;
    }

-    public List<AggregationInfo> getAggregationInfo() {
-        return aggregationInfo;
+    public List<AggregationDetails> getAggregationDetails() {
+        return aggregationDetails;
    }

-    public void setAggregationInfo(List<AggregationInfo> aggregationInfo) {
-        this.aggregationInfo = aggregationInfo;
+    public void setAggregationDetails(List<AggregationDetails> aggregationDetails) {
+        this.aggregationDetails = aggregationDetails;
    }

-    public AggregationInfo getLastIndexedVersion() {
+    public AggregationDetails getLastIndexedVersion() {
        return lastIndexedVersion;
    }

-    public void setLastIndexedVersion(AggregationInfo lastIndexedVersion) {
+    public void setLastIndexedVersion(AggregationDetails lastIndexedVersion) {
        this.lastIndexedVersion = lastIndexedVersion;
    }
 }
--- a/src/main/java/eu/dnetlib/repo/manager/domain/Constants.java
+++ b/src/main/java/eu/dnetlib/repo/manager/domain/Constants.java
@ -32,7 +32,6 @@ public class Constants{
    public static final String VALIDATION_MODE_LITERATURE = "literature";
    public static final String VALIDATION_MODE_DATA = "data";
    public static final String VALIDATION_MODE_CRIS = "cris";
-    public static final String VALIDATION_MODE_FAIR = "fair";

    public static final String VALIDATION_JOB_TYPE_COMPATIBILITY_TEST = "Compatibility Test";
    public static final String VALIDATION_JOB_TYPE_REGISTRATION_REQUEST = "Registration Request";
--- a/src/main/java/eu/dnetlib/repo/manager/domain/DatasourceDetails.java
+++ b/src/main/java/eu/dnetlib/repo/manager/domain/DatasourceDetails.java
@ -1,321 +0,0 @@
-package eu.dnetlib.repo.manager.domain;
-
-import javax.persistence.Transient;
-import java.util.Date;
-import java.util.Set;
-
-public class DatasourceDetails {
-
-    protected String id;
-    @Transient
-    protected String openaireId;
-    protected String officialname;
-    protected String englishname;
-    protected String websiteurl;
-    protected String logourl;
-    protected String contactemail;
-    protected Double latitude = 0.0;
-    protected Double longitude = 0.0;
-    protected Double timezone = 0.0;
-    protected String namespaceprefix;
-    protected String languages;
-    protected Date dateofvalidation;
-    protected String eoscDatasourceType;
-    protected Date dateofcollection;
-    protected String platform;
-    protected String activationId;
-    protected String description;
-    protected String issn;
-    protected String eissn;
-    protected String lissn;
-    protected String registeredby;
-    protected String subjects;
-    protected String aggregator = "OPENAIRE";
-    protected String collectedfrom;
-    protected Boolean managed;
-    protected Boolean consentTermsOfUse;
-    protected Boolean fullTextDownload;
-    protected Date consentTermsOfUseDate;
-    protected Date lastConsentTermsOfUseDate;
-    protected Set<OrganizationDetails> organizations;
-    protected Set<IdentitiesDetails> identities;
-    protected String status;
-    protected String typology;
-    protected Date registrationdate;
-
-    public DatasourceDetails() {
-        // no arg constructor
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getOpenaireId() {
-        return openaireId;
-    }
-
-    public void setOpenaireId(String openaireId) {
-        this.openaireId = openaireId;
-    }
-
-    public String getOfficialname() {
-        return officialname;
-    }
-
-    public void setOfficialname(String officialname) {
-        this.officialname = officialname;
-    }
-
-    public String getEnglishname() {
-        return englishname;
-    }
-
-    public void setEnglishname(String englishname) {
-        this.englishname = englishname;
-    }
-
-    public String getWebsiteurl() {
-        return websiteurl;
-    }
-
-    public void setWebsiteurl(String websiteurl) {
-        this.websiteurl = websiteurl;
-    }
-
-    public String getLogourl() {
-        return logourl;
-    }
-
-    public void setLogourl(String logourl) {
-        this.logourl = logourl;
-    }
-
-    public String getContactemail() {
-        return contactemail;
-    }
-
-    public void setContactemail(String contactemail) {
-        this.contactemail = contactemail;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public String getNamespaceprefix() {
-        return namespaceprefix;
-    }
-
-    public void setNamespaceprefix(String namespaceprefix) {
-        this.namespaceprefix = namespaceprefix;
-    }
-
-    public String getLanguages() {
-        return languages;
-    }
-
-    public void setLanguages(String languages) {
-        this.languages = languages;
-    }
-
-    public Date getDateofvalidation() {
-        return dateofvalidation;
-    }
-
-    public void setDateofvalidation(Date dateofvalidation) {
-        this.dateofvalidation = dateofvalidation;
-    }
-
-    public String getEoscDatasourceType() {
-        return eoscDatasourceType;
-    }
-
-    public void setEoscDatasourceType(String eoscDatasourceType) {
-        this.eoscDatasourceType = eoscDatasourceType;
-    }
-
-    public Date getDateofcollection() {
-        return dateofcollection;
-    }
-
-    public void setDateofcollection(Date dateofcollection) {
-        this.dateofcollection = dateofcollection;
-    }
-
-    public String getPlatform() {
-        return platform;
-    }
-
-    public void setPlatform(String platform) {
-        this.platform = platform;
-    }
-
-    public String getActivationId() {
-        return activationId;
-    }
-
-    public void setActivationId(String activationId) {
-        this.activationId = activationId;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public String getIssn() {
-        return issn;
-    }
-
-    public void setIssn(String issn) {
-        this.issn = issn;
-    }
-
-    public String getEissn() {
-        return eissn;
-    }
-
-    public void setEissn(String eissn) {
-        this.eissn = eissn;
-    }
-
-    public String getLissn() {
-        return lissn;
-    }
-
-    public void setLissn(String lissn) {
-        this.lissn = lissn;
-    }
-
-    public String getRegisteredby() {
-        return registeredby;
-    }
-
-    public void setRegisteredby(String registeredby) {
-        this.registeredby = registeredby;
-    }
-
-    public String getSubjects() {
-        return subjects;
-    }
-
-    public void setSubjects(String subjects) {
-        this.subjects = subjects;
-    }
-
-    public String getAggregator() {
-        return aggregator;
-    }
-
-    public void setAggregator(String aggregator) {
-        this.aggregator = aggregator;
-    }
-
-    public String getCollectedfrom() {
-        return collectedfrom;
-    }
-
-    public void setCollectedfrom(String collectedfrom) {
-        this.collectedfrom = collectedfrom;
-    }
-
-    public Boolean getManaged() {
-        return managed;
-    }
-
-    public void setManaged(Boolean managed) {
-        this.managed = managed;
-    }
-
-    public Boolean getConsentTermsOfUse() {
-        return consentTermsOfUse;
-    }
-
-    public void setConsentTermsOfUse(Boolean consentTermsOfUse) {
-        this.consentTermsOfUse = consentTermsOfUse;
-    }
-
-    public Boolean getFullTextDownload() {
-        return fullTextDownload;
-    }
-
-    public void setFullTextDownload(Boolean fullTextDownload) {
-        this.fullTextDownload = fullTextDownload;
-    }
-
-    public Date getConsentTermsOfUseDate() {
-        return consentTermsOfUseDate;
-    }
-
-    public void setConsentTermsOfUseDate(Date consentTermsOfUseDate) {
-        this.consentTermsOfUseDate = consentTermsOfUseDate;
-    }
-
-    public Date getLastConsentTermsOfUseDate() {
-        return lastConsentTermsOfUseDate;
-    }
-
-    public void setLastConsentTermsOfUseDate(Date lastConsentTermsOfUseDate) {
-        this.lastConsentTermsOfUseDate = lastConsentTermsOfUseDate;
-    }
-
-    public Set<OrganizationDetails> getOrganizations() {
-        return organizations;
-    }
-
-    public void setOrganizations(Set<OrganizationDetails> organizations) {
-        this.organizations = organizations;
-    }
-
-    public Set<IdentitiesDetails> getIdentities() {
-        return identities;
-    }
-
-    public void setIdentities(Set<IdentitiesDetails> identities) {
-        this.identities = identities;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getTypology() {
-        return typology;
-    }
-
-    public void setTypology(String typology) {
-        this.typology = typology;
-    }
-
-    public Date getRegistrationdate() {
-        return registrationdate;
-    }
-
-    public void setRegistrationdate(Date registrationdate) {
-        this.registrationdate = registrationdate;
-    }
-}
--- a/src/main/java/eu/dnetlib/repo/manager/domain/DatasourceRegistrationState.java
+++ b/src/main/java/eu/dnetlib/repo/manager/domain/DatasourceRegistrationState.java
@ -0,0 +1,47 @@
+package eu.dnetlib.repo.manager.domain;
+
+import eu.dnetlib.domain.data.Repository;
+
+/**
+ * Created by stefania on 12/17/15.
+ */
+public class DatasourceRegistrationState extends WizardState {
+
+    private String mode;
+    private String selectedRepositoryId;
+
+    private Repository repository;
+
+    public DatasourceRegistrationState() {
+    }
+
+    public DatasourceRegistrationState(String mode, String selectedRepositoryId, Repository repository) {
+        this.mode = mode;
+        this.selectedRepositoryId = selectedRepositoryId;
+        this.repository = repository;
+    }
+
+    public String getMode() {
+        return mode;
+    }
+
+    public void setMode(String mode) {
+        this.mode = mode;
+    }
+
+    public String getSelectedRepositoryId() {
+        return selectedRepositoryId;
+    }
+
+    public void setSelectedRepositoryId(String selectedRepositoryId) {
+        this.selectedRepositoryId = selectedRepositoryId;
+    }
+
+    public Repository getRepository() {
+        return repository;
+    }
+
+    public void setRepository(Repository repository) {
+        this.repository = repository;
+    }
+}
--- a/src/main/java/eu/dnetlib/repo/manager/domain/DatasourceResponse.java
+++ b/src/main/java/eu/dnetlib/repo/manager/domain/DatasourceResponse.java
@ -1,24 +0,0 @@
-package eu.dnetlib.repo.manager.domain;
-
-import com.google.common.collect.Lists;
-
-import java.util.List;
-
-public class DatasourceResponse extends Response {
-
-    private List<DatasourceDetails> datasourceInfo = Lists.newArrayList();
-
-    public DatasourceResponse addDatasourceInfo(final DatasourceDetails datasourceInfo) {
-        getDatasourceInfo().add(datasourceInfo);
-        return this;
-    }
-
-    public List<DatasourceDetails> getDatasourceInfo() {
-        return datasourceInfo;
-    }
-
-    public DatasourceResponse setDatasourceInfo(final List<DatasourceDetails> datasourceInfo) {
-        this.datasourceInfo = datasourceInfo;
-        return this;
-    }
-}
--- a/src/main/java/eu/dnetlib/repo/manager/domain/DatasourceVocabularies.java
+++ b/src/main/java/eu/dnetlib/repo/manager/domain/DatasourceVocabularies.java
@ -0,0 +1,60 @@
+package eu.dnetlib.repo.manager.domain;
+
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by nikonas on 21/12/15.
+ */
+public class DatasourceVocabularies{
+
+    private Map<String, String> countries;
+    private List<Timezone> timezones;
+    private Map<String, String> datasourceClasses;
+    private List<String> typologies;
+    private Map<String, String> compatibilityLevels;
+
+    public DatasourceVocabularies() {
+    }
+
+    public Map<String, String> getCountries() {
+        return countries;
+    }
+
+    public void setCountries(Map<String, String> countries) {
+        this.countries = countries;
+    }
+
+    public List<Timezone> getTimezones() {
+        return timezones;
+    }
+
+    public void setTimezones(List<Timezone> timezones) {
+        this.timezones = timezones;
+    }
+
+    public Map<String, String> getDatasourceClasses() {
+        return datasourceClasses;
+    }
+
+    public void setDatasourceClasses(Map<String, String> datasourceClasses) {
+        this.datasourceClasses = datasourceClasses;
+    }
+
+    public List<String> getTypologies() {
+        return typologies;
+    }
+
+    public void setTypologies(List<String> typologies) {
+        this.typologies = typologies;
+    }
+
+    public Map<String, String> getCompatibilityLevels() {
+        return compatibilityLevels;
+    }
+
+    public void setCompatibilityLevels(Map<String, String> compatibilityLevels) {
+        this.compatibilityLevels = compatibilityLevels;
+    }
+}
--- a/src/main/java/eu/dnetlib/repo/manager/domain/DatasourcesCollection.java
+++ b/src/main/java/eu/dnetlib/repo/manager/domain/DatasourcesCollection.java
@ -1,5 +1,7 @@
 package eu.dnetlib.repo.manager.domain;

+import eu.dnetlib.domain.data.Repository;
+
 import java.util.ArrayList;
 import java.util.List;

--- a/src/main/java/eu/dnetlib/repo/manager/domain/Header.java
+++ b/src/main/java/eu/dnetlib/repo/manager/domain/Header.java
@ -1,79 +0,0 @@
-package eu.dnetlib.repo.manager.domain;
-
-import com.google.common.collect.Lists;
-import com.google.gson.GsonBuilder;
-
-import java.util.List;
-import java.util.Queue;
-import java.util.stream.Collectors;
-
-public class Header {
-
-    private long total;
-    private int page;
-    private int size;
-    private long time;
-    private int statusCode;
-    private List<String> errors = Lists.newArrayList();
-
-    private Queue<Throwable> exceptions = Lists.newLinkedList();
-    public static Header newInsance() {
-        return new Header();
-    }
-    public Header() {
-    }
-    public long getTime() {
-        return time;
-    }
-    public Header setTime(final long time) {
-        this.time = time;
-        return this;
-    }
-    public int getStatusCode() {
-        return statusCode;
-    }
-    public Header setStatusCode(final int statusCode) {
-        this.statusCode = statusCode;
-        return this;
-    }
-    public long getTotal() {
-        return total;
-    }
-    public int getPage() {
-        return page;
-    }
-    public int getSize() {
-        return size;
-    }
-    public Header setPage(final int page) {
-        this.page = page;
-        return this;
-    }
-    public Header setSize(final int size) {
-        this.size = size;
-        return this;
-    }
-    public Header setTotal(final long total) {
-        this.total = total;
-        return this;
-    }
-    public Queue<Throwable> getExceptions() {
-        return exceptions;
-    }
-    public Header setExceptions(final Queue<Throwable> exceptions) {
-        this.exceptions = exceptions;
-        return this;
-    }
-    public List<String> getErrors() {
-        return getExceptions().stream()
-                .map(Throwable::getMessage)
-                .collect(Collectors.toList());
-    }
-    public Header setErrors(final List<String> errors) {
-        this.errors = errors;
-        return this;
-    }
-    public String toJson() {
-        return new GsonBuilder().setPrettyPrinting().create().toJson(this);
-    }
-}
--- a/src/main/java/eu/dnetlib/repo/manager/domain/IdentitiesDetails.java
+++ b/src/main/java/eu/dnetlib/repo/manager/domain/IdentitiesDetails.java
@ -1,29 +0,0 @@
-package eu.dnetlib.repo.manager.domain;
-
-public class IdentitiesDetails {
-    private String pid;
-    private String issuertype;
-
-    public IdentitiesDetails() {
-        // no arg constructor
-    }
-
-    public String getPid() {
-        return pid;
-    }
-
-    public String getIssuertype() {
-        return issuertype;
-    }
-
-    public IdentitiesDetails setPid(final String pid) {
-        this.pid = pid;
-        return this;
-    }
-
-    public IdentitiesDetails setIssuertype(final String issuertype) {
-        this.issuertype = issuertype;
-        return this;
-    }
-}
-
--- a/src/main/java/eu/dnetlib/repo/manager/domain/InterfaceComplianceRequest.java
+++ b/src/main/java/eu/dnetlib/repo/manager/domain/InterfaceComplianceRequest.java
@ -1,95 +0,0 @@
-package eu.dnetlib.repo.manager.domain;
-
-import eu.dnetlib.repo.manager.domain.dto.InterfaceComplianceRequestDTO;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.IdClass;
-import javax.persistence.Transient;
-import java.util.Date;
-
-@Entity
-@IdClass(InterfaceComplianceRequestId.class)
-public class InterfaceComplianceRequest {
-
-    @Id
-    String repositoryId;
-    @Id
-    String interfaceId;
-    String desiredCompatibilityLevel;
-    Date submissionDate;
-
-    public InterfaceComplianceRequest() {
-        this.submissionDate = new Date();
-    }
-
-    public InterfaceComplianceRequest(String repositoryId, String interfaceId, String desiredCompatibilityLevel) {
-        this.submissionDate = new Date();
-        this.repositoryId = repositoryId;
-        this.interfaceId = interfaceId;
-        this.desiredCompatibilityLevel = desiredCompatibilityLevel;
-    }
-
-    public static InterfaceComplianceRequest from(InterfaceComplianceRequestDTO dto) {
-        InterfaceComplianceRequest request = new InterfaceComplianceRequest();
-        request.setRepositoryId(dto.getRepositoryId());
-        request.setInterfaceId(dto.getInterfaceId());
-        if (dto.getSubmissionDate() != null) {
-            request.setSubmissionDate(dto.getSubmissionDate());
-        } else {
-            request.setSubmissionDate(new Date());
-        }
-        request.setDesiredCompatibilityLevel(dto.getDesiredCompatibilityLevel());
-        return request;
-    }
-
-    @Transient
-    public InterfaceComplianceRequestId getId() {
-        InterfaceComplianceRequestId id = new InterfaceComplianceRequestId();
-        id.repositoryId = this.repositoryId;
-        id.interfaceId = this.interfaceId;
-        return id;
-    }
-
-    public String getRepositoryId() {
-        return repositoryId;
-    }
-
-    public void setRepositoryId(String repositoryId) {
-        this.repositoryId = repositoryId;
-    }
-
-    public String getInterfaceId() {
-        return interfaceId;
-    }
-
-    public void setInterfaceId(String interfaceId) {
-        this.interfaceId = interfaceId;
-    }
-
-    public String getDesiredCompatibilityLevel() {
-        return desiredCompatibilityLevel;
-    }
-
-    public void setDesiredCompatibilityLevel(String desiredCompatibilityLevel) {
-        this.desiredCompatibilityLevel = desiredCompatibilityLevel;
-    }
-
-    public Date getSubmissionDate() {
-        return submissionDate;
-    }
-
-    public void setSubmissionDate(Date submissionDate) {
-        this.submissionDate = submissionDate;
-    }
-
-    @Override
-    public String toString() {
-        return "InterfaceComplianceRequest{" +
-                "repositoryId='" + repositoryId + '\'' +
-                ", interfaceId='" + interfaceId + '\'' +
-                ", desiredCompatibilityLevel='" + desiredCompatibilityLevel + '\'' +
-                ", submissionDate=" + submissionDate +
-                '}';
-    }
-}
--- a/src/main/java/eu/dnetlib/repo/manager/domain/InterfaceComplianceRequestId.java
+++ b/src/main/java/eu/dnetlib/repo/manager/domain/InterfaceComplianceRequestId.java
@ -1,50 +0,0 @@
-package eu.dnetlib.repo.manager.domain;
-
-import java.io.Serializable;
-
-public class InterfaceComplianceRequestId implements Serializable {
-    String repositoryId;
-    String interfaceId;
-
-    public String getRepositoryId() {
-        return repositoryId;
-    }
-
-    public void setRepositoryId(String repositoryId) {
-        this.repositoryId = repositoryId;
-    }
-
-    public String getInterfaceId() {
-        return interfaceId;
-    }
-
-    public void setInterfaceId(String interfaceId) {
-        this.interfaceId = interfaceId;
-    }
-
-    public static InterfaceComplianceRequestId of(String repositoryId, String interfaceId) {
-        InterfaceComplianceRequestId id = new InterfaceComplianceRequestId();
-        id.setRepositoryId(repositoryId);
-        id.setInterfaceId(interfaceId);
-        return id;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (!(o instanceof InterfaceComplianceRequestId)) return false;
-
-        InterfaceComplianceRequestId that = (InterfaceComplianceRequestId) o;
-
-        if (getRepositoryId() != null ? !getRepositoryId().equals(that.getRepositoryId()) : that.getRepositoryId() != null)
-            return false;
-        return getInterfaceId() != null ? getInterfaceId().equals(that.getInterfaceId()) : that.getInterfaceId() == null;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = getRepositoryId() != null ? getRepositoryId().hashCode() : 0;
-        result = 31 * result + (getInterfaceId() != null ? getInterfaceId().hashCode() : 0);
-        return result;
-    }
-}
--- a/src/main/java/eu/dnetlib/repo/manager/domain/OrganizationDetails.java
+++ b/src/main/java/eu/dnetlib/repo/manager/domain/OrganizationDetails.java
@ -1,54 +0,0 @@
-package eu.dnetlib.repo.manager.domain;
-
-public class OrganizationDetails {
-
-    private String legalshortname;
-    private String legalname;
-    private String websiteurl;
-    private String logourl;
-    private String country;
-
-    public OrganizationDetails() {
-        // no arg constructor
-    }
-
-    public String getLegalshortname() {
-        return legalshortname;
-    }
-
-    public void setLegalshortname(String legalshortname) {
-        this.legalshortname = legalshortname;
-    }
-
-    public String getLegalname() {
-        return legalname;
-    }
-
-    public void setLegalname(String legalname) {
-        this.legalname = legalname;
-    }
-
-    public String getWebsiteurl() {
-        return websiteurl;
-    }
-
-    public void setWebsiteurl(String websiteurl) {
-        this.websiteurl = websiteurl;
-    }
-
-    public String getLogourl() {
-        return logourl;
-    }
-
-    public void setLogourl(String logourl) {
-        this.logourl = logourl;
-    }
-
-    public String getCountry() {
-        return country;
-    }
-
-    public void setCountry(String country) {
-        this.country = country;
-    }
-}
--- a/src/main/java/eu/dnetlib/repo/manager/domain/Paging.java
+++ b/src/main/java/eu/dnetlib/repo/manager/domain/Paging.java
@ -43,18 +43,6 @@ public class Paging<T> {
        this.results = new ArrayList<>();
    }

-    public static  <K> Paging<K> of(Header header, List<K> results) {
-        Paging<K> paging = new Paging<>();
-        paging.setFrom(header.getPage() * header.getSize());
-        paging.setTo(paging.getFrom() + header.getSize() - 1);
-        if (paging.getTo() > header.getTotal()) {
-            paging.setTo((int) header.getTotal() - 1);
-        }
-        paging.setTotal((int) header.getTotal());
-        paging.setResults(results);
-        return paging;
-    }
-
    public int getTotal() {
        return total;
    }
@ -86,4 +74,4 @@ public class Paging<T> {
    public void setResults(List<T> results) {
        this.results = results;
    }
-}
+}
--- a/src/main/java/eu/dnetlib/repo/manager/domain/PendingUserRole.java
+++ b/src/main/java/eu/dnetlib/repo/manager/domain/PendingUserRole.java
@ -1,53 +0,0 @@
-package eu.dnetlib.repo.manager.domain;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-
-@Entity
-public class PendingUserRole {
-    @Id
-    long id;
-    int coPersonId;
-    int couId;
-
-    public PendingUserRole() {
-        // no-arg constructor
-    }
-
-    public PendingUserRole(int coPersonId, int couId) {
-        this.coPersonId = coPersonId;
-        this.couId = couId;
-    }
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public int getCoPersonId() {
-        return coPersonId;
-    }
-
-    public void setCoPersonId(int coPersonId) {
-        this.coPersonId = coPersonId;
-    }
-
-    public int getCouId() {
-        return couId;
-    }
-
-    public void setCouId(int couId) {
-        this.couId = couId;
-    }
-
-    @Override
-    public String toString() {
-        return "PendingUserRole{" +
-                "coPersonId=" + coPersonId +
-                ", couId=" + couId +
-                '}';
-    }
-}
--- a/src/main/java/eu/dnetlib/repo/manager/domain/Repository.java
+++ b/src/main/java/eu/dnetlib/repo/manager/domain/Repository.java
@ -1,92 +0,0 @@
-package eu.dnetlib.repo.manager.domain;
-
-import eu.dnetlib.domain.data.DataCollectionType;
-import eu.dnetlib.domain.data.PiwikInfo;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * The domain object for the Repository resource data structure
- *
- */
-public class Repository extends DatasourceDetails {
-    private static final long serialVersionUID = -7241644234046760972L;
-
-    private List<RepositoryInterface> interfaces = new ArrayList<>();
-
-    private static List<DataCollectionType> dataCollectionTypes = new ArrayList<>();
-
-    private PiwikInfo piwikInfo;
-
-    public Repository() {
-    }
-
-    public List<RepositoryInterface> getInterfaces() {
-        return interfaces;
-    }
-
-    public void setInterfaces(List<RepositoryInterface> interfaces) {
-        this.interfaces = interfaces;
-    }
-
-    public Double getTimezone() {
-        return timezone;
-    }
-
-    public void setTimezone(Double timezone) throws IllegalArgumentException {
-        if (timezone < -12 || timezone > 12 || (timezone % 0.5) != 0) {
-            String t = String.valueOf(timezone);
-            throw new IllegalArgumentException(
-                    "timezone must be in the range [-12.0, 12.0] and must me divided by 0.5. Value given is "
-                            + t);
-        }
-        this.timezone = timezone;
-    }
-
-    public List<DataCollectionType> getDataCollectionTypes() {
-        return dataCollectionTypes;
-    }
-
-    public void setDataCollectionTypes(
-            List<DataCollectionType> dataCollectionTypes) {
-        this.dataCollectionTypes = dataCollectionTypes;
-    }
-
-    public PiwikInfo getPiwikInfo() {
-        return piwikInfo;
-    }
-
-    public void setPiwikInfo(PiwikInfo piwikInfo) {
-        this.piwikInfo = piwikInfo;
-    }
-
-    @Override
-    public int hashCode() {
-        return officialname.hashCode();
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (!(o instanceof Repository))
-            return false;
-        else
-            return this.equals((Repository) o);
-    }
-
-    public boolean equals(Repository r) {
-        // TODO: fill with required fields...
-
-        if (this.getEnglishname() != null && r.getEnglishname() == null) {
-            return false;
-        } else if (this.getEnglishname() == null
-                && r.getEnglishname() != null) {
-            return false;
-        } else if (this.getEnglishname() != null
-                && r.getEnglishname() != null) {
-            return this.getEnglishname().equals(r.getEnglishname());
-        }
-
-        return true;
-    }
-}
--- a/src/main/java/eu/dnetlib/repo/manager/domain/RepositoryInterface.java
+++ b/src/main/java/eu/dnetlib/repo/manager/domain/RepositoryInterface.java
@ -1,57 +0,0 @@
-package eu.dnetlib.repo.manager.domain;
-
-import java.util.Map;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-public class RepositoryInterface extends ApiDetails {
-
-    private static final long serialVersionUID = 8013272950607614479L;
-
-    public void updateApiParam(String param, String value) {
-        for (ApiParamDetails entry : apiParams) {
-            if (entry.getParam().equals(param)) {
-                entry.setValue(value);
-                return;
-            }
-        }
-        ApiParamDetails newSet = new ApiParamDetails();
-        newSet.setParam(param);
-        newSet.setValue(value);
-        this.apiParams.add(newSet);
-    }
-
-    public void setAccessSet(String accessSet) {
-        if (accessSet != null) {
-            updateApiParam("set", accessSet);
-        }
-    }
-
-    public String getAccessSet() {
-        Map<String, String> map;
-        if (apiParams != null) {
-            map = apiParams.stream()
-                    .filter(Objects::nonNull)
-                    .filter(k -> k.getParam() != null && k.getValue() != null)
-                    .collect(Collectors.toMap(ApiParamDetails::getParam, ApiParamDetails::getValue));
-            return map.get("set");
-        }
-        return null;
-    }
-
-    public void setAccessFormat(String accessFormat) {
-        updateApiParam("format", accessFormat);
-    }
-
-    public String getAccessFormat() {
-        Map<String, String> map;
-        if (apiParams != null) {
-            map = apiParams.stream()
-                    .filter(Objects::nonNull)
-                    .filter(k -> k.getParam() != null && k.getValue() != null)
-                    .collect(Collectors.toMap(ApiParamDetails::getParam, ApiParamDetails::getValue));
-            return map.get("format");
-        }
-        return null;
-    }
-}
--- a/src/main/java/eu/dnetlib/repo/manager/exception/RepositoryServiceException.java
+++ b/src/main/java/eu/dnetlib/repo/manager/exception/RepositoryServiceException.java
@ -1,4 +1,4 @@
-package eu.dnetlib.repo.manager.exception;
+package eu.dnetlib.repo.manager.domain;

 /**
 * Created by nikonas on 7/12/15.
--- a/src/main/java/eu/dnetlib/repo/manager/domain/RepositorySnippet.java
+++ b/src/main/java/eu/dnetlib/repo/manager/domain/RepositorySnippet.java
@ -4,33 +4,27 @@ package eu.dnetlib.repo.manager.domain;
 import eu.dnetlib.domain.data.PiwikInfo;

 import java.util.Date;
-import java.util.Set;

 public class RepositorySnippet {

-    // Do not refactor names to keep compatibility with external api.
    private String id;
    private String officialname;
    private String englishname;
    private String websiteurl;
-
+    private String typology;
    private String registeredby;
-    private Date registrationdate;
-    private String eoscDatasourceType;
+    private Organization[] organizations;
+    private String registrationdate;
    private String logoUrl;
    private String description;
-    private Boolean consentTermsOfUse;
+    private String fullTextDownload;
+    private String consentTermsOfUse;
    private Date consentTermsOfUseDate;
-    private Date lastConsentTermsOfUseDate;
-    private Boolean fullTextDownload;
-    private Set<OrganizationDetails> organizations;
-    private String typology;


    private PiwikInfo piwikInfo;

-    public RepositorySnippet() {
-    }
+    public RepositorySnippet() {}

    public String getId() {
        return id;
@ -80,18 +74,19 @@ public class RepositorySnippet {
        this.typology = typology;
    }

-    public Set<OrganizationDetails> getOrganizations() {
+    public Organization[] getOrganizations() {
        return organizations;
    }

-    public void setOrganizations(Set<OrganizationDetails> organizations) {
+    public void setOrganizations(Organization[] organizations) {
        this.organizations = organizations;
    }
-    public Date getRegistrationdate() {
+
+    public String getRegistrationdate() {
        return registrationdate;
    }

-    public void setRegistrationdate(Date registrationdate) {
+    public void setRegistrationdate(String registrationdate) {
        this.registrationdate = registrationdate;
    }

@ -119,19 +114,19 @@ public class RepositorySnippet {
        this.description = description;
    }

-    public Boolean getFullTextDownload() {
+    public String getFullTextDownload() {
        return fullTextDownload;
    }

-    public void setFullTextDownload(Boolean fullTextDownload) {
+    public void setFullTextDownload(String fullTextDownload) {
        this.fullTextDownload = fullTextDownload;
    }

-    public Boolean getConsentTermsOfUse() {
+    public String getConsentTermsOfUse() {
        return consentTermsOfUse;
    }

-    public void setConsentTermsOfUse(Boolean consentTermsOfUse) {
+    public void setConsentTermsOfUse(String consentTermsOfUse) {
        this.consentTermsOfUse = consentTermsOfUse;
    }

@ -142,20 +137,4 @@ public class RepositorySnippet {
    public void setConsentTermsOfUseDate(Date consentTermsOfUseDate) {
        this.consentTermsOfUseDate = consentTermsOfUseDate;
    }
-
-    public Date getLastConsentTermsOfUseDate() {
-        return lastConsentTermsOfUseDate;
-    }
-
-    public void setLastConsentTermsOfUseDate(Date lastConsentTermsOfUseDate) {
-        this.lastConsentTermsOfUseDate = lastConsentTermsOfUseDate;
-    }
-
-    public String getEoscDatasourceType() {
-        return eoscDatasourceType;
-    }
-
-    public void setEoscDatasourceType(String eoscDatasourceType) {
-        this.eoscDatasourceType = eoscDatasourceType;
-    }
 }
--- a/src/main/java/eu/dnetlib/repo/manager/domain/RequestFilter.java
+++ b/src/main/java/eu/dnetlib/repo/manager/domain/RequestFilter.java
@ -7,7 +7,6 @@ public class RequestFilter{

    private String registeredby = null;
    private String typology = null;
-    private String eoscDatasourceType = null;
    private String country = null;
    private String id = null;
    private String officialname = null;
@ -29,14 +28,6 @@ public class RequestFilter{
        this.typology = typology;
    }

-    public String getEoscDatasourceType() {
-        return eoscDatasourceType;
-    }
-
-    public void setEoscDatasourceType(String eoscDatasourceType) {
-        this.eoscDatasourceType = eoscDatasourceType;
-    }
-
    public String getRegisteredby() {
        return registeredby;
    }
--- a/src/main/java/eu/dnetlib/repo/manager/domain/Response.java
+++ b/src/main/java/eu/dnetlib/repo/manager/domain/Response.java
@ -1,20 +0,0 @@
-package eu.dnetlib.repo.manager.domain;
-
-public class Response {
-
-    private Header header;
-
-    public Response() {
-        this.header = new Header();
-    }
-
-    public Header getHeader() {
-        return header;
-    }
-
-    public Response setHeader(final Header header) {
-        this.header = header;
-        return this;
-    }
-}
-
--- a/src/main/java/eu/dnetlib/repo/manager/exception/UserAccessException.java
+++ b/src/main/java/eu/dnetlib/repo/manager/exception/UserAccessException.java
@ -1,4 +1,4 @@
-package eu.dnetlib.repo.manager.exception;
+package eu.dnetlib.repo.manager.domain;



--- a/src/main/java/eu/dnetlib/repo/manager/exception/ValidationServiceException.java
+++ b/src/main/java/eu/dnetlib/repo/manager/exception/ValidationServiceException.java
@ -1,4 +1,4 @@
-package eu.dnetlib.repo.manager.exception;
+package eu.dnetlib.repo.manager.domain;

 /**
 * Created by nikonas on 7/12/15.
--- a/src/main/java/eu/dnetlib/repo/manager/domain/ValidationState.java
+++ b/src/main/java/eu/dnetlib/repo/manager/domain/ValidationState.java
@ -0,0 +1,16 @@
+package eu.dnetlib.repo.manager.domain;
+
+
+import eu.dnetlib.domain.functionality.validator.JobForValidation;
+
+/**
+ * Created by stefania on 2/10/16.
+ */
+public class ValidationState extends WizardState   {
+
+    private JobForValidation jobForValidation = new JobForValidation();
+
+    public JobForValidation getJobForValidation() {
+        return jobForValidation;
+    }
+}
--- a/src/main/java/eu/dnetlib/repo/manager/domain/WizardState.java
+++ b/src/main/java/eu/dnetlib/repo/manager/domain/WizardState.java
@ -0,0 +1,9 @@
+package eu.dnetlib.repo.manager.domain;
+
+
+
+/**
+ * Created by stefania on 2/10/16.
+ */
+public class WizardState   {
+}
--- a/src/main/java/eu/dnetlib/repo/manager/domain/broker/EventsPage.java
+++ b/src/main/java/eu/dnetlib/repo/manager/domain/broker/EventsPage.java
@ -1,6 +1,6 @@
 package eu.dnetlib.repo.manager.domain.broker;

-import eu.dnetlib.broker.objects.OaBrokerEventPayload;
+import eu.dnetlib.broker.objects.OpenAireEventPayload;

 import java.util.List;

@ -14,13 +14,13 @@ public class EventsPage{
    private long currPage;
    private long totalPages;
    private long total;
-    private List<OaBrokerEventPayload> values;
+    private List<OpenAireEventPayload> values;

    public EventsPage() {

    }
    public EventsPage(final String datasource, final String topic, final long currPage, final long totalPages, final long total,
-                      final List<OaBrokerEventPayload> values) {
+                      final List<OpenAireEventPayload> values) {
        this.datasource = datasource;
        this.topic = topic;
        this.currPage = currPage;
@ -69,11 +69,11 @@ public class EventsPage{
        this.total = total;
    }

-    public List<OaBrokerEventPayload> getValues() {
+    public List<OpenAireEventPayload> getValues() {
        return values;
    }

-    public void setValues(List<OaBrokerEventPayload> values) {
+    public void setValues(List<OpenAireEventPayload> values) {
        this.values = values;
    }
 }
--- a/src/main/java/eu/dnetlib/repo/manager/domain/dto/InterfaceComplianceRequestDTO.java
+++ b/src/main/java/eu/dnetlib/repo/manager/domain/dto/InterfaceComplianceRequestDTO.java
@ -1,47 +0,0 @@
-package eu.dnetlib.repo.manager.domain.dto;
-
-import java.util.Date;
-
-public class InterfaceComplianceRequestDTO {
-
-    String repositoryId;
-    String interfaceId;
-    String desiredCompatibilityLevel;
-    Date submissionDate;
-
-    public InterfaceComplianceRequestDTO() {
-        // no-arg constructor
-    }
-
-    public String getRepositoryId() {
-        return repositoryId;
-    }
-
-    public void setRepositoryId(String repositoryId) {
-        this.repositoryId = repositoryId;
-    }
-
-    public String getInterfaceId() {
-        return interfaceId;
-    }
-
-    public void setInterfaceId(String interfaceId) {
-        this.interfaceId = interfaceId;
-    }
-
-    public String getDesiredCompatibilityLevel() {
-        return desiredCompatibilityLevel;
-    }
-
-    public void setDesiredCompatibilityLevel(String desiredCompatibilityLevel) {
-        this.desiredCompatibilityLevel = desiredCompatibilityLevel;
-    }
-
-    public Date getSubmissionDate() {
-        return submissionDate;
-    }
-
-    public void setSubmissionDate(Date submissionDate) {
-        this.submissionDate = submissionDate;
-    }
-}
--- a/src/main/java/eu/dnetlib/repo/manager/domain/dto/RepositoryTerms.java
+++ b/src/main/java/eu/dnetlib/repo/manager/domain/dto/RepositoryTerms.java
@ -1,64 +0,0 @@
-package eu.dnetlib.repo.manager.domain.dto;
-
-import java.util.Date;
-
-public class RepositoryTerms {
-
-    private String id;
-    private String name;
-    private Boolean consentTermsOfUse;
-    private Boolean fullTextDownload;
-    private Date consentTermsOfUseDate;
-    private Date lastConsentTermsOfUseDate;
-
-    public RepositoryTerms() {
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Boolean getConsentTermsOfUse() {
-        return consentTermsOfUse;
-    }
-
-    public void setConsentTermsOfUse(Boolean consentTermsOfUse) {
-        this.consentTermsOfUse = consentTermsOfUse;
-    }
-
-    public Boolean getFullTextDownload() {
-        return fullTextDownload;
-    }
-
-    public void setFullTextDownload(Boolean fullTextDownload) {
-        this.fullTextDownload = fullTextDownload;
-    }
-
-    public Date getConsentTermsOfUseDate() {
-        return consentTermsOfUseDate;
-    }
-
-    public void setConsentTermsOfUseDate(Date consentTermsOfUseDate) {
-        this.consentTermsOfUseDate = consentTermsOfUseDate;
-    }
-
-    public Date getLastConsentTermsOfUseDate() {
-        return lastConsentTermsOfUseDate;
-    }
-
-    public void setLastConsentTermsOfUseDate(Date lastConsentTermsOfUseDate) {
-        this.lastConsentTermsOfUseDate = lastConsentTermsOfUseDate;
-    }
-}
--- a/src/main/java/eu/dnetlib/repo/manager/domain/dto/Role.java
+++ b/src/main/java/eu/dnetlib/repo/manager/domain/dto/Role.java
@ -1,32 +0,0 @@
-package eu.dnetlib.repo.manager.domain.dto;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement
-public class Role {
-    String name;
-    String description;
-
-    public Role() {}
-
-    public Role(String name, String description) {
-        this.name = name;
-        this.description = description;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-}
--- a/src/main/java/eu/dnetlib/repo/manager/domain/dto/User.java
+++ b/src/main/java/eu/dnetlib/repo/manager/domain/dto/User.java
@ -1,61 +0,0 @@
-package eu.dnetlib.repo.manager.domain.dto;
-
-import org.mitre.openid.connect.model.UserInfo;
-
-public class User {
-
-    private String sub;
-    private String firstName;
-    private String lastName;
-    private String email;
-
-    public User() {}
-
-    public User(String sub, String firstName, String lastName, String email) {
-        this.sub = sub;
-        this.firstName = firstName;
-        this.lastName = lastName;
-        this.email = email;
-    }
-
-    public static User from(UserInfo userInfo) {
-        User user = new User();
-        user.setSub(user.getSub());
-        user.setFirstName(userInfo.getGivenName());
-        user.setLastName(userInfo.getFamilyName());
-        user.setEmail(userInfo.getEmail());
-        return user;
-    }
-
-    public String getSub() {
-        return sub;
-    }
-
-    public void setSub(String sub) {
-        this.sub = sub;
-    }
-
-    public String getFirstName() {
-        return firstName;
-    }
-
-    public void setFirstName(String firstName) {
-        this.firstName = firstName;
-    }
-
-    public String getLastName() {
-        return lastName;
-    }
-
-    public void setLastName(String lastName) {
-        this.lastName = lastName;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-}
--- a/src/main/java/eu/dnetlib/repo/manager/exception/ResourceConflictException.java
+++ b/src/main/java/eu/dnetlib/repo/manager/exception/ResourceConflictException.java
@ -1,13 +0,0 @@
-package eu.dnetlib.repo.manager.exception;
-
-
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-@ResponseStatus(HttpStatus.CONFLICT)
-public class ResourceConflictException extends RuntimeException {
-
-    public ResourceConflictException(String message) {
-        super(message);
-    }
-}
--- a/src/main/java/eu/dnetlib/repo/manager/exception/ResourceNotFoundException.java
+++ b/src/main/java/eu/dnetlib/repo/manager/exception/ResourceNotFoundException.java
@ -9,10 +9,6 @@ public class ResourceNotFoundException extends Exception {
        super("Resource Not Found");
    }

-    public ResourceNotFoundException(String message) {
-        super(message);
-    }
-
    public ResourceNotFoundException(String id, String resourceType) {
        super(resourceType + " with id " + id + " was not found");
    }
--- a/src/main/java/eu/dnetlib/repo/manager/oaipmh/OAIPMHClient.java
+++ b/src/main/java/eu/dnetlib/repo/manager/oaipmh/OAIPMHClient.java
@ -0,0 +1,134 @@
+package eu.dnetlib.repo.manager.oaipmh;
+
+import org.apache.http.HttpRequest;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpUriRequest;
+import org.apache.http.client.methods.RequestBuilder;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
+
+import javax.xml.XMLConstants;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.stream.StreamSource;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.Validator;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathExpressionException;
+import javax.xml.xpath.XPathFactory;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+public class OAIPMHClient {
+    public void verifyURL(String url) throws OAIPMHException {
+        try {
+            HttpClient client = HttpClientBuilder.create().build();
+            HttpUriRequest request = RequestBuilder.get().setUri(url).
+                    addParameter("verb", "Identify").build();
+
+            HttpResponse response = client.execute(request);
+
+            if (response.getStatusLine().getStatusCode() == 200) {
+                if (!validateResponse(response.getEntity().getContent())) {
+
+                    try {
+                        getSets(url);
+                    } catch (OAIPMHException e) {
+                        throw e;
+                    }
+                    //throw new OAIPMHException("Response is not valid according to OAI-PMH schema");
+                }
+            } else {
+                throw new OAIPMHException("Error getting response from server: '" +  response.getStatusLine().getReasonPhrase());
+            }
+        } catch (IOException e) {
+            throw new OAIPMHException("Error verifying URL ", e);
+        }
+
+    }
+
+    public Map<String, String> getSets(String url) throws OAIPMHException {
+        Map<String, String> result = new HashMap<>();
+
+        try {
+            HttpClient client = HttpClientBuilder.create().build();
+
+            HttpResponse response = client.execute(new HttpGet(url + "?verb=ListSets"));
+
+            if (response.getStatusLine().getStatusCode() != 200) {
+                throw new OAIPMHException("Error getting response from server. Error: '" +  response.getStatusLine().getReasonPhrase());
+            }
+
+            if (!validateResponse(response.getEntity().getContent())) {
+                throw new OAIPMHException("Response is not valid according to OAI-PMH schema");
+            }
+
+            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+            DocumentBuilder db = dbf.newDocumentBuilder();
+            XPathFactory xpf = XPathFactory.newInstance();
+            XPath xpath = xpf.newXPath();
+
+            String token = null;
+            do {
+                RequestBuilder builder = RequestBuilder.get().setUri(url).addParameter("verb", "ListSets");
+
+                if (token != null)
+                    builder.addParameter("resumptionToken", token);
+
+                HttpUriRequest request = builder.build();
+
+                Document xml = db.parse(client.execute(request).getEntity().getContent());
+                NodeList sets = (NodeList) xpath.evaluate("//*[local-name()='setSpec']", xml, XPathConstants.NODESET);
+
+                for (int i = 0; i < sets.getLength(); i++) {
+                    String setSpec = sets.item(i).getTextContent();
+                    String setName = sets.item(i).getNextSibling().getTextContent();
+
+                    System.out.println(setSpec);
+                    result.put(setSpec, setName);
+                }
+
+                token = ((Node) xpath.evaluate("//*[local-name()='resumptionToken']", xml, XPathConstants.NODE)).getTextContent();
+            } while (token != null && !token.isEmpty());
+        } catch (IOException | ParserConfigurationException | SAXException | XPathExpressionException e) {
+            throw new OAIPMHException("Error getting sets", e);
+        }
+
+        return result;
+    }
+
+    private boolean validateResponse(InputStream response) {
+        try {
+            SchemaFactory factory =
+                    SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+            Schema schema = factory.newSchema(new StreamSource(new URL("http://www.openarchives.org/OAI/2.0/OAI-PMH.xsd").openStream()));
+            Validator validator = schema.newValidator();
+            validator.validate(new StreamSource(response));
+            return true;
+        } catch(Exception ex) {
+            ex.printStackTrace();
+            return false;
+        }
+    }
+
+    public static void main(String[] args) throws OAIPMHException {
+//        new OAIPMHClient().verifyURL("http://digital.csic.es/dspace-oai/request");
+
+        Map<String, String> sets = new OAIPMHClient().getSets("http://digital.csic.es/dspace-oai/request");
+
+        sets.entrySet().forEach(key -> {
+            System.out.println(sets.get(key));
+        });
+    }
+}
--- a/src/main/java/eu/dnetlib/repo/manager/oaipmh/OAIPMHException.java
+++ b/src/main/java/eu/dnetlib/repo/manager/oaipmh/OAIPMHException.java
@ -0,0 +1,18 @@
+package eu.dnetlib.repo.manager.oaipmh;
+
+public class OAIPMHException extends Exception {
+    public OAIPMHException() {
+    }
+
+    public OAIPMHException(String message) {
+        super(message);
+    }
+
+    public OAIPMHException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public OAIPMHException(Throwable cause) {
+        super(cause);
+    }
+}
--- a/src/main/java/eu/dnetlib/repo/manager/repository/InterfaceComplianceRequestsRepository.java
+++ b/src/main/java/eu/dnetlib/repo/manager/repository/InterfaceComplianceRequestsRepository.java
@ -1,15 +0,0 @@
-package eu.dnetlib.repo.manager.repository;
-
-import eu.dnetlib.repo.manager.domain.InterfaceComplianceRequest;
-import eu.dnetlib.repo.manager.domain.InterfaceComplianceRequestId;
-import org.springframework.data.repository.CrudRepository;
-import org.springframework.stereotype.Repository;
-
-import java.util.Date;
-import java.util.Set;
-
-@Repository
-public interface InterfaceComplianceRequestsRepository extends CrudRepository<InterfaceComplianceRequest, InterfaceComplianceRequestId> {
-
-    Set<InterfaceComplianceRequest> findAllBySubmissionDateBefore(Date submittedBefore);
-}
--- a/src/main/java/eu/dnetlib/repo/manager/repository/PendingUserRoleRepository.java
+++ b/src/main/java/eu/dnetlib/repo/manager/repository/PendingUserRoleRepository.java
@ -1,9 +0,0 @@
-package eu.dnetlib.repo.manager.repository;
-
-import eu.dnetlib.repo.manager.domain.PendingUserRole;
-import org.springframework.data.repository.CrudRepository;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface PendingUserRoleRepository extends CrudRepository<PendingUserRole, Long> {
-}
--- a/src/main/java/eu/dnetlib/repo/manager/service/AggregationService.java
+++ b/src/main/java/eu/dnetlib/repo/manager/service/AggregationService.java
@ -1,17 +0,0 @@
-package eu.dnetlib.repo.manager.service;
-
-import eu.dnetlib.openaire.exporter.model.dsm.AggregationInfo;
-import org.json.JSONException;
-
-import java.util.List;
-import java.util.Map;
-
-public interface AggregationService {
-
-    <T extends AggregationInfo> List<T> getRepositoryAggregations(String id) throws JSONException;
-
-    <T extends AggregationInfo> List<T> getRepositoryAggregations(String id, int from, int size) throws JSONException;
-
-    <T extends AggregationInfo> Map<String, List<T>> getRepositoryAggregationsByYear(String id) throws JSONException;
-
-}
--- a/src/main/java/eu/dnetlib/repo/manager/service/AggregationServiceImpl.java
+++ b/src/main/java/eu/dnetlib/repo/manager/service/AggregationServiceImpl.java
@ -1,81 +0,0 @@
-package eu.dnetlib.repo.manager.service;
-
-import eu.dnetlib.openaire.exporter.model.dsm.AggregationHistoryResponseV2;
-import eu.dnetlib.openaire.exporter.model.dsm.AggregationInfo;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
-import org.springframework.web.util.UriComponents;
-import org.springframework.web.util.UriComponentsBuilder;
-
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import static eu.dnetlib.repo.manager.utils.DateUtils.getYear;
-
-@Service("aggregationService")
-public class AggregationServiceImpl implements AggregationService {
-
-    private static final Logger logger = LoggerFactory.getLogger(AggregationServiceImpl.class);
-
-
-    @Value("${services.provide.clients.dsm}")
-    private String baseAddress;
-
-    private final RestTemplate restTemplate;
-
-
-    public AggregationServiceImpl(RestTemplate restTemplate) {
-        this.restTemplate = restTemplate;
-    }
-
-
-    @Override
-    public <T extends AggregationInfo> List<T> getRepositoryAggregations(String id) {
-
-        logger.debug("Retrieving aggregations for repository with id : " + id);
-        UriComponents uriComponents = getAggregationHistory(id);
-
-        AggregationHistoryResponseV2 rs = restTemplate.getForObject(uriComponents.toUri(), AggregationHistoryResponseV2.class);
-
-        return rs != null ? (List<T>) rs.getAggregationInfo() : null;
-    }
-
-    @Override
-    public <T extends AggregationInfo> List<T> getRepositoryAggregations(String id, int from, int size) {
-
-        List<T> res = getRepositoryAggregations(id);
-
-        return res.subList(from, Math.min(from + size, res.size()));
-    }
-
-    @Override
-    public <T extends AggregationInfo> Map<String, List<T>> getRepositoryAggregationsByYear(String id) {
-        logger.debug("Retrieving aggregations (by year) for repository with id : " + id);
-
-        List<T> aggregationHistory = getRepositoryAggregations(id);
-
-        return aggregationHistory.isEmpty() ? new HashMap<>() : createYearMap(aggregationHistory);
-    }
-
-    private <T extends AggregationInfo> Map<String, List<T>> createYearMap(List<T> aggregationHistory) {
-
-        return aggregationHistory.stream()
-                .sorted(Comparator.comparing(AggregationInfo::getDate).reversed())
-                .collect(Collectors.groupingBy(item -> getYear(item.getDate())));
-    }
-
-
-    private UriComponents getAggregationHistory(String repoId) {
-        return UriComponentsBuilder
-                .fromHttpUrl(baseAddress + "/dsm/2.0/aggregationhistory/")
-                .path(repoId)
-                .build().expand(repoId).encode();
-    }
-
-}
--- a/src/main/java/eu/dnetlib/repo/manager/service/BrokerService.java
+++ b/src/main/java/eu/dnetlib/repo/manager/service/BrokerService.java
@ -1,8 +1,8 @@
 package eu.dnetlib.repo.manager.service;

+import eu.dnetlib.repo.manager.domain.BrokerException;
 import eu.dnetlib.repo.manager.domain.Term;
 import eu.dnetlib.repo.manager.domain.broker.*;
-import eu.dnetlib.repo.manager.exception.BrokerException;
 import org.json.JSONException;
 import org.springframework.http.ResponseEntity;

--- a/src/main/java/eu/dnetlib/repo/manager/service/BrokerServiceImpl.java
+++ b/src/main/java/eu/dnetlib/repo/manager/service/BrokerServiceImpl.java
@ -2,20 +2,21 @@ package eu.dnetlib.repo.manager.service;

 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import eu.dnetlib.domain.data.Repository;
+import eu.dnetlib.repo.manager.domain.BrokerException;
 import eu.dnetlib.repo.manager.domain.RepositorySnippet;
 import eu.dnetlib.repo.manager.domain.Term;
 import eu.dnetlib.repo.manager.domain.Tuple;
 import eu.dnetlib.repo.manager.domain.broker.*;
-import eu.dnetlib.repo.manager.exception.BrokerException;
-import org.apache.commons.lang.NotImplementedException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.json.JSONException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.*;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.stereotype.Service;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.RestClientException;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.util.UriComponents;
@ -24,33 +25,33 @@ import org.springframework.web.util.UriComponentsBuilder;
 import javax.annotation.PostConstruct;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.URI;
 import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;

@Service("brokerService")
 public class BrokerServiceImpl implements BrokerService {

    @Autowired
    private RepositoryServiceImpl repoAPI;
-    @Value("${services.provide.broker.url}:${services.provide.broker.port}/${services.provide.broker.api}${services.provide.broker.openaire}")
+    @Value("${services.broker.url}:${services.broker.port}/${services.broker.api}${services.broker.openaire}")
    private String openairePath;
-    @Value("${services.provide.broker.url}:${services.provide.broker.port}/${services.provide.broker.api}")
+    @Value("${services.broker.url}:${services.broker.port}/${services.broker.api}")
    private String apiPath;
-    @Value("${services.provide.topic_types.url}")
+    @Value("${topic_types.url}")
    private String topicsURL;

-    private static final Logger logger = LoggerFactory.getLogger(BrokerServiceImpl.class);
+    private static final org.apache.log4j.Logger LOGGER = org.apache.log4j.Logger
+            .getLogger(BrokerServiceImpl.class);

    @Autowired
-    RestTemplate restTemplate;
+    RestTemplate restTemplate ;

    private HttpHeaders httpHeaders;

-    private final HashMap<String, Term> topics = new HashMap<>();
+    private HashMap<String,Term> topics = new HashMap<String, Term>();
+
+    @Autowired
+    private EmailUtils emailUtils;

    @PostConstruct
    private void initDnetTopicsMap() {
@ -58,29 +59,30 @@ public class BrokerServiceImpl implements BrokerService {
        httpHeaders = new HttpHeaders();
        httpHeaders.set("Content-Type", "application/json");

-        logger.debug("Init dnet topics!");
-        try (InputStream is = new URL(topicsURL).openStream()) {
+        LOGGER.debug("Init dnet topics!");
+        try (InputStream is = new URL(topicsURL).openStream() ){
            ObjectMapper mapper = new ObjectMapper();
            JsonNode root = mapper.readTree(is);
-            for (JsonNode term : root.path("terms"))
+            for (JsonNode term : root.path("terms") )
                topics.put(term.path("code").textValue(), parseTerm(term));
        } catch (IOException e) {
-            logger.error("Exception on initDnetTopicsMap", e);
+            LOGGER.debug("Exception on initDnetTopicsMap" , e);
+            emailUtils.reportException(e);
        }
    }

    private Term parseTerm(JsonNode term) {
-        return new Term(term.path("englishName").textValue(), term.path("nativeName").textValue(),
-                term.path("encoding").textValue(), term.path("code").textValue());
+        return new Term(term.path("englishName").textValue(),term.path("nativeName").textValue(),
+                term.path("encoding").textValue(),term.path("code").textValue());
    }


    @Override
-    public DatasourcesBroker getDatasourcesOfUser(String user, String includeShared, String includeByOthers) {
+    public DatasourcesBroker getDatasourcesOfUser(String user,String includeShared,String includeByOthers) throws JSONException {
        long start = System.currentTimeMillis();
        DatasourcesBroker ret = new DatasourcesBroker();
        try {
-            ret.setDatasourcesOfUser(getDatasourcesOfUserType(repoAPI.getRepositoriesSnippetsOfUser(user, "0", "100")));
+            ret.setDatasourcesOfUser(getDatasourcesOfUserType(repoAPI.getRepositoriesSnippetOfUser(user,"0","100")));
            //TODO fix bug when values are true
 //            if (Boolean.parseBoolean(includeShared)) {
 //                List<String> sharedDatasourceIds = new ArrayList<String>();
@ -90,11 +92,12 @@ public class BrokerServiceImpl implements BrokerService {
 //            if (Boolean.parseBoolean(includeByOthers)) {
 //                ret.setDatasourcesOfOthers(getDatasourcesOfUserType(getRepositoriesOfUser(user)));
 //            }
-        } catch (Exception e) {
-            logger.error("Exception on getDatasourcesOfUser", e);
+        } catch (BrokerException | IOException e) {
+            LOGGER.debug("Exception on getDatasourcesOfUser" , e);
+            emailUtils.reportException(e);
        }
        long end = System.currentTimeMillis();
-        logger.debug("Getting datasources of user in " + (end - start) + "ms");
+        System.out.println("Getting datasources of user in " + (end-start)+"ms");
        return ret;
    }

@ -114,7 +117,8 @@ public class BrokerServiceImpl implements BrokerService {
                    new ParameterizedTypeReference<List<BrowseEntry>>() {
                    });
        } catch (RestClientException e) {
-            logger.error(e.getMessage());
+            LOGGER.debug("Exception on getTopicsForDatasource" , e);
+            emailUtils.reportException(e);
            throw new BrokerException(e);
        }

@ -124,19 +128,18 @@ public class BrokerServiceImpl implements BrokerService {
    @Override
    public EventsPage advancedShowEvents(String page,
                                         String size,
-                                         AdvQueryObject advQueryObject) throws BrokerException {
+                                         AdvQueryObject advQueryObject) throws BrokerException, JSONException ,IOException {

        final String service = "/events/{page}/{pageSize}";

-        long pageNum = Long.parseLong(page);
-        advQueryObject.setPage(pageNum);
-
        Map<String, Long> uriParams = new HashMap<>();
-        uriParams.put("page", pageNum);
+        uriParams.put("page", Long.parseLong(page));
        uriParams.put("pageSize", Long.parseLong(size));

        UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(openairePath + service);

+        MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
+        advQueryObject.setPage(Long.parseLong(page));
        HttpEntity<AdvQueryObject> entity = new HttpEntity<>(advQueryObject, httpHeaders);
        ResponseEntity<EventsPage> resp;
        try {
@ -144,13 +147,17 @@ public class BrokerServiceImpl implements BrokerService {
                    builder.buildAndExpand(uriParams).encode().toUri(),
                    HttpMethod.POST,
                    entity,
-                    new ParameterizedTypeReference<EventsPage>() {}
+                    new ParameterizedTypeReference<EventsPage>() {
+                    }
            );
        } catch (RestClientException e) {
-            logger.error(e.getMessage());
+            LOGGER.debug("Exception on advancedShowEvents" , e);
+            emailUtils.reportException(e);
            throw new BrokerException(e);
        }
        return resp.getBody();
+
+
    }


@ -160,7 +167,7 @@ public class BrokerServiceImpl implements BrokerService {
        for (RepositorySnippet repo : repositories) {
            BrowseEntry temp = new BrowseEntry();
            temp.setValue(repo.getOfficialname());
-            temp.setSize(0L);
+            temp.setSize(new Long(0));
            for (BrowseEntry e : getTopicsForDatasource(repo.getOfficialname())) {
                temp.setSize(temp.getSize() + e.getSize());
            }
@ -169,17 +176,43 @@ public class BrokerServiceImpl implements BrokerService {
        }

        // sort the collection by the second field of the tuple which is size
-        entries.sort((e1, e2) -> (int) (e2.getFirst().getSize() - e1.getFirst().getSize()));
+        Collections.sort(entries, new Comparator<Tuple<BrowseEntry, String>>() {
+            @Override
+            public int compare(Tuple<BrowseEntry, String> e1, Tuple<BrowseEntry, String> e2) {
+                return (int) (e2.getFirst().getSize().longValue() - e1.getFirst().getSize().longValue());
+            }
+        });
        long stop = System.currentTimeMillis();
-        logger.debug("getDatasourcesOfUserType returned in " + (stop - start) + "ms ");
+        System.out.println("getDatasourcesOfUserType returned in " + (stop-start) + "ms ");
+
        return entries;
    }

+    private List<Repository> getRepositoriesOfUser(String userEmail) throws JSONException {
+
+        int page = 0;
+        int size = 50;
+        List<Repository> rs ;
+        List<Repository> resultSet = new ArrayList<>();
+
+        while (true){
+            rs = repoAPI.getRepositoriesOfUser(userEmail, String.valueOf(page), String.valueOf(size));
+            resultSet.addAll(rs);
+            page+=1;
+            if(rs.size() == 0) break;
+        }
+        return resultSet;
+    }
+
+    private List<Repository> getRepositoriesByIds(List<String> sharedDatasourceIds) {
+        return null;
+    }
+
    @Override
    public EventsPage showEvents(String datasourceName,
                                 String topic,
                                 String page,
-                                 String size) throws BrokerException {
+                                 String size) throws BrokerException, JSONException {

        final String service = "/events";

@ -197,7 +230,8 @@ public class BrokerServiceImpl implements BrokerService {
                    new ParameterizedTypeReference<EventsPage>() {
                    });
        } catch (RestClientException e) {
-            logger.error(e.getMessage());
+            LOGGER.debug("Exception on showEvents" , e);
+            emailUtils.reportException(e);
            throw new BrokerException(e);
        }
        return resp.getBody();
@ -209,29 +243,31 @@ public class BrokerServiceImpl implements BrokerService {

        final String service = "/subscriptions";

-        URI uri = UriComponentsBuilder.fromHttpUrl(openairePath + service)
-                .queryParam("email", userEmail).build().encode().toUri();
+        UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(openairePath + service)
+                .queryParam("email", userEmail);

-        logger.debug("{}", uri);
+        LOGGER.debug(builder.build().encode().toUri());
        ResponseEntity<Map<String, List<SimpleSubscriptionDesc>>> resp;
        try {
            resp = restTemplate.exchange(
-                    uri,
+                    builder.build().encode().toUri(),
                    HttpMethod.GET,
                    null,
                    new ParameterizedTypeReference<Map<String, List<SimpleSubscriptionDesc>>>() {
                    });
        } catch (RestClientException e) {
-            logger.error(e.getMessage());
+            LOGGER.debug("Exception on getSimpleSubscriptionsOfUser" , e);
+            emailUtils.reportException(e);
            throw new BrokerException(e);
        }
        return resp.getBody();
    }

    @Override
-    public Map<String, List<SimpleSubscriptionDesc>> getSimpleSubscriptionsOfUserByRepoId(String userEmail, String repoId) {    //throws BrokerException {
-        throw new NotImplementedException();
-        //Map<String, List<SimpleSubscriptionDesc>> subscriptionsOfUser = getSimpleSubscriptionsOfUser(userEmail);
+    public Map<String, List<SimpleSubscriptionDesc>> getSimpleSubscriptionsOfUserByRepoId(String userEmail, String repoId) throws BrokerException {
+        Map<String, List<SimpleSubscriptionDesc>> subscriptionsOfUser = getSimpleSubscriptionsOfUser(userEmail);
+
+        return null;
    }

    @Override
@ -256,7 +292,8 @@ public class BrokerServiceImpl implements BrokerService {
                    new ParameterizedTypeReference<Subscription>() {
                    });
        } catch (RestClientException e) {
-            logger.error(e.getMessage());
+            LOGGER.debug("Exception on OpenaireSubscription" , e);
+            emailUtils.reportException(e);
            throw new BrokerException(e);
        }

@ -279,14 +316,15 @@ public class BrokerServiceImpl implements BrokerService {
                    new ParameterizedTypeReference<Void>() {
                    });
        } catch (RestClientException e) {
-            logger.error(e.getMessage());
+            LOGGER.debug("Exception on unsubscribe" , e);
+            emailUtils.reportException(e);
            throw new BrokerException(e);
        }
-        return new ResponseEntity<>("OK", HttpStatus.OK);
+        return new ResponseEntity<>("OK",HttpStatus.OK);
    }

    @Override
-    public Subscription getSubscription(String subscriptionId) throws BrokerException {
+    public Subscription getSubscription( String subscriptionId) throws BrokerException {
        final String service = "/subscriptions/" + subscriptionId;

        //build the uri params
@ -302,7 +340,8 @@ public class BrokerServiceImpl implements BrokerService {
                    new ParameterizedTypeReference<Subscription>() {
                    });
        } catch (RestClientException e) {
-            logger.error(e.getMessage());
+            LOGGER.debug("Exception on getSubscription" , e);
+            emailUtils.reportException(e);
            throw new BrokerException(e);
        }
        return resp.getBody();
@ -321,7 +360,7 @@ public class BrokerServiceImpl implements BrokerService {
        UriComponents uriComponents = UriComponentsBuilder
                .fromHttpUrl(openairePath + "/notifications/")
                .path("/{id}/{page}/{size}/")
-                .build().expand(subscriptionId, page, size).encode();
+                .build().expand(subscriptionId,page, size).encode();

        ResponseEntity<EventsPage> resp;
        try {
@ -332,7 +371,8 @@ public class BrokerServiceImpl implements BrokerService {
                    new ParameterizedTypeReference<EventsPage>() {
                    });
        } catch (RestClientException e) {
-            logger.error(e.getMessage());
+            LOGGER.debug("Exception on getNotificationsBySubscriptionId" , e);
+            emailUtils.reportException(e);
            throw new BrokerException(e);
        }
        return resp.getBody();
@ -343,16 +383,16 @@ public class BrokerServiceImpl implements BrokerService {
            throws BrokerException {

        Map<String, List<SimpleSubscriptionDesc>> simpleSubs = getSimpleSubscriptionsOfUser(userEmail);
-        Map<String, List<Subscription>> subs = new HashMap<>();
+        Map<String,List<Subscription>> subs = new HashMap<>();
        List<Subscription> subscriptions = null;

-        for (String s : simpleSubs.keySet()) {
+        for(String s:simpleSubs.keySet()){
            List<SimpleSubscriptionDesc> simpleSubscriptionDescs = simpleSubs.get(s);
-            for (SimpleSubscriptionDesc simpleSubscriptionDesc : simpleSubscriptionDescs) {
+            for(SimpleSubscriptionDesc simpleSubscriptionDesc : simpleSubscriptionDescs) {
                subscriptions = new ArrayList<>();
                subscriptions.add(getSubscription(simpleSubscriptionDesc.getId()));
            }
-            subs.put(s, subscriptions);
+            subs.put(s,subscriptions);
        }
        return subs;
    }
--- a/src/main/java/eu/dnetlib/repo/manager/service/DashboardServiceImpl.java
+++ b/src/main/java/eu/dnetlib/repo/manager/service/DashboardServiceImpl.java
@ -1,15 +1,9 @@
 package eu.dnetlib.repo.manager.service;

-import eu.dnetlib.openaire.exporter.model.dsm.AggregationInfo;
-import eu.dnetlib.repo.manager.domain.MetricsNumbers;
-import eu.dnetlib.repo.manager.domain.RepositorySnippet;
-import eu.dnetlib.repo.manager.domain.RepositorySummaryInfo;
+import eu.dnetlib.domain.data.Repository;
+import eu.dnetlib.repo.manager.domain.*;
 import eu.dnetlib.repo.manager.domain.broker.BrowseEntry;
-import eu.dnetlib.repo.manager.exception.BrokerException;
-import eu.dnetlib.repo.manager.exception.RepositoryServiceException;
-import eu.dnetlib.repo.manager.utils.DateUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

@ -19,74 +13,73 @@ import java.util.List;
@Service("dashboardService")
 public class DashboardServiceImpl implements DashboardService {

-    private static final Logger logger = LoggerFactory.getLogger(DashboardServiceImpl.class);
+    private static final Logger logger = Logger.getLogger(DashboardServiceImpl.class);
+
+    @Autowired
+    private EmailUtils emailUtils;

    @Autowired
    private RepositoryService repositoryService;

-    @Autowired
-    private AggregationService aggregationService;
-
    @Autowired
    private BrokerService brokerService;

    @Override
    public List<RepositorySummaryInfo> getRepositoriesSummaryInfo(String userEmail,
                                                                  String page,
-                                                                  String size) {
+                                                                  String size){

        List<RepositorySummaryInfo> repositorySummaryInfoList = new ArrayList<>();

        try {
-            List<RepositorySnippet> repositoriesOfUser = repositoryService.getRepositoriesSnippetsOfUser(userEmail, page, size);
-            for (RepositorySnippet repository : repositoriesOfUser)
-            {
-                String repoId = repository.getId();
-                String repoOfficialName = repository.getOfficialname();

-                RepositorySummaryInfo repositorySummaryInfo = new RepositorySummaryInfo();
-                repositorySummaryInfo.setId(repoId);
-                repositorySummaryInfo.setRepositoryName(repoOfficialName);
-                repositorySummaryInfo.setLogoURL(repository.getLogoUrl());
+                List<Repository> repositoriesOfUser = repositoryService.getRepositoriesOfUser(userEmail, page, size);
+                for(Repository repository: repositoriesOfUser) {
+                    RepositorySummaryInfo repositorySummaryInfo = new RepositorySummaryInfo();
+                    repositorySummaryInfo.setId(repository.getId());
+                    repositorySummaryInfo.setRepositoryName(repository.getOfficialName());
+                    repositorySummaryInfo.setLogoURL(repository.getLogoUrl());

-                //TODO getRepositoryAggregations returns only the 20 more recent items. Is it possible that we will find an indexed version there?
-                boolean isIndexedVersionFound = false;
-                long start = System.currentTimeMillis();
-                List<AggregationInfo> aggregationInfoList = aggregationService.getRepositoryAggregations(repoId, 0, 20);
-                for (AggregationInfo aggregationInfo : aggregationInfoList) {
-                    if (aggregationInfo.isIndexedVersion()) {
-                        repositorySummaryInfo.setRecordsCollected(aggregationInfo.getNumberOfRecords());
-                        repositorySummaryInfo.setLastIndexedVersion(DateUtils.toDate(aggregationInfo.getDate()));
-                        isIndexedVersionFound = true;
-                        break;
+                    //TODO getRepositoryAggregations returns only the 20 more recent items. Is it positive that we will find an indexed version there?
+                    long start = System.currentTimeMillis();
+                    List<AggregationDetails> aggregationDetailsList = repositoryService.getRepositoryAggregations(repository.getId(),0,20);
+                    for(AggregationDetails aggregationDetails: aggregationDetailsList) {
+                        if(aggregationDetails.getIndexedVersion()) {
+                            repositorySummaryInfo.setRecordsCollected(aggregationDetails.getNumberOfRecords());
+                            repositorySummaryInfo.setLastIndexedVersion(aggregationDetails.getDate());
+                            break;
+                        }
                    }
-                }
-                long end = System.currentTimeMillis();
-                if ( isIndexedVersionFound )
-                    logger.debug("Got repo aggregations in " + (end - start) + "ms");
-                else
-                    logger.warn("Could not find repo aggregations, after " + (end - start) + "ms!");
+                    long end = System.currentTimeMillis();

-                try {
-                    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);
+                    System.out.println("Got repo aggregations in "+ (end-start)+"ms");
+
+                    try {
+
+                        MetricsInfo metricsInfo = repositoryService.getMetricsInfoForRepository(repository.getId());
+                        repositorySummaryInfo.setTotalDownloads(metricsInfo.getMetricsNumbers().getTotalDownloads());
+                        repositorySummaryInfo.setTotalViews(metricsInfo.getMetricsNumbers().getTotalViews());
+
+                    } catch (RepositoryServiceException e) {
+                        logger.error("Exception getting metrics info for repository: " + repository.getId(), e);
+                    }
+
+                    try {
+
+                        List<BrowseEntry> events = brokerService.getTopicsForDatasource(repository.getOfficialName());
+                        Long totalEvents = 0L;
+                        for(BrowseEntry browseEntry: events)
+                            totalEvents += browseEntry.getSize();
+                        repositorySummaryInfo.setEnrichmentEvents(totalEvents);
+
+
+                    } catch (BrokerException e) {
+                        logger.error("Exception getting broker events for repository: " + repository.getId(), e);
+                    }
+
+                    repositorySummaryInfoList.add(repositorySummaryInfo);
                }

-                try {
-                    List<BrowseEntry> events = brokerService.getTopicsForDatasource(repoOfficialName);
-                    Long totalEvents = 0L;
-                    for (BrowseEntry browseEntry : events)
-                        totalEvents += browseEntry.getSize();
-                    repositorySummaryInfo.setEnrichmentEvents(totalEvents);
-                } catch (BrokerException e) {
-                    logger.error("Exception getting broker events for repository: {}, {} ", repoId, repoOfficialName, e);
-                }
-
-                repositorySummaryInfoList.add(repositorySummaryInfo);
-            }
        } catch (Exception e) {
            logger.error("Something baad happened!", e);
        }
--- a/src/main/java/eu/dnetlib/repo/manager/service/EmailUtils.java
+++ b/src/main/java/eu/dnetlib/repo/manager/service/EmailUtils.java
@ -1,108 +1,74 @@
 package eu.dnetlib.repo.manager.service;

 import eu.dnetlib.domain.data.PiwikInfo;
+import eu.dnetlib.domain.data.Repository;
+import eu.dnetlib.domain.data.RepositoryInterface;
 import eu.dnetlib.domain.functionality.validator.JobForValidation;
-import eu.dnetlib.repo.manager.domain.InterfaceComplianceRequest;
-import eu.dnetlib.repo.manager.domain.Repository;
-import eu.dnetlib.repo.manager.domain.RepositoryInterface;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.security.core.Authentication;

-import java.util.List;
-
 public interface EmailUtils {

-    @Async
-    void sendAdministratorRequestToEnableMetrics(PiwikInfo piwikInfo);

-    @Async
-    void sendUserRequestToEnableMetrics(PiwikInfo piwikInfo);
+    void reportException(Exception exception);

-    @Async
-    void sendAdministratorMetricsEnabled(PiwikInfo piwikInfo);
+    void sendAdministratorRequestToEnableMetrics(PiwikInfo piwikInfo) throws Exception;

-    @Async
-    void sendUserMetricsEnabled(PiwikInfo piwikInfo);
+    void sendUserRequestToEnableMetrics(PiwikInfo piwikInfo) throws Exception;
+
+    void sendAdministratorMetricsEnabled(PiwikInfo piwikInfo) throws Exception;
+
+    void sendUserMetricsEnabled(PiwikInfo piwikInfo) throws Exception;

    /****USER REGISTRATION REQUEST EMAILS****/
-    @Async
-    void sendAdminRegistrationEmail(Repository repository, Authentication authentication);
+    void sendAdminRegistrationEmail(Repository repository, Authentication authentication) throws Exception;

-    @Async
-    void sendUserRegistrationEmail(Repository repository, Authentication authentication);
+    void sendUserRegistrationEmail(Repository repository, Authentication authentication) throws Exception;

-    @Async
-    void sendAdminRegisterInterfaceEmail(Repository repository, String comment, RepositoryInterface repositoryInterface, String desiredCompatibility, Authentication authentication);
+    void sendAdminRegisterInterfaceEmail(Repository repository, RepositoryInterface repositoryInterface, Authentication authentication) throws Exception;

-    @Async
-    void sendUserRegisterInterfaceEmail(Repository repository, String comment, RepositoryInterface repositoryInterface, String desiredCompatibility, Authentication authentication);
+    void sendUserRegisterInterfaceEmail(Repository repository, RepositoryInterface repositoryInterface, Authentication authentication) throws Exception;

    /****SUCCESSFUL REGISTRATION RESULTS EMAILS****/
-    @Async
-    void sendUserRegistrationResultsSuccessEmail(String issuerEmail, String jobId, RepositoryInterface repositoryInterface, String desiredCompatibility, Repository repository, Authentication authentication);
+    void sendUserRegistrationResultsSuccessEmail(String issuerEmail, String jobId,RepositoryInterface repositoryInterface, Repository repository, Authentication authentication) throws Exception;

-    @Async
-    void sendAdminRegistrationResultsSuccessEmail(String issuerEmail, String jobId, RepositoryInterface repositoryInterface, String desiredCompatibility, Repository repository, Authentication authentication);
+    void sendAdminRegistrationResultsSuccessEmail(String issuerEmail, String jobId,RepositoryInterface repositoryInterface, Repository repository, Authentication authentication) throws Exception;

    /****FAILURE REGISTRATION RESULTS EMAILS****/
-    @Async
-    void sendUserRegistrationResultsFailureEmail(String jobId, RepositoryInterface repositoryInterface, String desiredCompatibility, Repository repository, Authentication authentication);
+    void sendUserRegistrationResultsFailureEmail(String jobId,RepositoryInterface repositoryInterface, Repository repository, Authentication authentication) throws Exception;

-    @Async
-    void sendAdminRegistrationResultsFailureEmail(String issuerEmail, String jobId, RepositoryInterface repositoryInterface, String desiredCompatibility, Repository repository, Authentication authentication);
+    void sendAdminRegistrationResultsFailureEmail(String issuerEmail, String jobId,RepositoryInterface repositoryInterface, Repository repository, Authentication authentication) throws Exception;

    /****SUCCESSFUL UPDATE RESULTS EMAILS****/
-    @Async
-    void sendUserUpdateResultsSuccessEmail(String issuer, String jobId, RepositoryInterface repositoryInterface, String desiredCompatibility, Repository repository, Authentication authentication);
+    void sendUserUpdateResultsSuccessEmail(String issuer, String jobId,RepositoryInterface repositoryInterface, Repository repository, Authentication authentication) throws Exception;

-    @Async
-    void sendAdminUpdateResultsSuccessEmail(String issuerEmail, String jobId, RepositoryInterface repositoryInterface, String desiredCompatibility, Repository repository, Authentication authentication);
+    void sendAdminUpdateResultsSuccessEmail(String issuerEmail, String jobId,RepositoryInterface repositoryInterface, Repository repository, Authentication authentication) throws Exception;

    /****FAILURE UPDATE RESULTS EMAILS****/
-    @Async
-    void sendUserUpdateResultsFailureEmail(String issuer, String jobId, RepositoryInterface repositoryInterface, String desiredCompatibility, Repository repository, Authentication authentication);
+    void sendUserUpdateResultsFailureEmail(String issuer, String jobId,RepositoryInterface repositoryInterface, Repository repository, Authentication authentication) throws Exception;

-    @Async
-    void sendAdminUpdateResultsFailureEmail(String issuerEmail, String jobId, RepositoryInterface repositoryInterface, String desiredCompatibility, Repository repository, Authentication authentication);
-
-    /****FAILURE UPDATE INTERFACE COMPLIANCE****/
-    @Async
-    void sendUserUpdateInterfaceComplianceFailure(List<String> emails, Repository repository, RepositoryInterface repositoryInterface, InterfaceComplianceRequest request);
-
-    @Async
-    void sendAdminUpdateInterfaceComplianceFailure(Repository repository, RepositoryInterface repositoryInterface, InterfaceComplianceRequest request);
+    void sendAdminUpdateResultsFailureEmail(String issuerEmail, String jobId,RepositoryInterface repositoryInterface, Repository repository, Authentication authentication) throws Exception;

    /****VALIDATION OF CONTENT PROVIDER EMAILS****/
-    @Async
-    void sendUserValidationResults(String issuer, String jobId, RepositoryInterface repositoryInterface, Repository repository, Authentication authentication);
+    void sendUserValidationResults(String issuer,String jobId,RepositoryInterface repositoryInterface, Repository repository, Authentication authentication) throws Exception;

-    @Async
-    void sendAdminValidationResults(String issuer, String jobId, RepositoryInterface repositoryInterface, Repository repository, Authentication authentication);
+    void sendAdminValidationResults(String issuer,String jobId,RepositoryInterface repositoryInterface, Repository repository, Authentication authentication) throws Exception;

    /****GENERAL FAILURE OF VALIDATOR****/
-    @Async
-    void sendAdminGeneralFailure(String issuer, String jobId, RepositoryInterface repositoryInterface, Repository repository, Authentication authentication);
+    void sendAdminGeneralFailure(String issuer,String jobId,RepositoryInterface repositoryInterface, Repository repository, Authentication authentication) throws Exception;


-    @Async
-    void sendAdminUpdateRepositoryInfoEmail(Repository repository, Authentication authentication);
+    void sendAdminUpdateRepositoryInfoEmail(Repository repository, Authentication authentication) throws Exception;

-    @Async
-    void sendUserUpdateRepositoryInfoEmail(Repository repository, Authentication authentication);
+    void sendUserUpdateRepositoryInfoEmail(Repository repository, Authentication authentication) throws Exception;

-    @Async
-    void sendAdminUpdateInterfaceEmail(Repository repository, String comment, RepositoryInterface repositoryInterface, String desiredCompatibility, Authentication authentication);
+    void sendAdminUpdateInterfaceEmail(Repository repository, RepositoryInterface repositoryInterface, Authentication authentication) throws Exception;

-    @Async
-    void sendUserUpdateInterfaceEmail(Repository repository, String comment, RepositoryInterface repositoryInterface, String desiredCompatibility, Authentication authentication);
+    void sendUserUpdateInterfaceEmail(Repository repository, RepositoryInterface repositoryInterface, Authentication authentication) throws Exception;

-    @Async
-    void sendSubmitJobForValidationEmail(Authentication authentication, JobForValidation jobForValidation);
+    void sendSubmitJobForValidationEmail(Authentication authentication, JobForValidation jobForValidation) throws Exception;

-    @Async
    void sendUponJobCompletion(String repoId,
                               String repoInterfaceId,
-                               String compatibility,
                               int scoreUsage,
                               int scoreContent,
                               boolean isSuccess,
--- a/src/main/java/eu/dnetlib/repo/manager/service/EmailUtilsImpl.java
+++ b/src/main/java/eu/dnetlib/repo/manager/service/EmailUtilsImpl.java
--- a/src/main/java/eu/dnetlib/repo/manager/service/InterfaceComplianceService.java
+++ b/src/main/java/eu/dnetlib/repo/manager/service/InterfaceComplianceService.java
@ -1,96 +0,0 @@
-package eu.dnetlib.repo.manager.service;
-
-import eu.dnetlib.repo.manager.domain.*;
-import eu.dnetlib.repo.manager.domain.dto.User;
-import eu.dnetlib.repo.manager.exception.ResourceConflictException;
-import eu.dnetlib.repo.manager.exception.ResourceNotFoundException;
-import eu.dnetlib.repo.manager.repository.InterfaceComplianceRequestsRepository;
-import eu.dnetlib.repo.manager.service.security.AuthorizationService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Service;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-@Service
-public class InterfaceComplianceService {
-
-    private static final Logger logger = LoggerFactory.getLogger(InterfaceComplianceService.class);
-
-
-    private final InterfaceComplianceRequestsRepository repository;
-    private final EmailUtils emailUtils;
-    private final AuthorizationService authorizationService;
-    private final RepositoryService repositoryService;
-
-    public InterfaceComplianceService(InterfaceComplianceRequestsRepository repository,
-                                      EmailUtils emailUtils,
-                                      AuthorizationService authorizationService,
-                                      RepositoryService repositoryService) {
-        this.repository = repository;
-        this.emailUtils = emailUtils;
-        this.authorizationService = authorizationService;
-        this.repositoryService = repositoryService;
-    }
-
-
-    @Scheduled(cron = "0 0 0 * * *") // every day at 00:00
-    public void cleanUp() {
-        Set<InterfaceComplianceRequest> requests = getOutdated();
-
-        // TODO - In case we want to send the emails, uncomment the following code.
-        /*for ( InterfaceComplianceRequest request : requests )
-        {
-            String repoId = request.getRepositoryId();
-            String interfaceId = request.getInterfaceId();
-            try {
-                Map<String, RepositoryInterface> repositoryInterfaceMap = repositoryService.getRepositoryInterface(repoId)
-                        .stream()
-                        .collect(Collectors.toMap(ApiDetails::getId, i -> i));
-                RepositoryInterface iFace = repositoryInterfaceMap.get(interfaceId);
-                if ( iFace == null ) {
-                    logger.error("The repository-interface \"" + interfaceId + "\" does not exist! | the request had the \"repoId\": \"" + repoId + "\"");
-                    continue;
-                }
-                Repository repo = repositoryService.getRepositoryById(repoId);
-                List<User> repositoryAdmins = authorizationService.getAdminsOfRepo(repoId);
-                emailUtils.sendUserUpdateInterfaceComplianceFailure(repositoryAdmins.stream().map(User::getEmail).collect(Collectors.toList()), repo, iFace, request);
-                emailUtils.sendAdminUpdateInterfaceComplianceFailure(repo, iFace, request);
-            } catch (ResourceNotFoundException e) {
-                logger.error("Error for request with \"repoId\": \"" + repoId + "\" and \"interfaceId\": \"" + interfaceId + "\"", e);
-            }   // Continue to the next request.
-        }*/
-
-        repository.deleteAll(requests);
-    }
-
-    private Set<InterfaceComplianceRequest> getOutdated() {
-        Calendar calendar = Calendar.getInstance();
-        calendar.add(Calendar.DATE, -7);    // 7-days-old
-        return this.repository.findAllBySubmissionDateBefore(calendar.getTime());
-    }
-
-    public Optional<InterfaceComplianceRequest> getById(InterfaceComplianceRequestId id) {
-        return this.repository.findById(id);
-    }
-
-    public Iterable<InterfaceComplianceRequest> get() {
-        return this.repository.findAll();
-    }
-
-    public InterfaceComplianceRequest create(InterfaceComplianceRequest request) {
-        Optional<InterfaceComplianceRequest> existing = getById(request.getId());
-        if (existing.isPresent()) {
-            logger.warn("New Request: {}\nExisting request: {}", request, existing.get());
-            throw new ResourceConflictException("A request for altering compliance already exists. Desired Compatibility value: " + existing.get().getDesiredCompatibilityLevel());
-        }
-
-        return this.repository.save(request);
-    }
-
-    public void delete(InterfaceComplianceRequestId id) {
-        this.repository.deleteById(id);
-    }
-}
--- a/src/main/java/eu/dnetlib/repo/manager/service/MonitorServiceImpl.java
+++ b/src/main/java/eu/dnetlib/repo/manager/service/MonitorServiceImpl.java
@ -7,11 +7,10 @@ import eu.dnetlib.repo.manager.domain.Constants;
 import eu.dnetlib.repo.manager.domain.JobsOfUser;
 import eu.dnetlib.repo.manager.utils.CrisValidatorUtils;
 import gr.uoa.di.driver.util.ServiceLocator;
+import org.apache.log4j.Logger;
 import org.eurocris.openaire.cris.validator.model.Job;
 import org.eurocris.openaire.cris.validator.service.MapJobDao;
 import org.json.JSONException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

@ -23,8 +22,6 @@ import java.util.stream.Collectors;
@Service("monitorService")
 public class MonitorServiceImpl implements MonitorService {

-    private static final Logger logger = LoggerFactory.getLogger(MonitorServiceImpl.class);
-
    @Autowired
    private MapJobDao crisJobs;

@ -44,6 +41,9 @@ public class MonitorServiceImpl implements MonitorService {
    }


+    private static final Logger LOGGER = Logger
+            .getLogger(MonitorServiceImpl.class);
+
    @Override
    public JobsOfUser getJobsOfUser(String user,
                                    String jobType,
@ -52,7 +52,10 @@ public class MonitorServiceImpl implements MonitorService {
                                    String dateFrom,
                                    String dateTo,
                                    String validationStatus,
-                                    String includeJobsTotal) throws ValidatorServiceException, NumberFormatException {
+                                    String includeJobsTotal) throws JSONException, ValidatorServiceException {
+
+        LOGGER.debug("Getting jobs of user : " + user);
+        LOGGER.debug(user + "/" + jobType + "/" + offset + "/" + dateFrom + "/" + dateTo + "/" + validationStatus + "/" + includeJobsTotal);

        /////////////////////////////////////////////////////////////////////////////////////////
        // FIXME: this is a hack for CRIS Jan Dvorak Validator, should be implemented properly //
@ -95,6 +98,7 @@ public class MonitorServiceImpl implements MonitorService {
                        || (job.getValidationType().equals("U") && job.getContentJobStatus().equals("none") && job.getUsageJobStatus().equals("finished") && job.getUsageJobScore() <= 50)) {
                    job.setValidationStatus("failed");
                }
+
            }
        }

@ -139,6 +143,7 @@ public class MonitorServiceImpl implements MonitorService {
        /////////////////////////////////////////////////////////////////////////////////////////

        return retJobs;
+
    }

    private int getJobsTotalNumberOfUser(String user, String jobType, String validationStatus) throws ValidatorServiceException {
@ -149,7 +154,7 @@ public class MonitorServiceImpl implements MonitorService {
    public int getJobsOfUserPerValidationStatus(String user,
                                                String jobType,
                                                String validationStatus) throws JSONException {
-        logger.debug("Getting job with validation status : " + validationStatus);
+        LOGGER.debug("Getting job with validation status : " + validationStatus);

        if (jobType.equalsIgnoreCase("cris")) {
            return crisJobs.getJobs(user, validationStatus).size();
@ -158,19 +163,20 @@ public class MonitorServiceImpl implements MonitorService {
        try {
            return getValidationService().getStoredJobsTotalNumberNew(user, jobType, validationStatus);
        } catch (ValidatorServiceException e) {
-            logger.error(e.getMessage(), e);
+            LOGGER.error(e);
        }
        return 0;
    }

    @Override
-    public StoredJob getJobSummary(String jobId, String groupBy) {
-        logger.debug("Getting job summary with id : " + jobId);
+    public StoredJob getJobSummary(String jobId,
+                                   String groupBy) throws JSONException {
+        LOGGER.debug("Getting job summary with id : " + jobId);
        StoredJob job = null;
        try {
            job = getValidationService().getStoredJob(Integer.parseInt(jobId), groupBy);
-        } catch (Exception e) {
-            logger.error(e.getMessage(), e);
+        } catch (ValidatorServiceException e) {
+            LOGGER.error(e);
        }
        /////////////////////////////////////////////////////////////////////////////////////////
        // FIXME: this is a hack for CRIS Jan Dvorak Validator, should be implemented properly //
@ -186,5 +192,4 @@ public class MonitorServiceImpl implements MonitorService {
        /////////////////////////////////////////////////////////////////////////////////////////
        return job;
    }
-
 }
--- a/src/main/java/eu/dnetlib/repo/manager/service/PendingUserRoleService.java
+++ b/src/main/java/eu/dnetlib/repo/manager/service/PendingUserRoleService.java
@ -1,36 +0,0 @@
-package eu.dnetlib.repo.manager.service;
-
-import eu.dnetlib.repo.manager.domain.PendingUserRole;
-import eu.dnetlib.repo.manager.repository.PendingUserRoleRepository;
-import eu.dnetlib.repo.manager.service.aai.registry.AaiRegistryService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-
-@Service
-public class PendingUserRoleService {
-
-    private static final Logger logger = LoggerFactory.getLogger(PendingUserRoleService.class);
-    private final PendingUserRoleRepository pendingUserRoleRepository;
-    private final AaiRegistryService aaiRegistryService;
-
-    public PendingUserRoleService(PendingUserRoleRepository pendingUserRoleRepository,
-                                  AaiRegistryService aaiRegistryService) {
-        this.pendingUserRoleRepository = pendingUserRoleRepository;
-        this.aaiRegistryService = aaiRegistryService;
-    }
-
-    public void assignRoles() {
-        Iterable<PendingUserRole> roles = pendingUserRoleRepository.findAll();
-        for (PendingUserRole role : roles) {
-            logger.debug("Attempt to assign role: {}", role);
-            try {
-                aaiRegistryService.assignMemberRole(role.getCoPersonId(), role.getCouId());
-                pendingUserRoleRepository.deleteById(role.getId());
-            } catch (Exception e) {
-                logger.warn("Could not assign role to user. Pending Role: {}\n", role, e);
-            }
-        }
-    }
-
-}
--- a/src/main/java/eu/dnetlib/repo/manager/service/PiWikService.java
+++ b/src/main/java/eu/dnetlib/repo/manager/service/PiWikService.java
@ -4,7 +4,7 @@ package eu.dnetlib.repo.manager.service;
 import eu.dnetlib.domain.data.PiwikInfo;
 import eu.dnetlib.repo.manager.domain.OrderByField;
 import eu.dnetlib.repo.manager.domain.OrderByType;
-import eu.dnetlib.repo.manager.exception.RepositoryServiceException;
+import eu.dnetlib.repo.manager.domain.RepositoryServiceException;
 import org.springframework.http.ResponseEntity;

 import java.util.List;
@ -27,8 +27,4 @@ public interface PiWikService {
    ResponseEntity<Object> markPiwikSiteAsValidated(String repositoryId) throws RepositoryServiceException;

    PiwikInfo enableMetricsForRepository(String officialName, String repoWebsite, PiwikInfo piwikInfo) throws RepositoryServiceException;
-
-    Integer getTotal();
-
-    Integer getValidated(boolean validated);
 }
--- a/src/main/java/eu/dnetlib/repo/manager/service/PiWikServiceImpl.java
+++ b/src/main/java/eu/dnetlib/repo/manager/service/PiWikServiceImpl.java
@ -2,13 +2,12 @@ package eu.dnetlib.repo.manager.service;

 import com.fasterxml.jackson.databind.ObjectMapper;
 import eu.dnetlib.domain.data.PiwikInfo;
+import eu.dnetlib.domain.data.Repository;
 import eu.dnetlib.repo.manager.domain.OrderByField;
 import eu.dnetlib.repo.manager.domain.OrderByType;
-import eu.dnetlib.repo.manager.domain.Repository;
-import eu.dnetlib.repo.manager.exception.RepositoryServiceException;
+import eu.dnetlib.repo.manager.domain.RepositoryServiceException;
 import org.apache.commons.codec.digest.DigestUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
@ -33,14 +32,11 @@ import java.util.Map;
@Service("piwikService")
 public class PiWikServiceImpl implements PiWikService {

-    private static final Logger logger = LoggerFactory.getLogger(PiWikServiceImpl.class);
-
-
    @Autowired
    private DataSource dataSource;


-    @Value("${services.provide.analyticsURL}")
+    @Value("${services.repomanager.analyticsURL}")
    private String analyticsURL;


@ -51,113 +47,107 @@ public class PiWikServiceImpl implements PiWikService {
    @Qualifier("emailUtils")
    private EmailUtils emailUtils;

+    private static final Logger LOGGER = Logger
+            .getLogger(PiWikServiceImpl.class);

-    private static final String GET_PIWIK_SITE = "select repositoryid, siteid, authenticationtoken, creationdate, requestorname, requestoremail, validated, validationdate, comment, repositoryname, country from piwik_site where repositoryid = ? LIMIT 1;";
+    private final static String GET_PIWIK_SITE = "select repositoryid, siteid, authenticationtoken, creationdate, requestorname, requestoremail, validated, validationdate, comment, repositoryname, country from piwik_site where repositoryid = ?;";

-    private static final String INSERT_PIWIK_INFO = "insert into piwik_site (repositoryid, siteid, creationdate, requestorname, requestoremail, validated, repositoryname, country, authenticationtoken) values (?, ?, now(), ?, ?, ?, ?, ?, ?)";
+    private final static String INSERT_PIWIK_INFO = "insert into piwik_site (repositoryid, siteid, creationdate, requestorname, requestoremail, validated, repositoryname, country, authenticationtoken) values (?, ?, now(), ?, ?, ?, ?, ?, ?)";

-    private static final String UPDATE_PIWIK_INFO = "update piwik_site set siteid = ?, creationdate = now(), requestorname = ?, requestoremail = ?, validated = ?, repositoryname = ?, country = ?, authenticationtoken = ? where repositoryid = ?";
+    private final static String GET_PIWIK_SITES = "select  repositoryid, siteid, authenticationtoken, creationdate, requestorname, requestoremail, validated, validationdate, comment, repositoryname, country from piwik_site ";

-    private static final String GET_PIWIK_SITES = "select  repositoryid, siteid, authenticationtoken, creationdate, requestorname, requestoremail, validated, validationdate, comment, repositoryname, country from piwik_site ";
+    private final static String GET_PIWIK_SITES_TOTAL = "select count(*) as totals from piwik_site ";

-    private static final String GET_PIWIK_SITES_TOTAL = "select count(*) as totals from piwik_site ";
+    private final static String APPROVE_PIWIK_SITE = "update piwik_site set validated=true, validationdate=now() where repositoryid = ?;";

-    private static final String APPROVE_PIWIK_SITE = "update piwik_site set validated=true, validationdate=now() where repositoryid = ?;";
-
-    private final RowMapper<PiwikInfo> piwikRowMapper = (rs, i) -> new PiwikInfo(rs.getString("repositoryid"), getOpenaireId(rs.getString("repositoryid")), rs.getString("repositoryname"), rs.getString("country"),
+    private RowMapper<PiwikInfo> piwikRowMapper = (rs, i) -> new PiwikInfo(rs.getString("repositoryid"), getOpenaireId(rs.getString("repositoryid")), rs.getString("repositoryname"), rs.getString("country"),
            rs.getString("siteid"), rs.getString("authenticationtoken"), rs.getTimestamp("creationdate"), rs.getString("requestorname"), rs.getString("requestoremail"),
            rs.getBoolean("validated"), rs.getTimestamp("validationdate"), rs.getString("comment"));


    @Override
    public PiwikInfo getPiwikSiteForRepo(String repositoryId) {
-        try {
+        try{
            return new JdbcTemplate(dataSource).queryForObject(GET_PIWIK_SITE, new String[]{repositoryId}, new int[]{Types.VARCHAR}, piwikRowMapper);
-        } catch (EmptyResultDataAccessException e) {
+        }catch (EmptyResultDataAccessException e){
            return null;
        }
    }

    @Override
-    @PreAuthorize("hasAuthority('SUPER_ADMINISTRATOR') or hasAuthority('CONTENT_PROVIDER_DASHBOARD_ADMINISTRATOR') or (hasAuthority('REGISTERED_USER') and #piwikInfo.requestorEmail == authentication.userInfo.email)")
+    @PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_PROVIDE_ADMIN') or (hasRole('ROLE_USER') and #piwikInfo.requestorEmail == authentication.userInfo.email)")
    public PiwikInfo savePiwikInfo(PiwikInfo piwikInfo) {
        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-        if (getPiwikSiteForRepo(piwikInfo.getRepositoryId()) == null) {
-            jdbcTemplate.update(INSERT_PIWIK_INFO, new Object[]{piwikInfo.getRepositoryId(), piwikInfo.getSiteId(), piwikInfo.getRequestorName(),
-                            piwikInfo.getRequestorEmail(), piwikInfo.isValidated(), piwikInfo.getRepositoryName(), piwikInfo.getCountry(), piwikInfo.getAuthenticationToken()},
-                    new int[]{Types.VARCHAR, Types.VARCHAR, Types.VARCHAR, Types.VARCHAR, Types.BOOLEAN, Types.VARCHAR, Types.VARCHAR, Types.VARCHAR});
-        } else {
-            jdbcTemplate.update(UPDATE_PIWIK_INFO, new Object[]{piwikInfo.getSiteId(), piwikInfo.getRequestorName(), piwikInfo.getRequestorEmail(),
-                            piwikInfo.isValidated(), piwikInfo.getRepositoryName(), piwikInfo.getCountry(), piwikInfo.getAuthenticationToken(), piwikInfo.getRepositoryId()},
-                    new int[]{Types.VARCHAR, Types.VARCHAR, Types.VARCHAR, Types.BOOLEAN, Types.VARCHAR, Types.VARCHAR, Types.VARCHAR, Types.VARCHAR});
-        }
+        jdbcTemplate.update(INSERT_PIWIK_INFO, new Object[]{piwikInfo.getRepositoryId(), piwikInfo.getSiteId(), piwikInfo.getRequestorName(),
+                        piwikInfo.getRequestorEmail(), piwikInfo.isValidated(), piwikInfo.getRepositoryName(), piwikInfo.getCountry(), piwikInfo.getAuthenticationToken()},
+                new int[]{Types.VARCHAR, Types.VARCHAR, Types.VARCHAR, Types.VARCHAR, Types.BOOLEAN, Types.VARCHAR, Types.VARCHAR, Types.VARCHAR});
        return piwikInfo;
    }

    @Override
    public List<PiwikInfo> getPiwikSitesForRepos(OrderByField orderByField, OrderByType orderByType, int from, int quantity, String searchField) {
-        try {
-            String finalizedQuery = GET_PIWIK_SITES + " where (" +
+        try{
+            String finalizedQuery = GET_PIWIK_SITES + " where ("+
                    " repositoryid ilike ? " +
                    " or siteid ilike ?" +
                    " or requestorname ilike ?" +
                    " or requestoremail ilike ?" +
                    " or comment ilike ?" +
-                    " or repositoryname ilike ?" +
+                    " or repositoryname ilike ?"+
                    " or country ilike ?"
-                    + ") order by " + orderByField + " " + orderByType + " offset ? limit ?";
+                    +") order by "+orderByField + " " + orderByType + " offset ? limit ?";

            return new JdbcTemplate(dataSource).query(finalizedQuery, preparedStatement -> {
-                preparedStatement.setString(1, "%" + searchField + "%");
-                preparedStatement.setString(2, "%" + searchField + "%");
-                preparedStatement.setString(3, "%" + searchField + "%");
-                preparedStatement.setString(4, "%" + searchField + "%");
-                preparedStatement.setString(5, "%" + searchField + "%");
-                preparedStatement.setString(6, "%" + searchField + "%");
-                preparedStatement.setString(7, "%" + searchField + "%");
-                preparedStatement.setInt(8, from);
-                preparedStatement.setInt(9, quantity);
+                preparedStatement.setString(1,"%"+searchField+"%");
+                preparedStatement.setString(2,"%"+searchField+"%");
+                preparedStatement.setString(3,"%"+searchField+"%");
+                preparedStatement.setString(4,"%"+searchField+"%");
+                preparedStatement.setString(5,"%"+searchField+"%");
+                preparedStatement.setString(6,"%"+searchField+"%");
+                preparedStatement.setString(7,"%"+searchField+"%");
+                preparedStatement.setInt(8,from);
+                preparedStatement.setInt(9,quantity);
            }, piwikRowMapper);
-        } catch (EmptyResultDataAccessException e) {
+        }catch (EmptyResultDataAccessException e){
            return null;
        }

    }

    @Override
-    public int getPiwikSitesTotals(String searchField) {
-        try {
-            String finalizedQuery = GET_PIWIK_SITES_TOTAL + " where (" +
+    public int getPiwikSitesTotals(String searchField){
+        try{
+            String finalizedQuery = GET_PIWIK_SITES_TOTAL + " where ("+
                    " repositoryid ilike ? " +
                    " or siteid ilike ?" +
                    " or requestorname ilike ?" +
                    " or requestoremail ilike ?" +
                    " or comment ilike ?" +
-                    " or repositoryname ilike ?" +
+                    " or repositoryname ilike ?"+
                    " or country ilike ?)";

            return new JdbcTemplate(dataSource).query(finalizedQuery, preparedStatement -> {
-                preparedStatement.setString(1, "%" + searchField + "%");
-                preparedStatement.setString(2, "%" + searchField + "%");
-                preparedStatement.setString(3, "%" + searchField + "%");
-                preparedStatement.setString(4, "%" + searchField + "%");
-                preparedStatement.setString(5, "%" + searchField + "%");
-                preparedStatement.setString(6, "%" + searchField + "%");
-                preparedStatement.setString(7, "%" + searchField + "%");
-            }, rowMapper -> {
+                preparedStatement.setString(1,"%"+searchField+"%");
+                preparedStatement.setString(2,"%"+searchField+"%");
+                preparedStatement.setString(3,"%"+searchField+"%");
+                preparedStatement.setString(4,"%"+searchField+"%");
+                preparedStatement.setString(5,"%"+searchField+"%");
+                preparedStatement.setString(6,"%"+searchField+"%");
+                preparedStatement.setString(7,"%"+searchField+"%");
+            },rowMapper -> {
                rowMapper.next();
                return rowMapper.getInt("totals");
            });
-        } catch (EmptyResultDataAccessException e) {
+        }catch (EmptyResultDataAccessException e){
            return 0;
        }
    }

    @Override
-    @PreAuthorize("hasAuthority('SUPER_ADMINISTRATOR') or hasAuthority('CONTENT_PROVIDER_DASHBOARD_ADMINISTRATOR')")
+    @PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_PROVIDE_ADMIN')")
    public ResponseEntity<Object> approvePiwikSite(String repositoryId) {
-        new JdbcTemplate(dataSource).update(APPROVE_PIWIK_SITE, new Object[]{repositoryId}, new int[]{Types.VARCHAR});
-        return new ResponseEntity<>("OK", HttpStatus.OK);
+        new JdbcTemplate(dataSource).update(APPROVE_PIWIK_SITE, new Object[] {repositoryId}, new int[] {Types.VARCHAR});
+        return new ResponseEntity<>("OK",HttpStatus.OK);
    }

    @Override
@ -168,7 +158,7 @@ public class PiWikServiceImpl implements PiWikService {
    }

    @Override
-    @PreAuthorize("hasAuthority('SUPER_ADMINISTRATOR') or hasAuthority('CONTENT_PROVIDER_DASHBOARD_ADMINISTRATOR')")
+    @PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_PROVIDE_ADMIN')")
    public ResponseEntity<Object> markPiwikSiteAsValidated(String repositoryId) throws RepositoryServiceException {
        try {
            approvePiwikSite(repositoryId);
@ -178,26 +168,27 @@ public class PiWikServiceImpl implements PiWikService {
            emailUtils.sendUserMetricsEnabled(piwikInfo);

        } catch (EmptyResultDataAccessException e) {
-            logger.error("Error while approving piwik site: ", e);
+            LOGGER.error("Error while approving piwik site: ", e);
+            emailUtils.reportException(e);
            throw new RepositoryServiceException("General error", RepositoryServiceException.ErrorCode.GENERAL_ERROR);
        } catch (Exception e) {
-            logger.error("Error while sending email to administrator or user about the enabling of metrics", e);
-            throw new RepositoryServiceException(e, RepositoryServiceException.ErrorCode.GENERAL_ERROR);
+            LOGGER.error("Error while sending email to administrator or user about the enabling of metrics", e);
+            emailUtils.reportException(e);
        }
-        return new ResponseEntity<>("OK", HttpStatus.OK);
+        return new ResponseEntity<>("OK",HttpStatus.OK);
    }

    @Override
-    @PreAuthorize("hasAuthority('SUPER_ADMINISTRATOR') or hasAuthority('CONTENT_PROVIDER_DASHBOARD_ADMINISTRATOR') or (hasAuthority('REGISTERED_USER') and #piwikInfo.requestorEmail == authentication.userInfo.email)")
+    @PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_PROVIDE_ADMIN') or (hasRole('ROLE_USER') and #piwikInfo.requestorEmail == authentication.userInfo.email)")
    public PiwikInfo enableMetricsForRepository(String officialName,
                                                String repoWebsite,
                                                PiwikInfo piwikInfo) throws RepositoryServiceException {
        try {
-            String url = analyticsURL + "siteName=" + URLEncoder.encode(officialName, "UTF-8") + "&url="
+            String URL = analyticsURL + "siteName=" + URLEncoder.encode(officialName, "UTF-8") + "&url="
                    + URLEncoder.encode(repoWebsite, "UTF-8");
-            Map map = new ObjectMapper().readValue(new URL(url), Map.class);
+            Map map = new ObjectMapper().readValue(new URL(URL), Map.class);
            String siteId = null;
-            if (map.get("value") != null) {
+            if(map.get("value")!=null) {
                siteId = map.get("value").toString();
            }
            piwikInfo.setSiteId(siteId);
@ -212,26 +203,19 @@ public class PiWikServiceImpl implements PiWikService {
            emailUtils.sendAdministratorRequestToEnableMetrics(piwikInfo);
            emailUtils.sendUserRequestToEnableMetrics(piwikInfo);
        } catch (UnsupportedEncodingException uee) {
-            logger.error("Error while creating piwikScript URL", uee);
+            LOGGER.error("Error while creating piwikScript URL", uee);
+            emailUtils.reportException(uee);
            throw new RepositoryServiceException("login.generalError", RepositoryServiceException.ErrorCode.GENERAL_ERROR);
        } catch (IOException ioe) {
-            logger.error("Error while creating piwik site", ioe);
+            LOGGER.error("Error while creating piwik site", ioe);
+            emailUtils.reportException(ioe);
            throw new RepositoryServiceException("login.generalError", RepositoryServiceException.ErrorCode.GENERAL_ERROR);
        } catch (Exception e) {
-            logger.error("Error while sending email to administrator or user about the request to enable metrics", e);
-            throw new RepositoryServiceException(e, RepositoryServiceException.ErrorCode.GENERAL_ERROR);
+            LOGGER.error("Error while sending email to administrator or user about the request to enable metrics", e);
+            emailUtils.reportException(e);
        }
        return piwikInfo;
    }

-    @Override
-    public Integer getTotal() {
-        return new JdbcTemplate(dataSource).queryForObject(GET_PIWIK_SITES_TOTAL, Integer.class, new Object[]{});
-    }

-    @Override
-    public Integer getValidated(boolean validated) {
-        String finalizedQuery = GET_PIWIK_SITES_TOTAL + " where validated = ?";
-        return new JdbcTemplate(dataSource).queryForObject(finalizedQuery, Integer.class, validated);
-    }
 }
--- a/src/main/java/eu/dnetlib/repo/manager/service/RepositoryService.java
+++ b/src/main/java/eu/dnetlib/repo/manager/service/RepositoryService.java
@ -1,65 +1,54 @@
 package eu.dnetlib.repo.manager.service;

 import eu.dnetlib.api.functionality.ValidatorServiceException;
+import eu.dnetlib.domain.data.Repository;
+import eu.dnetlib.domain.data.RepositoryInterface;
 import eu.dnetlib.repo.manager.domain.*;
-import eu.dnetlib.repo.manager.exception.RepositoryServiceException;
 import eu.dnetlib.repo.manager.exception.ResourceNotFoundException;
+import org.json.JSONException;
 import org.springframework.security.core.Authentication;

+import java.io.IOException;
 import java.util.List;
 import java.util.Map;

 public interface RepositoryService {


-    // TODO: move this elsewhere
-    Country[] getCountries();
+    Country[] getCountries() ;

-    List<Repository> getRepositories(List<String> ids);
+    List<RepositorySnippet> getRepositoriesByCountry(String country, String mode, Boolean managed) throws JSONException, IOException;

-    List<Repository> getRepositories(List<String> ids, int page, int size);
+    List<Repository> getRepositoriesOfUser(String userEmail,
+                                           String page,
+                                           String size) throws JSONException, IOException;

-    List<RepositorySnippet> getRepositoriesSnippets(List<String> ids) throws Exception;
+    List<RepositorySnippet> getRepositoriesSnippetOfUser(String userEmail, String page, String size) throws IOException, JSONException;

-    List<RepositorySnippet> getRepositoriesSnippets(List<String> ids, int page, int size) throws Exception;
+    Repository getRepositoryById(String id) throws JSONException, ResourceNotFoundException;

-    List<RepositorySnippet> getRepositoriesByCountry(String country, String mode, Boolean managed);
+    List<AggregationDetails> getRepositoryAggregations(String id, int from, int size) throws JSONException;

-    // TODO: remove?
-    List<Repository> getRepositoriesOfUser(String page, String size);
-
-    // TODO: remove?
-    List<Repository> getRepositoriesOfUser(String userEmail, String page, String size);
-
-    List<RepositorySnippet> getRepositoriesSnippetsOfUser(String page, String size);
-
-    List<RepositorySnippet> getRepositoriesSnippetsOfUser(String userEmail, String page, String size);
-
-    RepositorySnippet getRepositorySnippetById(String id) throws ResourceNotFoundException;
-
-    Repository getRepositoryById(String id) throws ResourceNotFoundException;
+    Map<String,List<AggregationDetails>> getRepositoryAggregationsByYear(String id) throws JSONException;

    List<Repository> getRepositoriesByName(String name,
                                           String page,
-                                           String size);
+                                           String size) throws JSONException;

    List<RepositorySnippet> searchRegisteredRepositories(String country, String typology, String englishName,
-                                                         String officialName, String requestSortBy, String order,
-                                                         int page, int pageSize);
+                                                                String officialName, String requestSortBy, String order,
+                                                                int page, int pageSize) throws Exception;

-    Integer getTotalRegisteredRepositories();
+    List<RepositoryInterface> getRepositoryInterface(String id) throws JSONException;

-    List<RepositoryInterface> getRepositoryInterface(String id);
-
-    Repository addRepository(String datatype, Repository repository);
+    Repository addRepository(String datatype, Repository repository) throws Exception;

    void deleteRepositoryInterface(String id, String registeredBy);

    RepositoryInterface addRepositoryInterface(String datatype,
                                               String repoId,
-                                               String comment,
-                                               RepositoryInterface repositoryInterface,
-                                               String desiredCompatibilityLevel) throws Exception;
+                                               String registeredBy,
+                                               RepositoryInterface iFace) throws Exception;

    List<String> getDnetCountries();

@ -67,9 +56,13 @@ public interface RepositoryService {

    List<Timezone> getTimezones();

-    Repository updateRepository(Repository repository, Authentication authentication);
+    Repository updateRepository(Repository repository, Authentication authentication) throws Exception;

-    List<String> getUrlsOfUserRepos(String userEmail, String page, String size);
+    List<String> getUrlsOfUserRepos(String user_email,
+                                    String page,
+                                    String size) throws JSONException;
+
+    List<String> getDatasourceVocabularies(String mode);

    Map<String, String> getCompatibilityClasses(String mode);

@ -79,9 +72,8 @@ public interface RepositoryService {

    MetricsInfo getMetricsInfoForRepository(String repoId) throws RepositoryServiceException;

-    Map<String, String> getListLatestUpdate(String mode);
+    Map<String, String> getListLatestUpdate(String mode) throws RepositoryServiceException, JSONException;

-    RepositoryInterface updateRepositoryInterface(String repoId, String comment, RepositoryInterface repositoryInterface, String desiredCompatibilityLevel) throws ResourceNotFoundException, ValidatorServiceException;
+    RepositoryInterface updateRepositoryInterface(String repositoryId, String registeredBy, RepositoryInterface repositoryInterface) throws Exception;

-    void updateInterfaceCompliance(String repositoryId, String repositoryInterfaceId, String compliance);
 }
--- a/src/main/java/eu/dnetlib/repo/manager/service/RepositoryServiceImpl.java
+++ b/src/main/java/eu/dnetlib/repo/manager/service/RepositoryServiceImpl.java
--- a/src/main/java/eu/dnetlib/repo/manager/service/StatsServiceImpl.java
+++ b/src/main/java/eu/dnetlib/repo/manager/service/StatsServiceImpl.java
@ -1,248 +1,50 @@
 package eu.dnetlib.repo.manager.service;

-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import eu.dnetlib.repo.manager.service.customHystrixCommands.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestClientException;
 import org.springframework.web.client.RestTemplate;
-import org.springframework.web.util.UriComponents;
-import org.springframework.web.util.UriComponentsBuilder;

 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
-import java.util.Objects;

@Service("statsService")
 public class StatsServiceImpl implements StatsService {

-    private static final Logger logger = LoggerFactory.getLogger(StatsServiceImpl.class);
-
    @Autowired
    RestTemplate restTemplate;

-    @Value("${services.provide.clients.search}")
+    @Value("${search.api.baseAddress}")
    private String baseAddress;
-    @Value("${services.provide.clients.usagestats}")
+    @Value("${search.api.usagestats}")
    private String usagestatsBaseAddress;
-    @Value("${services.provide.clients.usageEvents}")
+    @Value("${search.api.usageEvents}")
    private String usagestatsEvents;

    @Override
    public Map getStatistics()  {
+
+        UsageStatsTotalHystrixCommand usageStatsTotalHystrixCommand = new UsageStatsTotalHystrixCommand(usagestatsEvents,restTemplate);
+        DataRepositoriesHystrixCommand dataRepositoriesHystrixCommand = new DataRepositoriesHystrixCommand(baseAddress,restTemplate);
+        AggregatorsHystrixCommand aggregatorsHystrixCommand = new AggregatorsHystrixCommand(baseAddress,restTemplate);
+        LiteratureHystrixCommand literatureHystrixCommand = new LiteratureHystrixCommand(baseAddress,restTemplate);
+        JournalHystrixCommand journalHystrixCommand = new JournalHystrixCommand(baseAddress,restTemplate);
+        PublicationHystrixCommand publicationHystrixCommand = new PublicationHystrixCommand(baseAddress,restTemplate);
+        DatasetsHystrixCommand datasetsHystrixCommand = new DatasetsHystrixCommand(baseAddress,restTemplate);
+        SoftwareHystrixCommand softwareHystrixCommand = new SoftwareHystrixCommand(baseAddress,restTemplate);
+        LastYearUsageStatsHystrixCommand lastYearUsageStatsHystrixCommand = new LastYearUsageStatsHystrixCommand(usagestatsBaseAddress,restTemplate);
+
        Map<String,Object> stats = new HashMap<>();
-        stats.put("aggregators", this.getAggregatorsStats());
-        stats.put("dataRepositories", this.getDataRepositoriesMetadata());
-        stats.put("literature", this.getLiteratureStats());
-        stats.put("journal", this.getJournalsStats());
-        stats.put("publications", this.getPublicationStats());
-        stats.put("datasets", this.getDatasetsStats());
-        stats.put("software", this.getSoftwareStats());
-        stats.put("lastYearUsagestats", this.getLastYearUsageStats());
-        stats.put("usagestats", this.getUsageStatsTotal());
+        stats.put("aggregators",aggregatorsHystrixCommand.execute());
+        stats.put("dataRepositories",dataRepositoriesHystrixCommand.execute());
+        stats.put("literature",literatureHystrixCommand.execute());
+        stats.put("journal",journalHystrixCommand.execute());
+        stats.put("publications",publicationHystrixCommand.execute());
+        stats.put("datasets",datasetsHystrixCommand.execute());
+        stats.put("software",softwareHystrixCommand.execute());
+        stats.put("lastYearUsagestats", lastYearUsageStatsHystrixCommand.execute());
+        stats.put("usagestats",usageStatsTotalHystrixCommand.execute());
        return stats;
    }
-
-
-    private String getAggregatorsStats()
-    {
-        String url = baseAddress + "/resources" +
-                "?query= " +
-                " oaftype exact datasource and " +
-                " ( datasourcetypename exact Institutional Repository Aggregator " +
-                "     or datasourcetypename exact Publication Repository Aggregator )";
-
-        UriComponents uriComponents = UriComponentsBuilder
-                .fromHttpUrl(url)
-                .queryParam("page", 0)
-                .queryParam("size", 0)
-                .queryParam("format", "json")
-                .build().encode();
-
-        try {
-            ResponseEntity<Map> rs = restTemplate.exchange(uriComponents.toUri(), HttpMethod.GET, null, Map.class);
-            Map metadata = (Map) ((Map<?, ?>) Objects.requireNonNull(rs.getBody())).get("meta");
-            return String.valueOf(metadata.get("total"));
-        } catch ( RestClientException rce ) {
-            logger.error(rce.getMessage());
-            return null;
-        } catch ( Exception e ) {
-            logger.error("", e);
-            return null;
-        }
-    }
-
-
-    private String getDataRepositoriesMetadata()
-    {
-        String url = baseAddress + "/resources" +
-                "?query= " +
-                " oaftype exact datasource and " +
-                " datasourcetypename exact Data Repository ";
-
-        return getMetadataTotals(url);
-    }
-
-
-    private String getLiteratureStats()
-    {
-        String url = baseAddress + "/resources" +
-                "?query= " +
-                " oaftype exact datasource and " +
-                " ( datasourcetypename exact Institutional Repository  " +
-                "     or datasourcetypename exact Publication Repository )";
-
-        return getMetadataTotals(url);
-    }
-
-
-    private String getJournalsStats()
-    {
-        String url = baseAddress + "/resources" +
-                "?query= " +
-                " oaftype exact datasource and " +
-                " datasourcetypename exact Journal";
-
-        return getMetadataTotals(url);
-    }
-
-
-    private String getPublicationStats()
-    {
-        String url = baseAddress + "/publications/count";
-
-        return getCommonStats(url);
-    }
-
-
-    private String getDatasetsStats()
-    {
-        String url = baseAddress + "/datasets/count";
-
-        return getCommonStats(url);
-    }
-
-
-    private String getSoftwareStats()
-    {
-        String url = baseAddress + "/software/count";
-
-        return getCommonStats(url);
-    }
-
-
-    private Map<String,Object> getLastYearUsageStats()
-    {
-        UriComponents uriComponents = UriComponentsBuilder
-                .fromHttpUrl(usagestatsBaseAddress + "/totals")
-                .build().encode();
-
-        try {
-            ResponseEntity<Map> rs = restTemplate.exchange(uriComponents.toUri(), HttpMethod.GET, null, Map.class);
-
-            List yearly_stats = (List) ((Map<?, ?>) Objects.requireNonNull(rs.getBody())).get("yearly_stats");
-            Map lastYear = (Map) yearly_stats.get(yearly_stats.size() - 2);
-            Integer downloads = (Integer) lastYear.get("downloads");
-            Integer views = (Integer) lastYear.get("views");
-            Integer year = (Integer) lastYear.get("year");
-
-            Map<String, Object> usagestats = new HashMap<>();
-            usagestats.put("number", String.valueOf(downloads + views));
-            usagestats.put("year", year);
-            return usagestats;
-        } catch ( RestClientException rce ) {
-            logger.error(rce.getMessage());
-            return null;
-        } catch ( Exception e ) {
-            logger.error("", e);
-            return null;
-        }
-    }
-
-
-    private Integer getUsageStatsTotal()
-    {
-        UriComponents uriComponents = UriComponentsBuilder
-                .fromHttpUrl(usagestatsEvents)
-                .build().encode();
-
-        try {
-            ResponseEntity<Map> rs = restTemplate.exchange(uriComponents.toUri(), HttpMethod.GET, null, Map.class);
-            Map statsTotals = (Map) ((Map<?, ?>) Objects.requireNonNull(rs.getBody())).get("totals");
-            if ( statsTotals == null ) {
-                logger.error("The statsTotals was null!");
-                return null;
-            }
-
-            // TODO - Will we ever need the following lines?
-            // String rs = restTemplate.getForObject(uriComponents.toUri(), String.class);
-            // JSONObject resultSet = new JSONObject(rs);
-            // JSONObject totals = resultSet.getJSONObject("totals");
-
-            return (Integer) statsTotals.get("events");
-        } catch ( RestClientException rce ) {
-            logger.error(rce.getMessage());
-            return null;
-        } catch ( Exception e ) {
-            logger.error("", e);
-            return null;
-        }
-    }
-
-
-    private String getMetadataTotals(String url) {
-        UriComponents uriComponents = UriComponentsBuilder
-                .fromHttpUrl(url)
-                .queryParam("page", 0)
-                .queryParam("size", 0)
-                .queryParam("format", "json")
-                .build().encode();
-
-        try {
-            ResponseEntity<Map> rs = restTemplate.exchange(uriComponents.toUri(), HttpMethod.GET, null, Map.class);
-            Map metadata = (Map) ((Map<?, ?>) Objects.requireNonNull(rs.getBody())).get("meta");
-            if ( metadata == null ) {
-                logger.error("The metadata was null!");
-                return null;
-            }
-            return String.valueOf(metadata.get("total"));
-        } catch ( RestClientException rce ) {
-            logger.error(rce.getMessage());
-            return null;
-        } catch ( Exception e ) {
-            logger.error("", e);
-            return null;
-        }
-    }
-
-
-    private String getCommonStats(String url) {
-        UriComponents uriComponents = UriComponentsBuilder
-                .fromHttpUrl(url)
-                .queryParam("page", 0)
-                .queryParam("size", 0)
-                .queryParam("format", "json")
-                .build().encode();
-
-        try {
-            ResponseEntity<Map> rs = restTemplate.exchange(uriComponents.toUri(), HttpMethod.GET, null, Map.class);
-            Map stats = (Map<?, ?>) rs.getBody();
-            if ( stats == null ) {
-                logger.error("The stats was null!");
-                return null;
-            }
-            return String.valueOf(stats.get("total"));
-        } catch ( RestClientException rce ) {
-            logger.error(rce.getMessage());
-            return null;
-        } catch ( Exception e ) {
-            logger.error("", e);
-            return null;
-        }
-    }
-
 }
--- a/src/main/java/eu/dnetlib/repo/manager/service/sushilite/SushiliteService.java
+++ b/src/main/java/eu/dnetlib/repo/manager/service/sushilite/SushiliteService.java
@ -1,4 +1,4 @@
-package eu.dnetlib.repo.manager.service.sushilite;
+package eu.dnetlib.repo.manager.service;

 import eu.dnetlib.usagestats.sushilite.domain.ReportResponseWrapper;
 import org.json.JSONException;
--- a/src/main/java/eu/dnetlib/repo/manager/service/SushiliteServiceImpl.java
+++ b/src/main/java/eu/dnetlib/repo/manager/service/SushiliteServiceImpl.java
@ -0,0 +1,114 @@
+package eu.dnetlib.repo.manager.service;
+
+import eu.dnetlib.usagestats.sushilite.domain.ReportItem;
+import eu.dnetlib.usagestats.sushilite.domain.ReportResponseWrapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestClientException;
+import org.springframework.web.client.RestTemplate;
+import org.springframework.web.util.UriComponentsBuilder;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service("sushiliteService")
+public class SushiliteServiceImpl implements SushiliteService {
+
+
+    @Value("${services.repomanager.usagestats.sushiliteEndpoint}")
+    private String usagestatsSushiliteEndpoint;
+
+    @Autowired
+    private EmailUtils emailUtils;
+
+    private static final org.apache.log4j.Logger LOGGER = org.apache.log4j.Logger.getLogger(SushiliteServiceImpl.class);
+
+
+    @Override
+    @PreAuthorize("hasRole('ROLE_USER')")
+    public ReportResponseWrapper getReportResults(String page,
+                                                  String pageSize,
+                                                  String Report,
+                                                  String Release,
+                                                  String RequestorID,
+                                                  String BeginDate,
+                                                  String EndDate,
+                                                  String RepositoryIdentifier,
+                                                  String ItemIdentifier,
+                                                  String ItemDataType,
+                                                  String Granularity,
+                                                  String Pretty) {
+
+            //build the uri params
+            UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(this.usagestatsSushiliteEndpoint + "GetReport/")
+                                                                .queryParam("Report", Report)
+                                                                .queryParam("Release", Release)
+                                                                .queryParam("RequestorID", RequestorID)
+                                                                .queryParam("BeginDate", BeginDate)
+                                                                .queryParam("EndDate", EndDate)
+                                                                .queryParam("RepositoryIdentifier", RepositoryIdentifier)
+                                                                .queryParam("ItemIdentifier", ItemIdentifier)
+                                                                .queryParam("ItemDataType", ItemDataType)
+                                                                .queryParam("Granularity", Granularity)
+                                                                .queryParam("Pretty", Pretty);
+
+            //create new template engine
+            RestTemplate template = new RestTemplate();
+            template.getMessageConverters().add(new MappingJackson2HttpMessageConverter());
+
+            ResponseEntity<ReportResponseWrapper> resp;
+            try {
+                //communicate with endpoint
+                resp = template.exchange(
+                        builder.build().encode().toUri(),
+                        HttpMethod.GET,
+                        null,
+                        new ParameterizedTypeReference<ReportResponseWrapper>() {
+                        });
+            } catch (RestClientException e) {
+                LOGGER.debug("Exception on getReportResults" , e);
+                emailUtils.reportException(e);
+                throw e;
+            }
+
+            // check remote api's response
+            System.out.println("sushi responded status " + resp.getStatusCode());
+
+            // get the items corresponding to the requested page
+            List<ReportItem> requestedItemList = new ArrayList<>();
+            if (resp.getBody().getReportResponse().getReportWrapper().getReport().getCustomer().getReportItems() != null) {
+                try {
+                    int totalItems = resp.getBody().getReportResponse().getReportWrapper().getReport().getCustomer().getReportItems().size();
+                    int size = Integer.parseInt(pageSize);
+                    int offset = Integer.parseInt(page)*size;
+
+                    if (offset < totalItems ) {
+                        int upperIndex = offset+size;
+                        if (upperIndex > totalItems) {
+                            upperIndex = totalItems;
+                        }
+                        requestedItemList = resp.getBody().getReportResponse().getReportWrapper().getReport().getCustomer().getReportItems().subList(offset,upperIndex);
+                    }
+
+                } catch (NumberFormatException e) {
+                    LOGGER.debug("Exception on getReportResults - trying to cast strings to integers", e);
+                    //emailUtils.reportException(e);
+                    throw e;
+                }
+
+            }
+
+            ReportResponseWrapper newReportResponse = resp.getBody();
+            newReportResponse.getReportResponse().getReportWrapper().getReport().getCustomer().setReportItems(requestedItemList);
+
+
+            return newReportResponse;
+    }
+
+}
--- a/src/main/java/eu/dnetlib/repo/manager/service/UserServiceImpl.java
+++ b/src/main/java/eu/dnetlib/repo/manager/service/UserServiceImpl.java
@ -1,9 +1,7 @@
 package eu.dnetlib.repo.manager.service;

 import org.mitre.openid.connect.model.OIDCAuthenticationToken;
-import org.mitre.openid.connect.model.UserInfo;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.GrantedAuthority;
@ -18,24 +16,24 @@ import java.util.stream.Collectors;
@Service("userService")
 public class UserServiceImpl implements UserService {

-    private static final Logger logger = LoggerFactory.getLogger(UserServiceImpl.class);
+    private static final org.apache.log4j.Logger LOGGER = org.apache.log4j.Logger
+            .getLogger(UserServiceImpl.class);
+
+    @Value("${oidc.issuer}")
+    private String oidc_issuer;

    @Override
    public ResponseEntity<Object> login() {
        OIDCAuthenticationToken authentication = (OIDCAuthenticationToken) SecurityContextHolder.getContext().getAuthentication();
-        logger.debug("User authentication : " + authentication);
+        LOGGER.debug("User authentication : " + authentication);
        Map<String,Object> body = new HashMap<>();
        body.put("sub",authentication.getSub());
-
-        UserInfo userInfo = authentication.getUserInfo();
-        String userName = userInfo.getName();
-
-        if ( userName == null || userName.isEmpty() )
-            body.put("name", userInfo.getGivenName() + " " + userInfo.getFamilyName());
+        if(authentication.getUserInfo().getName() == null || authentication.getUserInfo().getName().equals(""))
+            body.put("name",authentication.getUserInfo().getGivenName() + " " + authentication.getUserInfo().getFamilyName());
        else
-            body.put("name", userName);
+            body.put("name",authentication.getUserInfo().getName());

-        body.put("email",userInfo.getEmail());
+        body.put("email",authentication.getUserInfo().getEmail());
        List<String> roles = authentication.getAuthorities().stream().map(GrantedAuthority::getAuthority).collect(Collectors.toList());
        body.put("role",roles);

--- a/src/main/java/eu/dnetlib/repo/manager/service/ValidatorService.java
+++ b/src/main/java/eu/dnetlib/repo/manager/service/ValidatorService.java
@ -5,8 +5,8 @@ import eu.dnetlib.domain.functionality.validator.JobForValidation;
 import eu.dnetlib.domain.functionality.validator.RuleSet;
 import eu.dnetlib.domain.functionality.validator.StoredJob;
 import eu.dnetlib.repo.manager.domain.InterfaceInformation;
+import eu.dnetlib.repo.manager.domain.ValidationServiceException;
 import eu.dnetlib.repo.manager.exception.ResourceNotFoundException;
-import eu.dnetlib.repo.manager.exception.ValidationServiceException;
 import org.json.JSONException;
 import org.springframework.http.ResponseEntity;

@ -42,6 +42,4 @@ public interface ValidatorService {
    InterfaceInformation getInterfaceInformation(String baseUrl) throws ValidationServiceException;

    List<StoredJob> getJobsSummary(String repoId, int limit) throws ValidatorServiceException, ResourceNotFoundException, JSONException;
-
-    void onComplete(String repoId, String interfaceId, String jobId, String issuerEmail, boolean isUpdate, boolean isSuccess, int scoreUsage, int scoreContent) throws Exception;
 }
--- a/src/main/java/eu/dnetlib/repo/manager/service/ValidatorServiceImpl.java
+++ b/src/main/java/eu/dnetlib/repo/manager/service/ValidatorServiceImpl.java
@ -1,21 +1,19 @@
 package eu.dnetlib.repo.manager.service;

 import eu.dnetlib.api.functionality.ValidatorServiceException;
-import eu.dnetlib.domain.functionality.validator.JobForValidation;
-import eu.dnetlib.domain.functionality.validator.Rule;
-import eu.dnetlib.domain.functionality.validator.RuleSet;
-import eu.dnetlib.domain.functionality.validator.StoredJob;
-import eu.dnetlib.repo.manager.domain.*;
-import eu.dnetlib.repo.manager.exception.ValidationServiceException;
+import eu.dnetlib.domain.data.RepositoryInterface;
+import eu.dnetlib.domain.functionality.validator.*;
+import eu.dnetlib.repo.manager.domain.Constants;
+import eu.dnetlib.repo.manager.domain.InterfaceInformation;
+import eu.dnetlib.repo.manager.domain.ValidationServiceException;
 import eu.dnetlib.repo.manager.utils.CrisValidatorUtils;
 import eu.dnetlib.repo.manager.utils.OaiTools;
 import gr.uoa.di.driver.util.ServiceLocator;
+import org.apache.log4j.Logger;
 import org.eurocris.openaire.cris.validator.model.Job;
 import org.eurocris.openaire.cris.validator.service.JobExecutor;
 import org.eurocris.openaire.cris.validator.service.MapJobDao;
 import org.json.JSONException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@ -27,7 +25,6 @@ import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.regex.Pattern;
 import java.util.stream.Collectors;


@ -55,9 +52,10 @@ public class ValidatorServiceImpl implements ValidatorService {
        this.validatorServiceLocator = validatorServiceLocator;
    }

-    private final Map<String, List<RuleSet>> rulesetMap = new ConcurrentHashMap<String, List<RuleSet>>();
+    private Map<String, List<RuleSet>> rulesetMap = new ConcurrentHashMap<String, List<RuleSet>>();

-    private static final Logger logger = LoggerFactory.getLogger(ValidatorServiceImpl.class);
+    private static final Logger LOGGER = Logger
+            .getLogger(ValidatorServiceImpl.class);

    @Autowired
    private EmailUtils emailUtils;
@ -68,31 +66,19 @@ public class ValidatorServiceImpl implements ValidatorService {
    @Autowired
    private MapJobDao crisJobs;

-    @Autowired
-    InterfaceComplianceService interfaceComplianceService;
-
-
-    public static final Pattern OPENAIRE_DATA_REGEX = Pattern.compile("^openaire[1-9].0_data$");
-    public static final Pattern OPENAIRE_OR_DRIVER_REGEX = Pattern.compile("^(?:openaire[1-9].0|driver)$");
-    public static final Pattern OPENAIRE_CRIS_REGEX = Pattern.compile("^openaire[1-9].0_cris$");
-    public static final Pattern FAIR_REGEX = Pattern.compile(".*fair$");
-
    @PostConstruct
    private void loadRules(){
-        logger.debug("PostConstruct method! Load rules!");
+        LOGGER.debug("PostConstruct method! Load rules!");
        try {
            for (RuleSet ruleSet : getValidationService().getRuleSets()) {
                if (ruleSet.getVisibility() != null && ruleSet.getVisibility().contains("development")) {
                    String key = "";
-                    String guidelinesAcronym = ruleSet.getGuidelinesAcronym();
-                    if ( OPENAIRE_DATA_REGEX.matcher(guidelinesAcronym).matches() )
+                    if (ruleSet.getGuidelinesAcronym().matches("^openaire[1-9].0_data$"))
                        key = Constants.VALIDATION_MODE_DATA;
-                    else if ( OPENAIRE_OR_DRIVER_REGEX.matcher(guidelinesAcronym).matches() )
+                    else if (ruleSet.getGuidelinesAcronym().matches("^openaire[1-9].0$") || ruleSet.getGuidelinesAcronym().equals("driver"))
                        key = Constants.VALIDATION_MODE_LITERATURE;
-                    else if ( OPENAIRE_CRIS_REGEX.matcher(guidelinesAcronym).matches() )
+                    else if (ruleSet.getGuidelinesAcronym().matches("^openaire[1-9].0_cris$"))
                        key = Constants.VALIDATION_MODE_CRIS;
-                    else if ( FAIR_REGEX.matcher(guidelinesAcronym).matches() )
-                        key = Constants.VALIDATION_MODE_FAIR;

                    if (rulesetMap.containsKey(key))
                        rulesetMap.get(key).add(ruleSet);
@ -133,23 +119,22 @@ public class ValidatorServiceImpl implements ValidatorService {
            /////////////////////////////////////////////////////////////////////////////////////////
            /////////////////////////////////////////////////////////////////////////////////////////
        } catch (ValidatorServiceException e) {
-            logger.error(e.getMessage(), e);
+            LOGGER.error(e);
        }

    }

    @Override
-    @PreAuthorize("hasAuthority('REGISTERED_USER')")
+    @PreAuthorize("hasRole('ROLE_USER') and #jobForValidation.userEmail == authentication.userInfo.email")
    public JobForValidation submitJobForValidation(JobForValidation jobForValidation) throws ValidatorServiceException {
-        logger.debug("Submit job for validation with id : {}", jobForValidation.getDatasourceId());
+        LOGGER.debug("Submit job for validation with id : " + jobForValidation.getDatasourceId());
        try {
-            emailUtils.sendSubmitJobForValidationEmail(SecurityContextHolder.getContext().getAuthentication(), jobForValidation);
+            emailUtils.sendSubmitJobForValidationEmail(SecurityContextHolder.getContext().getAuthentication(),jobForValidation);
            /////////////////////////////////////////////////////////////////////////////////////////
            // FIXME: this is a hack for CRIS Jan Dvorak Validator, should be implemented properly //
            /////////////////////////////////////////////////////////////////////////////////////////
            if (jobForValidation.getSelectedContentRules()!=null && jobForValidation.getSelectedContentRules().size() == 1 &&
-                    jobForValidation.getSelectedContentRules().contains(-1000)
-                    || jobForValidation.getDesiredCompatibilityLevel().equals("openaire-cris_1.1")) {
+                    jobForValidation.getSelectedContentRules().contains(-1000)) {
                crisValidatorExecutor.submit(jobForValidation.getBaseUrl(), jobForValidation.getUserEmail());
            } else {
                this.getValidationService().submitValidationJob(jobForValidation);
@ -157,18 +142,21 @@ public class ValidatorServiceImpl implements ValidatorService {
            /////////////////////////////////////////////////////////////////////////////////////////
            /////////////////////////////////////////////////////////////////////////////////////////
 //            this.getValidationService().submitValidationJob(jobForValidation);
-        } catch (Exception e) { // FIXME: replaced exception with log
-//            throw new ValidatorServiceException(e);
-            logger.error(e.getMessage(), e);
+        } catch (ValidatorServiceException e) {
+            LOGGER.debug("Exception on submitJobForValidation" , e);
+            emailUtils.reportException(e);
+            throw e;
+        } catch (Exception e) {
+            LOGGER.error(e);
        }
-
        return jobForValidation;
    }

    @Override
+    @PreAuthorize("hasRole('ROLE_USER') and #email == authentication.userInfo.email")
    public ResponseEntity<Object> reSubmitJobForValidation(String email,
                                                           String jobId) throws JSONException, ValidatorServiceException {
-        logger.debug("Resubmit validation job with id : {}", jobId);
+        LOGGER.debug("Resubmit validation job with id : " + jobId);
        StoredJob job = monitorApi.getJobSummary(jobId, "all");
        Set<Integer> contentRules = new HashSet<Integer>();
        Set<Integer> usageRules = new HashSet<Integer>();
@ -185,7 +173,7 @@ public class ValidatorServiceImpl implements ValidatorService {
                }
            }
        }
-        if (ruleSet != null) {
+        if (ruleSet != null){
            for (int ruleId : job.getRules()) {
                if (ruleSet.getContentRulesIds().contains(ruleId))
                    contentRules.add(ruleId);
@ -203,57 +191,56 @@ public class ValidatorServiceImpl implements ValidatorService {

    @Override
    public List<RuleSet> getRuleSets(String mode) {
-        logger.info("Getting ruleSets for mode: {}", mode);
+        LOGGER.info("Getting rulesets for mode: " + mode);
        return rulesetMap.get(mode);
    }

    @Override
    public List<String> getSetsOfRepository(String url) {
-        logger.debug("Getting sets of repository with url : {}", url);
-        List<String> sets = null;
+        LOGGER.debug("Getting sets of repository with url : " + url);
        try {
-            sets = OaiTools.getSetsOfRepo(url);
+            return OaiTools.getSetsOfRepo(url);
        } catch (Exception e) {
-            logger.error("Exception on getSetsOfRepository", e);
+            LOGGER.debug("Exception on getSetsOfRepository" , e);
+            emailUtils.reportException(e);
        }
-        return sets;    // It may be null.
+        return null;
    }

    @Override
    public boolean identifyRepo(String url) {
-        logger.debug("Identify repository with url : {}", url);
+        LOGGER.debug("Identify repository with url : " + url);
        try {
            return OaiTools.identifyRepository(url);
        } catch (Exception e) {
-            logger.error("Error while identifying repository with url: " + url, e);
+            LOGGER.error("Error while identifying repository with url: " + url, e);
+            emailUtils.reportException(e);
            return false;
        }
    }

    @Override
    public RuleSet getRuleSet(String acronym) {
-        logger.debug("Getting ruleset with acronym : {}", acronym);
+        LOGGER.debug("Getting ruleset with acronym : " + acronym);
        RuleSet ruleSet = null;
        try {
            for (List<RuleSet> ruleSets : this.rulesetMap.values()) {
-                for ( RuleSet rSet : ruleSets ) {
-                    if ( rSet.getGuidelinesAcronym().equals(acronym) ) {
+                for (RuleSet rSet : ruleSets)
+                    if (rSet.getGuidelinesAcronym().equals(acronym)) {
                        ruleSet = rSet;
                        break;
                    }
-                }
-                if ( ruleSet != null )
-                    break;
            }
-            return ruleSet; // It may be null.
+            return ruleSet;
        } catch (Exception e) {
-            logger.error("Error getting ruleset", e);
+            LOGGER.error("Error getting ruleset", e);
+            emailUtils.reportException(e);
            return null;
        }
    }

    @Override
-    @PreAuthorize("hasAuthority('REGISTERED_USER')")
+    @PreAuthorize("hasRole('ROLE_USER')")
    public List<StoredJob> getStoredJobsNew(String user,
                                            String jobType,
                                            String offset,
@ -286,7 +273,7 @@ public class ValidatorServiceImpl implements ValidatorService {
    @Override
    public InterfaceInformation getInterfaceInformation(String baseUrl) throws ValidationServiceException {
        try {
-            logger.debug("Getting interface information with url: {}", baseUrl);
+            LOGGER.debug("Getting interface information with url: " + baseUrl);
            InterfaceInformation interfaceInformation = new InterfaceInformation();
            interfaceInformation.setIdentified(this.identifyRepo(baseUrl));
            if (interfaceInformation.isIdentified())
@ -294,35 +281,15 @@ public class ValidatorServiceImpl implements ValidatorService {

            return interfaceInformation;
        } catch (Exception e) {
-            logger.error("Error getting interface information with url: " + baseUrl, e);
+            LOGGER.error("Error getting interface information with url: " + baseUrl, e);
+            emailUtils.reportException(e);
            throw new ValidationServiceException("login.generalError", ValidationServiceException.ErrorCode.GENERAL_ERROR);
        }
    }

    @Override
    public List<StoredJob> getJobsSummary(String repoId, int limit) throws JSONException, ValidatorServiceException {
-        return getValidationService().getJobSummary(
-                repositoryService.getRepositoryInterface(repoId)
-                        .stream()
-                        .map(RepositoryInterface::getBaseurl)
-                        .collect(Collectors.toList()), limit);
-    }
-
-    @Override
-    public void onComplete(String repoId, String interfaceId, String jobId, String issuerEmail, boolean isUpdate, boolean isSuccess, int scoreUsage, int scoreContent) throws Exception {
-        InterfaceComplianceRequestId requestId = InterfaceComplianceRequestId.of(repoId, interfaceId);
-        Optional<InterfaceComplianceRequest> request = interfaceComplianceService.getById(requestId);
-        String compatibility = null;
-        if (request.isPresent()) {
-            compatibility = request.get().getDesiredCompatibilityLevel();
-            logger.info("Changing compatibility level. Request: {}", request);
-
-            if (scoreContent > 50) {
-                repositoryService.updateInterfaceCompliance(repoId, interfaceId, request.get().getDesiredCompatibilityLevel());
-            }
-            interfaceComplianceService.delete(requestId);
-        }
-        emailUtils.sendUponJobCompletion(repoId,interfaceId,compatibility,scoreUsage,scoreContent,isSuccess,isUpdate,issuerEmail, jobId);
+        return getValidationService().getJobSummary(repositoryService.getRepositoryInterface(repoId).stream().map(RepositoryInterface::getBaseUrl).collect(Collectors.toList()),limit);
    }

 }
--- a/src/main/java/eu/dnetlib/repo/manager/service/aai/registry/AaiRegistryService.java
+++ b/src/main/java/eu/dnetlib/repo/manager/service/aai/registry/AaiRegistryService.java
@ -1,300 +0,0 @@
-package eu.dnetlib.repo.manager.service.aai.registry;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-import eu.dnetlib.repo.manager.domain.dto.Role;
-import eu.dnetlib.repo.manager.domain.dto.User;
-
-import java.util.List;
-import java.util.Map;
-
-public interface AaiRegistryService {
-
-    /**
-     * 1.1 Get CoPersonId List by authenticated user's Email
-     *
-     * @return
-     */
-    List<Integer> getCoPersonIdsByEmail();
-
-    /**
-     * 1.2 Get CoPersonId List by Email
-     *
-     * @param email
-     * @return
-     */
-    List<Integer> getCoPersonIdsByEmail(String email);
-
-    /**
-     * 1.3 Get a list of User Identifiers by Email
-     *
-     * @param email
-     * @return
-     */
-    List<String> getUserIdentifiersByEmail(String email);
-
-    /**
-     * 1.3 Get a list of User Identifiers by Email
-     *
-     * @param coPersonId
-     * @return
-     */
-    List<String> getUserIdentifiersByCoPersonId(Integer coPersonId);
-
-    /**
-     * 2. Get CoPersonId by AAI identifier
-     *
-     * @return
-     */
-    Integer getCoPersonIdByIdentifier();
-
-    /**
-     * 3.1 Get OpenAIRE cous with a specific name(or substring)
-     *
-     * @param name
-     * @return
-     */
-    JsonArray getCous(String name);
-
-    /**
-     * 3.2 Get all OpenAIRE cous
-     *
-     * @return
-     */
-    JsonArray getCous();
-
-    /**
-     * 4.1 Get a couId by name
-     *
-     * @param name
-     * @return
-     */
-    Integer getCouId(String name);
-
-    /**
-     * 4.2 Get a couId by type.id with/without mapping type
-     *
-     * @param type
-     * @param id
-     * @return
-     */
-    Integer getCouId(String type, String id, boolean communityMap);
-
-    /**
-     * 4.3 Get a couId by type.id with mapping type
-     *
-     * @param type
-     * @param id
-     * @return
-     */
-    Integer getCouId(String type, String id);
-
-    /**
-     * 5. Get User non admin roles
-     *
-     * @param coPersonId
-     * @return
-     */
-    JsonArray getRoles(Integer coPersonId);
-
-    /**
-     * 5.2 Get User non admin active roles
-     *
-     * @param coPersonId
-     * @return
-     */
-    JsonArray getRolesWithStatus(Integer coPersonId, RoleStatus status);
-
-    /**
-     * 5.3 Get User non admin active roles
-     *
-     * @param coPersonIds
-     * @return
-     */
-    JsonArray getRolesWithStatus(List<Integer> coPersonIds, RoleStatus status);
-
-    /**
-     * 6. Get Role id of User base on couId.
-     *
-     * @param coPersonId
-     * @param couId
-     * @return
-     */
-    Integer getRoleId(Integer coPersonId, Integer couId);
-
-    /**
-     * 7. Get User Groups
-     *
-     * @param coPersonId
-     * @return
-     */
-    JsonArray getUserGroups(Integer coPersonId);
-
-    /**
-     * 8. Get User Admin Group of a Cou
-     *
-     * @param coPersonId
-     * @param couId
-     * @return
-     */
-    JsonObject getUserAdminGroup(Integer coPersonId, Integer couId);
-
-    /**
-     * 9. Get Groups of a Cou
-     *
-     * @param couId
-     * @return
-     */
-    JsonArray getCouGroups(Integer couId);
-
-    /**
-     * 10. Get Admin Group of a Cou
-     *
-     * @param couId
-     * @return
-     */
-    JsonObject getCouAdminGroup(Integer couId);
-
-    /**
-     * 11. Get users of a group
-     *
-     * @param coGroupId
-     * @return
-     */
-    JsonArray getGroupMembers(Integer coGroupId);
-
-
-    /**
-     * 12. Get Users' email of a Cou
-     *
-     * @param couId
-     * @param admin
-     * @return
-     */
-    JsonArray getUserEmailByCouId(Integer couId, boolean admin);
-
-    /**
-     * 12.2 Get All Users that have a specific role // TODO: Keep or delete
-     *
-     * @param couId
-     * @return
-     */
-    JsonArray getUsersByCouId(Integer couId);
-
-    /**
-     * 13. Get Users' names of a Cou
-     *
-     * @param couId
-     * @param admin
-     * @return
-     */
-    JsonArray getUserNamesByCouId(Integer couId, boolean admin);
-
-    /**
-     * 14. Get Users' identifiers of a Cou
-     *
-     * @param couId
-     * @param admin
-     * @return
-     */
-    JsonArray getUserIdByCouId(Integer couId, boolean admin);
-
-    /**
-     * 15. Assign a member role to a User
-     *
-     * @param coPersonId
-     * @param couId
-     */
-    void assignMemberRole(Integer coPersonId, Integer couId);
-
-    /**
-     * 16. Remove a member role from a User
-     *
-     * @param coPersonId
-     * @param couId
-     * @param id
-     */
-    void removeMemberRole(Integer coPersonId, Integer couId, Integer id);
-
-    /**
-     * 17. Create a new role
-     *
-     * @param role
-     * @return
-     */
-    Integer createRole(Role role);
-
-    /**
-     * 18. Get User's email
-     *
-     * @param coPersonId
-     * @return
-     */
-    String getUserEmail(Integer coPersonId);
-
-    /**
-     * 19. Get User's names
-     *
-     * @param coPersonId
-     * @return
-     */
-    String getUserNames(Integer coPersonId);
-
-    /**
-     * 20. Get User's identifier
-     *
-     * @param coPersonId
-     * @return
-     */
-    String getUserId(Integer coPersonId);
-
-    /**
-     * 21. Assign an admin role to a User
-     *
-     * @param coPersonId
-     * @param couId
-     */
-    void assignAdminRole(Integer coPersonId, Integer couId);
-
-    /**
-     * 22. Remove an admin role from a User
-     *
-     * @param coPersonId
-     * @param couId
-     */
-    void removeAdminRole(Integer coPersonId, Integer couId);
-
-    /**
-     * 23. Get a cou Names from couIds.
-     *
-     * @param couIds
-     * @return
-     */
-    Map<Integer, String> getCouNames(List<Integer> couIds);
-
-    // TODO: add description
-    List<User> getUsers(Integer couId);
-
-    enum RoleStatus {
-        ACTIVE("Active"),
-        APPROVED("Approved"),
-        CONFIRMED("Confirmed"),
-        DECLINED("Declined"),
-        DELETED("Deleted"),
-        DENIED("Denied"),
-        DUPLICATE("Duplicate"),
-        EXPIRED("Expired"),
-        GRACE_PERIOD("GracePeriod"),
-        INVITED("Invited"),
-        PENDING("Pending"),
-        PENDING_APPROVAL("PendingApproval"),
-        PENDING_CONFIRMATION("PendingConfirmation"),
-        SUSPENDED("Suspended");
-
-        public final String status;
-
-        RoleStatus(String status) {
-            this.status = status;
-        }
-    }
-}
--- a/src/main/java/eu/dnetlib/repo/manager/service/aai/registry/RegistryCalls.java
+++ b/src/main/java/eu/dnetlib/repo/manager/service/aai/registry/RegistryCalls.java
@ -1,460 +0,0 @@
-package eu.dnetlib.repo.manager.service.aai.registry;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.nimbusds.jose.util.StandardCharset;
-import eu.dnetlib.repo.manager.domain.dto.Role;
-import eu.dnetlib.repo.manager.domain.dto.User;
-import eu.dnetlib.repo.manager.service.aai.registry.utils.HttpUtils;
-import eu.dnetlib.repo.manager.service.aai.registry.utils.RegistryUtils;
-import org.mitre.openid.connect.model.OIDCAuthenticationToken;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestClientException;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.util.*;
-
-@Service
-public class RegistryCalls implements AaiRegistryService {
-
-    private static final Logger logger = LoggerFactory.getLogger(RegistryCalls.class);
-
-    public final HttpUtils httpUtils;
-    public final RegistryUtils jsonUtils;
-    private final String coid;
-
-    @Autowired
-    RegistryCalls(HttpUtils httpUtils, RegistryUtils registryUtils, @Value("${services.provide.aai.registry.coid}") String coid) {
-        this.httpUtils = httpUtils;
-        this.jsonUtils = registryUtils;
-        this.coid = coid;
-    }
-
-    private String mapType(String type, boolean communityMap) {
-        if (type.equals("organization")) {
-            type = "institution";
-        } else if (type.equals("ri") && communityMap) {
-            type = "community";
-        }
-        return type;
-    }
-
-    @Override
-    public List<String> getUserIdentifiersByEmail(String email) {
-        List<String> ids = new ArrayList<>();
-        for (Integer coPersonId : getCoPersonIdsByEmail(email)) {
-            ids.addAll(getUserIdentifiersByCoPersonId(coPersonId));
-        }
-        return ids;
-    }
-
-    @Override
-    public List<String> getUserIdentifiersByCoPersonId(Integer coPersonId) throws RestClientException {
-        List<String> ids = new ArrayList<>();
-        Map<String, String> params = new HashMap<>();
-        params.put("copersonid", coPersonId.toString());
-
-        JsonElement response = httpUtils.get("identifiers.json", params);
-        if (response != null) {
-            JsonArray infos = response.getAsJsonObject().get("Identifiers").getAsJsonArray();
-            infos.forEach(info -> {
-                JsonObject jsonInfo = info.getAsJsonObject();
-                if (!jsonInfo.get("Deleted").getAsBoolean()) {
-                    ids.add(jsonInfo.get("Identifier").getAsString());
-                }
-            });
-        }
-        return ids;
-    }
-
-    @Override
-    public List<Integer> getCoPersonIdsByEmail() {
-        try {
-            OIDCAuthenticationToken authentication = (OIDCAuthenticationToken) SecurityContextHolder.getContext().getAuthentication();
-            String email = authentication.getUserInfo().getEmail();
-            return getCoPersonIdsByEmail(email);
-        } catch (Exception e) {
-            logger.error("Get User info: An error occurred ", e);
-            return null;
-        }
-    }
-
-    @Override
-    public List<Integer> getCoPersonIdsByEmail(String email) throws RestClientException {
-        List<Integer> coPersonIds = new ArrayList<>();
-        Map<String, String> params = new HashMap<>();
-        params.put("mail", email);
-        params.put("coid", coid);
-        JsonElement response = httpUtils.get("co_people.json", params);
-        if (response != null) {
-            JsonArray coPeople = response.getAsJsonObject().get("CoPeople").getAsJsonArray();
-            for (int i = 0; i < coPeople.size(); i++) {
-                coPersonIds.add(coPeople.get(i).getAsJsonObject().get("Id").getAsInt());
-            }
-        }
-        return coPersonIds;
-    }
-
-    @Override
-    public Integer getCoPersonIdByIdentifier() {
-        try {
-            OIDCAuthenticationToken authentication = (OIDCAuthenticationToken) SecurityContextHolder.getContext().getAuthentication();
-            String sub = authentication.getUserInfo().getSub();
-            return getCoPersonIdByIdentifier(sub);
-        } catch (Exception e) {
-            logger.error("Get User info: An error occurred ", e);
-            return null;
-        }
-    }
-
-    public Integer getCoPersonIdByIdentifier(String sub) throws RestClientException {
-        Map<String, String> params = new HashMap<>();
-        params.put("search.identifier", sub);
-        params.put("coid", coid);
-        JsonElement response = httpUtils.get("co_people.json", params);
-        return (response != null) ? response.getAsJsonObject().get("CoPeople").getAsJsonArray().get(0).getAsJsonObject().get("Id").getAsInt() : null;
-    }
-
-    @Override
-    public JsonArray getCous(String name) throws RestClientException {
-        Map<String, String> params = new HashMap<>();
-        if (name != null) {
-            try {
-                params.put("name", URLEncoder.encode(name, StandardCharset.UTF_8.name()).toLowerCase());
-            } catch (UnsupportedEncodingException uee) {
-                logger.error(uee.getMessage());
-                return new JsonArray();
-            }
-        }
-        JsonElement response = httpUtils.get("cous.json", params);
-        return (response != null) ? response.getAsJsonObject().get("Cous").getAsJsonArray() : new JsonArray();
-    }
-
-    @Override
-    public JsonArray getCous() {
-        return getCous(null);
-    }
-
-    @Override
-    public Integer getCouId(String name) {
-        JsonArray cous = getCous(name);
-        for (JsonElement cou : cous) {
-            if (cou.getAsJsonObject().get("Name").getAsString().equalsIgnoreCase(name)) {
-                return cou.getAsJsonObject().get("Id").getAsInt();
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public Integer getCouId(String type, String id, boolean communityMap) {
-        return getCouId(mapType(type, communityMap) + "." + id);
-    }
-
-    @Override
-    public Integer getCouId(String type, String id) {
-        return getCouId(type, id, true);
-    }
-
-    @Override
-    public JsonArray getRoles(Integer coPersonId) throws RestClientException {
-        Map<String, String> params = new HashMap<>();
-        params.put("coid", coid);
-        params.put("copersonid", coPersonId.toString());
-        JsonElement response = httpUtils.get("co_person_roles.json", params);
-        return (response != null) ? response.getAsJsonObject().get("CoPersonRoles").getAsJsonArray() : new JsonArray();
-    }
-
-    @Override
-    public JsonArray getRolesWithStatus(Integer coPersonId, RoleStatus status) {
-        return getRolesWithStatus(Collections.singletonList(coPersonId), status);
-    }
-
-    @Override
-    public JsonArray getRolesWithStatus(List<Integer> coPersonIds, RoleStatus status) {
-        JsonArray roles = new JsonArray();
-        coPersonIds.parallelStream().forEach(coPersonId -> roles.addAll(getRoles(coPersonId)));
-        JsonArray activeRoles = new JsonArray();
-        if (status != null) {
-            for (JsonElement role : roles) {
-                if (role.getAsJsonObject().get("Status").getAsString().equalsIgnoreCase(status.toString())) {
-                    activeRoles.add(role);
-                }
-            }
-        }
-        return activeRoles;
-    }
-
-    @Override
-    public Integer getRoleId(Integer coPersonId, Integer couId) {
-        JsonArray roles = getRoles(coPersonId);
-        for (JsonElement role : roles) {
-            JsonObject object = role.getAsJsonObject();
-            if (object.get("CouId").getAsInt() == couId && !object.get("Status").getAsString().equals("Deleted")) {
-                return object.get("Id").getAsInt();
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public JsonArray getUserGroups(Integer coPersonId) throws RestClientException {
-        Map<String, String> params = new HashMap<>();
-        params.put("copersonid", coPersonId.toString());
-        JsonElement response = httpUtils.get("co_groups.json", params);
-        return (response != null) ? response.getAsJsonObject().get("CoGroups").getAsJsonArray() : new JsonArray();
-    }
-
-    @Override
-    public JsonObject getUserAdminGroup(Integer coPersonId, Integer couId) throws RestClientException {
-        Map<String, String> params = new HashMap<>();
-        params.put("copersonid", coPersonId.toString());
-        JsonElement response = httpUtils.get("co_groups.json", params);
-        JsonArray roles = (response != null) ? response.getAsJsonObject().get("CoGroups").getAsJsonArray() : new JsonArray();
-        for (JsonElement role : roles) {
-            JsonObject object = role.getAsJsonObject();
-            if (object.get("CouId") != null && object.get("CouId").getAsInt() == couId) {
-                if (object.get("Name").getAsString().contains("admins")) {
-                    return object;
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public JsonArray getCouGroups(Integer couId) throws RestClientException {
-        Map<String, String> params = new HashMap<>();
-        params.put("couid", couId.toString());
-        JsonElement response = httpUtils.get("co_groups.json", params);
-        return (response != null) ? response.getAsJsonObject().get("CoGroups").getAsJsonArray() : new JsonArray();
-    }
-
-    @Override
-    public JsonObject getCouAdminGroup(Integer couId) {
-        JsonArray groups = getCouGroups(couId);
-        for (JsonElement group : groups) {
-            if (group.getAsJsonObject().get("Name").getAsString().contains("admins")) {
-                return group.getAsJsonObject();
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public JsonArray getGroupMembers(Integer coGroupId) throws RestClientException {
-        Map<String, String> params = new HashMap<>();
-        params.put("cogroupid", coGroupId.toString());
-        JsonElement response = httpUtils.get("co_group_members.json", params);
-        return (response != null) ? response.getAsJsonObject().get("CoGroupMembers").getAsJsonArray() : new JsonArray();
-    }
-
-
-    @Override
-    public JsonArray getUserEmailByCouId(Integer couId, boolean admin) throws RestClientException {
-        Map<String, String> params = new HashMap<>();
-        if (couId == null) {
-            throw new IllegalArgumentException("Provided 'couId' is null");
-        }
-        params.put("couid", couId.toString());
-        if (admin) {
-            params.put("admin", "true");
-        }
-        JsonElement response = httpUtils.get("email_addresses.json", params);
-        JsonArray infos = (response != null) ? response.getAsJsonObject().get("EmailAddresses").getAsJsonArray() : new JsonArray();
-        JsonArray emails = new JsonArray();
-        infos.forEach(info -> {
-            JsonObject user = new JsonObject();
-            boolean add = true;
-            String email = info.getAsJsonObject().get("Mail").getAsString();
-            for (JsonElement element : emails) {
-                if (element.getAsJsonObject().get("email").getAsString().equals(email)) {
-                    add = false;
-                }
-            }
-            if (add) {
-                user.addProperty("email", email);
-                user.addProperty("memberSince", info.getAsJsonObject().get("Created").getAsString());
-                emails.add(user);
-            }
-        });
-        return emails;
-    }
-
-    @Override
-    public JsonArray getUsersByCouId(Integer couId) throws RestClientException {
-        Map<String, String> params = new HashMap<>();
-        params.put("couid", couId.toString());
-        JsonElement response = httpUtils.get("co_person_roles.json", params);
-        JsonArray infos = (response != null) ? response.getAsJsonObject().get("CoPersonRoles").getAsJsonArray() : new JsonArray();
-//        JsonArray users = new JsonArray();
-//        infos.forEach(info -> {
-//            JsonObject user = new JsonObject();
-//            user.addProperty("email", info.getAsJsonObject().get("Mail").getAsString());
-//            user.addProperty("memberSince", info.getAsJsonObject().get("Created").getAsString());
-//            emails.add(user);
-//        });
-        return infos;
-    }
-
-    @Override
-    public List<User> getUsers(Integer couId) {
-        List<User> users = new ArrayList<>();
-        JsonArray infos = getUserEmailByCouId(couId, false);
-
-        infos.forEach(info -> {
-            JsonObject jsonInfo = info.getAsJsonObject();
-
-            User user = new User();
-            user.setEmail(jsonInfo.get("email").getAsString());
-            // TODO: should add firstname and lastname and sub of user
-
-            users.add(user);
-        });
-        return users;
-    }
-
-    @Override
-    public JsonArray getUserNamesByCouId(Integer couId, boolean admin) throws RestClientException {
-        Map<String, String> params = new HashMap<>();
-        params.put("couid", couId.toString());
-        if (admin) {
-            params.put("admin", "true");
-        }
-        JsonElement response = httpUtils.get("names.json", params);
-        JsonArray infos = (response != null) ? response.getAsJsonObject().get("Names").getAsJsonArray() : new JsonArray();
-        JsonArray names = new JsonArray();
-        infos.forEach(info -> {
-            JsonObject jsonInfo = info.getAsJsonObject();
-            JsonObject user = new JsonObject();
-            user.addProperty("name", jsonInfo.get("Given").getAsString() + " " + jsonInfo.get("Family").getAsString());
-            user.addProperty("memberSince", jsonInfo.get("Created").getAsString());
-            names.add(user);
-        });
-        return names;
-    }
-
-    @Override
-    public JsonArray getUserIdByCouId(Integer couId, boolean admin) throws RestClientException {
-        Map<String, String> params = new HashMap<>();
-        params.put("couid", couId.toString());
-        if (admin) {
-            params.put("admin", "true");
-        }
-        JsonElement response = httpUtils.get("identifiers.json", params);
-        JsonArray infos = (response != null) ? response.getAsJsonObject().get("Identifiers").getAsJsonArray() : new JsonArray();
-        JsonArray emails = new JsonArray();
-        infos.forEach(info -> {
-            JsonObject jsonInfo = info.getAsJsonObject();
-            JsonObject user = new JsonObject();
-            user.addProperty("id", jsonInfo.get("Identifier").getAsString());
-            user.addProperty("memberSince", jsonInfo.get("Created").getAsString());
-            emails.add(user);
-        });
-        return emails;
-    }
-
-    @Override
-    public void assignMemberRole(Integer coPersonId, Integer couId) throws RestClientException {
-        httpUtils.post("co_person_roles.json", jsonUtils.coPersonRoles(coPersonId, couId, "Active"));
-    }
-
-
-    @Override
-    public void removeMemberRole(Integer coPersonId, Integer couId, Integer id) throws RestClientException {
-        if (id != null) {
-            httpUtils.put("co_person_roles/" + id + ".json", jsonUtils.coPersonRoles(coPersonId, couId, "Deleted"));
-        }
-    }
-
-    @Override
-    public Integer createRole(Role role) throws RestClientException {
-        JsonElement element = httpUtils.post("cous.json", jsonUtils.createNewCou(role));
-        return element.getAsJsonObject().get("Id").getAsInt();
-    }
-
-    @Override
-    public String getUserEmail(Integer coPersonId) throws RestClientException {
-        Map<String, String> params = new HashMap<>();
-        params.put("copersonid", coPersonId.toString());
-        JsonElement response = httpUtils.get("email_addresses.json", params);
-        JsonObject info = (response != null) ? response.getAsJsonObject().get("EmailAddresses").getAsJsonArray().get(0).getAsJsonObject() : null;
-        return (info != null) ? info.getAsJsonObject().get("Mail").getAsString() : null;
-    }
-
-    @Override
-    public String getUserNames(Integer coPersonId) throws RestClientException {
-        Map<String, String> params = new HashMap<>();
-        params.put("copersonid", coPersonId.toString());
-        JsonElement response = httpUtils.get("names.json", params);
-        JsonObject info = (response != null) ? response.getAsJsonObject().get("Names").getAsJsonArray().get(0).getAsJsonObject() : null;
-        if (info != null) {
-            JsonObject jsonInfo = info.getAsJsonObject();
-            return jsonInfo.get("Given").getAsString() + " " + jsonInfo.get("Family").getAsString();
-        } else
-            return null;
-    }
-
-    @Override
-    public String getUserId(Integer coPersonId) throws RestClientException {
-        Map<String, String> params = new HashMap<>();
-        params.put("copersonid", coPersonId.toString());
-        JsonElement response = httpUtils.get("identifiers.json", params);
-        JsonObject info = (response != null) ? response.getAsJsonObject().get("Identifiers").getAsJsonArray().get(0).getAsJsonObject() : null;
-        return (info != null) ? info.getAsJsonObject().get("Identifier").getAsString() : null;
-    }
-
-    @Override
-    public void assignAdminRole(Integer coPersonId, Integer couId) throws RestClientException {
-        JsonObject group = getCouAdminGroup(couId);
-        if (group != null) {
-            httpUtils.post("co_group_members.json", jsonUtils.coGroupMembers(group.get("Id").getAsInt(), coPersonId, true));
-        }
-    }
-
-    @Override
-    public void removeAdminRole(Integer coPersonId, Integer couId) throws RestClientException {
-        JsonObject adminGroup = this.getCouAdminGroup(couId);
-        JsonArray admins = this.getGroupMembers(adminGroup.get("Id").getAsInt());
-        Integer id = null;
-        for (JsonElement admin : admins) {
-            if (admin.getAsJsonObject().get("Person").getAsJsonObject().get("Id").getAsInt() == coPersonId) {
-                id = admin.getAsJsonObject().get("Id").getAsInt();
-            }
-        }
-        if (id != null) {
-            httpUtils.delete("co_group_members/" + id + ".json");
-        }
-    }
-
-    @Override
-    public Map<Integer, String> getCouNames(List<Integer> couIds) {
-        Map<Integer, String> idNameMap = new HashMap<>();
-        for (Integer id : couIds) {
-            idNameMap.put(id, null);
-        }
-
-        JsonArray cous = getCous();
-        int count = 0;
-        int total = couIds.size();
-        for (JsonElement cou : cous) {
-            if (count < total) {
-                JsonObject jsonCou = cou.getAsJsonObject();
-                if (idNameMap.containsKey(jsonCou.get("Id").getAsInt())) {
-                    idNameMap.put(jsonCou.get("Id").getAsInt(), jsonCou.get("Name").getAsString());
-                    count++;
-                }
-            } else {
-                break;
-            }
-        }
-        return idNameMap;
-    }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Antonis Lempesis	cb0acf93d8	first implementation of the new oai-pmh client	2020-07-14 11:55:45 +00:00
Antonis Lempesis	5b730d0870	creating new branch to change oai-pmh version	2020-07-14 11:54:54 +00:00