'property' -> 'parameter'

Author: leonardehrenfried

src/main/java/org/opentripplanner/standalone/OTPMain.java

@@ -180,9 +180,9 @@ private static void startOTPServer(CommandLineParameters cli) {
    * Optionally, check if the config is valid and if not abort the startup process.
    */
   private static void detectUnusedConfigParams(CommandLineParameters cli, ConfigModel config) {
-    if (cli.abortOnUnknownConfig && config.hasUnknownProperties()) {
+    if (cli.abortOnUnknownConfig && config.hasUnknownParameters()) {
       throw new OtpAppException(
-        "Configuration contains invalid properties (see above for details). " +
+        "Configuration contains unknown parameters (see above for details). " +
         "Please fix your configuration or remove --abortOnUnknownConfig from your OTP CLI parameters."
       );
     }

src/main/java/org/opentripplanner/standalone/config/BuildConfig.java

@@ -728,9 +728,9 @@ public NodeAdapter asNodeAdapter() {
   }
 
   /**
-   * Checks if any unknown or invalid properties were encountered while loading the configuration.
+   * Checks if any unknown or invalid parameters were encountered while loading the configuration.
    */
-  public boolean hasUnknownProperties() {
-    return root.hasUnknownProperties();
+  public boolean hasUnknownParameters() {
+    return root.hasUnknownParameters();
   }
 }

src/main/java/org/opentripplanner/standalone/config/CommandLineParameters.java

@@ -135,7 +135,7 @@ public class CommandLineParameters {
 
   @Parameter(
     names = { "--abortOnUnknownConfig" },
-    description = "Abort the startup if configuration files are found to be invalid."
+    description = "Abort the startup if configuration files are found to contain unknown parameters."
   )
   public boolean abortOnUnknownConfig = false;
 

src/main/java/org/opentripplanner/standalone/config/ConfigModel.java

@@ -107,13 +107,13 @@ public static void initializeOtpFeatures(OtpConfig otpConfig) {
   }
 
   /**
-   * Checks if any unknown or invalid properties were encountered while loading the configuration.
+   * Checks if any unknown or invalid parameters were encountered while loading the configuration.
    */
-  public boolean hasUnknownProperties() {
+  public boolean hasUnknownParameters() {
     return (
-      otpConfig.hasUnknownProperties() ||
-      buildConfig.hasUnknownProperties() ||
-      routerConfig.hasUnknownProperties()
+      otpConfig.hasUnknownParameters() ||
+      buildConfig.hasUnknownParameters() ||
+      routerConfig.hasUnknownParameters()
     );
   }
 }

src/main/java/org/opentripplanner/standalone/config/OtpConfig.java

@@ -73,9 +73,9 @@ public OtpConfig(NodeAdapter nodeAdapter, boolean logUnusedParams) {
   }
 
   /**
-   * Checks if any unknown or invalid properties were encountered while loading the configuration.
+   * Checks if any unknown or invalid parameters were encountered while loading the configuration.
    */
-  public boolean hasUnknownProperties() {
-    return root.hasUnknownProperties();
+  public boolean hasUnknownParameters() {
+    return root.hasUnknownParameters();
   }
 }

src/main/java/org/opentripplanner/standalone/config/RouterConfig.java

@@ -152,9 +152,9 @@ public String toString() {
   }
 
   /**
-   * Checks if any unknown or invalid properties were encountered while loading the configuration.
+   * Checks if any unknown or invalid parameters were encountered while loading the configuration.
    */
-  public boolean hasUnknownProperties() {
-    return root.hasUnknownProperties();
+  public boolean hasUnknownParameters() {
+    return root.hasUnknownParameters();
   }
 }

src/main/java/org/opentripplanner/standalone/config/framework/json/NodeAdapter.java

@@ -175,7 +175,7 @@ public void logAllWarnings(Consumer<String> logger) {
   /**
    * Checks if any unknown or invalid properties were encountered while loading the configuration.
    */
-  public boolean hasUnknownProperties() {
+  public boolean hasUnknownParameters() {
     return !unusedParams().isEmpty() || !allWarnings().toList().isEmpty();
   }
 

src/test/java/org/opentripplanner/standalone/config/framework/json/NodeAdapterTest.java

@@ -569,7 +569,7 @@ void invalidProperties() {
       // When: Access ONLY parameter 'a', but not 'b'
       subject.of("foo").asObject().of("a").asBoolean();
 
-      assertTrue(subject.hasUnknownProperties());
+      assertTrue(subject.hasUnknownParameters());
     }
 
     @Test
@@ -581,7 +581,7 @@ void valid() {
       object.of("a").asBoolean();
       object.of("b").asBoolean();
 
-      assertFalse(subject.hasUnknownProperties());
+      assertFalse(subject.hasUnknownParameters());
     }
   }