Skip to content

Commit 192b818

Browse files
IoannisPanagiotasIoannisPanagiotas
committed
Move optionals at the bottom
1 parent 7f70751 commit 192b818

File tree

7 files changed

+38
-52
lines changed

7 files changed

+38
-52
lines changed

‎applications/algorithms/centrality/src/main/java/org/neo4j/gds/applications/algorithms/centrality/CentralityAlgorithmsMutateModeBusinessFacade.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -271,16 +271,16 @@ public <RESULT> RESULT hits(
271271
var mutateStep = new HitsMutateStep(mutateNodeProperty, configuration);
272272
var hook = hitsHookGenerator.createETLHook(configuration);
273273
return algorithmProcessingTemplateConvenience.processAlgorithmInMutateMode(
274-
Optional.empty(),
275274
graphName,
276275
configuration,
277-
Optional.empty(),
278-
Optional.of(List.of(hook)),
279276
HITS,
280277
estimation::hits,
281278
(graph, __) -> algorithms.hits(graph, configuration),
282279
mutateStep,
283-
resultBuilder
280+
resultBuilder,
281+
Optional.empty(),
282+
Optional.empty(),
283+
Optional.of(List.of(hook))
284284
);
285285
}
286286

‎applications/algorithms/centrality/src/main/java/org/neo4j/gds/applications/algorithms/centrality/CentralityAlgorithmsWriteModeBusinessFacade.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -269,16 +269,16 @@ public <RESULT> RESULT hits(
269269
var hitsETLHook = hitsHookGenerator.createETLHook(configuration);
270270

271271
return algorithmProcessingTemplateConvenience.processAlgorithmInWriteMode(
272-
Optional.empty(),
273272
graphName,
274273
configuration,
275-
Optional.empty(),
276-
Optional.of(List.of(hitsETLHook)),
277274
HITS,
278275
estimationFacade::hits,
279276
(graph, __) -> centralityAlgorithms.hits(graph, configuration),
280277
writeStep,
281-
resultBuilder
278+
resultBuilder,
279+
Optional.empty(),
280+
Optional.empty(),
281+
Optional.of(List.of(hitsETLHook))
282282
);
283283
}
284284

