Merge pull request #29 from sbtqa/14-api-methods-to-const

#14 Add constants for api methods
sbtqa · Nov 14, 2017 · 6494303 · 6494303
2 parents 650be3a + 71a1922
commit 6494303
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 16 deletions.
diff --git a/src/main/java/ru/sbtqa/tag/apifactory/ApiEntry.java b/src/main/java/ru/sbtqa/tag/apifactory/ApiEntry.java
@@ -17,16 +17,11 @@
 import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import ru.sbtqa.tag.apifactory.annotation.AddBracket;
-import ru.sbtqa.tag.apifactory.annotation.ApiAction;
-import ru.sbtqa.tag.apifactory.annotation.ApiRequestHeader;
-import ru.sbtqa.tag.apifactory.annotation.ApiRequestParam;
-import ru.sbtqa.tag.apifactory.annotation.ApiValidationRule;
-import ru.sbtqa.tag.apifactory.annotation.DependentResponseParam;
-import ru.sbtqa.tag.apifactory.annotation.PutInStash;
+import ru.sbtqa.tag.apifactory.annotation.*;
 import ru.sbtqa.tag.apifactory.exception.ApiEntryInitializationException;
 import ru.sbtqa.tag.apifactory.exception.ApiException;
 import ru.sbtqa.tag.apifactory.repositories.Bullet;
+import ru.sbtqa.tag.apifactory.rest.HTTP;
 import ru.sbtqa.tag.apifactory.rest.Rest;
 import ru.sbtqa.tag.apifactory.soap.Soap;
 import ru.sbtqa.tag.datajack.Stash;
@@ -161,7 +156,7 @@ public void prepare() throws ApiException {
      */
     public Object fire(String url) throws ApiException {
         //Get request method of current api object
-        String requestMethod = this.getClass().getAnnotation(ApiAction.class).method().toLowerCase();
+        HTTP requestMethod = this.getClass().getAnnotation(ApiAction.class).method();
         String templateName = this.getClass().getAnnotation(ApiAction.class).template();
 
         Bullet response = null;
@@ -181,30 +176,30 @@ public Object fire(String url) throws ApiException {
 
             Map<String, String> hdrs = getHeaders();
             switch (requestMethod) {
-                case "get":
+                case GET:
                     response = (Bullet) rest.get(url, hdrs);
                     ApiFactory.getApiFactory().addRequestHeadersToRepository(this.getClass(), hdrs);
                     break;
-                case "post":
+                case POST:
                     response = (Bullet) rest.post(url, hdrs, bd);
                     request = new Bullet(hdrs, bd.toString());
                     ApiFactory.getApiFactory().addRequestToRepository(this.getClass(), request);
                     break;
-                case "put":
+                case PUT:
                     response = (Bullet) rest.put(url, hdrs, bd);
                     request = new Bullet(hdrs, bd.toString());
                     ApiFactory.getApiFactory().addRequestToRepository(this.getClass(), request);
                     break;
-                case "patch":
+                case PATCH:
                     response = (Bullet) rest.patch(url, hdrs, bd);
                     request = new Bullet(hdrs, bd.toString());
                     ApiFactory.getApiFactory().addRequestToRepository(this.getClass(), request);
                     break;
-                case "delete":
+                case DELETE:
                     response = (Bullet) rest.delete(url, hdrs);
                     ApiFactory.getApiFactory().addRequestHeadersToRepository(this.getClass(), hdrs);
                     break;
-                case "soap":
+                case SOAP:
                     response = (Bullet) soap.send(url, hdrs, bd, Proxy.NO_PROXY);
                     request = new Bullet(hdrs, bd.toString());
                     ApiFactory.getApiFactory().addRequestToRepository(this.getClass(), request);

diff --git a/src/main/java/ru/sbtqa/tag/apifactory/annotation/ApiAction.java b/src/main/java/ru/sbtqa/tag/apifactory/annotation/ApiAction.java
@@ -6,6 +6,7 @@
 import java.lang.annotation.Target;
 import ru.sbtqa.tag.apifactory.ApiEntry;
 import ru.sbtqa.tag.apifactory.EmptyApiEntry;
+import ru.sbtqa.tag.apifactory.rest.HTTP;
 
 /**
  * This annotation used above ApiEntry class declaration
@@ -33,9 +34,9 @@
     /**
      * HTTP method used to execute api method
      *
-     * @return a {@link java.lang.String} object.
+     * @return a {@link HTTP} object.
      */
-    public String method();
+    public HTTP method();
 
     /**
      * Body template

diff --git a/src/main/java/ru/sbtqa/tag/apifactory/rest/HTTP.java b/src/main/java/ru/sbtqa/tag/apifactory/rest/HTTP.java
@@ -0,0 +1,14 @@
+package ru.sbtqa.tag.apifactory.rest;
+
+/**
+ * This enum using in ApiAction annotation, for method type.
+ *
+ */
+public enum HTTP {
+    POST,
+    GET,
+    PUT,
+    DELETE,
+    PATCH,
+    SOAP
+}