Remove encoder option

cmd/config.go

@@ -1,25 +1,19 @@
 package cmd
 
 import (
-	"fmt"
 	"io"
 	"log"
 	"os"
-
-	"github.com/aswinkarthik93/csv-digest/pkg/encoder"
 )
 
-var encoders map[string]encoder.Encoder
 var config Config
 
 func init() {
-	encoders = map[string]encoder.Encoder{"json": encoder.JsonEncoder{}}
 	config = Config{}
 }
 
 type Config struct {
 	KeyPositions  []int
-	Encoder       string
 	Base          string
 	Delta         string
 	Additions     string
@@ -33,15 +27,6 @@ func (c Config) GetKeyPositions() []int {
 	return []int{0}
 }
 
-func (c Config) GetEncoder() encoder.Encoder {
-	if val, ok := encoders[c.Encoder]; ok {
-		return val
-	} else {
-		fmt.Println("Using JSON encoder")
-		return encoders["json"]
-	}
-}
-
 func (c Config) GetBaseReader() io.Reader {
 	return getReader(c.Base)
 }
@@ -80,15 +65,3 @@ func getWriter(outputStream string) io.WriteCloser {
 	}
 	return os.Stdout
 }
-
-func GetEncoders() []string {
-	result := make([]string, len(encoders))
-
-	counter := 0
-	for k := range encoders {
-		result[counter] = k
-		counter++
-	}
-
-	return result
-}

cmd/config_test.go

@@ -3,18 +3,9 @@ package cmd
 import (
 	"testing"
 
-	"github.com/aswinkarthik93/csv-digest/pkg/encoder"
 	"github.com/stretchr/testify/assert"
 )
 
-func TestGetEncoder(t *testing.T) {
-	config := Config{Encoder: "json"}
-	assert.Equal(t, encoder.JsonEncoder{}, config.GetEncoder())
-
-	config = Config{Encoder: "random"}
-	assert.Equal(t, encoder.JsonEncoder{}, config.GetEncoder())
-}
-
 func TestGetKeyPositions(t *testing.T) {
 	config := Config{KeyPositions: []int{0, 1}}
 	assert.Equal(t, []int{0, 1}, config.GetKeyPositions())

cmd/run.go

@@ -20,7 +20,6 @@ import (
 	"io"
 	"log"
 	"os"
-	"strings"
 	"sync"
 
 	"github.com/aswinkarthik93/csv-digest/pkg/digest"
@@ -55,7 +54,6 @@ func init() {
 
 	digestCmd.Flags().StringVarP(&config.Base, "base", "b", "", "The base csv file")
 	digestCmd.Flags().StringVarP(&config.Delta, "delta", "d", "", "The delta csv file")
-	digestCmd.Flags().StringVarP(&config.Encoder, "encoder", "e", "json", "Encoder to use to output the digest. Available Encoders: "+strings.Join(GetEncoders(), ","))
 	digestCmd.Flags().IntSliceVarP(&config.KeyPositions, "key-positions", "k", []int{0}, "Primary key positions of the Input CSV as comma separated values Eg: 1,2")
 	digestCmd.Flags().BoolVarP(&debug, "debug", "", false, "Debug mode")
 	digestCmd.Flags().StringVarP(&config.Additions, "additions", "a", "STDOUT", "Output stream for the additions in delta file")
@@ -74,14 +72,12 @@ func run() {
 
 	baseConfig := digest.DigestConfig{
 		KeyPositions: config.GetKeyPositions(),
-		Encoder:      config.GetEncoder(),
 		Reader:       config.GetBaseReader(),
 		Writer:       os.Stdout,
 	}
 
 	deltaConfig := digest.DigestConfig{
 		KeyPositions: config.GetKeyPositions(),
-		Encoder:      config.GetEncoder(),
 		Reader:       config.GetDeltaReader(),
 		Writer:       os.Stdout,
 		SourceMap:    true,

pkg/digest/digest.go

@@ -5,7 +5,6 @@ import (
 	"io"
 	"strings"
 
-	"github.com/aswinkarthik93/csv-digest/pkg/encoder"
 	"github.com/cespare/xxhash"
 )
 
@@ -35,7 +34,6 @@ func CreateDigest(csv []string, keyPositions []int) Digest {
 
 type DigestConfig struct {
 	KeyPositions []int
-	Encoder      encoder.Encoder
 	Reader       io.Reader
 	Writer       io.Writer
 	SourceMap    bool
@@ -61,6 +59,5 @@ func Create(config DigestConfig) (map[uint64]uint64, map[uint64]string, error) {
 		}
 	}
 
-	// config.Encoder.Encode(output, config.Writer)
 	return output, sourceMap, nil
 }

pkg/digest/digest_test.go

@@ -5,7 +5,6 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/aswinkarthik93/csv-digest/pkg/encoder"
 	"github.com/cespare/xxhash"
 	"github.com/stretchr/testify/assert"
 )
@@ -36,16 +35,12 @@ func TestDigestForFile(t *testing.T) {
 	testConfig := DigestConfig{
 		Reader:       strings.NewReader(firstLine + "\n" + secondLine),
 		Writer:       &outputBuffer,
-		Encoder:      encoder.JsonEncoder{},
 		KeyPositions: []int{0},
 		SourceMap:    true,
 	}
 
 	actualDigest, sourceMap, err := Create(testConfig)
 
-	//actualDigest := outputBuffer.String()
-	//expectedDigest := fmt.Sprintf(`{"%d":%d,"%d":%d}`, firstKey, firstDigest, secondKey, secondDigest)
-
 	expectedDigest := map[uint64]uint64{firstKey: firstDigest, secondKey: secondDigest}
 	expectedSourceMap := map[uint64]string{firstKey: firstLine, secondKey: secondLine}
 
@@ -57,7 +52,6 @@ func TestDigestForFile(t *testing.T) {
 	testConfigWithoutSourceMap := DigestConfig{
 		Reader:       strings.NewReader(firstLine + "\n" + secondLine),
 		Writer:       &outputBuffer,
-		Encoder:      encoder.JsonEncoder{},
 		KeyPositions: []int{0},
 		SourceMap:    false,
 	}