Skip to content

Publish message signatures adjusted for consistency #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 31 additions & 13 deletions Backendless/Service/MessagingService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -318,23 +318,23 @@ internal void UnregisterDeviceOnServer( AsyncCallback<bool> callback )

public Messaging.MessageStatus Publish( object message )
{
return Publish( message, DEFAULT_CHANNEL_NAME );
return Publish(DEFAULT_CHANNEL_NAME, message);
}

public Messaging.MessageStatus Publish( object message, Messaging.PublishOptions publishOptions )
{
return Publish( message, DEFAULT_CHANNEL_NAME, publishOptions );
return Publish(DEFAULT_CHANNEL_NAME, message, publishOptions );
}

public Messaging.MessageStatus Publish( object message, Messaging.DeliveryOptions deliveryOptions )
{
return Publish( message, DEFAULT_CHANNEL_NAME, null, deliveryOptions );
return Publish(DEFAULT_CHANNEL_NAME, message, null, deliveryOptions );
}

public Messaging.MessageStatus Publish( object message, Messaging.PublishOptions publishOptions,
Messaging.DeliveryOptions deliveryOptions )
{
return Publish( message, DEFAULT_CHANNEL_NAME, publishOptions, deliveryOptions );
return Publish(DEFAULT_CHANNEL_NAME, message, publishOptions, deliveryOptions );
}

#endregion
Expand Down Expand Up @@ -366,28 +366,28 @@ public void Publish( object message, Messaging.PublishOptions publishOptions, Me

#region PUBLISH SYNC

public Messaging.MessageStatus Publish( object message, string channelName )
public Messaging.MessageStatus Publish(string channelName, object message )
{
return PublishSync( message, channelName, null, null );
return PublishSync(channelName, message, null, null );
}

public Messaging.MessageStatus Publish( object message, string channelName, Messaging.PublishOptions publishOptions )
public Messaging.MessageStatus Publish(string channelName, object message, Messaging.PublishOptions publishOptions )
{
return PublishSync( message, channelName, publishOptions, null );
return PublishSync(channelName, message, publishOptions, null );
}

public Messaging.MessageStatus Publish( object message, string channelName, Messaging.DeliveryOptions deliveryOptions )
public Messaging.MessageStatus Publish(string channelName, object message, Messaging.DeliveryOptions deliveryOptions )
{
return PublishSync( message, channelName, null, deliveryOptions );
return PublishSync(channelName, message, null, deliveryOptions );
}

public Messaging.MessageStatus Publish( object message, string channelName, Messaging.PublishOptions publishOptions,
public Messaging.MessageStatus Publish(string channelName, object message, Messaging.PublishOptions publishOptions,
Messaging.DeliveryOptions deliveryOptions )
{
return PublishSync( message, channelName, publishOptions, deliveryOptions );
return PublishSync(channelName, message, publishOptions, deliveryOptions );
}

private Messaging.MessageStatus PublishSync( object message, string channelName, Messaging.PublishOptions publishOptions,
private Messaging.MessageStatus PublishSync(string channelName, object message, Messaging.PublishOptions publishOptions,
Messaging.DeliveryOptions deliveryOptions )
{
checkChannelName( channelName );
Expand Down Expand Up @@ -436,6 +436,24 @@ public void Publish( object message, string channelName, Messaging.PublishOption

#endregion


public MessageStatus GetMessageStatus(string messageId)
{
if (messageId == null)
throw new ArgumentNullException(ExceptionMessage.NULL_MESSAGE_ID);
MessageStatus messageStatus = Invoker.InvokeSync<MessageStatus>(MESSAGING_MANAGER_SERVER_ALIAS, "getMessageStatus", new object[]{ messageId });

return messageStatus;
}

public void GetMessageStatus(string messageId, AsyncCallback<MessageStatus> callback)
{
if (messageId == null)
throw new ArgumentNullException(ExceptionMessage.NULL_MESSAGE_ID);

Invoker.InvokeAsync(MESSAGING_MANAGER_SERVER_ALIAS, "getMessageStatus", new object[] { messageId }, callback);
}

public bool Cancel( string messageId )
{
if( string.IsNullOrEmpty( messageId ) )
Expand Down