Update property map type

ayeshLK · Oct 27, 2023 · 3de7cef · 3de7cef
1 parent 11b8d83
commit 3de7cef
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/ballerina/destination.bal b/ballerina/destination.bal
@@ -33,7 +33,7 @@ public client class Topic {
         'class: "io.ballerina.lib.ibm.ibmmq.Topic"
     } external;
 
-    remote function get(GetMessageOptions options = {}) returns Message|Error  =
+    remote function get(*GetMessageOptions options) returns Message|Error  =
     @java:Method {
         'class: "io.ballerina.lib.ibm.ibmmq.Topic"
     } external;

diff --git a/ballerina/types.bal b/ballerina/types.bal
@@ -37,12 +37,12 @@ public enum ConnectionOpenOptions {
 public type AccessTopicOptions MQOO_ALTERNATE_USER_AUTHORITY|MQOO_BIND_AS_Q_DEF|MQOO_FAIL_IF_QUIESCING|MQOO_OUTPUT|MQOO_PASS_ALL_CONTEXT|MQOO_PASS_IDENTITY_CONTEXT|MQOO_SET_ALL_CONTEXT|MQOO_SET_IDENTITY_CONTEXT;
 
 public type GetMessageOptions record {|
-    GM_OPTIONS options = MQGMO_NO_SYNCPOINT;
+    GM_OPTIONS gmOptions = MQGMO_NO_SYNCPOINT;
     int waitInterval = 0;    
 |};
 
 public type Property record {|
-    map<anydata> descriptor?;
+    map<int> descriptor?;
     boolean|byte|byte[]|decimal|float|int|string value;
 |};
 

diff --git a/native/src/main/java/io/ballerina/lib/ibm.ibmmq/CommonUtils.java b/native/src/main/java/io/ballerina/lib/ibm.ibmmq/CommonUtils.java
@@ -21,6 +21,7 @@
 import com.ibm.mq.MQException;
 import com.ibm.mq.MQMessage;
 import com.ibm.mq.MQPropertyDescriptor;
+import io.ballerina.runtime.api.PredefinedTypes;
 import io.ballerina.runtime.api.creators.ErrorCreator;
 import io.ballerina.runtime.api.creators.TypeCreator;
 import io.ballerina.runtime.api.creators.ValueCreator;
@@ -62,7 +63,6 @@ public class CommonUtils {
     private static final BString PROPERTY_VALUE = StringUtils.fromString("value");
     private static final BString PROPERTY_DESCRIPTOR = StringUtils.fromString("descriptor");
 
-
     private static final MQPropertyDescriptor defaultPropertyDescriptor = new MQPropertyDescriptor();
 
     public static MQMessage getMqMessageFromBMessage(BMap<BString, Object> bMessage) {
@@ -172,7 +172,8 @@ private static MQPropertyDescriptor getMQPropertyDescriptor(BMap descriptor) {
     }
 
     private static BMap populateDescriptorFromMQPropertyDescriptor(MQPropertyDescriptor propertyDescriptor) {
-        BMap<BString, Object> descriptor = ValueCreator.createMapValue();
+        BMap<BString, Object> descriptor = ValueCreator.createMapValue(TypeCreator
+                .createMapType(PredefinedTypes.TYPE_INT));
         descriptor.put(PD_VERSION, propertyDescriptor.version);
         descriptor.put(PD_COPY_OPTIONS, propertyDescriptor.copyOptions);
         descriptor.put(PD_OPTIONS, propertyDescriptor.options);