strategy pattern 적용

src/main/java/com/eactive/httpmockserver/api/condition/ConditionMatcher.java

@@ -0,0 +1,10 @@
+package com.eactive.httpmockserver.api.condition;
+
+import com.eactive.httpmockserver.api.dto.MockRequest;
+import com.eactive.httpmockserver.api.entity.MockCondition;
+
+import java.util.Map;
+
+public interface ConditionMatcher {
+    boolean matches(MockCondition condition, MockRequest request, Map<String, String> pathVariables);
+}

src/main/java/com/eactive/httpmockserver/api/condition/HeaderMatcher.java

@@ -0,0 +1,13 @@
+package com.eactive.httpmockserver.api.condition;
+
+import com.eactive.httpmockserver.api.dto.MockRequest;
+import com.eactive.httpmockserver.api.entity.MockCondition;
+
+import java.util.Map;
+
+public class HeaderMatcher implements ConditionMatcher {
+    @Override
+    public boolean matches(MockCondition condition, MockRequest request, Map<String, String> pathVariables) {
+        return condition.getValue().equals(request.getHeader(condition.getKey()));
+    }
+}

src/main/java/com/eactive/httpmockserver/api/condition/JsonPathMatcher.java

@@ -0,0 +1,20 @@
+package com.eactive.httpmockserver.api.condition;
+
+import com.eactive.httpmockserver.api.dto.MockRequest;
+import com.eactive.httpmockserver.api.entity.MockCondition;
+import com.jayway.jsonpath.JsonPath;
+import com.jayway.jsonpath.PathNotFoundException;
+
+import java.util.Map;
+
+public class JsonPathMatcher implements ConditionMatcher {
+    @Override
+    public boolean matches(MockCondition condition, MockRequest request, Map<String, String> pathVariables) {
+        try {
+            Object value = JsonPath.read(request.getBody(), condition.getKey());
+            return value.toString().equals(condition.getValue());
+        } catch (PathNotFoundException e) {
+            return false;
+        }
+    }
+}

src/main/java/com/eactive/httpmockserver/api/condition/PathMatcher.java

@@ -0,0 +1,13 @@
+package com.eactive.httpmockserver.api.condition;
+
+import com.eactive.httpmockserver.api.dto.MockRequest;
+import com.eactive.httpmockserver.api.entity.MockCondition;
+
+import java.util.Map;
+
+public class PathMatcher implements ConditionMatcher {
+    @Override
+    public boolean matches(MockCondition condition, MockRequest request, Map<String, String> pathVariables) {
+        return condition.getValue().equals(pathVariables.get(condition.getKey()));
+    }
+}

src/main/java/com/eactive/httpmockserver/api/condition/QueryMatcher.java

@@ -0,0 +1,13 @@
+package com.eactive.httpmockserver.api.condition;
+
+import com.eactive.httpmockserver.api.dto.MockRequest;
+import com.eactive.httpmockserver.api.entity.MockCondition;
+
+import java.util.Map;
+
+public class QueryMatcher implements ConditionMatcher {
+    @Override
+    public boolean matches(MockCondition condition, MockRequest request, Map<String, String> pathVariables) {
+        return condition.getValue().equals(request.getParam(condition.getKey()));
+    }
+}

src/main/java/com/eactive/httpmockserver/api/controller/MockApiController.java

@@ -1,15 +1,13 @@
 package com.eactive.httpmockserver.api.controller;
 
+import com.eactive.httpmockserver.api.condition.*;
 import com.eactive.httpmockserver.api.dto.MockRequest;
 import com.eactive.httpmockserver.api.entity.MockCondition;
 import com.eactive.httpmockserver.api.entity.MockResponse;
 import com.eactive.httpmockserver.api.entity.MockRoute;
 import com.eactive.httpmockserver.api.service.MockRouteService;
-import com.jayway.jsonpath.JsonPath;
-import com.jayway.jsonpath.PathNotFoundException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -19,16 +17,26 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
 @RestController
 public class MockApiController {
 
-    @Autowired
+    private final MockRouteService mockRouteService;
-    private MockRouteService mockRouteService;
+    Map<String, ConditionMatcher> matchers;
+
+    public MockApiController(MockRouteService mockRouteService) {
+        this.mockRouteService = mockRouteService;
+        this.matchers = new ConcurrentHashMap<>();
+        matchers.put("query", new QueryMatcher());
+        matchers.put("path", new PathMatcher());
+        matchers.put("header", new HeaderMatcher());
+        matchers.put("jsonpath", new JsonPathMatcher());
+
+    }
 
 
     //logger
@@ -99,54 +107,20 @@ public class MockApiController {
         return null;
     }
 
+
     private boolean isRequestMatching(List<MockCondition> conditions, MockRequest request, Map<String, String> pathVariables) {
 
         if (conditions == null) {
             return true;
         }
-        List<Boolean> results = new ArrayList<>();
 
         for (MockCondition condition : conditions) {
-            switch (condition.getType().toLowerCase()) {
+            ConditionMatcher matcher = matchers.get(condition.getType().toLowerCase());
-                case "query":
+            if (matcher != null && !matcher.matches(condition, request, pathVariables)) {
-                    results.add(isQueryMatching(condition, request));
+                return false;
-                    break;
-                case "header":
-                    results.add(isHeaderMatching(condition, request));
-                    break;
-                case "path":
-                    results.add(isPathMatching(condition, pathVariables));
-                    break;
-                case "jsonpath":
-                    results.add(isJsonPathMatching(condition, request));
-                    break;
-                default:
-                    break;
             }
         }
-        return !results.contains(false);
+        return true;
     }
 
-    private boolean isQueryMatching(MockCondition condition, MockRequest request) {
-        return condition.getValue().equals(request.getParam(condition.getKey()));
-    }
-
-    private boolean isHeaderMatching(MockCondition condition, MockRequest request) {
-        return condition.getValue().equals(request.getHeader(condition.getKey()));
-    }
-
-    private boolean isPathMatching(MockCondition condition, Map<String, String> pathVariables) {
-        return condition.getValue().equals(pathVariables.get(condition.getKey()));
-    }
-
-    private boolean isJsonPathMatching(MockCondition condition, MockRequest request) {
-        try {
-            Object value = JsonPath.read(request.getBody(), condition.getKey());
-            return value.toString().equals(condition.getValue());
-        } catch (PathNotFoundException e) {
-            return false;
-        }
-    }
-
-
 }