Skip to content

Commit 719f031

Browse files
Fix deprecation warnings wrt to pregel generated procedure
1 parent 847f6dd commit 719f031

File tree

2 files changed

+22
-4
lines changed

2 files changed

+22
-4
lines changed

pregel-proc-generator/src/main/java/org/neo4j/gds/pregel/generator/ProcedureGenerator.java

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,16 @@ MethodSpec procMethod(GDSMode gdsMode) {
147147
.addMember("value", "$S", "configuration")
148148
.addMember("defaultValue", "$S", "{}")
149149
.build())
150-
.build())
151-
.addStatement("var specification = new $T()", typeNames.specification(gdsMode))
150+
.build());
151+
152+
if (deprecatedBy.isPresent()) {
153+
methodBuilder.addStatement(
154+
"executionContext().metricsFacade().deprecatedProcedures().called($S)",
155+
fullProcedureName
156+
);
157+
}
158+
159+
methodBuilder.addStatement("var specification = new $T()", typeNames.specification(gdsMode))
152160
.addStatement("var executor = new $T<>(specification, executionContext())", ProcedureExecutor.class)
153161
.addStatement("return executor.compute(graphName, configuration)");
154162
return methodBuilder.build();
@@ -186,8 +194,16 @@ MethodSpec procEstimateMethod(GDSMode gdsMode) {
186194
.addAnnotation(AnnotationSpec.builder(Description.class)
187195
.addMember("value", "$T.ESTIMATE_DESCRIPTION", BaseProc.class)
188196
.build()
189-
)
190-
.addStatement("var specification = new $T()", typeNames.specification(gdsMode))
197+
);
198+
199+
if (deprecatedBy.isPresent()) {
200+
methodBuilder.addStatement(
201+
"executionContext().metricsFacade().deprecatedProcedures().called($S)",
202+
fullProcedureName
203+
);
204+
}
205+
206+
methodBuilder.addStatement("var specification = new $T()", typeNames.specification(gdsMode))
191207
.addStatement("var executor = new $T<>(specification, executionContext(), transactionContext())", MemoryEstimationExecutor.class)
192208
.addStatement("return executor.computeEstimate(graphNameOrConfiguration, algoConfiguration)");
193209
return methodBuilder.build();

pregel-proc-generator/src/test/java/org/neo4j/gds/pregel/generator/ProcedureGeneratorTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ void shouldMarkAsDeprecated() {
125125
"public java.util.stream.Stream<org.neo4j.gds.pregel.proc.PregelMutateResult> mutate(" + NL +
126126
" @org.neo4j.procedure.Name(\"graphName\") java.lang.String graphName," + NL +
127127
" @org.neo4j.procedure.Name(value = \"configuration\", defaultValue = \"{}\") java.util.Map<java.lang.String, java.lang.Object> configuration) {" + NL +
128+
" executionContext().metricsFacade().deprecatedProcedures().called(\"gds.alpha.bar.mutate\");" + NL +
128129
" var specification = new gds.bar.BarMutateSpecification();" + NL +
129130
" var executor = new org.neo4j.gds.executor.ProcedureExecutor<>(specification, executionContext());" + NL +
130131
" return executor.compute(graphName, configuration);" + NL +
@@ -145,6 +146,7 @@ void shouldMarkAsDeprecated() {
145146
"public java.util.stream.Stream<org.neo4j.gds.results.MemoryEstimateResult> estimate(" + NL +
146147
" @org.neo4j.procedure.Name(\"graphNameOrConfiguration\") java.lang.Object graphNameOrConfiguration," + NL +
147148
" @org.neo4j.procedure.Name(\"algoConfiguration\") java.util.Map<java.lang.String, java.lang.Object> algoConfiguration) {" + NL +
149+
" executionContext().metricsFacade().deprecatedProcedures().called(\"gds.alpha.bar.mutate.estimate\");" + NL +
148150
" var specification = new gds.bar.BarMutateSpecification();" + NL +
149151
" var executor = new org.neo4j.gds.executor.MemoryEstimationExecutor<>(specification, executionContext(), transactionContext());" + NL +
150152
" return executor.computeEstimate(graphNameOrConfiguration, algoConfiguration);" + NL +

0 commit comments

Comments
 (0)