From 6f87196dc9fc31e5ddf83763a71da4350ac2d2e4 Mon Sep 17 00:00:00 2001
From: Ganesh Pagade <ganesh.pagade@tesco.com>
Date: Thu, 1 Nov 2018 14:08:32 +0530
Subject: [PATCH] minor fixes

---
 .../ZuulRatelimitDemoApplication.java         | 47 ++-----------------
 .../controller/GreetingController.java        | 13 ++---
 .../controller/GreetingControllerTest.java    |  1 -
 3 files changed, 8 insertions(+), 53 deletions(-)

diff --git a/spring-cloud/spring-cloud-zuul-ratelimit/src/main/java/com/baeldung/spring/cloud/zuulratelimitdemo/ZuulRatelimitDemoApplication.java b/spring-cloud/spring-cloud-zuul-ratelimit/src/main/java/com/baeldung/spring/cloud/zuulratelimitdemo/ZuulRatelimitDemoApplication.java
index cc13b7a046..9b53099768 100644
--- a/spring-cloud/spring-cloud-zuul-ratelimit/src/main/java/com/baeldung/spring/cloud/zuulratelimitdemo/ZuulRatelimitDemoApplication.java
+++ b/spring-cloud/spring-cloud-zuul-ratelimit/src/main/java/com/baeldung/spring/cloud/zuulratelimitdemo/ZuulRatelimitDemoApplication.java
@@ -1,53 +1,14 @@
 package com.baeldung.spring.cloud.zuulratelimitdemo;
 
-import javax.servlet.http.HttpServletRequest;
-
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.netflix.zuul.filters.Route;
-import org.springframework.context.annotation.Bean;
+import org.springframework.cloud.client.SpringCloudApplication;
+import org.springframework.cloud.netflix.zuul.EnableZuulProxy;
 
-import com.marcosbarbero.cloud.autoconfigure.zuul.ratelimit.config.RateLimitKeyGenerator;
-import com.marcosbarbero.cloud.autoconfigure.zuul.ratelimit.config.RateLimitUtils;
-import com.marcosbarbero.cloud.autoconfigure.zuul.ratelimit.config.properties.RateLimitProperties;
-import com.marcosbarbero.cloud.autoconfigure.zuul.ratelimit.config.repository.RateLimiterErrorHandler;
-import com.marcosbarbero.cloud.autoconfigure.zuul.ratelimit.config.repository.DefaultRateLimiterErrorHandler;
-import com.marcosbarbero.cloud.autoconfigure.zuul.ratelimit.support.DefaultRateLimitKeyGenerator;
-
-@SpringBootApplication
+@EnableZuulProxy
+@SpringCloudApplication
 public class ZuulRatelimitDemoApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(ZuulRatelimitDemoApplication.class, args);
     }
-
-    @Bean
-    public RateLimitKeyGenerator ratelimitKeyGenerator(RateLimitProperties properties, RateLimitUtils rateLimitUtils) {
-        return new DefaultRateLimitKeyGenerator(properties, rateLimitUtils) {
-            @Override
-            public String key(HttpServletRequest request, Route route, RateLimitProperties.Policy policy) {
-                return super.key(request, route, policy) + ":" + request.getMethod();
-            }
-        };
-    }
-
-    @Bean
-    public RateLimiterErrorHandler rateLimitErrorHandler() {
-        return new DefaultRateLimiterErrorHandler() {
-            @Override
-            public void handleSaveError(String key, Exception e) {
-                // custom code
-            }
-
-            @Override
-            public void handleFetchError(String key, Exception e) {
-                // custom code
-            }
-
-            @Override
-            public void handleError(String msg, Exception e) {
-                // custom code
-            }
-        };
-    }
 }
diff --git a/spring-cloud/spring-cloud-zuul-ratelimit/src/main/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/GreetingController.java b/spring-cloud/spring-cloud-zuul-ratelimit/src/main/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/GreetingController.java
index f0facc621a..3f2ec4822f 100644
--- a/spring-cloud/spring-cloud-zuul-ratelimit/src/main/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/GreetingController.java
+++ b/spring-cloud/spring-cloud-zuul-ratelimit/src/main/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/GreetingController.java
@@ -1,26 +1,21 @@
 package com.baeldung.spring.cloud.zuulratelimitdemo.controller;
 
-import org.springframework.cloud.client.SpringCloudApplication;
-import org.springframework.cloud.netflix.zuul.EnableZuulProxy;
 import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-@EnableZuulProxy
-@SpringCloudApplication
+@Controller
 @RequestMapping("/greeting")
 public class GreetingController {
 
-    public static final String SIMPLE_RESPONSE = "Hi!";
-    public static final String ADVANCED_RESPONSE = "Hello, how you doing?";
-
     @GetMapping("/simple")
     public ResponseEntity<String> getSimple() {
-        return ResponseEntity.ok(SIMPLE_RESPONSE);
+        return ResponseEntity.ok("Hi!");
     }
 
     @GetMapping("/advanced")
     public ResponseEntity<String> getAdvanced() {
-        return ResponseEntity.ok(ADVANCED_RESPONSE);
+        return ResponseEntity.ok("Hello, how you doing?");
     }
 }
diff --git a/spring-cloud/spring-cloud-zuul-ratelimit/src/test/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/GreetingControllerTest.java b/spring-cloud/spring-cloud-zuul-ratelimit/src/test/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/GreetingControllerTest.java
index fe81838d5d..d51f881112 100644
--- a/spring-cloud/spring-cloud-zuul-ratelimit/src/test/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/GreetingControllerTest.java
+++ b/spring-cloud/spring-cloud-zuul-ratelimit/src/test/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/GreetingControllerTest.java
@@ -73,7 +73,6 @@ public class GreetingControllerTest {
         assertNotEquals(reset, "2000");
 
         assertEquals(TOO_MANY_REQUESTS, response.getStatusCode());
-        assertNotEquals(GreetingController.ADVANCED_RESPONSE, response.getBody());
 
         TimeUnit.SECONDS.sleep(2);