KhaninArtur commented on a change in pull request #16482:
URL: https://github.com/apache/beam/pull/16482#discussion_r783963670
##########
File path: playground/backend/internal/preparers/go_preparators_test.go
##########
@@ -13,7 +13,7 @@
// See the License for the specific language governing permissions and
Review comment:
ditto
##########
File path: playground/backend/internal/preparers/java_preparators.go
##########
@@ -13,11 +13,10 @@
// See the License for the specific language governing permissions and
Review comment:
ditto
##########
File path: playground/backend/internal/preparers/java_preparators_test.go
##########
@@ -88,25 +88,39 @@ func Test_replace(t *testing.T) {
}
}
-func TestGetJavaPreparators(t *testing.T) {
+func TestGetJavaPreparers(t *testing.T) {
type args struct {
- filePath string
+ filePath string
+ isUnitTest bool
+ isKata bool
}
tests := []struct {
name string
args args
want int
}{
{
- name: "all success",
- args: args{"MOCK_FILEPATH"},
- want: 4,
+ name: "Test number of preparers for code",
+ args: args{"MOCK_FILEPATH", false, false},
+ want: 2,
+ },
+ {
+ name: "Test number of preparers for unit test",
+ args: args{"MOCK_FILEPATH", false, false},
+ want: 2,
+ },
+ {
+ name: "Test number of preparers for kata",
+ args: args{"MOCK_FILEPATH", false, false},
Review comment:
Seems like you should put true as a third argument
##########
File path: playground/backend/internal/preparers/python_preparators.go
##########
@@ -13,7 +13,7 @@
// See the License for the specific language governing permissions and
Review comment:
ditto
##########
File path: playground/backend/internal/preparers/go_preparators.go
##########
@@ -13,33 +13,61 @@
// See the License for the specific language governing permissions and
Review comment:
Could you please also rename the file to `go_preparers.go`?
##########
File path: playground/backend/internal/preparers/java_preparators_test.go
##########
@@ -13,7 +13,7 @@
// See the License for the specific language governing permissions and
Review comment:
ditto
##########
File path: playground/backend/internal/preparers/java_preparators_test.go
##########
@@ -88,25 +88,39 @@ func Test_replace(t *testing.T) {
}
}
-func TestGetJavaPreparators(t *testing.T) {
+func TestGetJavaPreparers(t *testing.T) {
type args struct {
- filePath string
+ filePath string
+ isUnitTest bool
+ isKata bool
}
tests := []struct {
name string
args args
want int
}{
{
- name: "all success",
- args: args{"MOCK_FILEPATH"},
- want: 4,
+ name: "Test number of preparers for code",
+ args: args{"MOCK_FILEPATH", false, false},
+ want: 2,
+ },
+ {
+ name: "Test number of preparers for unit test",
+ args: args{"MOCK_FILEPATH", false, false},
Review comment:
Seems like you should put `true` as a second argument
##########
File path: playground/backend/internal/preparers/preparator.go
##########
@@ -13,10 +13,38 @@
// See the License for the specific language governing permissions and
Review comment:
ditto
##########
File path: playground/backend/internal/preparers/java_preparators.go
##########
@@ -40,47 +38,85 @@ const (
publicClassNamePattern = "public class (.*?)
[{|implements(.*)]"
)
-// GetJavaPreparators returns preparation methods that should be applied to
Java code
-func GetJavaPreparators(filePath string) *[]Preparator {
- removePublicClassPreparator := Preparator{
+//JavaPreparersBuilder facet of PreparersBuilder
+type JavaPreparersBuilder struct {
+ PreparersBuilder
+}
+
+//JavaPreparers chains to type *PreparersBuilder and returns a
*JavaPreparersBuilder
+func (builder *PreparersBuilder) JavaPreparers() *JavaPreparersBuilder {
+ return &JavaPreparersBuilder{*builder}
+}
+
+//WithPublicClassRemover adds preparer to remove public class
+func (builder *JavaPreparersBuilder) WithPublicClassRemover()
*JavaPreparersBuilder {
+ removePublicClassPreparer := Preparer{
Prepare: removePublicClassModifier,
- Args: []interface{}{filePath,
classWithPublicModifierPattern, classWithoutPublicModifierPattern},
+ Args: []interface{}{builder.filePath,
classWithPublicModifierPattern, classWithoutPublicModifierPattern},
}
- changePackagePreparator := Preparator{
+ builder.AddPreparer(removePublicClassPreparer)
+ return builder
+}
+
+//WithPackageChanger adds preparer to change package
+func (builder *JavaPreparersBuilder) WithPackageChanger()
*JavaPreparersBuilder {
+ changePackagePreparer := Preparer{
Prepare: changePackage,
- Args: []interface{}{filePath, packagePattern,
importStringPattern},
+ Args: []interface{}{builder.filePath, packagePattern,
importStringPattern},
}
- removePackagePreparator := Preparator{
+ builder.AddPreparer(changePackagePreparer)
+ return builder
+}
+
+//WithPackageRemover adds preparer to remove package
+func (builder *JavaPreparersBuilder) WithPackageRemover()
*JavaPreparersBuilder {
+ removePackagePreparer := Preparer{
Prepare: removePackage,
- Args: []interface{}{filePath, packagePattern,
newLinePattern},
+ Args: []interface{}{builder.filePath, packagePattern,
newLinePattern},
}
- unitTestFileNameChanger := Preparator{
+ builder.AddPreparer(removePackagePreparer)
+ return builder
+}
+
+//WithFileNameChanger adds preparer to remove package
+func (builder *JavaPreparersBuilder) WithFileNameChanger()
*JavaPreparersBuilder {
+ unitTestFileNameChanger := Preparer{
Prepare: changeJavaTestFileName,
- Args: []interface{}{filePath},
+ Args: []interface{}{builder.filePath},
+ }
+ builder.AddPreparer(unitTestFileNameChanger)
+ return builder
+}
+
+// GetJavaPreparers returns preparation methods that should be applied to Java
code
+func GetJavaPreparers(builder *PreparersBuilder, isUnitTest bool, isKata bool)
{
+ if !isUnitTest && !isKata {
+ builder.JavaPreparers().
+ WithPublicClassRemover().
+ WithPackageChanger()
+ }
+ if isUnitTest {
+ builder.JavaPreparers().
+ WithPackageChanger().
+ WithFileNameChanger()
+ }
+ if isKata {
+ builder.JavaPreparers().
+ WithPublicClassRemover().
+ WithPackageRemover()
}
- return &[]Preparator{removePublicClassPreparator,
changePackagePreparator, removePackagePreparator, unitTestFileNameChanger}
}
//changePackage changes the 'package' to 'import' and the last directory in
the package value to '*'
func changePackage(args ...interface{}) error {
- validationResults := args[3].(*sync.Map)
- isKata, ok := validationResults.Load(validators.KatasValidatorName)
- if ok && isKata.(bool) {
- return nil
- }
err := replace(args...)
return err
}
//removePackage remove the package line in the katas.
func removePackage(args ...interface{}) error {
- validationResults := args[3].(*sync.Map)
- isKata, ok := validationResults.Load(validators.KatasValidatorName)
- if ok && isKata.(bool) {
- err := replace(args...)
- return err
- }
- return nil
+ err := replace(args...)
+ return err
}
Review comment:
Do we even need this function if we can directly use `replace`?
--
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]
