Remove MutateStubConfigurationValidationDecorator.java

neo4j · Aug 29, 2024 · 0c10772 · 0c10772
1 parent c0ca33b
commit 0c10772
Show file tree

Hide file tree

Showing 17 changed files with 102 additions and 276 deletions.
diff --git a/algo/src/main/java/org/neo4j/gds/pagerank/PageRankMutateConfig.java b/algo/src/main/java/org/neo4j/gds/pagerank/PageRankMutateConfig.java
@@ -26,7 +26,19 @@
 @Configuration
 public interface PageRankMutateConfig extends PageRankConfig, MutateNodePropertyConfig {
 
-    static PageRankMutateConfig of(CypherMapWrapper userInput) {
+    private static PageRankMutateConfig of(CypherMapWrapper userInput, boolean checkDampingFactor) {
+        if (checkDampingFactor && userInput.containsKey("dampingFactor")) {
+            throw new IllegalArgumentException("Unexpected configuration key: dampingFactor");
+        }
+
         return new PageRankMutateConfigImpl(userInput);
     }
+
+    static PageRankMutateConfig configWithDampingFactor(CypherMapWrapper userInput) {
+        return of(userInput, false);
+    }
+
+    static PageRankMutateConfig configWithoutDampingFactor(CypherMapWrapper userInput) {
+        return of(userInput, true);
+    }
 }
diff --git a/algo/src/main/java/org/neo4j/gds/pagerank/PageRankStatsConfig.java b/algo/src/main/java/org/neo4j/gds/pagerank/PageRankStatsConfig.java
@@ -25,7 +25,20 @@
 @Configuration
 public interface PageRankStatsConfig extends PageRankConfig {
 
-    static PageRankStatsConfig of(CypherMapWrapper userInput) {
+   private static PageRankStatsConfig of(CypherMapWrapper userInput, boolean checkDampingFactor) {
+        if (checkDampingFactor && userInput.containsKey("dampingFactor")) {
+            throw new IllegalArgumentException("Unexpected configuration key: dampingFactor");
+        }
         return new PageRankStatsConfigImpl(userInput);
     }
+
+     static PageRankStatsConfig configWithDampingFactor(CypherMapWrapper userInput) {
+       return of(userInput, false);
+    }
+
+     static PageRankStatsConfig configWithoutDampingFactor(CypherMapWrapper userInput) {
+        return of(userInput, true);
+    }
+
+
 }
diff --git a/algo/src/main/java/org/neo4j/gds/pagerank/PageRankStreamConfig.java b/algo/src/main/java/org/neo4j/gds/pagerank/PageRankStreamConfig.java
@@ -25,7 +25,19 @@
 @Configuration
 public interface PageRankStreamConfig extends PageRankConfig {
 
-    static PageRankStreamConfig of(CypherMapWrapper userInput) {
+    private static PageRankStreamConfig of(CypherMapWrapper userInput, boolean checkDampingFactor) {
+        if (checkDampingFactor && userInput.containsKey("dampingFactor")) {
+            throw new IllegalArgumentException("Unexpected configuration key: dampingFactor");
+        }
+
         return new PageRankStreamConfigImpl(userInput);
     }
+
+    static PageRankStreamConfig configWithDampingFactor(CypherMapWrapper userInput) {
+        return of(userInput, false);
+    }
+
+    static PageRankStreamConfig configWithoutDampingFactor(CypherMapWrapper userInput) {
+        return of(userInput, true);
+    }
 }
diff --git a/algo/src/main/java/org/neo4j/gds/pagerank/PageRankWriteConfig.java b/algo/src/main/java/org/neo4j/gds/pagerank/PageRankWriteConfig.java
@@ -26,7 +26,18 @@
 @Configuration
 public interface PageRankWriteConfig extends PageRankConfig, WritePropertyConfig {
 
-    static PageRankWriteConfig of(CypherMapWrapper userInput) {
+   private  static PageRankWriteConfig of(CypherMapWrapper userInput, boolean checkDampingFactor) {
+        if (checkDampingFactor && userInput.containsKey("dampingFactor")) {
+            throw new IllegalArgumentException("Unexpected configuration key: dampingFactor");
+        }
         return new PageRankWriteConfigImpl(userInput);
     }
+
+    static PageRankWriteConfig configWithDampingFactor(CypherMapWrapper userInput) {
+        return of(userInput, false);
+    }
+
+    static PageRankWriteConfig configWithoutDampingFactor(CypherMapWrapper userInput) {
+        return of(userInput, true);
+    }
 }
diff --git a/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/ConfigurationParsersForMutateMode.java b/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/ConfigurationParsersForMutateMode.java
@@ -79,7 +79,7 @@ public Function<CypherMapWrapper, AlgoBaseConfig> lookup(Algorithm algorithm) {
         return switch (algorithm) {
             case AllShortestPaths -> null;
             case ApproximateMaximumKCut -> ApproxMaxKCutMutateConfig::of;
-            case ArticleRank -> PageRankMutateConfig::of;
+            case ArticleRank -> PageRankMutateConfig::configWithDampingFactor;
             case ArticulationPoints -> ArticulationPointsMutateConfig::of;
             case AStar -> ShortestPathAStarMutateConfig::of;
             case BellmanFord -> AllShortestPathsBellmanFordMutateConfig::of;
@@ -94,7 +94,7 @@ public Function<CypherMapWrapper, AlgoBaseConfig> lookup(Algorithm algorithm) {
             case DeltaStepping -> AllShortestPathsDeltaMutateConfig::of;
             case DFS -> DfsMutateConfig::of;
             case Dijkstra -> ShortestPathDijkstraMutateConfig::of;
-            case EigenVector -> PageRankMutateConfig::of;
+            case EigenVector -> PageRankMutateConfig::configWithoutDampingFactor;
             case FastRP -> FastRPMutateConfig::of;
             case FilteredKNN -> FilteredKnnMutateConfig::of;
             case FilteredNodeSimilarity -> FilteredNodeSimilarityMutateConfig::of;
@@ -118,7 +118,7 @@ public Function<CypherMapWrapper, AlgoBaseConfig> lookup(Algorithm algorithm) {
             case ModularityOptimization -> ModularityOptimizationMutateConfig::of;
             case NodeSimilarity -> NodeSimilarityMutateConfig::of;
             case Node2Vec -> Node2VecMutateConfig::of;
-            case PageRank -> PageRankMutateConfig::of;
+            case PageRank -> PageRankMutateConfig::configWithDampingFactor;
             case RandomWalk -> null;
             case ScaleProperties -> ScalePropertiesMutateConfig::of;
             case SCC -> SccMutateConfig::of;

diff --git a/proc/centrality/src/main/java/org/neo4j/gds/pagerank/EigenVectorMutateSpec.java b/proc/centrality/src/main/java/org/neo4j/gds/pagerank/EigenVectorMutateSpec.java
@@ -40,12 +40,7 @@ public PageRankAlgorithmFactory<PageRankMutateConfig> algorithmFactory(Execution
     }
     @Override
     public NewConfigFunction<PageRankMutateConfig> newConfigFunction() {
-        return (___, config) -> {
-            if (config.containsKey("dampingFactor")) {
-                throw new IllegalArgumentException("Unexpected configuration key: dampingFactor");
-            }
-            return PageRankMutateConfig.of(config);
-        };
+        return (___, config) -> PageRankMutateConfig.configWithoutDampingFactor(config);
     }
 
 

diff --git a/proc/centrality/src/main/java/org/neo4j/gds/pagerank/EigenVectorStatsSpec.java b/proc/centrality/src/main/java/org/neo4j/gds/pagerank/EigenVectorStatsSpec.java
@@ -40,12 +40,7 @@ public PageRankAlgorithmFactory<PageRankStatsConfig> algorithmFactory(ExecutionC
     }
     @Override
     public NewConfigFunction<PageRankStatsConfig> newConfigFunction() {
-        return (___, config) -> {
-            if (config.containsKey("dampingFactor")) {
-                throw new IllegalArgumentException("Unexpected configuration key: dampingFactor");
-            }
-            return PageRankStatsConfig.of(config);
-        };
+        return (___, config) -> PageRankStatsConfig.configWithoutDampingFactor(config);
     }
 
 

diff --git a/proc/centrality/src/main/java/org/neo4j/gds/pagerank/EigenVectorStreamSpec.java b/proc/centrality/src/main/java/org/neo4j/gds/pagerank/EigenVectorStreamSpec.java
@@ -41,11 +41,6 @@ public PageRankAlgorithmFactory<PageRankStreamConfig> algorithmFactory(Execution
 
     @Override
     public NewConfigFunction<PageRankStreamConfig> newConfigFunction() {
-        return (___, config) -> {
-            if (config.containsKey("dampingFactor")) {
-                throw new IllegalArgumentException("Unexpected configuration key: dampingFactor");
-            }
-            return PageRankStreamConfig.of(config);
-        };
+        return (___, config) -> PageRankStreamConfig.configWithoutDampingFactor(config);
     }
 }
diff --git a/proc/centrality/src/main/java/org/neo4j/gds/pagerank/EigenVectorWriteSpec.java b/proc/centrality/src/main/java/org/neo4j/gds/pagerank/EigenVectorWriteSpec.java
@@ -41,12 +41,7 @@ public PageRankAlgorithmFactory<PageRankWriteConfig> algorithmFactory(ExecutionC
 
     @Override
     public NewConfigFunction<PageRankWriteConfig> newConfigFunction() {
-        return (___, config) -> {
-            if (config.containsKey("dampingFactor")) {
-                throw new IllegalArgumentException("Unexpected configuration key: dampingFactor");
-            }
-            return PageRankWriteConfig.of(config);
-        };
+        return (___, config) -> PageRankWriteConfig.configWithoutDampingFactor(config);
     }
 
 }
diff --git a/proc/centrality/src/main/java/org/neo4j/gds/pagerank/PageRankMutateSpec.java b/proc/centrality/src/main/java/org/neo4j/gds/pagerank/PageRankMutateSpec.java
@@ -47,7 +47,7 @@ public PageRankAlgorithmFactory<PageRankMutateConfig> algorithmFactory(Execution
 
     @Override
     public NewConfigFunction<PageRankMutateConfig> newConfigFunction() {
-        return (___,config) -> PageRankMutateConfig.of(config);
+        return (___,config) -> PageRankMutateConfig.configWithDampingFactor(config);
     }
 
     @Override

diff --git a/proc/centrality/src/main/java/org/neo4j/gds/pagerank/PageRankStatsSpec.java b/proc/centrality/src/main/java/org/neo4j/gds/pagerank/PageRankStatsSpec.java
@@ -24,8 +24,8 @@
 import org.neo4j.gds.executor.ComputationResultConsumer;
 import org.neo4j.gds.executor.ExecutionContext;
 import org.neo4j.gds.executor.GdsCallable;
-import org.neo4j.gds.procedures.algorithms.configuration.NewConfigFunction;
 import org.neo4j.gds.procedures.algorithms.centrality.PageRankStatsResult;
+import org.neo4j.gds.procedures.algorithms.configuration.NewConfigFunction;
 
 import java.util.stream.Stream;
 
@@ -47,7 +47,7 @@ public PageRankAlgorithmFactory<PageRankStatsConfig> algorithmFactory(ExecutionC
 
     @Override
     public NewConfigFunction<PageRankStatsConfig> newConfigFunction() {
-        return (___,config) -> PageRankStatsConfig.of(config);
+        return (___,config) -> PageRankStatsConfig.configWithDampingFactor(config);
     }
 
     @Override

diff --git a/proc/centrality/src/main/java/org/neo4j/gds/pagerank/PageRankStreamSpec.java b/proc/centrality/src/main/java/org/neo4j/gds/pagerank/PageRankStreamSpec.java
@@ -24,8 +24,8 @@
 import org.neo4j.gds.executor.ComputationResultConsumer;
 import org.neo4j.gds.executor.ExecutionContext;
 import org.neo4j.gds.executor.GdsCallable;
-import org.neo4j.gds.procedures.algorithms.configuration.NewConfigFunction;
 import org.neo4j.gds.procedures.algorithms.centrality.CentralityStreamResult;
+import org.neo4j.gds.procedures.algorithms.configuration.NewConfigFunction;
 
 import java.util.stream.Stream;
 
@@ -47,7 +47,7 @@ public PageRankAlgorithmFactory<PageRankStreamConfig> algorithmFactory(Execution
 
     @Override
     public NewConfigFunction<PageRankStreamConfig> newConfigFunction() {
-        return (___,config) -> PageRankStreamConfig.of(config);
+        return (___,config) -> PageRankStreamConfig.configWithDampingFactor(config);
     }
 
     @Override

diff --git a/proc/centrality/src/main/java/org/neo4j/gds/pagerank/PageRankWriteSpec.java b/proc/centrality/src/main/java/org/neo4j/gds/pagerank/PageRankWriteSpec.java
@@ -24,8 +24,8 @@
 import org.neo4j.gds.executor.ComputationResultConsumer;
 import org.neo4j.gds.executor.ExecutionContext;
 import org.neo4j.gds.executor.GdsCallable;
-import org.neo4j.gds.procedures.algorithms.configuration.NewConfigFunction;
 import org.neo4j.gds.procedures.algorithms.centrality.PageRankWriteResult;
+import org.neo4j.gds.procedures.algorithms.configuration.NewConfigFunction;
 
 import java.util.stream.Stream;
 
@@ -47,7 +47,7 @@ public PageRankAlgorithmFactory<PageRankWriteConfig> algorithmFactory(ExecutionC
 
     @Override
     public NewConfigFunction<PageRankWriteConfig> newConfigFunction() {
-        return (___,config) -> PageRankWriteConfig.of(config);
+        return (___,config) -> PageRankWriteConfig.configWithDampingFactor(config);
     }
 
     @Override