src/main/java/eu/dnetlib/repo/manager/config/AaiSecurityConfiguration.java

@@ -15,7 +15,6 @@ 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.*;

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

@@ -1,8 +1,8 @@
 package eu.dnetlib.repo.manager.controllers;
 
-import eu.dnetlib.repo.manager.exception.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.annotations.Api;
 import io.swagger.annotations.ApiParam;

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

@@ -1,7 +1,10 @@
 package eu.dnetlib.repo.manager.controllers;
 
 import eu.dnetlib.enabling.datasources.common.AggregationInfo;
-import eu.dnetlib.repo.manager.domain.*;
+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.BrokerService;

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

@@ -1,8 +1,6 @@
 package eu.dnetlib.repo.manager.controllers;
 
 import eu.dnetlib.enabling.datasources.common.AggregationInfo;
-import eu.dnetlib.repo.manager.domain.Repository;
-import eu.dnetlib.repo.manager.domain.RepositoryInterface;
 import eu.dnetlib.repo.manager.domain.*;
 import eu.dnetlib.repo.manager.domain.dto.RepositoryTerms;
 import eu.dnetlib.repo.manager.domain.dto.User;

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

@@ -6,7 +6,6 @@ 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.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;

src/main/java/eu/dnetlib/repo/manager/controllers/ValidatorController.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.exception.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.annotations.Api;

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

@@ -1,8 +1,8 @@
 package eu.dnetlib.repo.manager.domain;
 
+import javax.persistence.Transient;
 import java.util.Date;
 import java.util.Set;
