#12 clean code a little

cmd/proxy/config/config.yml

@@ -1,12 +1,12 @@
 dns:
   - host: "google.localhost:8080"
     address: "https://google.com"
-  - host: "100commitow.localhost"
+  - host: "100commitow.localhost:8080"
     address: "https://100commitow.pl"
 
 rules:
   custom:
-    - name: "request payload must contains at least one character and should contain at least one header"
+    - name: "request payload must contain at least one character and should contain at least one header"
       predicate: "p => LEN(p.payload) > 0 && LEN(p.headers) > 0"
     - name: "payload must be a json"
       predicate: "p => FORMAT(p.payload) == 'json'"

internal/rule/expression_tree.go

@@ -8,6 +8,17 @@ type ExpressionTreeBuilder interface {
 	BuildExpressionTree(variable, expression string) (expressionTree, error)
 }
 
+type ExpressionTreeFactory interface {
+	CreateExpressionTree(tokens []Token) (expressionTree, error)
+}
+
+// Tokenizer should be implemented by the structs that tokenizes input.
+type Tokenizer interface {
+	// BuildTokens builds tokens based on the variable and expression.
+	// Returns error if tokenizer cannot be done with the input.
+	BuildTokens(variable string, expression string) ([]Token, error)
+}
+
 type expressionTreeBuilder struct {
 	tokenizer             Tokenizer
 	expressionTreeFactory ExpressionTreeFactory
@@ -17,7 +28,8 @@ var _ ExpressionTreeBuilder = (*expressionTreeBuilder)(nil)
 
 func newCustomRulesTokenizer() *expressionTreeBuilder {
 	return &expressionTreeBuilder{
-		tokenizer: &tokenizer{},
+		tokenizer:             &tokenizer{},
+		expressionTreeFactory: &expressionTreeFactory{},
 	}
 }
 

internal/rule/factory.go

@@ -1,5 +1,11 @@
 package rule
 
-type ExpressionTreeFactory interface {
-	CreateExpressionTree(tokens []Token) (expressionTree, error)
+type expressionTreeFactory struct {
+}
+
+var _ ExpressionTreeFactory = (*expressionTreeFactory)(nil)
+
+func (e *expressionTreeFactory) CreateExpressionTree(tokens []Token) (expressionTree, error) {
+	//TODO implement me
+	panic("implement me")
 }

internal/rule/tokenizer.go

@@ -44,13 +44,6 @@ var (
 	}
 )
 
-// Tokenizer should be implemented by the structs that tokenizes input.
-type Tokenizer interface {
-	// BuildTokens builds tokens based on the variable and expression.
-	// Returns error if tokenizer cannot be done with the input.
-	BuildTokens(variable string, expression string) ([]Token, error)
-}
-
 type Token struct {
 	Name  string
 	Value string
@@ -59,6 +52,8 @@ type Token struct {
 type tokenizer struct {
 }
 
+var _ Tokenizer = (*tokenizer)(nil)
+
 func (t *tokenizer) BuildTokens(variable string, expression string) ([]Token, error) {
 	var (
 		tokens []Token