Rename mapping functions

Author: MarcialRosales

deps/oauth2_client/src/oauth2_client.erl

@@ -13,10 +13,10 @@
         merge_openid_configuration/2,
         merge_oauth_provider/2,
         extract_ssl_options_as_list/1,
-        get_httpc_option_proxy_auth_if_any/1,
-        get_httpc_option_proxy_if_any/1,
-        get_httpc_option_ssl_options_if_any/1,
-        get_httpc_option_timeout_of_default/1,
+        map_proxy_auth_to_httpc_option/1,
+        map_proxy_to_httpc_option/1,
+        map_ssl_options_to_httpc_option/1,
+        map_timeout_to_httpc_option/1,
         format_ssl_options/1, format_oauth_provider/1, format_oauth_provider_id/1,
         extract_proxy_options_from_url/1
         ]).
@@ -47,8 +47,9 @@ refresh_access_token(OAuthProvider, Request) ->
     Header = [],
     Type = ?CONTENT_URLENCODED,
     Body = build_refresh_token_request_body(Request),
-    HTTPOptions = get_httpc_option_ssl_options_if_any(OAuthProvider) ++
-        get_httpc_option_timeout_of_default(Request#refresh_token_request.timeout),
+    HTTPOptions = 
+        map_ssl_options_to_httpc_option(OAuthProvider#oauth_porvider.ssl_options) ++
+        map_timeout_to_httpc_option(Request#refresh_token_request.timeout),
     Response = http_post(URL, Header, Type, Body, HTTPOptions, 
         OAuthProvider#oauth_provider.proxy_options),
     parse_access_token_response(Response).
@@ -57,21 +58,21 @@ http_post(URL, Header, Type, Body, HTTPOptions, ProxyOptions) ->
     case ProxyOptions of 
         undefined -> httpc:request(post, {URL, Header, Type, Body}, HTTPOptions, []);
         _ ->
-            case httpc:set_options(get_httpc_option_proxy_if_any(ProxyOptions)) of
+            case httpc:set_options(map_proxy_to_httpc_option(ProxyOptions)) of
                 ok -> 
                     httpc:request(post, {URL, Header, Type, Body},
-                        HTTPOptions ++ get_httpc_option_proxy_auth_if_any(ProxyOptions), []);
+                        HTTPOptions ++ map_proxy_auth_to_httpc_option(ProxyOptions), []);
                 {error, _} = Error -> Error 
             end
     end.
 http_get(URL, HTTPOptions, ProxyOptions) ->
     case ProxyOptions of 
         undefined -> httpc:request(get, {URL, []}, HTTPOptions, []);
         _ ->
-            case httpc:set_options(get_httpc_option_proxy_if_any(ProxyOptions)) of 
+            case httpc:set_options(map_proxy_to_httpc_option(ProxyOptions)) of 
                 ok -> 
                     httpc:request(get, {URL, []},
-                        HTTPOptions ++ get_httpc_option_proxy_auth_if_any(ProxyOptions), []);
+                        HTTPOptions ++ map_proxy_auth_to_httpc_option(ProxyOptions), []);
                 {error, _} = Error -> Error 
             end
     end.
@@ -589,19 +590,19 @@ append_extra_parameters(Request, QueryList) ->
         Params -> Params ++ QueryList
     end.
 
-get_httpc_option_ssl_options_if_any(OAuthProvider) ->
-    case OAuthProvider#oauth_provider.ssl_options of
+map_ssl_options_to_httpc_option(SslOptions) ->
+    case SslOptions of
         undefined -> [];
         Options ->  [{ssl, Options}]
     end.
 
-get_httpc_option_timeout_of_default(Timeout) ->
+map_timeout_to_httpc_option(Timeout) ->
     case Timeout of
         undefined -> [{timeout, ?DEFAULT_HTTP_TIMEOUT}];
         Timeout -> [{timeout, Timeout}]
     end.
 
-get_httpc_option_proxy_if_any(ProxyOptions) ->
+map_proxy_to_httpc_option(ProxyOptions) ->
     case ProxyOptions of
         undefined -> 
             []; 
@@ -618,7 +619,7 @@ get_httpc_option_proxy_if_any(ProxyOptions) ->
             end
     end.
 
-get_httpc_option_proxy_auth_if_any(ProxyOptions) ->
+map_proxy_auth_to_httpc_option(ProxyOptions) ->
     case ProxyOptions of
         undefined -> 
             []; 

deps/rabbitmq_auth_backend_oauth2/src/uaa_jwks.erl

@@ -2,10 +2,10 @@
 -export([get/2, get/3]).
 
 -import(oauth2_client, [
-    get_httpc_option_ssl_options_if_any/1,
-    get_httpc_option_timeout_of_default/1,
-    get_httpc_option_proxy_auth_if_any/1,
-    get_httpc_option_proxy_if_any/1]).
+    map_ssl_options_to_httpc_option/1,
+    map_timeout_to_httpc_option/1,
+    map_proxy_auth_to_httpc_option/1,
+    map_proxy_to_httpc_option/1]).
 
 -spec get(uri_string:uri_string(), list()) -> {ok, term()} | {error, term()}.
 get(JwksUrl, SslOptions) ->
@@ -18,21 +18,15 @@ get(JwksUrl, SslOptions, undefined) ->
 get(JwksUrl, SslOptions, ProxyOptions) ->
     http_get(JwksUrl, SslOptions, ProxyOptions).    
 
-get_ssl_options_if_any(SslOptions) ->
-    case SslOptions of
-        undefined -> [];
-        Options ->  [{ssl, Options}]
-    end.
-
 http_get(URL, SslOptions, ProxyOptions) ->
-    HttpOptions = get_httpc_option_timeout_of_default(60000) 
-                    ++ get_ssl_options_if_any(SslOptions),
+    HttpOptions = map_timeout_to_httpc_option(60000) 
+                    ++ map_ssl_options_to_httpc_option(SslOptions),
     {HttpProxyOptions, SetOptions} = 
         case ProxyOptions of 
             undefined -> {[], ok};
         _ ->
-            case httpc:set_options(get_httpc_option_proxy_if_any(ProxyOptions)) of 
-                ok -> {get_httpc_option_proxy_auth_if_any(ProxyOptions), ok};
+            case httpc:set_options(map_proxy_to_httpc_option(ProxyOptions)) of 
+                ok -> {map_proxy_auth_to_httpc_option(ProxyOptions), ok};
                 {error, _} = Error -> {undefined, Error}
             end
     end,