‎applications/algorithms/machinery/src/main/java/org/neo4j/gds/applications/algorithms/machinery/AlgorithmProcessingTemplateConvenience.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,16 @@ public AlgorithmProcessingTemplateConvenience(AlgorithmProcessingTemplate algori
4040
* With all bells and whistles
4141
*/
4242
public <CONFIGURATION extends AlgoBaseConfig, RESULT_TO_CALLER, RESULT_FROM_ALGORITHM, WRITE_METADATA> RESULT_TO_CALLER processAlgorithmInWriteMode(
43-
Optional<String> relationshipWeightOverride,
4443
GraphName graphName,
4544
CONFIGURATION configuration,
46-
Optional<Iterable<PostLoadValidationHook>> postGraphStoreLoadValidationHooks,
47-
Optional<Iterable<PostLoadETLHook>> postGraphStoreLoadETLHooks,
4845
Label label,
4946
Supplier<MemoryEstimation> estimationFactory,
5047
Computation<RESULT_FROM_ALGORITHM> computation,
5148
WriteStep<RESULT_FROM_ALGORITHM, WRITE_METADATA> writeStep,
52-
ResultBuilder<CONFIGURATION, RESULT_FROM_ALGORITHM, RESULT_TO_CALLER, WRITE_METADATA> resultBuilder
49+
ResultBuilder<CONFIGURATION, RESULT_FROM_ALGORITHM, RESULT_TO_CALLER, WRITE_METADATA> resultBuilder,
50+
Optional<String> relationshipWeightOverride,
51+
Optional<Iterable<PostLoadValidationHook>> postGraphStoreLoadValidationHooks,
52+
Optional<Iterable<PostLoadETLHook>> postGraphStoreLoadETLHooks
5353
) {
5454
return algorithmProcessingTemplate.processAlgorithmForWrite(
5555
relationshipWeightOverride,
@@ -92,16 +92,16 @@ public <CONFIGURATION extends AlgoBaseConfig, RESULT_TO_CALLER, RESULT_FROM_ALGO
9292
}
9393

9494
public <CONFIGURATION extends AlgoBaseConfig, RESULT_TO_CALLER, RESULT_FROM_ALGORITHM, MUTATE_METADATA> RESULT_TO_CALLER processAlgorithmInMutateMode(
95-
Optional<String> relationshipWeightOverride,
9695
GraphName graphName,
9796
CONFIGURATION configuration,
98-
Optional<Iterable<PostLoadValidationHook>> postGraphStoreLoadValidationHooks,
99-
Optional<Iterable<PostLoadETLHook>> postGraphStoreLoadETLHooks,
10097
Label label,
10198
Supplier<MemoryEstimation> estimationFactory,
10299
Computation<RESULT_FROM_ALGORITHM> computation,
103100
MutateStep<RESULT_FROM_ALGORITHM, MUTATE_METADATA> mutateStep,
104-
ResultBuilder<CONFIGURATION, RESULT_FROM_ALGORITHM, RESULT_TO_CALLER, MUTATE_METADATA> resultBuilder
101+
ResultBuilder<CONFIGURATION, RESULT_FROM_ALGORITHM, RESULT_TO_CALLER, MUTATE_METADATA> resultBuilder,
102+
Optional<String> relationshipWeightOverride,
103+
Optional<Iterable<PostLoadValidationHook>> postGraphStoreLoadValidationHooks,
104+
Optional<Iterable<PostLoadETLHook>> postGraphStoreLoadETLHooks
105105
) {
106106
return algorithmProcessingTemplate.processAlgorithmForMutate(
107107
relationshipWeightOverride,

‎applications/algorithms/node-embeddings/src/main/java/org/neo4j/gds/applications/algorithms/embeddings/NodeEmbeddingAlgorithmsMutateModeBusinessFacade.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -88,16 +88,16 @@ public <RESULT> RESULT graphSage(
8888
var graphSageProcessParameters = graphSageAlgorithmProcessing.graphSageValidationHook(configuration);
8989

9090
return algorithmProcessingTemplateConvenience.processAlgorithmInMutateMode(
91-
graphSageProcessParameters.relationshipWeightPropertyFromTrainConfiguration(),
9291
graphName,
9392
configuration,
94-
Optional.of(List.of(graphSageProcessParameters.validationHook())),
95-
Optional.empty(),
9693
GraphSage,
9794
() -> estimation.graphSage(configuration, true),
9895
(graph, __) -> algorithms.graphSage(graph, configuration),
9996
mutateStep,
100-
resultBuilder
97+
resultBuilder,
98+
graphSageProcessParameters.relationshipWeightPropertyFromTrainConfiguration(),
99+
Optional.of(List.of(graphSageProcessParameters.validationHook())),
100+
Optional.empty()
101101
);
102102
}
103103

@@ -128,16 +128,16 @@ public <RESULT> RESULT node2Vec(
128128
var validationHook = new Node2VecValidationHook(configuration);
129129

130130
return algorithmProcessingTemplateConvenience.processAlgorithmInMutateMode(
131-
Optional.empty(),
132131
graphName,
133132
configuration,
134-
Optional.of(List.of(validationHook)),
135-
Optional.empty(),
136133
Node2Vec,
137134
() -> estimation.node2Vec(configuration),
138135
(graph, __) -> algorithms.node2Vec(graph, configuration),
139136
mutateStep,
140-
resultBuilder
137+
resultBuilder,
138+
Optional.empty(),
139+
Optional.of(List.of(validationHook)),
140+
Optional.empty()
141141
);
142142
}
143143
}

‎applications/algorithms/node-embeddings/src/main/java/org/neo4j/gds/applications/algorithms/embeddings/NodeEmbeddingAlgorithmsTrainModeBusinessFacade.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,16 +68,16 @@ public <RESULT> RESULT graphSage(
6868
);
6969

7070
return algorithmProcessingTemplateConvenience.processAlgorithmInWriteMode(
71-
Optional.empty(),
7271
graphName,
7372
configuration,
74-
Optional.of(List.of(validationHook)),
75-
Optional.empty(),
7673
GraphSageTrain,
7774
() -> estimation.graphSageTrain(configuration),
7875
(graph, __) -> algorithms.graphSageTrain(graph, configuration),
7976
writeToDiskStep,
80-
resultBuilder
77+
resultBuilder,
78+
Optional.empty(),
79+
Optional.of(List.of(validationHook)),
80+
Optional.empty()
8181
);
8282
}
8383
}

‎applications/algorithms/node-embeddings/src/main/java/org/neo4j/gds/applications/algorithms/embeddings/NodeEmbeddingAlgorithmsWriteModeBusinessFacade.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -111,16 +111,16 @@ public <RESULT> RESULT graphSage(
111111

112112
var graphSageProcessParameters = graphSageAlgorithmProcessing.graphSageValidationHook(configuration);
113113
return algorithmProcessingTemplateConvenience.processAlgorithmInWriteMode(
114-
graphSageProcessParameters.relationshipWeightPropertyFromTrainConfiguration(),
115114
graphName,
116115
configuration,
117-
Optional.of(List.of(graphSageProcessParameters.validationHook())),
118-
Optional.empty(),
119116
GraphSage,
120117
() -> estimationFacade.graphSage(configuration, false),
121118
(graph, __) -> algorithms.graphSage(graph, configuration),
122119
writeStep,
123-
resultBuilder
120+
resultBuilder,
121+
graphSageProcessParameters.relationshipWeightPropertyFromTrainConfiguration(),
122+
Optional.of(List.of(graphSageProcessParameters.validationHook())),
123+
Optional.empty()
124124
);
125125
}
126126
public <RESULT> RESULT hashGnn(
@@ -150,16 +150,16 @@ public <RESULT> RESULT node2Vec(
150150
var validationHook = new Node2VecValidationHook(configuration);
151151

152152
return algorithmProcessingTemplateConvenience.processAlgorithmInWriteMode(
153-
Optional.empty(),
154153
graphName,
155154
configuration,
156-
Optional.of(List.of(validationHook)),
157-
Optional.empty(),
158155
Node2Vec,
159156
() -> estimationFacade.node2Vec(configuration),
160157
(graph, __) -> algorithms.node2Vec(graph, configuration),
161158
writeStep,
162-
resultBuilder
159+
resultBuilder,
160+
Optional.empty(),
161+
Optional.of(List.of(validationHook)),
162+
Optional.empty()
163163
);
164164
}
165165
}

‎applications/algorithms/node-embeddings/src/test/java/org/neo4j/gds/applications/algorithms/embeddings/NodeEmbeddingAlgorithmsProcedureFacadeTest.java

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,8 @@ void shouldValidateNode2VecDataSizeInMutateMode() {
4141
facade.node2Vec(null, null, null);
4242

4343
verify(processingTemplate).processAlgorithmInMutateMode(
44-
any(),
45-
any(),
46-
any(),
44+
any(), any(), any(), any(), any(), any(), any(), any(),
4745
node2VecValidationHook(),
48-
any(),
49-
any(),
50-
any(),
51-
any(),
52-
any(),
5346
any()
5447
);
5548
}
@@ -82,15 +75,8 @@ void shouldValidateNode2VecDataSizeInWriteMode() {
8275
facade.node2Vec(null, null, null);
8376

8477
verify(processingTemplate).processAlgorithmInWriteMode(
85-
any(),
86-
any(),
87-
any(),
78+
any(), any(), any(), any(), any(), any(), any(), any(),
8879
node2VecValidationHook(),
89-
any(),
90-
any(),
91-
any(),
92-
any(),
93-
any(),
9480
any()
9581
);
9682
}

0 commit comments

Comments
 (0)