Merge pull request #564 from Shopify/lint

A few minor suggestions from golint

client.go

@@ -667,11 +667,10 @@ func (client *client) updateMetadata(data *MetadataResponse) (retry bool, err er
 func (client *client) cachedCoordinator(consumerGroup string) *Broker {
 	client.lock.RLock()
 	defer client.lock.RUnlock()
-	if coordinatorID, ok := client.coordinators[consumerGroup]; !ok {
-		return nil
-	} else {
+	if coordinatorID, ok := client.coordinators[consumerGroup]; ok {
 		return client.brokers[coordinatorID]
 	}
+	return nil
 }
 
 func (client *client) getConsumerMetadata(consumerGroup string, attemptsRemaining int) (*ConsumerMetadataResponse, error) {

mockresponses_test.go

@@ -52,14 +52,14 @@ func (mmr *mockMetadataResponse) SetBroker(addr string, brokerID int32) *mockMet
 	return mmr
 }
 
-func (mor *mockMetadataResponse) For(reqBody decoder) encoder {
+func (mmr *mockMetadataResponse) For(reqBody decoder) encoder {
 	metadataRequest := reqBody.(*MetadataRequest)
 	metadataResponse := &MetadataResponse{}
-	for addr, brokerID := range mor.brokers {
+	for addr, brokerID := range mmr.brokers {
 		metadataResponse.AddBroker(addr, brokerID)
 	}
 	if len(metadataRequest.Topics) == 0 {
-		for topic, partitions := range mor.leaders {
+		for topic, partitions := range mmr.leaders {
 			for partition, brokerID := range partitions {
 				metadataResponse.AddTopicPartition(topic, partition, brokerID, nil, nil, ErrNoError)
 			}
@@ -67,7 +67,7 @@ func (mor *mockMetadataResponse) For(reqBody decoder) encoder {
 		return metadataResponse
 	}
 	for _, topic := range metadataRequest.Topics {
-		for partition, brokerID := range mor.leaders[topic] {
+		for partition, brokerID := range mmr.leaders[topic] {
 			metadataResponse.AddTopicPartition(topic, partition, brokerID, nil, nil, ErrNoError)
 		}
 	}

offset_manager.go

@@ -345,9 +345,9 @@ func (pom *partitionOffsetManager) NextOffset() (int64, string) {
 
 	if pom.offset >= 0 {
 		return pom.offset + 1, pom.metadata
-	} else {
-		return pom.parent.conf.Consumer.Offsets.Initial, ""
 	}
+
+	return pom.parent.conf.Consumer.Offsets.Initial, ""
 }
 
 func (pom *partitionOffsetManager) AsyncClose() {

prep_encoder.go

@@ -12,7 +12,7 @@ type prepEncoder struct {
 // primitives
 
 func (pe *prepEncoder) putInt8(in int8) {
-	pe.length += 1
+	pe.length++
 }
 
 func (pe *prepEncoder) putInt16(in int16) {

real_decoder.go

@@ -19,7 +19,7 @@ func (rd *realDecoder) getInt8() (int8, error) {
 		return -1, ErrInsufficientData
 	}
 	tmp := int8(rd.raw[rd.off])
-	rd.off += 1
+	rd.off++
 	return tmp, nil
 }
 

real_encoder.go

@@ -12,7 +12,7 @@ type realEncoder struct {
 
 func (re *realEncoder) putInt8(in int8) {
 	re.raw[re.off] = byte(in)
-	re.off += 1
+	re.off++
 }
 
 func (re *realEncoder) putInt16(in int16) {

sync_producer.go

@@ -67,9 +67,9 @@ func (sp *syncProducer) SendMessage(msg *ProducerMessage) (partition int32, offs
 
 	if err := <-expectation; err != nil {
 		return -1, -1, err
-	} else {
-		return msg.Partition, msg.Offset, nil
 	}
+
+	return msg.Partition, msg.Offset, nil
 }
 
 func (sp *syncProducer) handleSuccesses() {