From a8143fe775bff2d04fcda0841a31c7746044a350 Mon Sep 17 00:00:00 2001 From: Antonis Lempesis Date: Mon, 5 Apr 2021 10:35:28 +0000 Subject: [PATCH] code cleanup --- src/main/java/eu/dnetlib/repo/manager/config/Config.java | 3 --- .../eu/dnetlib/repo/manager/config/RedisConfiguration.java | 3 --- .../java/eu/dnetlib/repo/manager/config/SwaggerConfig.java | 2 -- 3 files changed, 8 deletions(-) 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 60e6744..bd5d4bf 100644 --- a/src/main/java/eu/dnetlib/repo/manager/config/Config.java +++ b/src/main/java/eu/dnetlib/repo/manager/config/Config.java @@ -2,7 +2,6 @@ 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; @@ -16,8 +15,6 @@ import javax.annotation.PostConstruct; @Configuration @EnableRedisHttpSession -@EnableAspectJAutoProxy -@EnableCircuitBreaker @PropertySource(value = {"classpath:application.properties"} ) @ComponentScan(basePackages = { "org.eurocris.openaire.cris.validator.service", 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 167545f..5a3ea0a 100644 --- a/src/main/java/eu/dnetlib/repo/manager/config/RedisConfiguration.java +++ b/src/main/java/eu/dnetlib/repo/manager/config/RedisConfiguration.java @@ -2,7 +2,6 @@ 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; @@ -16,8 +15,6 @@ import javax.annotation.PostConstruct; @Configuration @EnableRedisHttpSession -@EnableAspectJAutoProxy -@EnableCircuitBreaker @PropertySource(value = {"classpath:application.properties"} ) @ComponentScan(basePackages = { "org.eurocris.openaire.cris.validator.service", diff --git a/src/main/java/eu/dnetlib/repo/manager/config/SwaggerConfig.java b/src/main/java/eu/dnetlib/repo/manager/config/SwaggerConfig.java index cf114d0..5f23176 100644 --- a/src/main/java/eu/dnetlib/repo/manager/config/SwaggerConfig.java +++ b/src/main/java/eu/dnetlib/repo/manager/config/SwaggerConfig.java @@ -1,7 +1,6 @@ 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; @@ -24,7 +23,6 @@ import java.util.ArrayList; @Configuration @EnableSwagger2 @EnableWebMvc -@EnableCircuitBreaker @ComponentScan(basePackageClasses = { RepositoryController.class, MonitorController.class,