KhaninArtur commented on a change in pull request #16482:
URL: https://github.com/apache/beam/pull/16482#discussion_r782944110
##########
File path: playground/backend/internal/preparators/go_preparators.go
##########
@@ -33,13 +31,44 @@ const (
sep = "."
)
+//GoPreparersBuilder facet of PreparersBuilder
+type GoPreparersBuilder struct {
+ PreparersBuilder
+}
+
+//GoPreparers chains to type *PreparersBuilder and returns a
*GoPreparersBuilder
+func (b *PreparersBuilder) GoPreparers() *GoPreparersBuilder {
+ return &GoPreparersBuilder{*b}
+}
+
+//WithCodeFormatter adds code formatter preparer
+func (a *GoPreparersBuilder) WithCodeFormatter() *GoPreparersBuilder {
+ formatCodePreparator := Preparator{
+ Prepare: formatCode,
+ Args: []interface{}{a.filePath},
+ }
+ a.AddPreparer(formatCodePreparator)
+ return a
+}
+
+//WithFileNameChanger adds preparer to change file name
+func (a *GoPreparersBuilder) WithFileNameChanger() *GoPreparersBuilder {
+ changeTestFileName := Preparator{
+ Prepare: changeGoTestFileName,
+ Args: []interface{}{a.filePath},
+ }
+ a.AddPreparer(changeTestFileName)
+ return a
+}
+
// GetGoPreparators returns reparation methods that should be applied to Go
code
-func GetGoPreparators(filePath string) *[]Preparator {
- preparatorArgs := make([]interface{}, 1)
- preparatorArgs[0] = filePath
- formatCodePreparator := Preparator{Prepare: formatCode, Args:
preparatorArgs}
- changeNamePreparator := Preparator{Prepare: changeGoTestFileName, Args:
preparatorArgs}
- return &[]Preparator{formatCodePreparator, changeNamePreparator}
+func GetGoPreparators(builder *PreparersBuilder, isUnitTest bool) {
Review comment:
Shouldn't we rename it to `GetGoPreparers` as well?
##########
File path: playground/backend/internal/preparators/java_preparators.go
##########
@@ -41,47 +39,85 @@ const (
publicClassNamePattern = "public class (.*?)
[{|implements(.*)]"
)
-// GetJavaPreparators returns preparation methods that should be applied to
Java code
-func GetJavaPreparators(filePath string) *[]Preparator {
+//JavaPreparersBuilder facet of PreparersBuilder
+type JavaPreparersBuilder struct {
+ PreparersBuilder
+}
+
+//JavaPreparers chains to type *PreparersBuilder and returns a
*JavaPreparersBuilder
+func (b *PreparersBuilder) JavaPreparers() *JavaPreparersBuilder {
+ return &JavaPreparersBuilder{*b}
+}
+
+//WithPublicClassRemover adds preparer to remove public class
+func (a *JavaPreparersBuilder) WithPublicClassRemover() *JavaPreparersBuilder {
removePublicClassPreparator := Preparator{
Prepare: removePublicClassModifier,
- Args: []interface{}{filePath,
classWithPublicModifierPattern, classWithoutPublicModifierPattern},
+ Args: []interface{}{a.filePath,
classWithPublicModifierPattern, classWithoutPublicModifierPattern},
}
+ a.AddPreparer(removePublicClassPreparator)
+ return a
+}
+
+//WithPackageChanger adds preparer to change package
+func (a *JavaPreparersBuilder) WithPackageChanger() *JavaPreparersBuilder {
changePackagePreparator := Preparator{
Prepare: changePackage,
- Args: []interface{}{filePath, packagePattern,
importStringPattern},
+ Args: []interface{}{a.filePath, packagePattern,
importStringPattern},
}
+ a.AddPreparer(changePackagePreparator)
+ return a
+}
+
+//WithPackageRemover adds preparer to remove package
+func (a *JavaPreparersBuilder) WithPackageRemover() *JavaPreparersBuilder {
removePackagePreparator := Preparator{
Prepare: removePackage,
- Args: []interface{}{filePath, packagePattern,
newLinePattern},
+ Args: []interface{}{a.filePath, packagePattern,
newLinePattern},
}
+ a.AddPreparer(removePackagePreparator)
+ return a
+}
+
+//WithFileNameChanger adds preparer to remove package
+func (a *JavaPreparersBuilder) WithFileNameChanger() *JavaPreparersBuilder {
unitTestFileNameChanger := Preparator{
Prepare: changeJavaTestFileName,
- Args: []interface{}{filePath},
+ Args: []interface{}{a.filePath},
+ }
+ a.AddPreparer(unitTestFileNameChanger)
+ return a
+}
+
+// GetJavaPreparators returns preparation methods that should be applied to
Java code
+func GetJavaPreparators(builder *PreparersBuilder, isUnitTest bool, isKata
bool) {
Review comment:
ditto
##########
File path: playground/backend/internal/utils/preparators_utils.go
##########
@@ -18,24 +18,34 @@ package utils
import (
pb "beam.apache.org/playground/backend/internal/api/v1"
"beam.apache.org/playground/backend/internal/preparators"
+ "beam.apache.org/playground/backend/internal/validators"
"fmt"
"regexp"
+ "sync"
)
// GetPreparators returns slice of preparators.Preparator according to sdk
-func GetPreparators(sdk pb.Sdk, filepath string) (*[]preparators.Preparator,
error) {
- var prep *[]preparators.Preparator
+func GetPreparators(sdk pb.Sdk, filepath string, valResults *sync.Map)
(*[]preparators.Preparator, error) {
Review comment:
Should we also change this from `GetPreparators` to `GetPreparers`?
##########
File path: playground/backend/internal/preparators/python_preparators.go
##########
@@ -27,12 +27,30 @@ const (
)
// GetPythonPreparators returns preparation methods that should be applied to
Python code
-func GetPythonPreparators(filePath string) *[]Preparator {
+func GetPythonPreparators(builder *PreparersBuilder) {
Review comment:
ditto
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
