From 18bdacfa0020bacfdfe734a75cb06f3b317a54f5 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 16 Jul 2021 14:57:26 +0200 Subject: [PATCH] Polishing: Remove unused fields. --- .../data/neo4j/core/mapping/CypherGenerator.java | 12 ------------ .../data/neo4j/repository/config/StartupLogger.java | 3 +-- .../support/ReactiveNeo4jRepositoryFactoryBean.java | 4 ---- .../support/SimpleReactiveNeo4jRepository.java | 4 ---- 4 files changed, 1 insertion(+), 22 deletions(-) diff --git a/src/main/java/org/springframework/data/neo4j/core/mapping/CypherGenerator.java b/src/main/java/org/springframework/data/neo4j/core/mapping/CypherGenerator.java index 13011d5f4..23f3e7399 100644 --- a/src/main/java/org/springframework/data/neo4j/core/mapping/CypherGenerator.java +++ b/src/main/java/org/springframework/data/neo4j/core/mapping/CypherGenerator.java @@ -44,7 +44,6 @@ import org.neo4j.cypherdsl.core.Parameter; import org.neo4j.cypherdsl.core.PatternElement; import org.neo4j.cypherdsl.core.Property; import org.neo4j.cypherdsl.core.Relationship; -import org.neo4j.cypherdsl.core.RelationshipPattern; import org.neo4j.cypherdsl.core.SortItem; import org.neo4j.cypherdsl.core.Statement; import org.neo4j.cypherdsl.core.StatementBuilder; @@ -673,15 +672,4 @@ public enum CypherGenerator { private static Condition conditionOrNoCondition(@Nullable Condition condition) { return condition == null ? Conditions.noCondition() : condition; } - - private static class RelationshipProcessState { - private final RelationshipPattern relationship; - private final boolean done; - - RelationshipProcessState(RelationshipPattern relationship, boolean done) { - this.relationship = relationship; - this.done = done; - } - } - } diff --git a/src/main/java/org/springframework/data/neo4j/repository/config/StartupLogger.java b/src/main/java/org/springframework/data/neo4j/repository/config/StartupLogger.java index 3d74cab55..d93e8a7d0 100644 --- a/src/main/java/org/springframework/data/neo4j/repository/config/StartupLogger.java +++ b/src/main/java/org/springframework/data/neo4j/repository/config/StartupLogger.java @@ -21,7 +21,6 @@ import org.apache.commons.logging.LogFactory; import org.neo4j.driver.Driver; import org.springframework.core.log.LogAccessor; import org.springframework.data.mapping.context.AbstractMappingContext; -import org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport; /** * Logs startup information. @@ -67,7 +66,7 @@ final class StartupLogger { .orElse("an unknown version of Spring Data Commons"); String driver = getVersionOf(Driver.class).map(v -> "Neo4j Driver v" + v) .orElse("an unknown version of the Neo4j Java Driver"); - RepositoryConfigurationExtensionSupport f; + sb.append("Bootstrapping ").append(mode.displayValue).append(" Neo4j repositories based on ").append(sdnRx) .append(" with ").append(sdC).append(" and ").append(driver).append("."); diff --git a/src/main/java/org/springframework/data/neo4j/repository/support/ReactiveNeo4jRepositoryFactoryBean.java b/src/main/java/org/springframework/data/neo4j/repository/support/ReactiveNeo4jRepositoryFactoryBean.java index 8f5ad25fc..1d1ba45cf 100644 --- a/src/main/java/org/springframework/data/neo4j/repository/support/ReactiveNeo4jRepositoryFactoryBean.java +++ b/src/main/java/org/springframework/data/neo4j/repository/support/ReactiveNeo4jRepositoryFactoryBean.java @@ -18,13 +18,11 @@ package org.springframework.data.neo4j.repository.support; import java.io.Serializable; import org.apiguardian.api.API; -import org.springframework.data.mapping.callback.ReactiveEntityCallbacks; import org.springframework.data.neo4j.core.ReactiveNeo4jOperations; import org.springframework.data.neo4j.core.mapping.Neo4jMappingContext; import org.springframework.data.repository.Repository; import org.springframework.data.repository.core.support.RepositoryFactorySupport; import org.springframework.data.repository.core.support.TransactionalRepositoryFactoryBeanSupport; -import org.springframework.lang.Nullable; /** * Special adapter for Springs {@link org.springframework.beans.factory.FactoryBean} interface to allow easy setup of @@ -45,8 +43,6 @@ public final class ReactiveNeo4jRepositoryFactoryBean implements ReactiveSortingRepo private final Neo4jPersistentEntity entityMetaData; - private final CypherGenerator cypherGenerator; - protected SimpleReactiveNeo4jRepository(ReactiveNeo4jOperations neo4jOperations, Neo4jEntityInformation entityInformation) { this.neo4jOperations = neo4jOperations; this.entityInformation = entityInformation; this.entityMetaData = this.entityInformation.getEntityMetaData(); - this.cypherGenerator = CypherGenerator.INSTANCE; } @Override