Unverified Commit 447ec377 authored by Emilio Garcia's avatar Emilio Garcia
Browse files

EE-2415 Fix maven dependencies and remove singletons

parent be88bd05
Pipeline #276328 passed with stage
in 1 minute and 31 seconds
...@@ -22,7 +22,9 @@ import eu.elixir.ega.ebi.commons.shared.service.AuthenticationService; ...@@ -22,7 +22,9 @@ import eu.elixir.ega.ebi.commons.shared.service.AuthenticationService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import eu.elixir.ega.ebi.dataedge.service.FileService; import eu.elixir.ega.ebi.dataedge.service.FileService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.context.annotation.Scope;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.security.core.Authentication; import org.springframework.security.core.Authentication;
...@@ -39,6 +41,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.*; ...@@ -39,6 +41,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.*;
* @author asenf * @author asenf
*/ */
@RestController @RestController
@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
@EnableDiscoveryClient @EnableDiscoveryClient
@Slf4j @Slf4j
@RequestMapping("/files") @RequestMapping("/files")
......
...@@ -56,9 +56,11 @@ import okhttp3.OkHttpClient; ...@@ -56,9 +56,11 @@ import okhttp3.OkHttpClient;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
import org.springframework.cache.annotation.Cacheable; import org.springframework.cache.annotation.Cacheable;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.client.loadbalancer.LoadBalancerClient; import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
import org.springframework.context.annotation.Scope;
import org.springframework.http.HttpMethod; import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
...@@ -89,6 +91,7 @@ import static eu.elixir.ega.ebi.commons.config.Constants.RES_SERVICE; ...@@ -89,6 +91,7 @@ import static eu.elixir.ega.ebi.commons.config.Constants.RES_SERVICE;
import static org.apache.catalina.connector.OutputBuffer.DEFAULT_BUFFER_SIZE; import static org.apache.catalina.connector.OutputBuffer.DEFAULT_BUFFER_SIZE;
@Service @Service
@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
@EnableDiscoveryClient @EnableDiscoveryClient
@Slf4j @Slf4j
public class RemoteFileServiceImpl implements FileService { public class RemoteFileServiceImpl implements FileService {
......
...@@ -21,6 +21,12 @@ ...@@ -21,6 +21,12 @@
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId> <artifactId>spring-boot-starter-aop</artifactId>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
...@@ -154,12 +160,20 @@ ...@@ -154,12 +160,20 @@
<groupId>com.github.uio-bmi</groupId> <groupId>com.github.uio-bmi</groupId>
<artifactId>crypt4gh</artifactId> <artifactId>crypt4gh</artifactId>
<version>v1.2.1</version> <version>v1.2.1</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.minio</groupId> <groupId>io.minio</groupId>
<artifactId>minio</artifactId> <artifactId>minio</artifactId>
<version>5.0.1</version> <version>5.0.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>uk.ac.ebi.ega</groupId> <groupId>uk.ac.ebi.ega</groupId>
<artifactId>fire-v3-core</artifactId> <artifactId>fire-v3-core</artifactId>
......
...@@ -24,7 +24,9 @@ import htsjdk.samtools.seekablestream.ebi.BufferedBackgroundInputStream; ...@@ -24,7 +24,9 @@ import htsjdk.samtools.seekablestream.ebi.BufferedBackgroundInputStream;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.context.annotation.Scope;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.ServletContext; import javax.servlet.ServletContext;
...@@ -46,6 +48,7 @@ import java.util.stream.StreamSupport; ...@@ -46,6 +48,7 @@ import java.util.stream.StreamSupport;
* @author asenf * @author asenf
*/ */
@RestController @RestController
@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
@EnableDiscoveryClient @EnableDiscoveryClient
@Slf4j @Slf4j
@RequestMapping("/file") @RequestMapping("/file")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment