Bump embedded-consul from 2.1.4 to 2.2.0 (#380)

* Bump embedded-consul from 2.1.4 to 2.2.0 Bumps [embedded-consul](https://github.com/pszymczyk/embedded-consul) from 2.1.4 to 2.2.0. - [Release notes](https://github.com/pszymczyk/embedded-consul/releases) - [Changelog](https://github.com/pszymczyk/embedded-consul/blob/master/CHANGELOG.md) - [Commits](pszymczyk/embedded-consul@release/2.1.4...release/2.2.0) Signed-off-by: dependabot-preview[bot] <[email protected]> * Fix embedded consul dependencies Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: Marcos Barbero <[email protected]>
marcosbarbero · Nov 2, 2020 · c53b254 · c53b254
1 parent 528c79c
commit c53b254
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/.../cloud/autoconfigure/zuul/ratelimit/config/repository/DefaultRateLimiterErrorHandler.java b/.../cloud/autoconfigure/zuul/ratelimit/config/repository/DefaultRateLimiterErrorHandler.java
@@ -24,7 +24,7 @@
  */
 public class DefaultRateLimiterErrorHandler implements RateLimiterErrorHandler {
 
-    private static Logger log = LoggerFactory.getLogger(DefaultRateLimiterErrorHandler.class);
+    private static final Logger log = LoggerFactory.getLogger(DefaultRateLimiterErrorHandler.class);
 
     @Override
     public void handleSaveError(String key, Exception e) {

diff --git a/spring-cloud-zuul-ratelimit-tests/consul/pom.xml b/spring-cloud-zuul-ratelimit-tests/consul/pom.xml
@@ -32,8 +32,16 @@
         <dependency>
             <groupId>com.pszymczyk.consul</groupId>
             <artifactId>embedded-consul</artifactId>
-            <version>2.1.4</version>
+            <version>2.2.0</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy-all</artifactId>
+            <version>2.4.12</version>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
     <build>

diff --git a/...-zuul-ratelimit-tests/consul/src/main/java/com/marcosbarbero/tests/ConsulApplication.java b/...-zuul-ratelimit-tests/consul/src/main/java/com/marcosbarbero/tests/ConsulApplication.java
@@ -4,7 +4,9 @@
 
 import com.pszymczyk.consul.ConsulProcess;
 import com.pszymczyk.consul.ConsulStarterBuilder;
+
 import javax.annotation.PreDestroy;
+
 import org.springframework.cloud.client.SpringCloudApplication;
 import org.springframework.cloud.netflix.zuul.EnableZuulProxy;
 import org.springframework.context.annotation.Bean;
@@ -27,7 +29,7 @@ public static void main(String... args) {
     }
 
     @RestController
-    public class ServiceController {
+    public static class ServiceController {
 
         public static final String RESPONSE_BODY = "ResponseBody";
 
@@ -58,7 +60,6 @@ public ResponseEntity<String> serviceE() throws InterruptedException {
         }
     }
 
-
     @Configuration
     static class ConsulConfig {
 

diff --git a/...tests/springdata/src/test/java/com/marcosbarbero/tests/it/SpringDataDenyOriginTestIT.java b/...tests/springdata/src/test/java/com/marcosbarbero/tests/it/SpringDataDenyOriginTestIT.java
@@ -22,7 +22,6 @@ public class SpringDataDenyOriginTestIT {
     @Test
     void testDeniedOrigin() {
         ResponseEntity<String> response = this.restTemplate.getForEntity("/serviceC", String.class);
-//        assertEquals(FORBIDDEN, response.getStatusCode());
         assertEquals(NOT_FOUND, response.getStatusCode());
     }