Skip to content

Commit d8a6183

Browse files
s1ckknutwalkerbreakanalysis
committed
Turn RequestScopedDependencies into a record
Co-Authored-By: Paul Horn <paul.horn@neotechnology.com> Co-Authored-By: Jacob Sznajdman <breakanalysis@gmail.com>
1 parent 25d8c0f commit d8a6183

File tree

52 files changed

+300
-419
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+300
-419
lines changed

‎algo/src/main/java/org/neo4j/gds/algorithms/similarity/WriteRelationshipService.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ public WriteRelationshipResult write(
5454
return Neo4jDatabaseRelationshipWriter.writeRelationship(
5555
writeRelationshipType,
5656
writeProperty,
57-
requestScopedDependencies.getTaskRegistryFactory(),
57+
requestScopedDependencies.taskRegistryFactory(),
5858
writeContext.relationshipExporterBuilder(),
5959
graph,
6060
rootIdMap,
6161
log,
6262
taskName,
63-
requestScopedDependencies.getTerminationFlag(),
63+
requestScopedDependencies.terminationFlag(),
6464
resultStore,
6565
relationshipWithPropertyConsumer,
6666
jobId

‎algo/src/test/java/org/neo4j/gds/embeddings/fastrp/FastRPTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -551,8 +551,8 @@ void shouldYieldEmptyEmbeddingForIsolatedNodes() {
551551
void shouldLogProgress() {
552552
var log = new GdsTestLog();
553553
var progressTrackerCreator = new ProgressTrackerCreator(log, RequestScopedDependencies.builder()
554-
.with(EmptyTaskRegistryFactory.INSTANCE)
555-
.with(EmptyUserLogRegistryFactory.INSTANCE)
554+
.taskRegistryFactory(EmptyTaskRegistryFactory.INSTANCE)
555+
.userLogRegistryFactory(EmptyUserLogRegistryFactory.INSTANCE)
556556
.build());
557557
var nodeEmbeddingAlgorithms = new NodeEmbeddingAlgorithms(null, progressTrackerCreator, TerminationFlag.RUNNING_TRUE);
558558

‎algo/src/test/java/org/neo4j/gds/influenceMaximization/CELFOnConnectedGraphTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,8 @@ void testSpreadWithSeed1() {
151151
void shouldLogProgress() {
152152
var log = new GdsTestLog();
153153
var requestScopedDependencies = RequestScopedDependencies.builder()
154-
.with(EmptyTaskRegistryFactory.INSTANCE)
155-
.with(EmptyUserLogRegistryFactory.INSTANCE)
154+
.taskRegistryFactory(EmptyTaskRegistryFactory.INSTANCE)
155+
.userLogRegistryFactory(EmptyUserLogRegistryFactory.INSTANCE)
156156
.build();
157157
var progressTrackerCreator = new ProgressTrackerCreator(log, requestScopedDependencies);
158158
var centralityAlgorithms = new CentralityAlgorithms(progressTrackerCreator, TerminationFlag.RUNNING_TRUE);

‎algo/src/test/java/org/neo4j/gds/kspanningtree/KSpanningTreeTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -272,9 +272,9 @@ void shouldWorkForComponentSmallerThanK() {
272272
void shouldLogProgress() {
273273
var log = new GdsTestLog();
274274
var requestScopedDependencies = RequestScopedDependencies.builder()
275-
.with(EmptyTaskRegistryFactory.INSTANCE)
276-
.with(TerminationFlag.RUNNING_TRUE)
277-
.with(EmptyUserLogRegistryFactory.INSTANCE)
275+
.taskRegistryFactory(EmptyTaskRegistryFactory.INSTANCE)
276+
.terminationFlag(TerminationFlag.RUNNING_TRUE)
277+
.userLogRegistryFactory(EmptyUserLogRegistryFactory.INSTANCE)
278278
.build();
279279
var progressTrackerCreator = new ProgressTrackerCreator(log, requestScopedDependencies);
280280
var pathFindingAlgorithms = new PathFindingAlgorithms(requestScopedDependencies, progressTrackerCreator);

‎algo/src/test/java/org/neo4j/gds/pagerank/PageRankTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,8 @@ void withSourceNodes(String sourceNodesString, String expectedPropertyKey) {
176176
void shouldLogProgress() {
177177
var log = new GdsTestLog();
178178
var requestScopedDependencies = RequestScopedDependencies.builder()
179-
.with(EmptyTaskRegistryFactory.INSTANCE)
180-
.with(EmptyUserLogRegistryFactory.INSTANCE)
179+
.taskRegistryFactory(EmptyTaskRegistryFactory.INSTANCE)
180+
.userLogRegistryFactory(EmptyUserLogRegistryFactory.INSTANCE)
181181
.build();
182182
var progressTrackerCreator = new ProgressTrackerCreator(log, requestScopedDependencies);
183183
var centralityAlgorithms = new CentralityAlgorithms(progressTrackerCreator, TerminationFlag.RUNNING_TRUE);

‎algo/src/test/java/org/neo4j/gds/paths/astar/AStarTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@ void sourceTarget() {
126126
void shouldLogProgress() {
127127
var log = new GdsTestLog();
128128
var requestScopedDependencies = RequestScopedDependencies.builder()
129-
.with(EmptyTaskRegistryFactory.INSTANCE)
130-
.with(TerminationFlag.RUNNING_TRUE)
131-
.with(EmptyUserLogRegistryFactory.INSTANCE)
129+
.taskRegistryFactory(EmptyTaskRegistryFactory.INSTANCE)
130+
.terminationFlag(TerminationFlag.RUNNING_TRUE)
131+
.userLogRegistryFactory(EmptyUserLogRegistryFactory.INSTANCE)
132132
.build();
133133
var progressTrackerCreator = new ProgressTrackerCreator(log, requestScopedDependencies);
134134
var pathFindingAlgorithms = new PathFindingAlgorithms(requestScopedDependencies, progressTrackerCreator);

‎algo/src/test/java/org/neo4j/gds/paths/bellmanford/BellmanFordTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -251,9 +251,9 @@ void shouldLogProgress() {
251251

252252
var log = new GdsTestLog();
253253
var requestScopedDependencies = RequestScopedDependencies.builder()
254-
.with(EmptyTaskRegistryFactory.INSTANCE)
255-
.with(TerminationFlag.RUNNING_TRUE)
256-
.with(EmptyUserLogRegistryFactory.INSTANCE)
254+
.taskRegistryFactory(EmptyTaskRegistryFactory.INSTANCE)
255+
.terminationFlag(TerminationFlag.RUNNING_TRUE)
256+
.userLogRegistryFactory(EmptyUserLogRegistryFactory.INSTANCE)
257257
.build();
258258
var progressTrackerCreator = new ProgressTrackerCreator(log, requestScopedDependencies);
259259
var pathFindingAlgorithms = new PathFindingAlgorithms(requestScopedDependencies, progressTrackerCreator);

‎algo/src/test/java/org/neo4j/gds/paths/delta/DeltaSteppingTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,9 @@ void singleSourceFromDisconnectedNode(double delta, int concurrency, long idOffs
180180
void shouldLogProgress() {
181181
var log = new GdsTestLog();
182182
var requestScopedDependencies = RequestScopedDependencies.builder()
183-
.with(EmptyTaskRegistryFactory.INSTANCE)
184-
.with(TerminationFlag.RUNNING_TRUE)
185-
.with(EmptyUserLogRegistryFactory.INSTANCE)
183+
.taskRegistryFactory(EmptyTaskRegistryFactory.INSTANCE)
184+
.terminationFlag(TerminationFlag.RUNNING_TRUE)
185+
.userLogRegistryFactory(EmptyUserLogRegistryFactory.INSTANCE)
186186
.build();
187187
var progressTrackerCreator = new ProgressTrackerCreator(log, requestScopedDependencies);
188188
var pathFindingAlgorithms = new PathFindingAlgorithms(requestScopedDependencies, progressTrackerCreator);

‎algo/src/test/java/org/neo4j/gds/paths/yens/YensParallelEdgesTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ static ShortestPathYensStreamConfigImpl.Builder defaultSourceTargetConfigBuilder
6767
@Test
6868
void shouldWorkWithParallelEdges() {
6969
var requestScopedDependencies = RequestScopedDependencies.builder()
70-
.with(TerminationFlag.RUNNING_TRUE)
70+
.terminationFlag(TerminationFlag.RUNNING_TRUE)
7171
.build();
7272
var pathFindingAlgorithms = new PathFindingAlgorithms(requestScopedDependencies, null);
7373

‎algo/src/test/java/org/neo4j/gds/paths/yens/YensTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,9 @@ void compute(Collection<String> expectedPaths) {
150150
void shouldLogProgress() {
151151
var log = new GdsTestLog();
152152
var requestScopedDependencies = RequestScopedDependencies.builder()
153-
.with(EmptyTaskRegistryFactory.INSTANCE)
154-
.with(TerminationFlag.RUNNING_TRUE)
155-
.with(EmptyUserLogRegistryFactory.INSTANCE)
153+
.taskRegistryFactory(EmptyTaskRegistryFactory.INSTANCE)
154+
.terminationFlag(TerminationFlag.RUNNING_TRUE)
155+
.userLogRegistryFactory(EmptyUserLogRegistryFactory.INSTANCE)
156156
.build();
157157
var progressTrackerCreator = new ProgressTrackerCreator(log, requestScopedDependencies);
158158
var pathFindingAlgorithms = new PathFindingAlgorithms(requestScopedDependencies, progressTrackerCreator);
@@ -188,9 +188,9 @@ void shouldLogProgress() {
188188
void shouldLogProgressIfNothingToDo() {
189189
var log = new GdsTestLog();
190190
var requestScopedDependencies = RequestScopedDependencies.builder()
191-
.with(EmptyTaskRegistryFactory.INSTANCE)
192-
.with(TerminationFlag.RUNNING_TRUE)
193-
.with(EmptyUserLogRegistryFactory.INSTANCE)
191+
.taskRegistryFactory(EmptyTaskRegistryFactory.INSTANCE)
192+
.terminationFlag(TerminationFlag.RUNNING_TRUE)
193+
.userLogRegistryFactory(EmptyUserLogRegistryFactory.INSTANCE)
194194
.build();
195195
var progressTrackerCreator = new ProgressTrackerCreator(log, requestScopedDependencies);
196196
var pathFindingAlgorithms = new PathFindingAlgorithms(requestScopedDependencies, progressTrackerCreator);

0 commit comments

Comments
 (0)