new: move Filtering out of elemental

context.go

@@ -53,7 +53,7 @@ type FinalizerFunc func(o elemental.Identifiable) error
 type Context interface {
 	Count() int
 	SetCount(count int)
-	Filter() *Filter
+	Filter() *elemental.Filter
 	Finalizer() FinalizerFunc
 	Version() int
 	TransactionID() TransactionID
@@ -103,7 +103,7 @@ type mcontext struct {
 	pageSize             int
 	parent               elemental.Identifiable
 	countTotal           int
-	filter               *Filter
+	filter               *elemental.Filter
 	parameters           url.Values
 	transactionID        TransactionID
 	namespace            string
@@ -129,7 +129,7 @@ func (c *mcontext) Count() int { return c.countTotal }
 func (c *mcontext) SetCount(count int) { c.countTotal = count }
 
 // Filter returns the filter.
-func (c *mcontext) Filter() *Filter { return c.filter }
+func (c *mcontext) Filter() *elemental.Filter { return c.filter }
 
 // Finalizer returns the finalizer.
 func (c *mcontext) Finalizer() FinalizerFunc { return c.createFinalizer }

context_test.go

@@ -17,6 +17,7 @@ import (
 	"testing"
 
 	. "github.com/smartystreets/goconvey/convey"
+	"go.aporeto.io/elemental"
 	testmodel "go.aporeto.io/elemental/test/model"
 )
 
@@ -72,7 +73,7 @@ func TestMethodNewContextWithFilter(t *testing.T) {
 
 	Convey("Given I create a new context with filter", t, func() {
 
-		filter := NewFilter()
+		filter := elemental.NewFilter()
 		mctx := NewContext(
 			context.Background(),
 			ContextOptionFilter(filter),
@@ -125,7 +126,7 @@ func TestContext_Derive(t *testing.T) {
 			pageSize:             2,
 			parent:               testmodel.NewList(),
 			countTotal:           3,
-			filter:               NewFilterComposer().WithKey("k").Equals("v").Done(),
+			filter:               elemental.NewFilterComposer().WithKey("k").Equals("v").Done(),
 			parameters:           url.Values{"a": []string{"b"}},
 			transactionID:        NewTransactionID(),
 			namespace:            "/",
@@ -171,7 +172,7 @@ func TestContext_Derive(t *testing.T) {
 
 			copy := mctx.Derive(
 				ContextOptionPage(11, 12),
-				ContextOptionFilter(NewFilterComposer().WithKey("k").Equals("v2").Done()),
+				ContextOptionFilter(elemental.NewFilterComposer().WithKey("k").Equals("v2").Done()),
 			).(*mcontext)
 
 			Convey("Then the copy should resemble to the original but for the changes", func() {

filter.go

@@ -0,0 +1,54 @@
+// Copyright 2019 Aporeto Inc.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//     http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package manipulate
+
+import (
+	"fmt"
+
+	"go.aporeto.io/elemental"
+)
+
+// This package provides type mapping for backward compatilility
+// as manipulate.Filter moved to elemental.
+
+// Filter is an alias of elemental.Filter
+type Filter = elemental.Filter
+
+// FilterKeyComposer is an alias of elemental.FilterKeyComposer
+type FilterKeyComposer = elemental.FilterKeyComposer
+
+// FilterParser is an alias of elemental.FilterParser
+type FilterParser = elemental.FilterParser
+
+// NewFilter returns a new Filter using the aliased type.
+func NewFilter() *Filter {
+	fmt.Println("DEPRECATED: manipulate.NewFilter is deprecated and aliased to elemental.NewFilter")
+	return elemental.NewFilter()
+}
+
+// NewFilterComposer returns a new FilterKeyComposer using the aliased type.
+func NewFilterComposer() FilterKeyComposer {
+	fmt.Println("DEPRECATED: manipulate.NewFilterComposer is deprecated and aliased to elemental.NewFilterComposer")
+	return elemental.NewFilter()
+}
+
+// NewFilterFromString returns a new NewFilterFromString using the aliased type.
+func NewFilterFromString(filter string) (*Filter, error) {
+	fmt.Println("DEPRECATED: manipulate.NewFilterFromString is deprecated and aliased to elemental.NewFilterFromString")
+	return elemental.NewFilterFromString(filter)
+}
+
+// NewFilterParser returns a new NewFilterParser using the aliased type.
+func NewFilterParser(input string) *FilterParser {
+	fmt.Println("DEPRECATED: manipulate.NewFilterParser is deprecated and aliased to elemental.NewFilterParser")
+	return elemental.NewFilterParser(input)
+}