Skip to content

Commit 6f50503

Browse files
authored
Code cleanup and correction of typos (#255)
1 parent 7ac1c04 commit 6f50503

File tree

36 files changed

+62
-69
lines changed

36 files changed

+62
-69
lines changed

core/src/main/kotlin/org/neo4j/graphql/AugmentationHandler.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ abstract class AugmentationHandler(
162162
} else {
163163
FieldOperator.forType(typeDefinition, field.type.inner().isNeo4jType())
164164
.forEach { op -> builder.addFilterField(op.fieldName(field.name), op.list, filterType, field.description) }
165-
if (typeDefinition.isNeo4jSpatialType() == true) {
165+
if (typeDefinition.isNeo4jSpatialType()) {
166166
val distanceFilterType = getSpatialDistanceFilter(neo4jTypeDefinitionRegistry.getUnwrappedType(filterType) as TypeDefinition<*>)
167167
FieldOperator.forType(distanceFilterType, true)
168168
.forEach { op -> builder.addFilterField(op.fieldName(field.name + NEO4j_POINT_DISTANCE_FILTER_SUFFIX), op.list, NEO4j_POINT_DISTANCE_FILTER) }
@@ -301,7 +301,7 @@ abstract class AugmentationHandler(
301301

302302
fun Type<*>.resolve(): TypeDefinition<*>? = getTypeFromAnyRegistry(name())
303303
fun Type<*>.isScalar(): Boolean = resolve() is ScalarTypeDefinition
304-
fun Type<*>.isNeo4jType(): Boolean = name()
304+
private fun Type<*>.isNeo4jType(): Boolean = name()
305305
?.takeIf {
306306
!ScalarInfo.GRAPHQL_SPECIFICATION_SCALARS_DEFINITIONS.containsKey(it)
307307
&& it.startsWith("_Neo4j") // TODO remove this check by refactoring neo4j input types

core/src/main/kotlin/org/neo4j/graphql/DynamicProperties.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ object DynamicProperties {
3232
return when (input) {
3333
!is Value<*> -> throw CoercingParseLiteralException("Expected AST type 'StringValue' but was '${input::class.java.simpleName}'.")
3434
is NullValue -> null
35-
is ObjectValue -> input.objectFields.map { it.name to parseNested(it.value, variables) }.toMap()
35+
is ObjectValue -> input.objectFields.associate { it.name to parseNested(it.value, variables) }
3636
else -> Assert.assertShouldNeverHappen("Only maps structures are expected")
3737
}
3838
}

core/src/main/kotlin/org/neo4j/graphql/ExtensionFunctions.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,4 @@ fun String.asDescription() = Description(this, null, this.contains("\n"))
3434
fun String.capitalize(): String = replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() }
3535
fun String.decapitalize(): String = replaceFirstChar { it.lowercase(Locale.getDefault()) }
3636
fun String.toUpperCase(): String = uppercase(Locale.getDefault())
37+
fun String.toLowerCase(): String = lowercase(Locale.getDefault())

core/src/main/kotlin/org/neo4j/graphql/Neo4jTypes.kt

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,7 @@ open class Neo4jConverter(
7373
name: String,
7474
val prefixedName: String = "_Neo4j$name",
7575
val typeDefinition: TypeDefinition = TypeDefinition(name, prefixedName)
76-
) : Neo4jSimpleConverter(name) {
77-
}
76+
) : Neo4jSimpleConverter(name)
7877

7978
open class Neo4jSimpleConverter(val name: String) {
8079
protected fun toExpression(parameter: Expression): Expression {
@@ -115,19 +114,15 @@ private val neo4jConverter = listOf(
115114
Neo4jTimeConverter("Time"),
116115
Neo4jTimeConverter("LocalDateTime"),
117116
Neo4jPointConverter("Point"),
118-
)
119-
.map { it.prefixedName to it }
120-
.toMap()
117+
).associateBy { it.prefixedName }
121118

122119
private val neo4jScalarConverter = listOf(
123120
Neo4jTemporalConverter("LocalTime"),
124121
Neo4jTemporalConverter("Date"),
125122
Neo4jTemporalConverter("DateTime"),
126123
Neo4jTemporalConverter("Time"),
127124
Neo4jTemporalConverter("LocalDateTime")
128-
)
129-
.map { it.name to it }
130-
.toMap()
125+
).associateBy { it.name }
131126

132127
val NEO4j_TEMPORAL_TYPES = neo4jScalarConverter.keys
133128

core/src/main/kotlin/org/neo4j/graphql/SchemaBuilder.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ class SchemaBuilder(
230230
enhancedRegistry.add(ObjectTypeDefinition.newObjectTypeDefinition().name("Query").build())
231231

232232
if (schemaDefinition != null) {
233-
// otherwise adding a transform schema would fail
233+
// otherwise, adding a transform schema would fail
234234
enhancedRegistry.remove(schemaDefinition)
235235
} else {
236236
schemaDefinition = SchemaDefinition.newSchemaDefinition().build()

core/src/main/kotlin/org/neo4j/graphql/SchemaConfig.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ data class SchemaConfig @JvmOverloads constructor(
2121

2222
/**
2323
* if enabled the `filter` argument will be named `where` and the input type will be named `<typeName>Where`.
24-
* additionally the separated filter arguments will no longer be generated.
24+
* additionally, the separated filter arguments will no longer be generated.
2525
*/
2626
val useWhereFilter: Boolean = false,
2727

core/src/main/kotlin/org/neo4j/graphql/handler/BaseDataFetcher.kt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,7 @@ import graphql.schema.GraphQLType
99
import org.neo4j.cypherdsl.core.Statement
1010
import org.neo4j.cypherdsl.core.renderer.Configuration
1111
import org.neo4j.cypherdsl.core.renderer.Renderer
12-
import org.neo4j.graphql.Cypher
13-
import org.neo4j.graphql.SchemaConfig
14-
import org.neo4j.graphql.Translator
15-
import org.neo4j.graphql.aliasOrName
12+
import org.neo4j.graphql.*
1613
import org.neo4j.graphql.handler.projection.ProjectionBase
1714

1815
/**

core/src/main/kotlin/org/neo4j/graphql/handler/BaseDataFetcherForContainer.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ abstract class BaseDataFetcherForContainer(schemaConfig: SchemaConfig) : BaseDat
120120

121121
/**
122122
* @param propertyName the name used in neo4j
123-
* @param accessorFactory an factory for crating an expression to access the property
123+
* @param accessorFactory a factory for crating an expression to access the property
124124
*/
125125
class PropertyAccessor(
126126
val propertyName: String,

core/src/main/kotlin/org/neo4j/graphql/handler/filter/OptimizedFilterHandler.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ typealias WhereClauseFactory = (
2121
typealias ConditionBuilder = (ExposesWith) -> OrderableOngoingReadingAndWithWithoutWhere
2222

2323
/**
24-
* This its a specialized handler that uses an alternative approach for filtering. By using multiple MATCH clauses,
24+
* This is a specialized handler that uses an alternative approach for filtering. By using multiple MATCH clauses,
2525
* this can facilitate the use of optimizations within the neo4j database, which can lead to significant performance
2626
* improvements for large data sets.
2727
*

core/src/main/kotlin/org/neo4j/graphql/handler/relation/BaseRelationHandler.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import org.neo4j.graphql.handler.BaseDataFetcherForContainer
1414
/**
1515
* This is a base class for all handler acting on relations / edges
1616
*/
17-
abstract class BaseRelationHandler(val prefix: String, schemaConfig: SchemaConfig) : BaseDataFetcherForContainer(schemaConfig) {
17+
abstract class BaseRelationHandler(private val prefix: String, schemaConfig: SchemaConfig) : BaseDataFetcherForContainer(schemaConfig) {
1818

1919
lateinit var relation: RelationshipInfo<GraphQLFieldsContainer>
2020
lateinit var startId: RelatedField
@@ -27,7 +27,7 @@ abstract class BaseRelationHandler(val prefix: String, schemaConfig: SchemaConfi
2727
)
2828

2929
abstract class BaseRelationFactory(
30-
val prefix: String,
30+
private val prefix: String,
3131
schemaConfig: SchemaConfig,
3232
typeDefinitionRegistry: TypeDefinitionRegistry,
3333
neo4jTypeDefinitionRegistry: TypeDefinitionRegistry

0 commit comments

Comments
 (0)