diff --git a/pom.xml b/pom.xml index 63e0458..8b48dc0 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.springframework.boot - spring-boot-starter + spring-boot-starter-web org.springframework.boot @@ -30,15 +30,10 @@ - org.springframework.boot spring-boot-starter-log4j2 - - org.springframework.boot - spring-boot-starter-web - org.springframework.boot spring-boot-starter-data-jdbc @@ -47,11 +42,6 @@ org.springframework.boot spring-boot-actuator-autoconfigure - - org.springframework.boot - spring-boot-starter-tomcat - - org.springframework.boot spring-boot-starter-data-redis @@ -60,20 +50,7 @@ org.springframework.boot spring-boot-starter-validation - - + eu.dnetlib.dhp @@ -123,36 +100,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - eu.dnetlib dnet-openaire-usage-stats-sushilite @@ -192,38 +139,6 @@ 2.7.2 - - - - - - - - - - - - - - - - - - - com.sun.jersey jersey-client @@ -265,13 +180,6 @@ 9.1-901.jdbc3 - - - - - - - commons-fileupload commons-fileupload @@ -293,14 +201,6 @@ org.springframework.session spring-session-data-redis - @@ -324,13 +224,7 @@ cors-filter 2.5 - + javax.xml.ws @@ -384,30 +278,6 @@ test - - - - - - - - - - - - - - - - - - io.micrometer - micrometer-registry-prometheus - 1.7.2 - compile - - - diff --git a/settings-dnet45.xml b/settings-dnet45.xml deleted file mode 100644 index 6b67467..0000000 --- a/settings-dnet45.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - ${env.HOME}/.m2/repository-dnet45 - - org.apache.tomcat.maven - - - - dnet4.0 - - true - - - - dnet45-bootstrap-snapshot - D-Net 45 Bootstrap Snapshot - https://maven.research-infrastructures.eu/nexus/content/repositories/dnet45-bootstrap-snapshot - - false - - - true - - default - - - dnet45-bootstrap-release - D-Net 45 Bootstrap Release - https://maven.research-infrastructures.eu/nexus/content/repositories/dnet45-bootstrap-release - - true - - - false - - default - - - - - diff --git a/src/main/java/eu/dnetlib/repo/manager/config/AsyncConfiguration.java b/src/main/java/eu/dnetlib/repo/manager/config/AsyncConfiguration.java index fea620a..e2689eb 100644 --- a/src/main/java/eu/dnetlib/repo/manager/config/AsyncConfiguration.java +++ b/src/main/java/eu/dnetlib/repo/manager/config/AsyncConfiguration.java @@ -1,6 +1,7 @@ package eu.dnetlib.repo.manager.config; -import org.apache.log4j.Logger; +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; @@ -15,7 +16,7 @@ public class AsyncConfiguration implements AsyncConfigurer { @Override public AsyncUncaughtExceptionHandler getAsyncUncaughtExceptionHandler() { return new AsyncUncaughtExceptionHandler() { - private final Logger logger = Logger.getLogger(getClass()); + private final Logger logger = LoggerFactory.getLogger(getClass()); @Override public void handleUncaughtException(Throwable throwable, Method method, Object... objects) { diff --git a/src/main/java/eu/dnetlib/repo/manager/config/DatasourceConfiguration.java b/src/main/java/eu/dnetlib/repo/manager/config/DatasourceConfiguration.java index 14b5d23..d7d7b89 100644 --- a/src/main/java/eu/dnetlib/repo/manager/config/DatasourceConfiguration.java +++ b/src/main/java/eu/dnetlib/repo/manager/config/DatasourceConfiguration.java @@ -1,7 +1,8 @@ package eu.dnetlib.repo.manager.config; import org.apache.commons.dbcp.BasicDataSource; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -12,7 +13,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; @EnableTransactionManagement public class DatasourceConfiguration { - private static Logger logger = Logger.getLogger(DatasourceConfiguration.class); + private static Logger logger = LoggerFactory.getLogger(DatasourceConfiguration.class); @Value("${services.provide.db.driverClassName}") private String driverClassname; diff --git a/src/main/java/eu/dnetlib/repo/manager/config/FrontEndLinkURIAuthenticationSuccessHandler.java b/src/main/java/eu/dnetlib/repo/manager/config/FrontEndLinkURIAuthenticationSuccessHandler.java index e942444..d93d44f 100644 --- a/src/main/java/eu/dnetlib/repo/manager/config/FrontEndLinkURIAuthenticationSuccessHandler.java +++ b/src/main/java/eu/dnetlib/repo/manager/config/FrontEndLinkURIAuthenticationSuccessHandler.java @@ -1,8 +1,9 @@ package eu.dnetlib.repo.manager.config; import com.google.gson.JsonParser; -import org.apache.log4j.Logger; +import org.slf4j.Logger; import org.mitre.openid.connect.model.OIDCAuthenticationToken; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.security.core.Authentication; import org.springframework.security.web.authentication.AuthenticationSuccessHandler; @@ -22,7 +23,7 @@ public class FrontEndLinkURIAuthenticationSuccessHandler implements Authenticati private String frontEndURI; - private static final Logger logger = Logger.getLogger(FrontEndLinkURIAuthenticationSuccessHandler.class); + private static final Logger logger = LoggerFactory.getLogger(FrontEndLinkURIAuthenticationSuccessHandler.class); public void init() { logger.debug("Front end uri : " + frontEndURI); diff --git a/src/main/java/eu/dnetlib/repo/manager/config/OpenAIREAuthoritiesMapper.java b/src/main/java/eu/dnetlib/repo/manager/config/OpenAIREAuthoritiesMapper.java index c992e17..c08e982 100644 --- a/src/main/java/eu/dnetlib/repo/manager/config/OpenAIREAuthoritiesMapper.java +++ b/src/main/java/eu/dnetlib/repo/manager/config/OpenAIREAuthoritiesMapper.java @@ -3,9 +3,10 @@ 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.apache.log4j.Logger; +import org.slf4j.Logger; import org.mitre.openid.connect.client.OIDCAuthoritiesMapper; import org.mitre.openid.connect.model.UserInfo; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; @@ -18,7 +19,7 @@ import java.util.Set; @Component public class OpenAIREAuthoritiesMapper implements OIDCAuthoritiesMapper { - private static final Logger logger = Logger.getLogger(OpenAIREAuthoritiesMapper.class); + private static final Logger logger = LoggerFactory.getLogger(OpenAIREAuthoritiesMapper.class); @Value("${services.provide.adminEmail}") String adminEmail; diff --git a/src/main/java/eu/dnetlib/repo/manager/config/RedisConfiguration.java b/src/main/java/eu/dnetlib/repo/manager/config/RedisConfiguration.java index 8949665..11ee4cd 100644 --- a/src/main/java/eu/dnetlib/repo/manager/config/RedisConfiguration.java +++ b/src/main/java/eu/dnetlib/repo/manager/config/RedisConfiguration.java @@ -1,6 +1,7 @@ package eu.dnetlib.repo.manager.config; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -15,7 +16,7 @@ import javax.annotation.PostConstruct; @EnableRedisHttpSession public class RedisConfiguration { - private static Logger logger = Logger.getLogger(RedisConfiguration.class); + private static final Logger logger = LoggerFactory.getLogger(RedisConfiguration.class); @Value("${services.provide.redis.host}") private String host; diff --git a/src/main/java/eu/dnetlib/repo/manager/controllers/GenericControllerAdvice.java b/src/main/java/eu/dnetlib/repo/manager/controllers/GenericControllerAdvice.java index d71797c..9c9174d 100644 --- a/src/main/java/eu/dnetlib/repo/manager/controllers/GenericControllerAdvice.java +++ b/src/main/java/eu/dnetlib/repo/manager/controllers/GenericControllerAdvice.java @@ -6,9 +6,9 @@ import eu.dnetlib.repo.manager.exception.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.slf4j.Logger; import org.json.JSONException; +import org.slf4j.LoggerFactory; import org.springframework.core.Ordered; import org.springframework.core.annotation.Order; import org.springframework.http.HttpStatus; @@ -26,7 +26,7 @@ import java.net.UnknownHostException; @Order(Ordered.HIGHEST_PRECEDENCE) public class GenericControllerAdvice { - private Logger logger = LogManager.getLogger(GenericControllerAdvice.class); + private Logger logger = LoggerFactory.getLogger(GenericControllerAdvice.class); @ResponseStatus(HttpStatus.NOT_FOUND) diff --git a/src/main/java/eu/dnetlib/repo/manager/controllers/MonitorController.java b/src/main/java/eu/dnetlib/repo/manager/controllers/MonitorController.java index 11df575..b2354cb 100644 --- a/src/main/java/eu/dnetlib/repo/manager/controllers/MonitorController.java +++ b/src/main/java/eu/dnetlib/repo/manager/controllers/MonitorController.java @@ -6,9 +6,10 @@ import eu.dnetlib.repo.manager.domain.JobsOfUser; import eu.dnetlib.repo.manager.service.MonitorServiceImpl; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; -import org.apache.log4j.Logger; +import org.slf4j.Logger; import org.json.JSONException; import org.mitre.openid.connect.model.OIDCAuthenticationToken; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; import org.springframework.security.access.prepost.PreAuthorize; @@ -20,7 +21,7 @@ import org.springframework.web.bind.annotation.*; @Api(description = "Monitor API", tags = {"monitor"}) public class MonitorController { - private static final Logger logger = Logger.getLogger(MonitorController.class); + private static final Logger logger = LoggerFactory.getLogger(MonitorController.class); @Autowired private MonitorServiceImpl monitorService; diff --git a/src/main/java/eu/dnetlib/repo/manager/controllers/PiWikController.java b/src/main/java/eu/dnetlib/repo/manager/controllers/PiWikController.java index 3727b27..395856c 100644 --- a/src/main/java/eu/dnetlib/repo/manager/controllers/PiWikController.java +++ b/src/main/java/eu/dnetlib/repo/manager/controllers/PiWikController.java @@ -9,7 +9,8 @@ import eu.dnetlib.repo.manager.service.PiWikServiceImpl; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.FileSystemResource; import org.springframework.http.MediaType; @@ -33,7 +34,7 @@ import java.util.List; @Api(description = "Piwik API", tags = {"piwik"}) public class PiWikController { - private static final Logger logger = Logger.getLogger(PiWikController.class); + private static final Logger logger = LoggerFactory.getLogger(PiWikController.class); @Autowired private PiWikServiceImpl piWikService; diff --git a/src/main/java/eu/dnetlib/repo/manager/controllers/PrometheusController.java b/src/main/java/eu/dnetlib/repo/manager/controllers/PrometheusController.java index 3c147f8..28102ea 100644 --- a/src/main/java/eu/dnetlib/repo/manager/controllers/PrometheusController.java +++ b/src/main/java/eu/dnetlib/repo/manager/controllers/PrometheusController.java @@ -11,7 +11,8 @@ 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.apache.log4j.Logger; +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; @@ -24,7 +25,7 @@ import java.io.File; @RestController @RequestMapping("/actuator/prometheus") public class PrometheusController { // TODO: remove this with migration to Spring Boot 2 - private static final Logger logger = Logger.getLogger(PrometheusController.class); + private static final Logger logger = LoggerFactory.getLogger(PrometheusController.class); private final PiWikService piWikService; private final RepositoryService repositoryService; diff --git a/src/main/java/eu/dnetlib/repo/manager/controllers/RepositoryController.java b/src/main/java/eu/dnetlib/repo/manager/controllers/RepositoryController.java index 1a26f4c..1a3713e 100644 --- a/src/main/java/eu/dnetlib/repo/manager/controllers/RepositoryController.java +++ b/src/main/java/eu/dnetlib/repo/manager/controllers/RepositoryController.java @@ -11,9 +11,10 @@ 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.annotations.Api; -import org.apache.log4j.Logger; +import org.slf4j.Logger; import org.json.JSONException; import org.mitre.openid.connect.model.OIDCAuthenticationToken; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; @@ -35,7 +36,7 @@ import java.util.Map; @Api(description = "Repository API", tags = {"repositories"}) public class RepositoryController { - private static final Logger logger = Logger.getLogger(RepositoryController.class); + private static final Logger logger = LoggerFactory.getLogger(RepositoryController.class); private final RepositoryService repositoryService; diff --git a/src/main/java/eu/dnetlib/repo/manager/service/AggregationServiceImpl.java b/src/main/java/eu/dnetlib/repo/manager/service/AggregationServiceImpl.java index d4add2b..507dc93 100644 --- a/src/main/java/eu/dnetlib/repo/manager/service/AggregationServiceImpl.java +++ b/src/main/java/eu/dnetlib/repo/manager/service/AggregationServiceImpl.java @@ -3,7 +3,8 @@ package eu.dnetlib.repo.manager.service; import com.fasterxml.jackson.databind.ObjectMapper; import eu.dnetlib.enabling.datasources.common.AggregationInfo; import eu.dnetlib.repo.manager.domain.AggregationHistoryResponse; -import org.apache.log4j.Logger; +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.RestClientException; @@ -22,7 +23,7 @@ import static eu.dnetlib.repo.manager.utils.DateUtils.getYear; @Service("aggregationService") public class AggregationServiceImpl implements AggregationService { - private static final Logger logger = Logger.getLogger(AggregationServiceImpl.class); + private static final Logger logger = LoggerFactory.getLogger(AggregationServiceImpl.class); @Value("${services.provide.clients.dsm}") diff --git a/src/main/java/eu/dnetlib/repo/manager/service/BrokerServiceImpl.java b/src/main/java/eu/dnetlib/repo/manager/service/BrokerServiceImpl.java index fcbf4a5..ee32c5c 100644 --- a/src/main/java/eu/dnetlib/repo/manager/service/BrokerServiceImpl.java +++ b/src/main/java/eu/dnetlib/repo/manager/service/BrokerServiceImpl.java @@ -9,6 +9,8 @@ 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.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.core.ParameterizedTypeReference; @@ -40,7 +42,7 @@ public class BrokerServiceImpl implements BrokerService { @Value("${services.provide.topic_types.url}") private String topicsURL; - private static final org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(BrokerServiceImpl.class); + private static final Logger logger = LoggerFactory.getLogger(BrokerServiceImpl.class); @Autowired RestTemplate restTemplate; @@ -212,7 +214,7 @@ public class BrokerServiceImpl implements BrokerService { UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(openairePath + service) .queryParam("email", userEmail); - logger.debug(builder.build().encode().toUri()); + logger.debug("{}", builder.build().encode().toUri()); ResponseEntity>> resp; try { resp = restTemplate.exchange( diff --git a/src/main/java/eu/dnetlib/repo/manager/service/DashboardServiceImpl.java b/src/main/java/eu/dnetlib/repo/manager/service/DashboardServiceImpl.java index cda2516..a344fcc 100644 --- a/src/main/java/eu/dnetlib/repo/manager/service/DashboardServiceImpl.java +++ b/src/main/java/eu/dnetlib/repo/manager/service/DashboardServiceImpl.java @@ -8,7 +8,8 @@ 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.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -18,7 +19,7 @@ import java.util.List; @Service("dashboardService") public class DashboardServiceImpl implements DashboardService { - private static final Logger logger = Logger.getLogger(DashboardServiceImpl.class); + private static final Logger logger = LoggerFactory.getLogger(DashboardServiceImpl.class); @Autowired private RepositoryService repositoryService; diff --git a/src/main/java/eu/dnetlib/repo/manager/service/EmailUtilsImpl.java b/src/main/java/eu/dnetlib/repo/manager/service/EmailUtilsImpl.java index 97e8064..dc32188 100644 --- a/src/main/java/eu/dnetlib/repo/manager/service/EmailUtilsImpl.java +++ b/src/main/java/eu/dnetlib/repo/manager/service/EmailUtilsImpl.java @@ -6,8 +6,9 @@ import eu.dnetlib.repo.manager.domain.Repository; import eu.dnetlib.repo.manager.domain.RepositoryInterface; import eu.dnetlib.repo.manager.exception.ValidationServiceException; import eu.dnetlib.utils.MailLibrary; -import org.apache.log4j.Logger; +import org.slf4j.Logger; import org.mitre.openid.connect.model.OIDCAuthenticationToken; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.security.core.Authentication; @@ -21,7 +22,7 @@ import java.util.stream.Collectors; @Component("emailUtils") public class EmailUtilsImpl implements EmailUtils { - private final static Logger logger = Logger.getLogger(EmailUtilsImpl.class); + private final static Logger logger = LoggerFactory.getLogger(EmailUtilsImpl.class); private final MailLibrary mailLibrary; private final RepositoryService repositoryService; diff --git a/src/main/java/eu/dnetlib/repo/manager/service/MonitorServiceImpl.java b/src/main/java/eu/dnetlib/repo/manager/service/MonitorServiceImpl.java index 804585a..77049c5 100644 --- a/src/main/java/eu/dnetlib/repo/manager/service/MonitorServiceImpl.java +++ b/src/main/java/eu/dnetlib/repo/manager/service/MonitorServiceImpl.java @@ -7,10 +7,11 @@ 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.slf4j.Logger; import org.eurocris.openaire.cris.validator.model.Job; import org.eurocris.openaire.cris.validator.service.MapJobDao; import org.json.JSONException; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -22,7 +23,7 @@ import java.util.stream.Collectors; @Service("monitorService") public class MonitorServiceImpl implements MonitorService { - private static final Logger logger = Logger.getLogger(MonitorServiceImpl.class); + private static final Logger logger = LoggerFactory.getLogger(MonitorServiceImpl.class); @Autowired private MapJobDao crisJobs; @@ -53,9 +54,6 @@ public class MonitorServiceImpl implements MonitorService { String validationStatus, String includeJobsTotal) throws JSONException, ValidatorServiceException { - logger.debug("Getting jobs of user : " + user - + "\n" + user + "/" + jobType + "/" + offset + "/" + dateFrom + "/" + dateTo + "/" + validationStatus + "/" + includeJobsTotal); - ///////////////////////////////////////////////////////////////////////////////////////// // FIXME: this is a hack for CRIS Jan Dvorak Validator, should be implemented properly // ///////////////////////////////////////////////////////////////////////////////////////// @@ -162,7 +160,7 @@ public class MonitorServiceImpl implements MonitorService { try { return getValidationService().getStoredJobsTotalNumberNew(user, jobType, validationStatus); } catch (ValidatorServiceException e) { - logger.error(e); + logger.error(e.getMessage(), e); } return 0; } @@ -175,7 +173,7 @@ public class MonitorServiceImpl implements MonitorService { try { job = getValidationService().getStoredJob(Integer.parseInt(jobId), groupBy); } catch (ValidatorServiceException e) { - logger.error(e); + logger.error(e.getMessage(), e); } ///////////////////////////////////////////////////////////////////////////////////////// // FIXME: this is a hack for CRIS Jan Dvorak Validator, should be implemented properly // diff --git a/src/main/java/eu/dnetlib/repo/manager/service/PiWikServiceImpl.java b/src/main/java/eu/dnetlib/repo/manager/service/PiWikServiceImpl.java index 061c1f8..f8fa173 100644 --- a/src/main/java/eu/dnetlib/repo/manager/service/PiWikServiceImpl.java +++ b/src/main/java/eu/dnetlib/repo/manager/service/PiWikServiceImpl.java @@ -7,7 +7,8 @@ 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; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Value; @@ -32,7 +33,7 @@ import java.util.Map; @Service("piwikService") public class PiWikServiceImpl implements PiWikService { - private static final Logger logger = Logger.getLogger(PiWikServiceImpl.class); + private static final Logger logger = LoggerFactory.getLogger(PiWikServiceImpl.class); @Autowired diff --git a/src/main/java/eu/dnetlib/repo/manager/service/RepositoryServiceImpl.java b/src/main/java/eu/dnetlib/repo/manager/service/RepositoryServiceImpl.java index 1c66c93..935840a 100644 --- a/src/main/java/eu/dnetlib/repo/manager/service/RepositoryServiceImpl.java +++ b/src/main/java/eu/dnetlib/repo/manager/service/RepositoryServiceImpl.java @@ -26,11 +26,12 @@ import eu.dnetlib.repo.manager.utils.Converter; import eu.dnetlib.repo.manager.utils.DateUtils; import gr.uoa.di.driver.enabling.vocabulary.VocabularyLoader; import org.apache.commons.codec.digest.DigestUtils; -import org.apache.log4j.Logger; +import org.slf4j.Logger; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; import org.mitre.openid.connect.model.OIDCAuthenticationToken; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; @@ -54,7 +55,7 @@ import java.util.concurrent.ConcurrentHashMap; @Service("repositoryService") public class RepositoryServiceImpl implements RepositoryService { - private static final Logger logger = Logger.getLogger(RepositoryServiceImpl.class); + private static final Logger logger = LoggerFactory.getLogger(RepositoryServiceImpl.class); private final AuthorizationService authorizationService; private final RoleMappingService roleMappingService; @@ -625,7 +626,7 @@ public class RepositoryServiceImpl implements RepositoryService { .fromHttpUrl(baseAddress + "/ds/api/") .path("/{id}") .build().expand(id).encode(); - logger.debug(uriComponents.toUri()); + logger.debug("{}", uriComponents.toUri()); restTemplate.delete(uriComponents.toUri()); } diff --git a/src/main/java/eu/dnetlib/repo/manager/service/StatsServiceImpl.java b/src/main/java/eu/dnetlib/repo/manager/service/StatsServiceImpl.java index ecb9b4f..4009f7f 100644 --- a/src/main/java/eu/dnetlib/repo/manager/service/StatsServiceImpl.java +++ b/src/main/java/eu/dnetlib/repo/manager/service/StatsServiceImpl.java @@ -1,6 +1,7 @@ package eu.dnetlib.repo.manager.service; -import org.apache.log4j.Logger; +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.http.HttpMethod; @@ -19,7 +20,7 @@ import java.util.Objects; @Service("statsService") public class StatsServiceImpl implements StatsService { - private static final Logger logger = Logger.getLogger(StatsServiceImpl.class); + private static final Logger logger = LoggerFactory.getLogger(StatsServiceImpl.class); @Autowired RestTemplate restTemplate; diff --git a/src/main/java/eu/dnetlib/repo/manager/service/SushiliteServiceImpl.java b/src/main/java/eu/dnetlib/repo/manager/service/SushiliteServiceImpl.java index b4745af..08aa735 100644 --- a/src/main/java/eu/dnetlib/repo/manager/service/SushiliteServiceImpl.java +++ b/src/main/java/eu/dnetlib/repo/manager/service/SushiliteServiceImpl.java @@ -2,6 +2,8 @@ package eu.dnetlib.repo.manager.service; import eu.dnetlib.usagestats.sushilite.domain.ReportItem; import eu.dnetlib.usagestats.sushilite.domain.ReportResponseWrapper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.core.ParameterizedTypeReference; import org.springframework.http.HttpMethod; @@ -22,7 +24,7 @@ public class SushiliteServiceImpl implements SushiliteService { @Value("${services.provide.usagestats.sushiliteEndpoint}") private String usagestatsSushiliteEndpoint; - private static final org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(SushiliteServiceImpl.class); + private static final Logger logger = LoggerFactory.getLogger(SushiliteServiceImpl.class); @Override diff --git a/src/main/java/eu/dnetlib/repo/manager/service/UserServiceImpl.java b/src/main/java/eu/dnetlib/repo/manager/service/UserServiceImpl.java index 949fa8f..e97c64a 100644 --- a/src/main/java/eu/dnetlib/repo/manager/service/UserServiceImpl.java +++ b/src/main/java/eu/dnetlib/repo/manager/service/UserServiceImpl.java @@ -2,6 +2,8 @@ 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.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.core.GrantedAuthority; @@ -16,8 +18,7 @@ import java.util.stream.Collectors; @Service("userService") public class UserServiceImpl implements UserService { - private static final org.apache.log4j.Logger logger = org.apache.log4j.Logger - .getLogger(UserServiceImpl.class); + private static final Logger logger = LoggerFactory.getLogger(UserServiceImpl.class); @Override public ResponseEntity login() { diff --git a/src/main/java/eu/dnetlib/repo/manager/service/ValidatorServiceImpl.java b/src/main/java/eu/dnetlib/repo/manager/service/ValidatorServiceImpl.java index 4d6ba1c..24e321c 100644 --- a/src/main/java/eu/dnetlib/repo/manager/service/ValidatorServiceImpl.java +++ b/src/main/java/eu/dnetlib/repo/manager/service/ValidatorServiceImpl.java @@ -12,11 +12,12 @@ import eu.dnetlib.repo.manager.exception.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.slf4j.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.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -57,7 +58,7 @@ public class ValidatorServiceImpl implements ValidatorService { private Map> rulesetMap = new ConcurrentHashMap>(); - private static final Logger logger = Logger.getLogger(ValidatorServiceImpl.class); + private static final Logger logger = LoggerFactory.getLogger(ValidatorServiceImpl.class); @Autowired private EmailUtils emailUtils; @@ -123,7 +124,7 @@ public class ValidatorServiceImpl implements ValidatorService { ///////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////// } catch (ValidatorServiceException e) { - logger.error(e); + logger.error(e.getMessage(), e); } } @@ -153,7 +154,7 @@ public class ValidatorServiceImpl implements ValidatorService { // this.getValidationService().submitValidationJob(jobForValidation); } catch (Exception e) { // FIXME: replaced exception with log // throw new ValidatorServiceException(e); - logger.error(e); + logger.error(e.getMessage(), e); } return jobForValidation; diff --git 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 index f4c3aa5..5158502 100644 --- 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 @@ -7,8 +7,9 @@ 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.RegistryUtils; import eu.dnetlib.repo.manager.utils.HttpUtils; -import org.apache.log4j.Logger; +import org.slf4j.Logger; import org.mitre.openid.connect.model.OIDCAuthenticationToken; +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; @@ -23,7 +24,7 @@ import java.util.Map; @Service public class RegistryCalls implements AaiRegistryService { - private static final Logger logger = Logger.getLogger(RegistryCalls.class); + private static final Logger logger = LoggerFactory.getLogger(RegistryCalls.class); private final String coid; public final HttpUtils httpUtils; diff --git a/src/main/java/eu/dnetlib/repo/manager/service/security/AaiRoleMappingService.java b/src/main/java/eu/dnetlib/repo/manager/service/security/AaiRoleMappingService.java index 2938066..96c91d6 100644 --- a/src/main/java/eu/dnetlib/repo/manager/service/security/AaiRoleMappingService.java +++ b/src/main/java/eu/dnetlib/repo/manager/service/security/AaiRoleMappingService.java @@ -1,6 +1,7 @@ package eu.dnetlib.repo.manager.service.security; -import org.apache.log4j.Logger; +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; @@ -14,7 +15,7 @@ import java.util.stream.Collectors; @Service("roleMappingService") public class AaiRoleMappingService implements RoleMappingService { - private static final Logger logger = Logger.getLogger(AaiRoleMappingService.class); + private static final Logger logger = LoggerFactory.getLogger(AaiRoleMappingService.class); @Value("${services.provide.aai.registry.production:true}") private boolean production; diff --git a/src/main/java/eu/dnetlib/repo/manager/service/security/AuthoritiesMapper.java b/src/main/java/eu/dnetlib/repo/manager/service/security/AuthoritiesMapper.java index 567cca9..33ce43d 100644 --- a/src/main/java/eu/dnetlib/repo/manager/service/security/AuthoritiesMapper.java +++ b/src/main/java/eu/dnetlib/repo/manager/service/security/AuthoritiesMapper.java @@ -2,7 +2,8 @@ package eu.dnetlib.repo.manager.service.security; import com.google.gson.JsonArray; import com.google.gson.JsonElement; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; @@ -13,7 +14,7 @@ import java.util.regex.Pattern; public class AuthoritiesMapper { - private static final Logger logger = Logger.getLogger(AuthoritiesMapper.class); + private static final Logger logger = LoggerFactory.getLogger(AuthoritiesMapper.class); private static final String ENTITLEMENT_REGEX = "urn:geant:openaire[.]eu:group:([^:]*):?(.*)?:role=member#aai[.]openaire[.]eu"; private AuthoritiesMapper() { diff --git a/src/main/java/eu/dnetlib/repo/manager/service/security/AuthoritiesUpdater.java b/src/main/java/eu/dnetlib/repo/manager/service/security/AuthoritiesUpdater.java index a82aab6..c076234 100644 --- a/src/main/java/eu/dnetlib/repo/manager/service/security/AuthoritiesUpdater.java +++ b/src/main/java/eu/dnetlib/repo/manager/service/security/AuthoritiesUpdater.java @@ -1,7 +1,8 @@ package eu.dnetlib.repo.manager.service.security; -import org.apache.log4j.Logger; +import org.slf4j.Logger; import org.mitre.openid.connect.model.OIDCAuthenticationToken; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.Authentication; import org.springframework.security.core.GrantedAuthority; @@ -21,7 +22,7 @@ import java.util.Map; @Service public class AuthoritiesUpdater extends HttpSessionSecurityContextRepository { - private static final Logger logger = Logger.getLogger(AuthoritiesUpdater.class); + private static final Logger logger = LoggerFactory.getLogger(AuthoritiesUpdater.class); @Autowired FindByIndexNameSessionRepository sessions; @@ -31,7 +32,6 @@ public class AuthoritiesUpdater extends HttpSessionSecurityContextRepository { Map map = sessions. findByIndexNameAndIndexValue(FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME, id); if (map != null) { - logger.debug(map.values().toArray().length); for (Session session : map.values()) { logger.debug(session.getId()); if (!session.isExpired()) { @@ -39,7 +39,6 @@ public class AuthoritiesUpdater extends HttpSessionSecurityContextRepository { Authentication authentication = securityContext.getAuthentication(); if (authentication instanceof OIDCAuthenticationToken) { OIDCAuthenticationToken authOIDC = (OIDCAuthenticationToken) authentication; - logger.debug(update.authorities(authOIDC.getAuthorities())); securityContext.setAuthentication(new OIDCAuthenticationToken(authOIDC.getSub(), authOIDC.getIssuer(), authOIDC.getUserInfo(), update.authorities(authOIDC.getAuthorities()), authOIDC.getIdToken(), authOIDC.getAccessTokenValue(), authOIDC.getRefreshTokenValue())); diff --git a/src/main/java/eu/dnetlib/repo/manager/service/security/AuthorizationServiceImpl.java b/src/main/java/eu/dnetlib/repo/manager/service/security/AuthorizationServiceImpl.java index a697acb..f830d9a 100644 --- a/src/main/java/eu/dnetlib/repo/manager/service/security/AuthorizationServiceImpl.java +++ b/src/main/java/eu/dnetlib/repo/manager/service/security/AuthorizationServiceImpl.java @@ -4,10 +4,10 @@ import com.google.gson.JsonElement; import eu.dnetlib.repo.manager.domain.dto.User; import eu.dnetlib.repo.manager.exception.ResourceNotFoundException; import eu.dnetlib.repo.manager.service.aai.registry.AaiRegistryService; -import org.apache.log4j.LogManager; -import org.apache.log4j.Logger; +import org.slf4j.Logger; import org.mitre.openid.connect.model.OIDCAuthenticationToken; import org.mitre.openid.connect.model.UserInfo; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Service; @@ -19,7 +19,7 @@ import java.util.List; @Service("authorizationService") public class AuthorizationServiceImpl implements AuthorizationService { - private static final Logger logger = LogManager.getLogger(AuthorizationServiceImpl.class); + private static final Logger logger = LoggerFactory.getLogger(AuthorizationServiceImpl.class); public static final String SUPER_ADMINISTRATOR = "SUPER_ADMINISTRATOR"; public static final String CONTENT_PROVIDER_DASHBOARD_ADMINISTRATOR = "CONTENT_PROVIDER_DASHBOARD_ADMINISTRATOR"; diff --git a/src/main/java/eu/dnetlib/repo/manager/utils/Converter.java b/src/main/java/eu/dnetlib/repo/manager/utils/Converter.java index 5639f2b..418f834 100644 --- a/src/main/java/eu/dnetlib/repo/manager/utils/Converter.java +++ b/src/main/java/eu/dnetlib/repo/manager/utils/Converter.java @@ -1,13 +1,16 @@ package eu.dnetlib.repo.manager.utils; import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import eu.dnetlib.repo.manager.domain.*; import org.apache.commons.codec.digest.DigestUtils; -import org.apache.log4j.Logger; +import org.slf4j.Logger; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; import java.io.BufferedReader; @@ -20,12 +23,12 @@ import java.util.Objects; @Component public class Converter { - private static final Logger logger = Logger.getLogger(Converter.class); + private static final Logger logger = LoggerFactory.getLogger(Converter.class); private final ObjectMapper objectMapper; public Converter() { - objectMapper = new ObjectMapper(); + objectMapper = new ObjectMapper()/*.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)*/; } public Repository toRepository(Object repositoryObject) { diff --git a/src/main/java/eu/dnetlib/repo/manager/utils/DateUtils.java b/src/main/java/eu/dnetlib/repo/manager/utils/DateUtils.java index e4c5c1f..33710ac 100644 --- a/src/main/java/eu/dnetlib/repo/manager/utils/DateUtils.java +++ b/src/main/java/eu/dnetlib/repo/manager/utils/DateUtils.java @@ -2,7 +2,8 @@ package eu.dnetlib.repo.manager.utils; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -12,7 +13,7 @@ import java.util.Objects; public class DateUtils { - private static final Logger logger = Logger.getLogger(DateUtils.class); + private static final Logger logger = LoggerFactory.getLogger(DateUtils.class); public static Date toDate(String date) { @@ -23,7 +24,7 @@ public class DateUtils { try { return formatter.parse(date); } catch (ParseException e) { - logger.error(e); + logger.error(e.getMessage(), e); } return null; } diff --git a/src/main/java/eu/dnetlib/repo/manager/utils/HttpUtils.java b/src/main/java/eu/dnetlib/repo/manager/utils/HttpUtils.java index 9a0de9e..b52b03d 100644 --- a/src/main/java/eu/dnetlib/repo/manager/utils/HttpUtils.java +++ b/src/main/java/eu/dnetlib/repo/manager/utils/HttpUtils.java @@ -4,7 +4,8 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; import org.apache.commons.codec.binary.Base64; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.*; import org.springframework.stereotype.Component; @@ -16,7 +17,7 @@ import java.util.Map; @Component public class HttpUtils { - private static final Logger logger = Logger.getLogger(HttpUtils.class); + private static final Logger logger = LoggerFactory.getLogger(HttpUtils.class); @Value("${services.provide.aai.registry.url}") private String registryUrl; diff --git a/src/main/java/eu/dnetlib/repo/manager/utils/OaiTools.java b/src/main/java/eu/dnetlib/repo/manager/utils/OaiTools.java index 774cc71..fd1a679 100644 --- a/src/main/java/eu/dnetlib/repo/manager/utils/OaiTools.java +++ b/src/main/java/eu/dnetlib/repo/manager/utils/OaiTools.java @@ -1,7 +1,8 @@ package eu.dnetlib.repo.manager.utils; -import org.apache.log4j.Logger; +import org.slf4j.Logger; import org.dom4j.io.DOMWriter; +import org.slf4j.LoggerFactory; import org.w3c.dom.Document; import se.kb.oai.pmh.*; @@ -24,7 +25,7 @@ public class OaiTools { disableSslVerification(); } - private static Logger logger = Logger.getLogger(OaiTools.class); + private static Logger logger = LoggerFactory.getLogger(OaiTools.class); public static List getSetsOfRepo(String baseUrl) throws Exception { try { diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml index ab51f28..a98fd99 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -6,11 +6,11 @@ + + + - - -