version 12.1.5

Former-commit-id: cda69f08955cb0d594e98bf26197ee573cbba4b2

cache/cache_test.go

@@ -165,10 +165,8 @@ func TestCacheValidator(t *testing.T) {
 	managedCache := cache.Cache(cacheDuration)
 	managedCache.AddRule(rule.Validator([]rule.PreValidator{
 		func(ctx context.Context) bool {
-			if ctx.Request().URL.Path == "/invalid" {
-				return false // should always invalid for cache, don't bother to go to try to get or set cache
-			}
-			return true
+			// should always invalid for cache, don't bother to go to try to get or set cache
+			return ctx.Request().URL.Path != "/invalid"
 		},
 	}, nil))
 
@@ -176,10 +174,8 @@ func TestCacheValidator(t *testing.T) {
 	managedCache2.AddRule(rule.Validator(nil,
 		[]rule.PostValidator{
 			func(ctx context.Context) bool {
-				if ctx.ResponseWriter().Header().Get("DONT") != "" {
-					return false // it's passed the Claim and now Valid checks if the response contains a header of "DONT"
-				}
-				return true
+				// it's passed the Claim and now Valid checks if the response contains a header of "DONT"
+				return ctx.ResponseWriter().Header().Get("DONT") == ""
 			},
 		},
 	))

cache/client/client.go

@@ -153,7 +153,10 @@ func (h *ClientHandler) ServeHTTP(ctx context.Context) {
 			return
 		}
 		// go Client.Do(request)
-		Client.Do(request)
+		_, err = Client.Do(request)
+		if err != nil {
+			return
+		}
 	} else {
 		// get the status code , content type and the write the response body
 		ctx.ContentType(response.Header.Get(cfg.ContentTypeHeader))
@@ -163,7 +166,6 @@ func (h *ClientHandler) ServeHTTP(ctx context.Context) {
 		if err != nil {
 			return
 		}
-		ctx.Write(responseBody)
-
+		_, _ = ctx.Write(responseBody)
 	}
 }

cache/client/handler.go

@@ -30,7 +30,7 @@ func NewHandler(expiration time.Duration) *Handler {
 	return &Handler{
 		rule:       DefaultRuleSet,
 		expiration: expiration,
-		entries:    make(map[string]*entry.Entry, 0),
+		entries:    make(map[string]*entry.Entry),
 	}
 }
 

cache/client/rule/conditional.go

@@ -34,16 +34,10 @@ func Conditional(claimPredicate func() bool, validPredicate func() bool) Rule {
 
 // Claim validator
 func (c *conditionalRule) Claim(ctx context.Context) bool {
-	if !c.claimPredicate() {
-		return false
-	}
-	return true
+	return c.claimPredicate()
 }
 
 // Valid validator
 func (c *conditionalRule) Valid(ctx context.Context) bool {
-	if !c.validPredicate() {
-		return false
-	}
-	return true
+	return c.validPredicate()
 }