Use map decoding in example client

As introduced in commit 1b3b64af and adjusted in commit e0603ba1.
There's nothing client-specific about it, but keep the record format in
the server example for the sake of coverage.

2 files changed, 18 insertions, 21 deletions

diff --git a/lib/diameter/examples/code/client.erl b/lib/diameter/examples/code/client.erl
index 6fb90b1c09..0864919cdd 100644
--- a/lib/diameter/examples/code/client.erl
+++ b/lib/diameter/examples/code/client.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2015. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2017. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -39,7 +39,6 @@
 -module(client).
 
 -include_lib("diameter/include/diameter.hrl").
--include_lib("diameter/include/diameter_gen_base_rfc6733.hrl").
 
 -export([start/1,     %% start a service
          start/2,     %%
@@ -71,6 +70,7 @@
                         {'Product-Name', "Client"},
                         {'Auth-Application-Id', [0]},
                         {string_decode, false},
+                        {decode_format, map},
                         {application, [{alias, common},
                                        {dictionary, diameter_gen_base_rfc6733},
                                        {module, client_cb}]}]).
@@ -108,9 +108,9 @@ connect(T) ->
 
 call(Name) ->
     SId = diameter:session_id(?L(Name)),
-    RAR = #diameter_base_RAR{'Session-Id' = SId,
-                             'Auth-Application-Id' = 0,
-                             'Re-Auth-Request-Type' = 0},
+    RAR = ['RAR' | #{'Session-Id' => SId,
+                     'Auth-Application-Id' => 0,
+                     'Re-Auth-Request-Type' => 0}],
     diameter:call(Name, common, RAR, []).
 
 call() ->
diff --git a/lib/diameter/examples/code/client_cb.erl b/lib/diameter/examples/code/client_cb.erl
index ed1d3b9b7b..af2d4d6da7 100644
--- a/lib/diameter/examples/code/client_cb.erl
+++ b/lib/diameter/examples/code/client_cb.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2017. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -55,21 +55,18 @@ prepare_request(#diameter_packet{msg = ['RAR' = T | Avps]}, _, {_, Caps}) ->
                    origin_realm = {OR, DR}}
         = Caps,
 
-    {send, [T, {'Origin-Host', OH},
-               {'Origin-Realm', OR},
-               {'Destination-Host', DH},
-               {'Destination-Realm', DR}
-             | Avps]};
-
-prepare_request(#diameter_packet{msg = Rec}, _, {_, Caps}) ->
-    #diameter_caps{origin_host = {OH, DH},
-                   origin_realm = {OR, DR}}
-        = Caps,
-
-    {send, Rec#diameter_base_RAR{'Origin-Host' = OH,
-                                 'Origin-Realm' = OR,
-                                 'Destination-Host' = DH,
-                                 'Destination-Realm' = DR}}.
+    {send, [T | if is_map(Avps) ->
+                        Avps#{'Origin-Host' => OH,
+                              'Origin-Realm' => OR,
+                              'Destination-Host' => DH,
+                              'Destination-Realm' => DR};
+                   is_list(Avps) ->
+                        [{'Origin-Host', OH},
+                         {'Origin-Realm', OR},
+                         {'Destination-Host', DH},
+                         {'Destination-Realm', DR}
+                         | Avps]
+                end]}.
 
 %% prepare_retransmit/3