refactor: deleted redundant structs.

Author: en-ken

kadai2/en-ken/cli/cli.go

@@ -10,8 +10,8 @@ import (
 
 // CLI is for DI
 type CLI struct {
-	DirPath      imgcnv.DirPath
-	ImageFactory imgcnv.ImageFileFactory
+	AllFilePaths imgcnv.IAllFilePaths
+	NewImageFIle imgcnv.INewImageFile
 }
 
 // Execute executes this app according to options
@@ -43,13 +43,13 @@ func (cli *CLI) Execute(args []string) error {
 		outputDir = inputDir
 	}
 
-	paths, err := cli.DirPath.AllFilePaths(inputDir, *inputExt)
+	paths, err := cli.AllFilePaths(inputDir, *inputExt)
 	if err != nil {
 		return err
 	}
 
 	for _, path := range paths {
-		img, err := cli.ImageFactory.Create(path)
+		img, err := cli.NewImageFIle(path)
 		if err != nil {
 			return err
 		}

kadai2/en-ken/imgcnv/dirpath.go

@@ -5,24 +5,13 @@ import (
 	"path/filepath"
 )
 
-// DirPath expresses I/F to DirPathStruct
-type DirPath interface {
-	AllFilePaths(path string, ext string) ([]string, error)
-}
-
-// DirPathStruct expresses searching dir
-type DirPathStruct struct {
-}
-
-// NewDirPath is a constructor of DirPath
-func NewDirPath() DirPath {
-	return &DirPathStruct{}
-}
+// IAllFilePaths is I/F of AllFilePaths
+type IAllFilePaths func(path string, ext string) ([]string, error)
 
 // AllFilePaths returns
 // the paths of the files in the specified directory
 // filtered by the specified extension.
-func (dirPath *DirPathStruct) AllFilePaths(path string, ext string) ([]string, error) {
+func AllFilePaths(path string, ext string) ([]string, error) {
 	absPath, err := filepath.Abs(path)
 	if err != nil {
 		return nil, err

kadai2/en-ken/imgcnv/dirpath_test.go

@@ -7,8 +7,7 @@ import (
 )
 
 func TestAllFilePathsSuccess(t *testing.T) {
-	dirPath := NewDirPath()
-	actual, _ := dirPath.AllFilePaths("../testdata/", "jpg")
+	actual, _ := AllFilePaths("../testdata/", "jpg")
 	expected := []string{
 		"../testdata/lenna_color.jpg",
 		"../testdata/lenna_gray.jpg",
@@ -26,8 +25,7 @@ func TestAllFilePathsSuccess(t *testing.T) {
 }
 
 func TestAllFilePathsFailure(t *testing.T) {
-	dirPath := NewDirPath()
-	_, err := dirPath.AllFilePaths("../foo/", "jpg")
+	_, err := AllFilePaths("../foo/", "jpg")
 
 	if err == nil {
 		t.Errorf("directory does not exist")

kadai2/en-ken/imgcnv/imgfile.go

@@ -22,24 +22,8 @@ type ImageFileStruct struct {
 	ImageFile
 }
 
-// ImageFileFactory is I/F of ImageFileFactoryStruct
-type ImageFileFactory interface {
-	Create(path string) (ImageFile, error)
-}
-
-// ImageFileFactoryStruct is for DI
-type ImageFileFactoryStruct struct {
-}
-
-// NewImageFileFactory is a constructor of NewImageFileFactory
-func NewImageFileFactory() ImageFileFactory {
-	return &ImageFileFactoryStruct{}
-}
-
-// Create generates ImageFile
-func (factory *ImageFileFactoryStruct) Create(path string) (ImageFile, error) {
-	return NewImageFile(path)
-}
+// INewImageFile is I/F to NewImageFile
+type INewImageFile func(path string) (ImageFile, error)
 
 // NewImageFile is a constructor of ImageFile
 func NewImageFile(path string) (ImageFile, error) {

kadai2/en-ken/kadai2/main.go

@@ -8,11 +8,9 @@ import (
 )
 
 func main() {
-	dirPath := imgcnv.NewDirPath()
-	factory := imgcnv.NewImageFileFactory()
 	cli := &cli.CLI{
-		DirPath:      dirPath,
-		ImageFactory: factory,
+		AllFilePaths: func(path string, ext string) ([]string, error) { return imgcnv.AllFilePaths(path, ext) },
+		NewImageFIle: func(path string) (imgcnv.ImageFile, error) { return imgcnv.NewImageFile(path) },
 	}
 
 	cli.Execute(os.Args)