From cf4b96da4280f7166df697a0b0d71a2b32256b77 Mon Sep 17 00:00:00 2001 From: Tobe O Date: Wed, 14 Aug 2019 00:44:22 -0400 Subject: [PATCH] Remove "new" kw --- graphql_server/example/main.dart | 4 +- graphql_server/lib/graphql_server.dart | 76 +++++++++++++------------- graphql_server/lib/introspection.dart | 14 ++--- graphql_server/lib/mirrors.dart | 14 ++--- graphql_server/test/query_test.dart | 4 +- 5 files changed, 56 insertions(+), 56 deletions(-) diff --git a/graphql_server/example/main.dart b/graphql_server/example/main.dart index c008fb84..6cf07e9e 100644 --- a/graphql_server/example/main.dart +++ b/graphql_server/example/main.dart @@ -23,7 +23,7 @@ void main() { 'todos', listOf(todoType), resolve: (_, __) => [ - new Todo( + Todo( text: 'Clean your room!', completed: false, ) @@ -32,7 +32,7 @@ void main() { ]), ); - var graphql = new GraphQL(schema); + var graphql = GraphQL(schema); var result = await graphql.parseAndExecute('{ todos { text } }'); print(result); diff --git a/graphql_server/lib/graphql_server.dart b/graphql_server/lib/graphql_server.dart index a27c5bdf..f24c8f02 100644 --- a/graphql_server/lib/graphql_server.dart +++ b/graphql_server/lib/graphql_server.dart @@ -53,7 +53,7 @@ class GraphQL { GraphQLType convertType(TypeContext ctx) { if (ctx.listType != null) { - return new GraphQLListType(convertType(ctx.listType.type)); + return GraphQLListType(convertType(ctx.listType.type)); } else if (ctx.typeName != null) { switch (ctx.typeName.name) { case 'Int': @@ -71,11 +71,11 @@ class GraphQL { return graphQLDate; default: return customTypes.firstWhere((t) => t.name == ctx.typeName.name, - orElse: () => throw new ArgumentError( + orElse: () => throw ArgumentError( 'Unknown GraphQL type: "${ctx.typeName.name}"')); } } else { - throw new ArgumentError('Invalid GraphQL type: "${ctx.span.text}"'); + throw ArgumentError('Invalid GraphQL type: "${ctx.span.text}"'); } } @@ -86,13 +86,13 @@ class GraphQL { initialValue, Map globalVariables}) { var tokens = scan(text, sourceUrl: sourceUrl); - var parser = new Parser(tokens); + var parser = Parser(tokens); var document = parser.parseDocument(); if (parser.errors.isNotEmpty) { - throw new GraphQLException(parser.errors - .map((e) => new GraphQLExceptionError(e.message, locations: [ - new GraphExceptionErrorLocation.fromSourceLocation(e.span.start) + throw GraphQLException(parser.errors + .map((e) => GraphQLExceptionError(e.message, locations: [ + GraphExceptionErrorLocation.fromSourceLocation(e.span.start) ])) .toList()); } @@ -135,12 +135,12 @@ class GraphQL { if (operationName == null) { return ops.length == 1 ? ops.first as OperationDefinitionContext - : throw new GraphQLException.fromMessage( + : throw GraphQLException.fromMessage( 'This document does not define any operations.'); } else { return ops.firstWhere( (d) => (d as OperationDefinitionContext).name == operationName, - orElse: () => throw new GraphQLException.fromMessage( + orElse: () => throw GraphQLException.fromMessage( 'Missing required operation "$operationName".')) as OperationDefinitionContext; } @@ -164,7 +164,7 @@ class GraphQL { if (defaultValue != null) { coercedValues[variableName] = defaultValue.value.value; } else if (!variableType.isNullable) { - throw new GraphQLException.fromSourceSpan( + throw GraphQLException.fromSourceSpan( 'Missing required variable "$variableName".', variableDefinition.span); } @@ -173,9 +173,9 @@ class GraphQL { var validation = type.validate(variableName, value); if (!validation.successful) { - throw new GraphQLException(validation.errors - .map((e) => new GraphQLExceptionError(e, locations: [ - new GraphExceptionErrorLocation.fromSourceLocation( + throw GraphQLException(validation.errors + .map((e) => GraphQLExceptionError(e, locations: [ + GraphExceptionErrorLocation.fromSourceLocation( variableDefinition.span.start) ])) .toList()); @@ -211,7 +211,7 @@ class GraphQL { var mutationType = schema.mutationType; if (mutationType == null) { - throw new GraphQLException.fromMessage( + throw GraphQLException.fromMessage( 'The schema does not define a mutation type.'); } @@ -348,7 +348,7 @@ class GraphQL { objectValue, fields, fieldType, - new Map.from( + Map.from( globalVariables ?? {}) ..addAll(variableValues), globalVariables); @@ -411,7 +411,7 @@ class GraphQL { } else if (defaultValue != null || argumentDefinition.defaultsToNull) { coercedValues[argumentName] = defaultValue; } else if (argumentType is GraphQLNonNullableType) { - throw new GraphQLException.fromSourceSpan( + throw GraphQLException.fromSourceSpan( 'Missing value for argument "$argumentName" of field "$fieldName".', value.valueOrVariable.span); } else { @@ -421,7 +421,7 @@ class GraphQL { if (defaultValue != null || argumentDefinition.defaultsToNull) { coercedValues[argumentName] = defaultValue; } else if (argumentType is GraphQLNonNullableType) { - throw new GraphQLException.fromMessage( + throw GraphQLException.fromMessage( 'Missing value for argument "$argumentName" of field "$fieldName".'); } else { continue; @@ -433,10 +433,10 @@ class GraphQL { if (!validation.successful) { var errors = [ - new GraphQLExceptionError( + GraphQLExceptionError( 'Type coercion error for value of argument "$argumentName" of field "$fieldName".', locations: [ - new GraphExceptionErrorLocation.fromSourceLocation( + GraphExceptionErrorLocation.fromSourceLocation( value.valueOrVariable.span.start) ], ) @@ -444,34 +444,34 @@ class GraphQL { for (var error in validation.errors) { errors.add( - new GraphQLExceptionError( + GraphQLExceptionError( error, locations: [ - new GraphExceptionErrorLocation.fromSourceLocation( + GraphExceptionErrorLocation.fromSourceLocation( value.valueOrVariable.span.start) ], ), ); } - throw new GraphQLException(errors); + throw GraphQLException(errors); } else { var coercedValue = validation.value; coercedValues[argumentName] = coercedValue; } } on TypeError catch (e) { - throw new GraphQLException([ - new GraphQLExceptionError( + throw GraphQLException([ + GraphQLExceptionError( 'Type coercion error for value of argument "$argumentName" of field "$fieldName".', locations: [ - new GraphExceptionErrorLocation.fromSourceLocation( + GraphExceptionErrorLocation.fromSourceLocation( value.valueOrVariable.span.start) ], ), - new GraphQLExceptionError( + GraphQLExceptionError( e.message.toString(), locations: [ - new GraphExceptionErrorLocation.fromSourceLocation( + GraphExceptionErrorLocation.fromSourceLocation( value.valueOrVariable.span.start) ], ), @@ -514,7 +514,7 @@ class GraphQL { fields, result, variableValues, globalVariables); if (completedResult == null) { - throw new GraphQLException.fromMessage( + throw GraphQLException.fromMessage( 'Null value provided for non-nullable field "$fieldName".'); } else { return completedResult; @@ -527,7 +527,7 @@ class GraphQL { if (fieldType is GraphQLListType) { if (result is! Iterable) { - throw new GraphQLException.fromMessage( + throw GraphQLException.fromMessage( 'Value of field "$fieldName" must be a list or iterable, got $result instead.'); } @@ -552,7 +552,7 @@ class GraphQL { return validation.value; } } on TypeError { - throw new GraphQLException.fromMessage( + throw GraphQLException.fromMessage( 'Value of field "$fieldName" must be ${fieldType.valueType}, got $result instead.'); } } @@ -571,7 +571,7 @@ class GraphQL { result, variableValues, globalVariables); } - throw new UnsupportedError('Unsupported type: $fieldType'); + throw UnsupportedError('Unsupported type: $fieldType'); } GraphQLObjectType resolveAbstractType( @@ -587,7 +587,7 @@ class GraphQL { } else if (type is GraphQLUnionType) { possibleTypes = type.possibleTypes; } else { - throw new ArgumentError(); + throw ArgumentError(); } var errors = []; @@ -602,7 +602,7 @@ class GraphQL { } errors - .addAll(validation.errors.map((m) => new GraphQLExceptionError(m))); + .addAll(validation.errors.map((m) => GraphQLExceptionError(m))); } on GraphQLException catch (e) { errors.addAll(e.errors); } @@ -610,10 +610,10 @@ class GraphQL { errors.insert( 0, - new GraphQLExceptionError( + GraphQLExceptionError( 'Cannot convert value $result to type $type.')); - throw new GraphQLException(errors); + throw GraphQLException(errors); } SelectionSetContext mergeSelectionSets(List fields) { @@ -627,7 +627,7 @@ class GraphQL { } } - return new SelectionSetContext.merged(selections); + return SelectionSetContext.merged(selections); } Map> collectFields( @@ -713,7 +713,7 @@ class GraphQL { var vname = vv.variable.name; if (!variableValues.containsKey(vname)) - throw new GraphQLException.fromSourceSpan( + throw GraphQLException.fromSourceSpan( 'Unknown variable: "$vname"', vv.span); return variableValues[vname]; @@ -721,7 +721,7 @@ class GraphQL { bool doesFragmentTypeApply( GraphQLObjectType objectType, TypeConditionContext fragmentType) { - var type = convertType(new TypeContext(fragmentType.typeName, null)); + var type = convertType(TypeContext(fragmentType.typeName, null)); if (type is GraphQLObjectType && !type.isInterface) { for (var field in type.fields) if (!objectType.fields.any((f) => f.name == field.name)) return false; diff --git a/graphql_server/lib/introspection.dart b/graphql_server/lib/introspection.dart index a341791d..ad07bd43 100644 --- a/graphql_server/lib/introspection.dart +++ b/graphql_server/lib/introspection.dart @@ -1,7 +1,7 @@ import 'package:graphql_parser/graphql_parser.dart'; import 'package:graphql_schema/graphql_schema.dart'; -/// Performs introspection over a GraphQL [schema], and returns a new one, containing +/// Performs introspection over a GraphQL [schema], and returns a one, containing /// introspective information. /// /// [allTypes] should contain all types, not directly defined in the schema, that you @@ -79,11 +79,11 @@ GraphQLSchema reflectSchema(GraphQLSchema schema, List allTypes) { field( '__type', typeType, - inputs: [new GraphQLFieldInput('name', graphQLString.nonNullable())], + inputs: [GraphQLFieldInput('name', graphQLString.nonNullable())], resolve: (_, args) { var name = args['name'] as String; return allTypes.firstWhere((t) => t.name == name, - orElse: () => throw new GraphQLException.fromMessage( + orElse: () => throw GraphQLException.fromMessage( 'No type named "$name" exists.')); }, ), @@ -91,7 +91,7 @@ GraphQLSchema reflectSchema(GraphQLSchema schema, List allTypes) { fields.addAll(schema.queryType.fields); - return new GraphQLSchema( + return GraphQLSchema( queryType: objectType(schema.queryType.name, fields: fields), mutationType: schema.mutationType, subscriptionType: schema.subscriptionType, @@ -228,14 +228,14 @@ GraphQLObjectType _createTypeType() { else if (t is GraphQLUnionType) return 'UNION'; else - throw new UnsupportedError('Cannot get the kind of $t.'); + throw UnsupportedError('Cannot get the kind of $t.'); }, ), field( 'fields', listOf(fieldType), inputs: [ - new GraphQLFieldInput( + GraphQLFieldInput( 'includeDeprecated', graphQLBoolean, defaultValue: false, @@ -252,7 +252,7 @@ GraphQLObjectType _createTypeType() { 'enumValues', listOf(enumValueType.nonNullable()), inputs: [ - new GraphQLFieldInput( + GraphQLFieldInput( 'includeDeprecated', graphQLBoolean, defaultValue: false, diff --git a/graphql_server/lib/mirrors.dart b/graphql_server/lib/mirrors.dart index 3f04d9b6..35149790 100644 --- a/graphql_server/lib/mirrors.dart +++ b/graphql_server/lib/mirrors.dart @@ -42,10 +42,10 @@ GraphQLType _objectTypeFromDartType(Type type, [List typeArguments]) { } else if (type == double) { return graphQLFloat; } else if (type == num) { - throw new UnsupportedError( + throw UnsupportedError( 'Cannot convert `num` to a GraphQL type. Choose `int` or `float` instead.'); } else if (type == Null) { - throw new UnsupportedError('Cannot convert `Null` to a GraphQL type.'); + throw UnsupportedError('Cannot convert `Null` to a GraphQL type.'); } else if (type == String) { return graphQLString; } else if (type == DateTime) { @@ -56,7 +56,7 @@ GraphQLType _objectTypeFromDartType(Type type, [List typeArguments]) { type, typeArguments?.isNotEmpty == true ? typeArguments : null); if (mirror is! ClassMirror) { - throw new StateError( + throw StateError( '$type is not a class, and therefore cannot be converted into a GraphQL object type.'); } @@ -69,7 +69,7 @@ GraphQLType _objectTypeFromDartType(Type type, [List typeArguments]) { return listOf(inner.nonNullable()); } - throw new ArgumentError( + throw ArgumentError( 'Cannot convert ${clazz.reflectedType}, an iterable WITHOUT a type argument, into a GraphQL type.'); } @@ -213,7 +213,7 @@ GraphQLEnumType enumTypeFromClassMirror(ClassMirror mirror) { if (name != #values) { var methodMirror = mirror.staticMembers[name]; values.add( - new GraphQLEnumValue( + GraphQLEnumValue( MirrorSystem.getName(name), mirror.getField(name).reflectee, description: _getDescription(methodMirror.metadata), @@ -223,7 +223,7 @@ GraphQLEnumType enumTypeFromClassMirror(ClassMirror mirror) { } } - return new GraphQLEnumType( + return GraphQLEnumType( MirrorSystem.getName(mirror.simpleName), values, description: _getDescription(mirror.metadata), @@ -294,7 +294,7 @@ String _getSerializedName(Symbol name, MethodMirror mirror, ClassMirror clazz) { var ann = obj.reflectee as Serializable; if (ann.autoSnakeCaseNames != false) { - return new ReCase(MirrorSystem.getName(name)).snakeCase; + return ReCase(MirrorSystem.getName(name)).snakeCase; } } } diff --git a/graphql_server/test/query_test.dart b/graphql_server/test/query_test.dart index c008fb84..6cf07e9e 100644 --- a/graphql_server/test/query_test.dart +++ b/graphql_server/test/query_test.dart @@ -23,7 +23,7 @@ void main() { 'todos', listOf(todoType), resolve: (_, __) => [ - new Todo( + Todo( text: 'Clean your room!', completed: false, ) @@ -32,7 +32,7 @@ void main() { ]), ); - var graphql = new GraphQL(schema); + var graphql = GraphQL(schema); var result = await graphql.parseAndExecute('{ todos { text } }'); print(result);