OpenAPI: blocking is required argument for indexing_settings

broker/gen/model/Indexing_settings.cpp

@@ -34,7 +34,6 @@ Indexing_settings::Indexing_settings()
     m_Rotation_indexing_min_angular_range_deg = 20.0f;
     m_Rotation_indexing_angular_stride_deg = 0.5f;
     m_Blocking = false;
-    m_BlockingIsSet = false;
     
 }
 
@@ -278,8 +277,8 @@ bool Indexing_settings::operator==(const Indexing_settings& rhs) const
     (getRotationIndexingAngularStrideDeg() == rhs.getRotationIndexingAngularStrideDeg())
      &&
     
+    (isBlocking() == rhs.isBlocking())
     
-    ((!blockingIsSet() && !rhs.blockingIsSet()) || (blockingIsSet() && rhs.blockingIsSet() && isBlocking() == rhs.isBlocking()))
     
     ;
 }
@@ -306,8 +305,7 @@ void to_json(nlohmann::json& j, const Indexing_settings& o)
     j["rotation_indexing"] = o.m_Rotation_indexing;
     j["rotation_indexing_min_angular_range_deg"] = o.m_Rotation_indexing_min_angular_range_deg;
     j["rotation_indexing_angular_stride_deg"] = o.m_Rotation_indexing_angular_stride_deg;
-    if(o.blockingIsSet())
-        j["blocking"] = o.m_Blocking;
+    j["blocking"] = o.m_Blocking;
     
 }
 
@@ -327,11 +325,7 @@ void from_json(const nlohmann::json& j, Indexing_settings& o)
     j.at("rotation_indexing").get_to(o.m_Rotation_indexing);
     j.at("rotation_indexing_min_angular_range_deg").get_to(o.m_Rotation_indexing_min_angular_range_deg);
     j.at("rotation_indexing_angular_stride_deg").get_to(o.m_Rotation_indexing_angular_stride_deg);
-    if(j.find("blocking") != j.end())
-    {
-        j.at("blocking").get_to(o.m_Blocking);
-        o.m_BlockingIsSet = true;
-    } 
+    j.at("blocking").get_to(o.m_Blocking);
     
 }
 
@@ -454,15 +448,6 @@ bool Indexing_settings::isBlocking() const
 void Indexing_settings::setBlocking(bool const value)
 {
     m_Blocking = value;
-    m_BlockingIsSet = true;
-}
-bool Indexing_settings::blockingIsSet() const
-{
-    return m_BlockingIsSet;
-}
-void Indexing_settings::unsetBlocking()
-{
-    m_BlockingIsSet = false;
 }
 
 

broker/gen/model/Indexing_settings.h

@@ -134,8 +134,6 @@ public:
     /// </summary>
     bool isBlocking() const;
     void setBlocking(bool const value);
-    bool blockingIsSet() const;
-    void unsetBlocking();
 
     friend  void to_json(nlohmann::json& j, const Indexing_settings& o);
     friend  void from_json(const nlohmann::json& j, Indexing_settings& o);
@@ -169,7 +167,7 @@ protected:
     float m_Rotation_indexing_angular_stride_deg;
 
     bool m_Blocking;
-    bool m_BlockingIsSet;
+
     
 };
 

broker/jfjoch_api.yaml

@@ -1839,6 +1839,7 @@ components:
         - rotation_indexing
         - rotation_indexing_min_angular_range_deg
         - rotation_indexing_angular_stride_deg
+        - blocking
       properties:
         algorithm:
           $ref: "#/components/schemas/indexing_algorithm"

docs/python_client/docs/IndexingSettings.md

@@ -20,7 +20,7 @@ Name | Type | Description | Notes
 **rotation_indexing** | **bool** |  | [default to False]
 **rotation_indexing_min_angular_range_deg** | **float** |  | [default to 20.0]
 **rotation_indexing_angular_stride_deg** | **float** |  | [default to 0.5]
-**blocking** | **bool** | Indexing in Jungfraujoch goes with a dedicated thread pool. If set to false, the thread pool is non-blocking, i.e. if there are no threads available, image indexing will be skipped. If set to true, the thread pool will block until a thread is available.  | [optional] [default to False]
+**blocking** | **bool** | Indexing in Jungfraujoch goes with a dedicated thread pool. If set to false, the thread pool is non-blocking, i.e. if there are no threads available, image indexing will be skipped. If set to true, the thread pool will block until a thread is available.  | [default to False]
 
 ## Example
 

frontend/src/openapi/models/indexing_settings.ts

@@ -61,6 +61,6 @@ export type indexing_settings = {
      * If set to true, the thread pool will block until a thread is available.
      *
      */
-    blocking?: boolean;
+    blocking: boolean;
 };