Skip to content

Commit 8546150

Browse files
committed
PR FIXUP - Remove Request suffix from parser funcs
1 parent b31db1b commit 8546150

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

core/parser.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ type Schema struct {
3939
// a query language. This includes schema and query parsing, and introspection.
4040
type Parser interface {
4141
// Returns true if the given string is an introspection request.
42-
IsIntrospectionRequest(request string) bool
42+
IsIntrospection(request string) bool
4343

4444
// Executes the given introspection request.
45-
ExecuteIntrospectionRequest(request string) *client.QueryResult
45+
ExecuteIntrospection(request string) *client.QueryResult
4646

4747
// Parses the given request, returning a strongly typed model of that request.
4848
Parse(request string) (*request.Request, []error)

db/query.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ func (db *db) ExecTransactionalQuery(
6464
query string,
6565
txn datastore.Txn,
6666
) *client.QueryResult {
67-
if db.parser.IsIntrospectionRequest(query) {
67+
if db.parser.IsIntrospection(query) {
6868
return db.ExecIntrospection(query)
6969
}
7070

@@ -92,5 +92,5 @@ func (db *db) ExecTransactionalQuery(
9292
}
9393

9494
func (db *db) ExecIntrospection(query string) *client.QueryResult {
95-
return db.parser.ExecuteIntrospectionRequest(query)
95+
return db.parser.ExecuteIntrospection(query)
9696
}

query/graphql/parser.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ func NewParser() (*parser, error) {
4545
return p, nil
4646
}
4747

48-
func (p *parser) IsIntrospectionRequest(request string) bool {
48+
func (p *parser) IsIntrospection(request string) bool {
4949
// todo: This needs to be done properly https://github.com/sourcenetwork/defradb/issues/911
5050
return strings.Contains(request, "IntrospectionQuery")
5151
}
5252

53-
func (p *parser) ExecuteIntrospectionRequest(request string) *client.QueryResult {
53+
func (p *parser) ExecuteIntrospection(request string) *client.QueryResult {
5454
schema := p.schemaManager.Schema()
5555
params := gql.Params{Schema: *schema, RequestString: request}
5656
r := gql.Do(params)

0 commit comments

Comments
 (0)