-import javax.persistence.Transient;
 
 public class DatasourceDetails {
 

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

@@ -1,7 +1,5 @@
 package eu.dnetlib.repo.manager.domain;
 
-import eu.dnetlib.repo.manager.domain.Repository;
-
 import java.util.ArrayList;
 import java.util.List;
 

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

@@ -3,7 +3,8 @@ package eu.dnetlib.repo.manager.domain;
 import eu.dnetlib.domain.data.DataCollectionType;
 import eu.dnetlib.domain.data.PiwikInfo;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * The domain object for the Repository resource data structure

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.exception.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;
 

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

@@ -2,11 +2,11 @@ package eu.dnetlib.repo.manager.service;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import eu.dnetlib.repo.manager.exception.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.json.JSONException;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,7 +1,9 @@
 package eu.dnetlib.repo.manager.service;
 
 import eu.dnetlib.enabling.datasources.common.AggregationInfo;
-import eu.dnetlib.repo.manager.domain.*;
+import eu.dnetlib.repo.manager.domain.MetricsInfo;
+import eu.dnetlib.repo.manager.domain.RepositorySnippet;
+import eu.dnetlib.repo.manager.domain.RepositorySummaryInfo;
 import eu.dnetlib.repo.manager.domain.broker.BrowseEntry;
 import eu.dnetlib.repo.manager.exception.BrokerException;
 import eu.dnetlib.repo.manager.exception.RepositoryServiceException;

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

@@ -1,9 +1,9 @@
 package eu.dnetlib.repo.manager.service;
 
 import eu.dnetlib.domain.data.PiwikInfo;
+import eu.dnetlib.domain.functionality.validator.JobForValidation;
 import eu.dnetlib.repo.manager.domain.Repository;
 import eu.dnetlib.repo.manager.domain.RepositoryInterface;
-import eu.dnetlib.domain.functionality.validator.JobForValidation;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.security.core.Authentication;
 

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

@@ -1,9 +1,9 @@
 package eu.dnetlib.repo.manager.service;
 
 import eu.dnetlib.domain.data.PiwikInfo;
+import eu.dnetlib.domain.functionality.validator.JobForValidation;
 import eu.dnetlib.repo.manager.domain.Repository;
 import eu.dnetlib.repo.manager.domain.RepositoryInterface;
-import eu.dnetlib.domain.functionality.validator.JobForValidation;
 import eu.dnetlib.repo.manager.exception.ValidationServiceException;
 import eu.dnetlib.utils.MailLibrary;
 import org.apache.log4j.Logger;

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

@@ -2,9 +2,9 @@ package eu.dnetlib.repo.manager.service;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import eu.dnetlib.domain.data.PiwikInfo;
-import eu.dnetlib.repo.manager.domain.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 org.apache.commons.codec.digest.DigestUtils;
 import org.apache.log4j.Logger;

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

@@ -5,11 +5,9 @@ import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import eu.dnetlib.api.functionality.ValidatorServiceException;
-import eu.dnetlib.enabling.datasources.common.AggregationInfo;
-import eu.dnetlib.repo.manager.domain.Repository;
-import eu.dnetlib.repo.manager.domain.RepositoryInterface;
 import eu.dnetlib.domain.enabling.Vocabulary;
 import eu.dnetlib.domain.functionality.validator.JobForValidation;
+import eu.dnetlib.enabling.datasources.common.AggregationInfo;
 import eu.dnetlib.repo.manager.domain.*;
 import eu.dnetlib.repo.manager.domain.dto.Role;
 import eu.dnetlib.repo.manager.domain.dto.User;

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.exception.ValidationServiceException;
 import eu.dnetlib.repo.manager.exception.ResourceNotFoundException;
+import eu.dnetlib.repo.manager.exception.ValidationServiceException;
 import org.json.JSONException;
 import org.springframework.http.ResponseEntity;
 

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

@@ -1,10 +1,13 @@
 package eu.dnetlib.repo.manager.service;
 
 import eu.dnetlib.api.functionality.ValidatorServiceException;
-import eu.dnetlib.repo.manager.domain.RepositoryInterface;
+import eu.dnetlib.domain.functionality.validator.JobForValidation;
-import eu.dnetlib.domain.functionality.validator.*;
+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.Constants;
 import eu.dnetlib.repo.manager.domain.InterfaceInformation;
+import eu.dnetlib.repo.manager.domain.RepositoryInterface;
 import eu.dnetlib.repo.manager.exception.ValidationServiceException;
 import eu.dnetlib.repo.manager.utils.CrisValidatorUtils;
 import eu.dnetlib.repo.manager.utils.OaiTools;

src/main/java/eu/dnetlib/repo/manager/service/security/AuthoritiesUpdater.java

@@ -9,8 +9,8 @@ import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.oauth2.common.exceptions.UnauthorizedClientException;
 import org.springframework.security.web.context.HttpSessionSecurityContextRepository;
-import org.springframework.session.Session;
 import org.springframework.session.FindByIndexNameSessionRepository;
+import org.springframework.session.Session;
 import org.springframework.stereotype.Service;
 
 import java.util.Collection;

src/main/java/eu/dnetlib/repo/manager/service/security/AuthorizationServiceImpl.java

@@ -1,6 +1,5 @@
 package eu.dnetlib.repo.manager.service.security;
 
-import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import eu.dnetlib.repo.manager.domain.dto.User;
 import eu.dnetlib.repo.manager.exception.ResourceNotFoundException;
@@ -10,15 +9,12 @@ import org.apache.log4j.Logger;
 import org.mitre.openid.connect.model.OIDCAuthenticationToken;
 import org.mitre.openid.connect.model.UserInfo;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
-import java.util.stream.Collectors;
 
 @Service("authorizationService")
 public class AuthorizationServiceImpl implements AuthorizationService {

src/main/java/eu/dnetlib/repo/manager/utils/Converter.java

@@ -15,9 +15,9 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.text.ParseException;
+import java.util.ArrayList;
-import java.text.SimpleDateFormat;
+import java.util.List;
-import java.util.*;
+import java.util.Objects;
 
 @Component
 public class Converter {

src/main/resources/application-context.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context" xmlns:tx="http://www.springframework.org/schema/tx"
+       xmlns:context="http://www.springframework.org/schema/context"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
-               http://www.springframework.org/schema/beans/spring-beans-4.0.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd">
+               http://www.springframework.org/schema/beans/spring-beans-4.0.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
 
 
     <context:annotation-config/>

src/main/webapp/WEB-INF/applicationContext.xml

@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:tx="http://www.springframework.org/schema/tx"
        xmlns:mvc="http://www.springframework.org/schema/mvc"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
 
        http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
-	http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
+
     http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd">
 
     <import resource="classpath*:/application-context.xml"/>

src/test/resources/application-context.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context" xmlns:tx="http://www.springframework.org/schema/tx"
+       xmlns:context="http://www.springframework.org/schema/context"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
-               http://www.springframework.org/schema/beans/spring-beans-4.0.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd">
+               http://www.springframework.org/schema/beans/spring-beans-4.0.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
 
 
     <context:annotation-config/>

src/test/resources/applicationContext.xml

@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:tx="http://www.springframework.org/schema/tx"
-       xmlns:mvc="http://www.springframework.org/schema/mvc"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
 
-       http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
+       http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
-	http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
-    http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd">
 
     <import resource="classpath*:/application-context.xml"/>