Support ID: prefix in JMSMessageID, JMSCorrelationID - #46

Author: matrober-uk

getbycorrelid_test.go

@@ -130,6 +130,11 @@ func TestSelectorParsing(t *testing.T) {
 	assert.Nil(t, msgIDErr)
 	assert.NotNil(t, msgIDConsumer)
 
+	// MessageID selector that has an empty ID
+	failMsgIDConsumer, failMsgIDErr := context.CreateConsumerWithSelector(queue, "JMSMessageID = 'ID:'")
+	assert.NotNil(t, failMsgIDErr)
+	assert.Nil(t, failMsgIDConsumer)
+
 	// Check that we get an appropriate error when trying to create a consumer with
 	// a malformed selector.
 	fail1Consumer, fail1Err := context.CreateConsumerWithSelector(queue, "JMSCorrelationID")

getbymsgid_test.go

@@ -89,3 +89,74 @@ func TestGetByMsgID(t *testing.T) {
 	}
 
 }
+
+/*
+ * Test receiving a specific message from a queue using its JMSMessageID
+ */
+func TestGetByMsgIDWithPrefix(t *testing.T) {
+
+	// Loads CF parameters from connection_info.json and applicationApiKey.json in the Downloads directory
+	cf, cfErr := mqjms.CreateConnectionFactoryFromDefaultJSONFiles()
+	assert.Nil(t, cfErr)
+
+	// Creates a connection to the queue manager, using defer to close it automatically
+	// at the end of the function (if it was created successfully)
+	context, ctxErr := cf.CreateContext()
+	assert.Nil(t, ctxErr)
+	if context != nil {
+		defer context.Close()
+	}
+
+	// First, check the queue is empty
+	queue := context.CreateQueue("DEV.QUEUE.1")
+	consumer, conErr := context.CreateConsumer(queue)
+	assert.Nil(t, conErr)
+	if consumer != nil {
+		defer consumer.Close()
+	}
+	reqMsgTest, err := consumer.ReceiveNoWait()
+	assert.Nil(t, err)
+	assert.Nil(t, reqMsgTest)
+
+	// Put a couple of messages before the one we're aiming to get back
+	producer := context.CreateProducer().SetTimeToLive(10000)
+	producer.SendString(queue, "One-prefix")
+	producer.SendString(queue, "Two-prefix")
+	producer.SendString(queue, "Three-prefix")
+
+	myMsgFourStr := "Four-prefix"
+	sentMsg := context.CreateTextMessageWithString(myMsgFourStr)
+	err = producer.Send(queue, sentMsg)
+	assert.Nil(t, err)
+	sentMsgID := sentMsg.GetJMSMessageID()
+
+	// Put a couple of messages after the one we're aiming to get back
+	producer.SendString(queue, "Five-prefix")
+
+	// Create the consumer to read by CorrelID
+	correlIDConsumer, correlErr := context.CreateConsumerWithSelector(queue, "JMSMessageID = 'ID:"+sentMsgID+"'")
+	assert.Nil(t, correlErr)
+	gotCorrelMsg, correlGetErr := correlIDConsumer.ReceiveNoWait()
+
+	// Clean up the remaining messages from the queue before we start checking if
+	// we got the right one back.
+	var cleanupMsg jms20subset.Message
+	for ok := true; ok; ok = (cleanupMsg != nil) {
+		cleanupMsg, err = consumer.ReceiveNoWait()
+	}
+
+	// Now do the comparisons
+	assert.Nil(t, correlGetErr)
+	assert.NotNil(t, gotCorrelMsg)
+	gotMsgID := gotCorrelMsg.GetJMSMessageID()
+	assert.Equal(t, sentMsgID, gotMsgID)
+
+	switch msg := gotCorrelMsg.(type) {
+	case jms20subset.TextMessage:
+		assert.Equal(t, myMsgFourStr, *msg.GetText())
+	default:
+		fmt.Println(reflect.TypeOf(gotCorrelMsg))
+		assert.Fail(t, "Got something other than a text message")
+	}
+
+}

mqjms/ConsumerImpl.go

@@ -322,6 +322,12 @@ func applySelector(selector string, getmqmd *ibmmq.MQMD, gmo *ibmmq.MQGMO) error
 		stringSplits := strings.Split(value, "'")
 		selectorValue := stringSplits[1]
 
+		// For CorrelID and MsgID there is typically an "ID:" prefix on the
+		// selector value that needs to be trimmed off before we convert it.
+		if strings.HasPrefix(selectorValue, "ID:") {
+			selectorValue = selectorValue[3:]
+		}
+
 		if selectorValue != "" {
 
 			selectorValueBytes := convertStringToMQBytes(selectorValue)