diff --git a/Dockerfile b/Dockerfile
index 2bc1b7d..b88fe6a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,10 @@
-FROM tomcat:7.0.90-jre8
+#FROM tomcat:7.0.90-jre8
+FROM tomcat:8.5.71-jre8-openjdk-bullseye
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 src/main/resources/application.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/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/
diff --git a/pom.xml b/pom.xml
index a257c4e..b827685 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,48 +4,139 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- eu.dnetlib
- dnet45-parent
- 1.0.0-SNAPSHOT
+ org.springframework.boot
+ spring-boot-starter-parent
+ 2.5.4
+
4.0.0
+ eu.dnetlib
uoa-repository-manager-service
1.0.0-SNAPSHOT
war
+
+ 2.5.4
+
+
+ org.springframework.boot
+ spring-boot-starter
+
+
+ org.springframework.boot
+ spring-boot-starter-logging
+
+
+
+
- org.springframework
- spring-webmvc
- ${spring.version}
+ org.springframework.boot
+ spring-boot-starter-log4j2
- org.hibernate
- hibernate-validator-annotation-processor
- 4.1.0.Final
+ org.springframework.boot
+ spring-boot-starter-web
- log4j
- log4j
- ${log4j.version}
+ org.springframework.boot
+ spring-boot-starter-data-jdbc
+
+
+ org.springframework.boot
+ spring-boot-actuator-autoconfigure
+
+
+ org.springframework.boot
+ spring-boot-starter-tomcat
+
+
+
+ org.springframework.boot
+ spring-boot-starter-data-redis
+
+
+ org.springframework.boot
+ spring-boot-starter-validation
+
+
+
+
+
+ eu.dnetlib
+ uoa-clients
+ [2.0.0-SNAPSHOT, 3.0.0)
+
+
+ log4j
+ log4j
+
+
+
+ javax.servlet
+ javax.servlet-api
+
+
+ com.google.gwt
+ gwt-user
+
+
eu.dnetlib
dnet-runtime
- [1.0.0-SNAPSHOT, 2.0.0)
-
-
- org.apache.geronimo.specs
- geronimo-javamail_1.4_spec
-
+ 1.0.2-SNAPSHOT
+
+
+ log4j
+ log4j
+
-
+
eu.dnetlib
- uoa-utils
+ uoa-hcm
[2.0.0-SNAPSHOT, 3.0.0)
+
+
+ log4j
+ log4j
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
eu.dnetlib
uoa-domain
@@ -55,6 +146,10 @@
cglib
cglib
+
+ log4j
+ log4j
+
@@ -79,22 +174,6 @@
2.2
-
- eu.dnetlib
- uoa-commons
- [2.0.0-SNAPSHOT, 3.0.0)
-
-
- eu.dnetlib
- uoa-clients
- [2.0.0-SNAPSHOT, 3.0.0)
-
-
- eu.dnetlib
- uoa-hcm
- [2.0.0-SNAPSHOT, 3.0.0)
-
-
commons-io
commons-io
@@ -112,36 +191,37 @@
2.7.2
-
- xerces
- xercesImpl
- 2.11.0
-
+
+
+
+
+
+
+
+
+
+
+
-
- org.springframework
- spring-context
- ${spring.version}
-
-
-
- org.springframework
- spring-jdbc
- ${spring.version}
-
+
+
+
+
+
com.sun.jersey
@@ -185,11 +265,11 @@
-
- org.apache.tomcat
- tomcat-catalina
- 9.0.22
-
+
+
+
+
+
commons-fileupload
@@ -211,15 +291,27 @@
org.springframework.session
spring-session-data-redis
- 1.3.1.RELEASE
+
+
+
redis.clients
jedis
- 2.9.0
-
+ ${jedis.version}
+
+
+
+org.apache.commons
+commons-pool2
+
com.google.code.gson
gson
@@ -231,18 +323,18 @@
cors-filter
2.5
-
com.netflix.hystrix
hystrix-core
1.5.18
-
+
+
javax.xml.ws
@@ -297,21 +389,21 @@
-
- org.springframework.boot
- spring-boot-actuator
- 1.3.5.RELEASE
-
+
+
+
+
+
-
- io.micrometer
- micrometer-core
- 1.7.2
-
+
+
+
+
+
io.micrometer
micrometer-registry-prometheus
@@ -322,9 +414,23 @@
+
+
+
+
+ org.springframework.session
+ spring-session-bom
+ 2021.0.2
+ pom
+ import
+
+
+
+
${project.build.directory}/${project.build.finalName}/WEB-INF/classes
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
cz.habarta.typescript-generator
typescript-generator-maven-plugin
@@ -377,5 +488,30 @@
-
+
+
+ dnet-deps
+ dnet-dependencies
+ https://maven.d4science.org/nexus/content/repositories/dnet-deps
+ default
+
+
+ dnet45-snapshots
+ D-Net 45 Snapshots
+ https://maven.d4science.org/nexus/content/repositories/dnet45-snapshots
+ default
+
+ true
+
+
+
+ dnet45-releases
+ D-Net 45 Releases
+ https://maven.d4science.org/nexus/content/repositories/dnet45-releases
+ default
+
+ true
+
+
+
diff --git a/src/main/java/eu/dnetlib/repo/manager/Application.java b/src/main/java/eu/dnetlib/repo/manager/Application.java
new file mode 100644
index 0000000..0eeb9c8
--- /dev/null
+++ b/src/main/java/eu/dnetlib/repo/manager/Application.java
@@ -0,0 +1,12 @@
+package eu.dnetlib.repo.manager;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class Application {
+
+ public static void main(String[] args) {
+ SpringApplication.run(Application.class, args);
+ }
+}
diff --git a/src/main/java/eu/dnetlib/repo/manager/config/ActuatorConfig.java b/src/main/java/eu/dnetlib/repo/manager/config/ActuatorConfig.java
deleted file mode 100644
index 875b2a1..0000000
--- a/src/main/java/eu/dnetlib/repo/manager/config/ActuatorConfig.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package eu.dnetlib.repo.manager.config;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.actuate.autoconfigure.EndpointAutoConfiguration;
-import org.springframework.boot.actuate.autoconfigure.HealthIndicatorAutoConfiguration;
-import org.springframework.boot.actuate.autoconfigure.PublicMetricsAutoConfiguration;
-import org.springframework.boot.actuate.endpoint.MetricsEndpoint;
-import org.springframework.boot.actuate.endpoint.mvc.EndpointHandlerMapping;
-import org.springframework.boot.actuate.endpoint.mvc.EndpointMvcAdapter;
-import org.springframework.boot.actuate.endpoint.mvc.MvcEndpoint;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-
-import java.util.Collection;
-
-@Configuration
-@EnableWebMvc
-@Import({
- EndpointAutoConfiguration.class,
- PublicMetricsAutoConfiguration.class,
-// HealthIndicatorAutoConfiguration.class
-})
-
-public class ActuatorConfig { // TODO: remove this with migration to Spring Boot 2
-
- @Bean
- @Autowired
- public EndpointHandlerMapping endpointHandlerMapping(Collection extends MvcEndpoint> endpoints) {
- return new EndpointHandlerMapping(endpoints);
- }
-
- @Bean
- @Autowired
- public EndpointMvcAdapter metricsEndPoint(MetricsEndpoint delegate) {
- return new EndpointMvcAdapter(delegate);
- }
-}
diff --git a/src/main/java/eu/dnetlib/repo/manager/config/AsyncConfiguration.java b/src/main/java/eu/dnetlib/repo/manager/config/AsyncConfiguration.java
new file mode 100644
index 0000000..9ffa643
--- /dev/null
+++ b/src/main/java/eu/dnetlib/repo/manager/config/AsyncConfiguration.java
@@ -0,0 +1,27 @@
+package eu.dnetlib.repo.manager.config;
+
+import eu.dnetlib.repo.manager.service.ValidatorServiceImpl;
+import org.apache.log4j.Logger;
+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 = Logger.getLogger(getClass());
+
+ @Override
+ public void handleUncaughtException(Throwable throwable, Method method, Object... objects) {
+ //logger.error("Async error", throwable);
+ }
+ };
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/eu/dnetlib/repo/manager/config/Config.java b/src/main/java/eu/dnetlib/repo/manager/config/Config.java
index bd5d4bf..cbef70b 100644
--- a/src/main/java/eu/dnetlib/repo/manager/config/Config.java
+++ b/src/main/java/eu/dnetlib/repo/manager/config/Config.java
@@ -1,75 +1,81 @@
-package eu.dnetlib.repo.manager.config;
-
-import org.apache.log4j.Logger;
-import org.springframework.beans.factory.annotation.Value;
-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
-@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;
- }
-
-}
+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.*;
+
+@Configuration
+public class Config {
+
+ @Value("${ISLookUpService.url}")
+ private String lookupURL;
+
+ @Value("${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 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 locator = new StaticServiceLocator<>();
+ locator.setService(client);
+
+ return locator;
+ }
+
+ // @Bean(name="vocabularyLookUp")
+ private ISLookUp createVocabularyLookUp() throws Exception {
+ ISLookUpImpl lookUp = new ISLookUpImpl<>();
+
+ lookUp.setLookupLocator(createIsLookupServiceLocator());
+ lookUp.setConverter(new VocabularyXmlConverter());
+
+ return lookUp;
+ }
+
+ private ServiceLocator 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 locator = new StaticServiceLocator<>();
+ locator.setService(service);
+
+ return locator;
+ }
+}
\ No newline at end of file
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 1b0c95b..09a38a8 100644
--- a/src/main/java/eu/dnetlib/repo/manager/config/DatasourceConfiguration.java
+++ b/src/main/java/eu/dnetlib/repo/manager/config/DatasourceConfiguration.java
@@ -14,16 +14,16 @@ public class DatasourceConfiguration {
private static Logger LOGGER = Logger.getLogger(DatasourceConfiguration.class);
- @Value("${repomanager.db.driverClassName}")
+ @Value("${services.repomanager.db.driverClassName}")
private String driverClassname;
- @Value("${repomanager.db.url}")
+ @Value("${services.repomanager.db.url}")
private String URL;
- @Value("${repomanager.db.username}")
+ @Value("${services.repomanager.db.username}")
private String username;
- @Value("${repomanager.db.password}")
+ @Value("${services.repomanager.db.password}")
private String password;
@Bean
diff --git a/src/main/java/eu/dnetlib/repo/manager/config/MailConfig.java b/src/main/java/eu/dnetlib/repo/manager/config/MailConfig.java
new file mode 100644
index 0000000..560d2b6
--- /dev/null
+++ b/src/main/java/eu/dnetlib/repo/manager/config/MailConfig.java
@@ -0,0 +1,57 @@
+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.repomanager.mail.host}")
+ private String host;
+
+ @Value("${services.repomanager.mail.port}")
+ private int port;
+
+ @Value("${services.repomanager.mail.authenticate}")
+ private boolean authenticate;
+
+ @Value("${services.repomanager.mail.username}")
+ private String username;
+
+ @Value("${services.repomanager.mail.password}")
+ private String password;
+
+ @Value("${services.repomanager.mail.from}")
+ private String from;
+
+ @Value("${services.repomanager.mail.replyTo}")
+ private String replyTo;
+
+ @Value("${services.repomanager.mail.mode}")
+ private String mode;
+
+ @Value("${services.repomanager.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;
+ }
+}
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 9b96fd8..84d4968 100644
--- a/src/main/java/eu/dnetlib/repo/manager/controllers/RepositoryController.java
+++ b/src/main/java/eu/dnetlib/repo/manager/controllers/RepositoryController.java
@@ -163,13 +163,13 @@ public class RepositoryController {
@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)")
+ @PreAuthorize("hasAuthority('SUPER_ADMINISTRATOR') or hasAuthority('CONTENT_PROVIDER_DASHBOARD_ADMINISTRATOR') or @authorizationService.isMemberOfInterface(#repository.id)")
public Repository updateRepository(@RequestBody Repository repository, Authentication authentication) throws Exception {
return repositoryService.updateRepository(repository, authentication);
}
@RequestMapping(value = "/deleteInterface/", method = RequestMethod.DELETE)
- @PreAuthorize("@authorizationService.isMemberOf(#id)")
+ @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);
@@ -180,13 +180,24 @@ public class RepositoryController {
@ResponseBody
@PreAuthorize("hasAuthority('SUPER_ADMINISTRATOR') or hasAuthority('CONTENT_PROVIDER_DASHBOARD_ADMINISTRATOR') or @authorizationService.isMemberOf(#id)")
public RepositoryInterface addRepositoryInterface(@RequestParam("datatype") String datatype,
- @RequestParam("id") String id,
+ @RequestParam("repoId") String id,
@RequestParam("registeredBy") String registeredBy,
@RequestParam(value = "comment", required = false) String comment,
@RequestBody RepositoryInterface repositoryInterface) throws Exception {
return repositoryService.addRepositoryInterface(datatype, id, registeredBy, comment, repositoryInterface);
}
+ @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("registeredBy") String registeredBy,
+ @RequestParam(value = "comment", required = false) String comment,
+ @RequestBody RepositoryInterface repositoryInterface) throws Exception {
+ return repositoryService.updateRepositoryInterface(id, registeredBy, comment, repositoryInterface);
+ }
+
@RequestMapping(value = "/getUrlsOfUserRepos/{page}/{size}/", method = RequestMethod.GET,
produces = MediaType.APPLICATION_JSON_VALUE)
@ResponseBody
@@ -231,18 +242,6 @@ public class RepositoryController {
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("id") String id,
- @RequestParam("registeredBy") String registeredBy,
- @RequestParam(value = "comment", required = false) String comment,
- @RequestBody RepositoryInterface repositoryInterface) throws Exception {
- return repositoryService.updateRepositoryInterface(id, registeredBy, comment, repositoryInterface);
- }
-
-
///////////////////////////////////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////////////////////////////////
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 5edd88c..c455e26 100644
--- a/src/main/java/eu/dnetlib/repo/manager/service/BrokerServiceImpl.java
+++ b/src/main/java/eu/dnetlib/repo/manager/service/BrokerServiceImpl.java
@@ -50,9 +50,6 @@ public class BrokerServiceImpl implements BrokerService {
private HashMap topics = new HashMap();
- @Autowired
- private EmailUtils emailUtils;
-
@PostConstruct
private void initDnetTopicsMap() {
@@ -66,8 +63,7 @@ public class BrokerServiceImpl implements BrokerService {
for (JsonNode term : root.path("terms"))
topics.put(term.path("code").textValue(), parseTerm(term));
} catch (IOException e) {
- LOGGER.debug("Exception on initDnetTopicsMap", e);
- emailUtils.reportException(e);
+ LOGGER.error("Exception on initDnetTopicsMap", e);
}
}
@@ -93,8 +89,7 @@ public class BrokerServiceImpl implements BrokerService {
// ret.setDatasourcesOfOthers(getDatasourcesOfUserType(getRepositoriesOfUser(user)));
// }
} catch (Exception e) {
- LOGGER.debug("Exception on getDatasourcesOfUser", e);
- emailUtils.reportException(e);
+ LOGGER.error("Exception on getDatasourcesOfUser", e);
}
long end = System.currentTimeMillis();
System.out.println("Getting datasources of user in " + (end - start) + "ms");
@@ -117,8 +112,6 @@ public class BrokerServiceImpl implements BrokerService {
new ParameterizedTypeReference>() {
});
} catch (RestClientException e) {
- LOGGER.debug("Exception on getTopicsForDatasource", e);
- emailUtils.reportException(e);
throw new BrokerException(e);
}
@@ -151,13 +144,9 @@ public class BrokerServiceImpl implements BrokerService {
}
);
} catch (RestClientException e) {
- LOGGER.debug("Exception on advancedShowEvents", e);
- emailUtils.reportException(e);
throw new BrokerException(e);
}
return resp.getBody();
-
-
}
@@ -210,8 +199,6 @@ public class BrokerServiceImpl implements BrokerService {
new ParameterizedTypeReference() {
});
} catch (RestClientException e) {
- LOGGER.debug("Exception on showEvents", e);
- emailUtils.reportException(e);
throw new BrokerException(e);
}
return resp.getBody();
@@ -236,8 +223,6 @@ public class BrokerServiceImpl implements BrokerService {
new ParameterizedTypeReference