From c995b24a5aac8be2ba631cf2fb14b4adf1387e9c Mon Sep 17 00:00:00 2001 From: Gerrit Meier Date: Fri, 8 Mar 2019 13:23:51 +0100 Subject: [PATCH] Remove internal API builder method. We came to the conclusion that we do not want to have builder style access for our internal APIs but use explicit constructors. This commit removes builder API and introduces public constructors. --- .../data/neo4j/repository/query/Neo4jQueryMethod.java | 11 +++-------- .../repository/support/Neo4jRepositoryFactory.java | 2 +- .../neo4j/repository/query/Neo4jQueryMethodTest.java | 2 +- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/query/Neo4jQueryMethod.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/query/Neo4jQueryMethod.java index ffa641a4b..4a19d6f29 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/query/Neo4jQueryMethod.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/query/Neo4jQueryMethod.java @@ -36,12 +36,6 @@ public class Neo4jQueryMethod extends QueryMethod { private final Method method; - private Neo4jQueryMethod(Method method, RepositoryMetadata metadata, ProjectionFactory factory) { - super(method, metadata, factory); - - this.method = method; - } - /** * Creates a new {@link Neo4jQueryMethod} from the given parameters. Looks up the correct query to use for following * invocations of the method given. @@ -50,8 +44,9 @@ public class Neo4jQueryMethod extends QueryMethod { * @param metadata must not be {@literal null}. * @param factory must not be {@literal null}. */ - public static Neo4jQueryMethod of(Method method, RepositoryMetadata metadata, ProjectionFactory factory) { - return new Neo4jQueryMethod(method, metadata, factory); + public Neo4jQueryMethod(Method method, RepositoryMetadata metadata, ProjectionFactory factory) { + super(method, metadata, factory); + this.method = method; } /** diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/support/Neo4jRepositoryFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/support/Neo4jRepositoryFactory.java index 9dc0af6b9..c2f8943fd 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/support/Neo4jRepositoryFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/support/Neo4jRepositoryFactory.java @@ -95,7 +95,7 @@ class Neo4jRepositoryFactory extends RepositoryFactorySupport { public RepositoryQuery resolveQuery(Method method, RepositoryMetadata metadata, ProjectionFactory factory, NamedQueries namedQueries) { - Neo4jQueryMethod queryMethod = Neo4jQueryMethod.of(method, metadata, factory); + Neo4jQueryMethod queryMethod = new Neo4jQueryMethod(method, metadata, factory); if (queryMethod.hasAnnotatedQuery()) { return new StringBasedNeo4jQuery(queryMethod, neo4jOperations); } diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/query/Neo4jQueryMethodTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/query/Neo4jQueryMethodTest.java index 1e62a1b24..4d592d11f 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/query/Neo4jQueryMethodTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/query/Neo4jQueryMethodTest.java @@ -53,7 +53,7 @@ class Neo4jQueryMethodTest { Method method = repositoryClass.getMethod(name, parameters); ProjectionFactory factory = new SpelAwareProxyProjectionFactory(); - return Neo4jQueryMethod.of(method, new DefaultRepositoryMetadata(repositoryClass), factory); + return new Neo4jQueryMethod(method, new DefaultRepositoryMetadata(repositoryClass), factory); } interface PersonRepository extends Repository {