Update expected test files for Config generator

knutwalker · knutwalker · commit 60ca30b6d61b · 2022-12-08T15:20:56.000+01:00
diff --git a/config-generator/src/test/resources/expected/CollectingKeys.java b/config-generator/src/test/resources/expected/CollectingKeys.java
@@ -27,6 +27,7 @@
 import java.util.stream.Collectors;
 import javax.annotation.processing.Generated;
 import org.jetbrains.annotations.NotNull;
+import org.neo4j.gds.core.CypherMapAccess;
 import org.neo4j.gds.core.CypherMapWrapper;
 
 @Generated("org.neo4j.gds.proc.ConfigurationProcessor")
@@ -37,7 +38,7 @@ public final class CollectingKeysConfig implements CollectingKeys {
 
     private double baz;
 
-    public CollectingKeysConfig(int foo, @NotNull CypherMapWrapper config) {
+    public CollectingKeysConfig(int foo, @NotNull CypherMapAccess config) {
         ArrayList<IllegalArgumentException> errors = new ArrayList<>();
         try {
             this.foo = foo;
diff --git a/config-generator/src/test/resources/expected/Conversions.java b/config-generator/src/test/resources/expected/Conversions.java
@@ -25,6 +25,7 @@
 import java.util.stream.Collectors;
 import javax.annotation.processing.Generated;
 import org.jetbrains.annotations.NotNull;
+import org.neo4j.gds.core.CypherMapAccess;
 import org.neo4j.gds.core.CypherMapWrapper;
 
 @Generated("org.neo4j.gds.proc.ConfigurationProcessor")
@@ -37,7 +38,7 @@ public final class ConversionsConfig implements Conversions.MyConversion {
 
     private String referenceTypeAsResult;
 
-    public ConversionsConfig(@NotNull CypherMapWrapper config) {
+    public ConversionsConfig(@NotNull CypherMapAccess config) {
         ArrayList<IllegalArgumentException> errors = new ArrayList<>();
         try {
             this.directMethod = Conversions.MyConversion.toInt(config.requireString("directMethod"));
@@ -55,7 +56,7 @@ public ConversionsConfig(@NotNull CypherMapWrapper config) {
             errors.add(e);
         }
         try {
-            this.referenceTypeAsResult = CypherMapWrapper.failOnNull(
+            this.referenceTypeAsResult = CypherMapAccess.failOnNull(
                 "referenceTypeAsResult",
                 Conversions.MyConversion.add42(config.requireString("referenceTypeAsResult"))
             );
diff --git a/config-generator/src/test/resources/expected/ConvertingParameters.java b/config-generator/src/test/resources/expected/ConvertingParameters.java
@@ -25,6 +25,7 @@
 import java.util.stream.Collectors;
 import javax.annotation.processing.Generated;
 import org.jetbrains.annotations.NotNull;
+import org.neo4j.gds.core.CypherMapAccess;
 import org.neo4j.gds.core.CypherMapWrapper;
 
 @Generated("org.neo4j.gds.proc.ConfigurationProcessor")
@@ -34,7 +35,7 @@ public final class ConvertingParametersConfig implements ConvertingParameters {
     public ConvertingParametersConfig(@NotNull String parametersAreSubjectToConversion) {
         ArrayList<IllegalArgumentException> errors = new ArrayList<>();
         try {
-            this.parametersAreSubjectToConversion = ConvertingParameters.toInt(CypherMapWrapper.failOnNull(
+            this.parametersAreSubjectToConversion = ConvertingParameters.toInt(CypherMapAccess.failOnNull(
                 "parametersAreSubjectToConversion",
                 parametersAreSubjectToConversion
             ));
diff --git a/config-generator/src/test/resources/expected/DefaultValues.java b/config-generator/src/test/resources/expected/DefaultValues.java
@@ -25,6 +25,7 @@
 import java.util.stream.Collectors;
 import javax.annotation.processing.Generated;
 import org.jetbrains.annotations.NotNull;
+import org.neo4j.gds.core.CypherMapAccess;
 import org.neo4j.gds.core.CypherMapWrapper;
 
 @Generated("org.neo4j.gds.proc.ConfigurationProcessor")
@@ -33,15 +34,15 @@ public final class DefaultValuesConfig implements DefaultValues {
 
     private String defaultString;
 
-    public DefaultValuesConfig(@NotNull CypherMapWrapper config) {
+    public DefaultValuesConfig(@NotNull CypherMapAccess config) {
         ArrayList<IllegalArgumentException> errors = new ArrayList<>();
         try {
             this.defaultInt = config.getInt("defaultInt", DefaultValues.super.defaultInt());
         } catch (IllegalArgumentException e) {
             errors.add(e);
         }
         try {
-            this.defaultString = CypherMapWrapper.failOnNull(
+            this.defaultString = CypherMapAccess.failOnNull(
                 "defaultString",
                 config.getString("defaultString", DefaultValues.super.defaultString())
             );
diff --git a/config-generator/src/test/resources/expected/FieldTypes.java b/config-generator/src/test/resources/expected/FieldTypes.java
@@ -27,6 +27,7 @@
 import java.util.stream.Collectors;
 import javax.annotation.processing.Generated;
 import org.jetbrains.annotations.NotNull;
+import org.neo4j.gds.core.CypherMapAccess;
 import org.neo4j.gds.core.CypherMapWrapper;
 
 @Generated("org.neo4j.gds.proc.ConfigurationProcessor")
@@ -55,7 +56,7 @@ public final class FieldTypesConfig implements FieldTypes {
 
     private Optional<String> anOptional;
 
-    public FieldTypesConfig(@NotNull CypherMapWrapper config) {
+    public FieldTypesConfig(@NotNull CypherMapAccess config) {
         ArrayList<IllegalArgumentException> errors = new ArrayList<>();
         try {
             this.aBoolean = config.requireBool("aBoolean");
@@ -93,27 +94,27 @@ public FieldTypesConfig(@NotNull CypherMapWrapper config) {
             errors.add(e);
         }
         try {
-            this.aNumber = CypherMapWrapper.failOnNull("aNumber", config.requireNumber("aNumber"));
+            this.aNumber = CypherMapAccess.failOnNull("aNumber", config.requireNumber("aNumber"));
         } catch (IllegalArgumentException e) {
             errors.add(e);
         }
         try {
-            this.aString = CypherMapWrapper.failOnNull("aString", config.requireString("aString"));
+            this.aString = CypherMapAccess.failOnNull("aString", config.requireString("aString"));
         } catch (IllegalArgumentException e) {
             errors.add(e);
         }
         try {
-            this.aMap = CypherMapWrapper.failOnNull("aMap", config.requireChecked("aMap", Map.class));
+            this.aMap = CypherMapAccess.failOnNull("aMap", config.requireChecked("aMap", Map.class));
         } catch (IllegalArgumentException e) {
             errors.add(e);
         }
         try {
-            this.aList = CypherMapWrapper.failOnNull("aList", config.requireChecked("aList", List.class));
+            this.aList = CypherMapAccess.failOnNull("aList", config.requireChecked("aList", List.class));
         } catch (IllegalArgumentException e) {
             errors.add(e);
         }
         try {
-            this.anOptional = CypherMapWrapper.failOnNull("anOptional", config.getOptional("anOptional", String.class));
+            this.anOptional = CypherMapAccess.failOnNull("anOptional", config.getOptional("anOptional", String.class));
         } catch (IllegalArgumentException e) {
             errors.add(e);
         }
diff --git a/config-generator/src/test/resources/expected/Ignores.java b/config-generator/src/test/resources/expected/Ignores.java
@@ -25,13 +25,14 @@
 import java.util.stream.Collectors;
 import javax.annotation.processing.Generated;
 import org.jetbrains.annotations.NotNull;
+import org.neo4j.gds.core.CypherMapAccess;
 import org.neo4j.gds.core.CypherMapWrapper;
 
 @Generated("org.neo4j.gds.proc.ConfigurationProcessor")
 public final class MyConfigImpl implements Ignores.MyConfig {
     private long notIgnored;
 
-    public MyConfig(@NotNull CypherMapWrapper config) {
+    public MyConfig(@NotNull CypherMapAccess config) {
         ArrayList<IllegalArgumentException> errors = new ArrayList<>();
         try {
             this.notIgnored = config.requireLong("notIgnored");
diff --git a/config-generator/src/test/resources/expected/Inheritance.java b/config-generator/src/test/resources/expected/Inheritance.java
@@ -26,6 +26,7 @@
 import javax.annotation.processing.Generated;
 
 import org.jetbrains.annotations.NotNull;
+import org.neo4j.gds.core.CypherMapAccess;
 import org.neo4j.gds.core.CypherMapWrapper;
 
 @Generated("org.neo4j.gds.proc.ConfigurationProcessor")
@@ -42,10 +43,10 @@ public final class MyConfigImpl implements Inheritance.MyConfig {
 
     private short inheritedDefaultValue;
 
-    public MyConfigImpl(@NotNull CypherMapWrapper config) {
+    public MyConfigImpl(@NotNull CypherMapAccess config) {
         ArrayList<IllegalArgumentException> errors = new ArrayList<>();
         try {
-            this.baseValue = CypherMapWrapper.failOnNull("baseValue", config.requireString("baseValue"));
+            this.baseValue = CypherMapAccess.failOnNull("baseValue", config.requireString("baseValue"));
         } catch (IllegalArgumentException e) {
             errors.add(e);
         }
diff --git a/config-generator/src/test/resources/expected/KeyRenames.java b/config-generator/src/test/resources/expected/KeyRenames.java
@@ -25,6 +25,7 @@
 import java.util.stream.Collectors;
 import javax.annotation.processing.Generated;
 import org.jetbrains.annotations.NotNull;
+import org.neo4j.gds.core.CypherMapAccess;
 import org.neo4j.gds.core.CypherMapWrapper;
 
 @Generated("org.neo4j.gds.proc.ConfigurationProcessor")
@@ -33,7 +34,7 @@ public final class KeyRenamesConfig implements KeyRenames {
 
     private int whitespaceWillBeTrimmed;
 
-    public KeyRenamesConfig(@NotNull CypherMapWrapper config) {
+    public KeyRenamesConfig(@NotNull CypherMapAccess config) {
         ArrayList<IllegalArgumentException> errors = new ArrayList<>();
         try {
             this.lookupUnderAnotherKey = config.requireInt("key could also be an invalid identifier");
diff --git a/config-generator/src/test/resources/expected/NamingConflict.java b/config-generator/src/test/resources/expected/NamingConflict.java
@@ -25,6 +25,7 @@
 import java.util.stream.Collectors;
 import javax.annotation.processing.Generated;
 import org.jetbrains.annotations.NotNull;
+import org.neo4j.gds.core.CypherMapAccess;
 import org.neo4j.gds.core.CypherMapWrapper;
 
 @Generated("org.neo4j.gds.proc.ConfigurationProcessor")
@@ -35,7 +36,7 @@ public final class NamingConflictConfig implements NamingConflict {
 
     private int config_;
 
-    public NamingConflictConfig(int config_, @NotNull CypherMapWrapper config__) {
+    public NamingConflictConfig(int config_, @NotNull CypherMapAccess config__) {
         ArrayList<IllegalArgumentException> errors = new ArrayList<>();
         try {
             this.config = config__.requireInt("config");
diff --git a/config-generator/src/test/resources/expected/NullableFields.java b/config-generator/src/test/resources/expected/NullableFields.java
@@ -26,6 +26,7 @@
 import javax.annotation.processing.Generated;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.neo4j.gds.core.CypherMapAccess;
 import org.neo4j.gds.core.CypherMapWrapper;
 
 @Generated("org.neo4j.gds.proc.ConfigurationProcessor")
@@ -36,7 +37,7 @@ public final class NullableFieldsConfig implements NullableFields {
 
     private @Nullable String conversionCanReturnNull;
 
-    public NullableFieldsConfig(@NotNull CypherMapWrapper config) {
+    public NullableFieldsConfig(@NotNull CypherMapAccess config) {
         ArrayList<IllegalArgumentException> errors = new ArrayList<>();
         try {
             this.nullableRequiredField = config.requireString("nullableRequiredField");
diff --git a/config-generator/src/test/resources/expected/NullableParameters.java b/config-generator/src/test/resources/expected/NullableParameters.java
@@ -26,6 +26,7 @@
 import javax.annotation.processing.Generated;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.neo4j.gds.core.CypherMapAccess;
 import org.neo4j.gds.core.CypherMapWrapper;
 
 @Generated("org.neo4j.gds.proc.ConfigurationProcessor")
@@ -42,19 +43,19 @@ public NullableParametersConfig(
         @NotNull String referenceTypesDefaultToNotNull,
         @NotNull String referenceTypesCanBeMarkedAsNotNull,
         @Nullable String referenceTypesCanBeMarkedAsNullable,
-        @NotNull CypherMapWrapper config
+        @NotNull CypherMapAccess config
     ) {
         ArrayList<IllegalArgumentException> errors = new ArrayList<>();
         try {
-            this.referenceTypesDefaultToNotNull = CypherMapWrapper.failOnNull(
+            this.referenceTypesDefaultToNotNull = CypherMapAccess.failOnNull(
                 "referenceTypesDefaultToNotNull",
                 referenceTypesDefaultToNotNull
             );
         } catch (IllegalArgumentException e) {
             errors.add(e);
         }
         try {
-            this.referenceTypesCanBeMarkedAsNotNull = CypherMapWrapper.failOnNull(
+            this.referenceTypesCanBeMarkedAsNotNull = CypherMapAccess.failOnNull(
                 "referenceTypesCanBeMarkedAsNotNull",
                 referenceTypesCanBeMarkedAsNotNull
             );
diff --git a/config-generator/src/test/resources/expected/Parameters.java b/config-generator/src/test/resources/expected/Parameters.java
@@ -25,6 +25,7 @@
 import java.util.stream.Collectors;
 import javax.annotation.processing.Generated;
 import org.jetbrains.annotations.NotNull;
+import org.neo4j.gds.core.CypherMapAccess;
 import org.neo4j.gds.core.CypherMapWrapper;
 
 @Generated("org.neo4j.gds.proc.ConfigurationProcessor")
@@ -37,7 +38,7 @@ public final class ParametersConfig implements Parameters {
 
     public ParametersConfig(
         int keyFromParameter, int parametersAreAddedFirst,
-        @NotNull CypherMapWrapper config
+        @NotNull CypherMapAccess config
     ) {
         ArrayList<IllegalArgumentException> errors = new ArrayList<>();
         try {
diff --git a/config-generator/src/test/resources/expected/RangeValidation.java b/config-generator/src/test/resources/expected/RangeValidation.java
@@ -27,6 +27,7 @@
 import java.util.stream.Collectors;
 import javax.annotation.processing.Generated;
 import org.jetbrains.annotations.NotNull;
+import org.neo4j.gds.core.CypherMapAccess;
 import org.neo4j.gds.core.CypherMapWrapper;
 
 @Generated("org.neo4j.gds.proc.ConfigurationProcessor")
@@ -41,11 +42,11 @@ public final class RangeValidationConfig implements RangeValidation {
 
     private List<Double> listDoubleWithinRange;
 
-    public RangeValidationConfig(@NotNull CypherMapWrapper config) {
+    public RangeValidationConfig(@NotNull CypherMapAccess config) {
         ArrayList<IllegalArgumentException> errors = new ArrayList<>();
         try {
             this.integerWithinRange = config.requireInt("integerWithinRange")
-            CypherMapWrapper.validateIntegerRange(
+            CypherMapAccess.validateIntegerRange(
                 "integerWithinRange",
                 integerWithinRange,
                 21,
@@ -58,7 +59,7 @@ public RangeValidationConfig(@NotNull CypherMapWrapper config) {
         }
         try {
             this.longWithinRange = config.requireLong("longWithinRange")
-            CypherMapWrapper.validateLongRange(
+            CypherMapAccess.validateLongRange(
                 "longWithinRange",
                 longWithinRange,
                 21L,
@@ -70,7 +71,7 @@ public RangeValidationConfig(@NotNull CypherMapWrapper config) {
         }
         try {
             this.doubleWithinRange = config.requireDouble("doubleWithinRange");
-            CypherMapWrapper.validateDoubleRange(
+            CypherMapAccess.validateDoubleRange(
                 "doubleWithinRange",
                 doubleWithinRange,
                 21.0,
@@ -82,12 +83,12 @@ public RangeValidationConfig(@NotNull CypherMapWrapper config) {
             errors.add(e);
         }
         try {
-            this.maybeDoubleWithinRange = CypherMapWrapper.failOnNull(
+            this.maybeDoubleWithinRange = CypherMapAccess.failOnNull(
                 "maybeDoubleWithinRange",
                 config.getOptional("maybeDoubleWithinRange", Double.class)
             );
             maybeDoubleWithinRange.ifPresent(maybeDoubleWithinRange ->
-                CypherMapWrapper.validateDoubleRange(
+                CypherMapAccess.validateDoubleRange(
                     "maybeDoubleWithinRange",
                     maybeDoubleWithinRange,
                     21.0,
@@ -100,11 +101,11 @@ public RangeValidationConfig(@NotNull CypherMapWrapper config) {
             errors.add(e);
         }
         try {
-            this.listDoubleWithinRange = CypherMapWrapper.failOnNull(
+            this.listDoubleWithinRange = CypherMapAccess.failOnNull(
                 "listDoubleWithinRange",
                 config.requireChecked("listDoubleWithinRange", List.class)
             );
-            this.listDoubleWithinRange.forEach(listDoubleWithinRange -> CypherMapWrapper.validateDoubleRange(
+            this.listDoubleWithinRange.forEach(listDoubleWithinRange -> CypherMapAccess.validateDoubleRange(
                 "listDoubleWithinRange",
                 listDoubleWithinRange,
                 21.0,
diff --git a/config-generator/src/test/resources/expected/ToMap.java b/config-generator/src/test/resources/expected/ToMap.java
@@ -27,6 +27,7 @@
 import java.util.stream.Collectors;
 import javax.annotation.processing.Generated;
 import org.jetbrains.annotations.NotNull;
+import org.neo4j.gds.core.CypherMapAccess;
 import org.neo4j.gds.core.CypherMapWrapper;
 
 @Generated("org.neo4j.gds.proc.ConfigurationProcessor")
@@ -41,7 +42,7 @@ public final class ToMapConfig implements ToMap {
 
     private Optional<Double> maybeBaz;
 
-    public ToMapConfig(int foo, @NotNull CypherMapWrapper config) {
+    public ToMapConfig(int foo, @NotNull CypherMapAccess config) {
         ArrayList<IllegalArgumentException> errors = new ArrayList<>();
         try {
             this.foo = foo;
@@ -59,12 +60,12 @@ public ToMapConfig(int foo, @NotNull CypherMapWrapper config) {
             errors.add(e);
         }
         try {
-            this.maybeBar = CypherMapWrapper.failOnNull("maybeBar", config.getOptional("maybeBar", Long.class));
+            this.maybeBar = CypherMapAccess.failOnNull("maybeBar", config.getOptional("maybeBar", Long.class));
         } catch (IllegalArgumentException e) {
             errors.add(e);
         }
         try {
-            this.maybeBaz = CypherMapWrapper.failOnNull("maybeBaz", config.getOptional("maybeBaz", Double.class));
+            this.maybeBaz = CypherMapAccess.failOnNull("maybeBaz", config.getOptional("maybeBaz", Double.class));
         } catch (IllegalArgumentException e) {
             errors.add(e);
         }
diff --git a/config-generator/src/test/resources/expected/Validation.java b/config-generator/src/test/resources/expected/Validation.java
@@ -25,13 +25,14 @@
 import java.util.stream.Collectors;
 import javax.annotation.processing.Generated;
 import org.jetbrains.annotations.NotNull;
+import org.neo4j.gds.core.CypherMapAccess;
 import org.neo4j.gds.core.CypherMapWrapper;
 
 @Generated("org.neo4j.gds.proc.ConfigurationProcessor")
 public final class ValidationConfig implements Validation {
     private int foo;
 
-    private ValidationConfig(@NotNull CypherMapWrapper config) {
+    private ValidationConfig(@NotNull CypherMapAccess config) {
         ArrayList<IllegalArgumentException> errors = new ArrayList<>();
         try {
             this.foo = config.requireInt("foo");
@@ -62,7 +63,7 @@ private ValidationConfig(@NotNull CypherMapWrapper config) {
         }
     }
 
-    public static Validation of(@NotNull CypherMapWrapper config) {
+    public static Validation of(@NotNull CypherMapAccess config) {
         Validation instance = new ValidationConfig(config);
         instance = instance.normalize();
         return instance;
