yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename emqx_mqtt_properties module to emqx_mqtt_props

This commit is contained in:
Feng Lee 2018-09-06 18:09:22 +08:00
parent f0f818ab1a
commit edf654727c
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/emqx_client.erl
View File

@ -159,7 +159,7 @@ start_link() -> start_link([]).
start_link(Options) when is_map(Options) -> start_link(Options) when is_map(Options) ->
start_link(maps:to_list(Options)); start_link(maps:to_list(Options));
start_link(Options) when is_list(Options) -> start_link(Options) when is_list(Options) ->
ok = emqx_mqtt_properties:validate( ok = emqx_mqtt_props:validate(
proplists:get_value(properties, Options, #{})), proplists:get_value(properties, Options, #{})),
case start_client(with_owner(Options)) of case start_client(with_owner(Options)) of
{ok, Client} -> {ok, Client} ->
@ -265,7 +265,7 @@ publish(Client, Topic, Payload, Opts) when is_binary(Topic), is_list(Opts) ->
-> ok | {ok, packet_id()} | {error, term()}). -> ok | {ok, packet_id()} | {error, term()}).
publish(Client, Topic, Properties, Payload, Opts) publish(Client, Topic, Properties, Payload, Opts)
when is_binary(Topic), is_map(Properties), is_list(Opts) -> when is_binary(Topic), is_map(Properties), is_list(Opts) ->
ok = emqx_mqtt_properties:validate(Properties), ok = emqx_mqtt_props:validate(Properties),
Retain = proplists:get_bool(retain, Opts), Retain = proplists:get_bool(retain, Opts),
QoS = ?QOS_I(proplists:get_value(qos, Opts, ?QOS_0)), QoS = ?QOS_I(proplists:get_value(qos, Opts, ?QOS_0)),
publish(Client, #mqtt_msg{qos = QoS, publish(Client, #mqtt_msg{qos = QoS,
@ -541,7 +541,7 @@ mqtt_connect(State = #state{client_id = ClientId,
will_msg = WillMsg, will_msg = WillMsg,
properties = Properties}) -> properties = Properties}) ->
?WILL_MSG(WillQoS, WillRetain, WillTopic, WillProps, WillPayload) = WillMsg, ?WILL_MSG(WillQoS, WillRetain, WillTopic, WillProps, WillPayload) = WillMsg,
ConnProps = emqx_mqtt_properties:filter(?CONNECT, Properties), ConnProps = emqx_mqtt_props:filter(?CONNECT, Properties),
send(?CONNECT_PACKET( send(?CONNECT_PACKET(
#mqtt_packet_connect{proto_ver = ProtoVer, #mqtt_packet_connect{proto_ver = ProtoVer,
proto_name = ProtoName, proto_name = ProtoName,

2
src/emqx_mqtt_properties.erl → src/emqx_mqtt_props.erl
View File

@ -13,7 +13,7 @@
%% limitations under the License. %% limitations under the License.
%% @doc MQTT5 Properties %% @doc MQTT5 Properties
-module(emqx_mqtt_properties). -module(emqx_mqtt_props).
-include("emqx_mqtt.hrl"). -include("emqx_mqtt.hrl").

9
test/emqx_mqtt_properties_SUITE.erl → test/emqx_mqtt_props_SUITE.erl
View File

@ -12,7 +12,7 @@
%% See the License for the specific language governing permissions and %% See the License for the specific language governing permissions and
%% limitations under the License. %% limitations under the License.
-module(emqx_mqtt_properties_SUITE). -module(emqx_mqtt_props_SUITE).
-compile(export_all). -compile(export_all).
-compile(nowarn_export_all). -compile(nowarn_export_all).
@ -22,6 +22,7 @@
all() -> [t_mqtt_properties_all]. all() -> [t_mqtt_properties_all].
t_mqtt_properties_all(_) -> t_mqtt_properties_all(_) ->
Props = emqx_mqtt_properties:filter(?CONNECT, #{'Session-Expiry-Interval' => 1, 'Maximum-Packet-Size' => 255}), Props = emqx_mqtt_props:filter(?CONNECT, #{'Session-Expiry-Interval' => 1, 'Maximum-Packet-Size' => 255}),
ok = emqx_mqtt_properties:validate(Props), ok = emqx_mqtt_props:validate(Props),
#{} = emqx_mqtt_properties:filter(?CONNECT, #{'Maximum-QoS' => ?QOS_2}). #{} = emqx_mqtt_props:filter(?CONNECT, #{'Maximum-QoS' => ?QOS_2}).