ignoreMissingProperties is a better name than ignoreUnknownProperties

PADL · Dec 4, 2024 · 8f2369b · 8f2369b
1 parent 1c7c4bb
commit 8f2369b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/Sources/SwiftOCADevice/OCC/ControlClasses/Root.swift b/Sources/SwiftOCADevice/OCC/ControlClasses/Root.swift
@@ -391,8 +391,12 @@ open class OcaRoot: CustomStringConvertible, Codable, Sendable, OcaKeyPathMarker
       let propertyName = property.propertyID.description
 
       guard let value = jsonObject[propertyName] else {
-        if flags.contains(.ignoreUnknownProperties) { continue }
-        else { throw Ocp1Error.status(.parameterOutOfRange) }
+        if flags.contains(.ignoreMissingProperties) {
+          continue
+        } else {
+          logger.warning("JSON object \(jsonObject) is missing \(propertyName)")
+          throw Ocp1Error.status(.parameterOutOfRange)
+        }
       }
 
       do {

diff --git a/Sources/SwiftOCADevice/OCC/PropertyTypes/Serialization.swift b/Sources/SwiftOCADevice/OCC/PropertyTypes/Serialization.swift
@@ -55,13 +55,13 @@ public extension OcaRoot {
     }
 
     public static let ignoreDecodingErrors = DeserializationFlags(rawValue: 1 << 0)
-    public static let ignoreUnknownProperties = DeserializationFlags(rawValue: 1 << 1)
+    public static let ignoreMissingProperties = DeserializationFlags(rawValue: 1 << 1)
     public static let ignoreUnknownObjectNumbers = DeserializationFlags(rawValue: 1 << 2)
     public static let ignoreObjectClassMismatches = DeserializationFlags(rawValue: 1 << 3)
 
     public static let ignoreAllErrors: DeserializationFlags = [
       .ignoreDecodingErrors,
-      .ignoreUnknownProperties,
+      .ignoreMissingProperties,
       .ignoreUnknownObjectNumbers,
       .ignoreObjectClassMismatches,
     ]