feature: Use httpClient http Method rather than request method

Author: manudss

projects/ngx-http-annotations/src/lib/ngx-http-annotations.utils.ts

@@ -49,6 +49,16 @@ const NO_DELAY = 0;
 
 const MOCK_DEFAULT_DELAY = 500;
 
+export enum RequestMethodParams {
+  get = 'Get',
+  post = 'Post',
+  put = 'Put',
+  delete = 'Delete',
+  options = 'Options',
+  head = 'Head',
+  patch = 'Patch'
+}
+
 export class HttpRestUtils {
 
   public static http: HttpClient = null;
@@ -116,7 +126,7 @@ export class HttpRestUtils {
     target[RESOURCE_METADATA_ROOT][entityType] = metadataObj;
   }
 
-  public static requestMethod(requestMethodName: string): any {
+  public static requestMethod(requestMethodName: RequestMethodParams): any {
       // @dynamic
     return (target: any, key: string, descriptor: any) => {
       const originalFunction = descriptor.value;
@@ -150,7 +160,7 @@ export class HttpRestUtils {
           if (HttpRestUtils.ifUseMock(callConfig)) { // If "use mock" is true, call original function, to get mock directly from function
             return HttpRestUtils.processIfUseMock(responseIndex, args, newArgs, originalFunction);
           }
-          const request = HttpRestUtils.http.request(requestMethodName, url, params);
+          const request = HttpRestUtils.getRequest(callConfig);
 
 
 
@@ -170,6 +180,27 @@ export class HttpRestUtils {
     };
   }
 
+  private static getRequest(callConfig: CallConfig) {
+    switch (callConfig.requestMethodName) {
+      case RequestMethodParams.get:
+        return HttpRestUtils.http.get(callConfig.url, callConfig.params);
+      case RequestMethodParams.post:
+        return HttpRestUtils.http.post(callConfig.url, callConfig.params);
+      case RequestMethodParams.put:
+        return HttpRestUtils.http.put(callConfig.url, callConfig.params);
+      case RequestMethodParams.delete:
+        return HttpRestUtils.http.delete(callConfig.url, callConfig.params);
+      case RequestMethodParams.options:
+        return HttpRestUtils.http.options(callConfig.url, callConfig.params);
+      case RequestMethodParams.head:
+        return HttpRestUtils.http.head(callConfig.url, callConfig.params);
+      case RequestMethodParams.patch:
+        return HttpRestUtils.http.patch(callConfig.url, callConfig.params);
+      default:
+        return HttpRestUtils.http.request(callConfig.requestMethodName, callConfig.url, callConfig.params);
+    }
+  }
+
   private static ifUseMock(callConfig: CallConfig): boolean | Function {
     let useMock: boolean | Function = HttpRestUtils.appInjector.get(HTTP_ANNOTATIONS_USE_MOCKS, false);
     if (typeof useMock === 'function') {

projects/ngx-http-annotations/src/public_api.ts

@@ -1,6 +1,16 @@
 export * from './lib/ngx-http-annotations.module';
 export * from './lib/ngx-http-annotations.utils';
-import {HttpRestUtils, path, body, query, headers, produces, observe, response} from "./lib/ngx-http-annotations.utils";
+import {
+  body,
+  headers,
+  HttpRestUtils,
+  observe,
+  path,
+  produces,
+  query,
+  RequestMethodParams,
+  response
+} from './lib/ngx-http-annotations.utils';
 
 export let Path = path;
 export let PathParam = path;
@@ -18,10 +28,10 @@ export let Headers = headers;
 export let Produces = produces;
 
 // Request methods
-export let GET = HttpRestUtils.requestMethod('Get');
-export let POST = HttpRestUtils.requestMethod('Post');
-export let PUT = HttpRestUtils.requestMethod('Put');
-export let DELETE = HttpRestUtils.requestMethod('Delete');
-export let OPTIONS = HttpRestUtils.requestMethod('Options');
-export let HEAD = HttpRestUtils.requestMethod('Head');
-export let PATCH = HttpRestUtils.requestMethod('Patch');
+export let GET = HttpRestUtils.requestMethod(RequestMethodParams.get);
+export let POST = HttpRestUtils.requestMethod(RequestMethodParams.post);
+export let PUT = HttpRestUtils.requestMethod(RequestMethodParams.put);
+export let DELETE = HttpRestUtils.requestMethod(RequestMethodParams.delete);
+export let OPTIONS = HttpRestUtils.requestMethod(RequestMethodParams.options);
+export let HEAD = HttpRestUtils.requestMethod(RequestMethodParams.head);
+export let PATCH = HttpRestUtils.requestMethod(RequestMethodParams.patch);