Merge pull request #145 from xmidt-org/messageType-Update

Message type update

messagetype.go

@@ -4,7 +4,6 @@
 package wrp
 
 import (
-	"fmt"
 	"strconv"
 )
 
@@ -97,11 +96,11 @@ func init() {
 // If the value equals the friendly name of a type, e.g. "Auth" for AuthMessageType,
 // that type is returned.  Otherwise, the value is converted to an integer and looked up,
 // with an error being returned in the event the integer value is not valid.
-func StringToMessageType(value string) (MessageType, error) {
+func StringToMessageType(value string) MessageType {
 	mt, ok := stringToMessageType[value]
 	if !ok {
-		return MessageType(-1), fmt.Errorf("invalid message type: %s", value)
+		return UnknownMessageType
 	}
 
-	return mt, nil
+	return mt
 }

messagetype_test.go

@@ -101,25 +101,21 @@ func testStringToMessageTypeValid(t *testing.T, expected MessageType) {
 		expectedString = expected.String()
 	)
 
-	actual, err := StringToMessageType(expectedString)
+	actual := StringToMessageType(expectedString)
 	assert.Equal(expected, actual)
-	assert.NoError(err)
 
-	actual, err = StringToMessageType(expectedString[0 : len(expectedString)-len("MessageType")])
+	actual = StringToMessageType(expectedString[0 : len(expectedString)-len("MessageType")])
 	assert.Equal(expected, actual)
-	assert.NoError(err)
 
-	actual, err = StringToMessageType(strconv.Itoa(int(expected)))
+	actual = StringToMessageType(strconv.Itoa(int(expected)))
 	assert.Equal(expected, actual)
-	assert.NoError(err)
 }
 
 func testStringToMessageTypeInvalid(t *testing.T, invalid string) {
 	assert := assert.New(t)
 
-	actual, err := StringToMessageType(invalid)
-	assert.Equal(MessageType(-1), actual)
-	assert.Error(err)
+	actual := StringToMessageType(invalid)
+	assert.Equal(UnknownMessageType, actual)
 }
 
 func TestStringToMessageType(t *testing.T) {

wrphttp/decoders_test.go

@@ -175,8 +175,8 @@ func testDecodeRequestHeadersInvalid(t *testing.T) {
 
 	request.Header.Set(MessageTypeHeader, "askdjfa;skdjfasdf")
 	entity, err := DecodeRequestHeaders(context.Background(), request)
-	assert.Nil(entity)
-	assert.Error(err)
+	assert.Equal(wrp.UnknownMessageType, entity.Message.Type)
+	assert.NoError(err)
 }
 
 func TestDecodeRequestHeaders(t *testing.T) {

wrphttp/headers.go

@@ -73,10 +73,7 @@ func getMessageType(h http.Header) wrp.MessageType {
 		}
 	}
 
-	messageType, err := wrp.StringToMessageType(value)
-	if err != nil {
-		panic(err)
-	}
+	messageType := wrp.StringToMessageType(value)
 	return messageType
 }
 

wrphttp/headers_test.go

@@ -230,8 +230,8 @@ func testNewMessageFromHeadersBadMessageType(t *testing.T) {
 	assert.Error(err)
 
 	message, err = NewMessageFromHeaders(http.Header{MessageTypeHeader: []string{"this could not possibly be a valid message type"}}, nil)
-	assert.Nil(message)
-	assert.Error(err)
+	assert.Equal(wrp.UnknownMessageType, message.MessageType())
+	assert.NoError(err)
 }
 
 func testNewMessageFromHeadersBadIntHeader(t *testing.T, headerName string) {