OpenAPI: Remove SSL from settings
This commit is contained in:
@@ -39,7 +39,6 @@ Jfjoch_settings::Jfjoch_settings()
|
||||
m_Numa_policy = "";
|
||||
m_Numa_policyIsSet = false;
|
||||
m_Frontend_directory = "";
|
||||
m_SslIsSet = false;
|
||||
m_Spot_findingIsSet = false;
|
||||
m_Zeromq_previewIsSet = false;
|
||||
m_Zeromq_metadataIsSet = false;
|
||||
@@ -141,7 +140,7 @@ bool Jfjoch_settings::validate(std::stringstream& msg, const std::string& pathPr
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
return success;
|
||||
}
|
||||
|
||||
@@ -196,9 +195,6 @@ bool Jfjoch_settings::operator==(const Jfjoch_settings& rhs) const
|
||||
&&
|
||||
|
||||
|
||||
((!sslIsSet() && !rhs.sslIsSet()) || (sslIsSet() && rhs.sslIsSet() && getSsl() == rhs.getSsl())) &&
|
||||
|
||||
|
||||
((!spotFindingIsSet() && !rhs.spotFindingIsSet()) || (spotFindingIsSet() && rhs.spotFindingIsSet() && getSpotFinding() == rhs.getSpotFinding())) &&
|
||||
|
||||
(getImagePusher() == rhs.getImagePusher())
|
||||
@@ -252,8 +248,6 @@ void to_json(nlohmann::json& j, const Jfjoch_settings& o)
|
||||
if(o.numaPolicyIsSet())
|
||||
j["numa_policy"] = o.m_Numa_policy;
|
||||
j["frontend_directory"] = o.m_Frontend_directory;
|
||||
if(o.sslIsSet())
|
||||
j["ssl"] = o.m_Ssl;
|
||||
if(o.spotFindingIsSet())
|
||||
j["spot_finding"] = o.m_Spot_finding;
|
||||
j["image_pusher"] = o.m_Image_pusher;
|
||||
@@ -335,11 +329,6 @@ void from_json(const nlohmann::json& j, Jfjoch_settings& o)
|
||||
o.m_Numa_policyIsSet = true;
|
||||
}
|
||||
j.at("frontend_directory").get_to(o.m_Frontend_directory);
|
||||
if(j.find("ssl") != j.end())
|
||||
{
|
||||
j.at("ssl").get_to(o.m_Ssl);
|
||||
o.m_SslIsSet = true;
|
||||
}
|
||||
if(j.find("spot_finding") != j.end())
|
||||
{
|
||||
j.at("spot_finding").get_to(o.m_Spot_finding);
|
||||
@@ -601,23 +590,6 @@ void Jfjoch_settings::setFrontendDirectory(std::string const& value)
|
||||
{
|
||||
m_Frontend_directory = value;
|
||||
}
|
||||
org::openapitools::server::model::Jfjoch_settings_ssl Jfjoch_settings::getSsl() const
|
||||
{
|
||||
return m_Ssl;
|
||||
}
|
||||
void Jfjoch_settings::setSsl(org::openapitools::server::model::Jfjoch_settings_ssl const& value)
|
||||
{
|
||||
m_Ssl = value;
|
||||
m_SslIsSet = true;
|
||||
}
|
||||
bool Jfjoch_settings::sslIsSet() const
|
||||
{
|
||||
return m_SslIsSet;
|
||||
}
|
||||
void Jfjoch_settings::unsetSsl()
|
||||
{
|
||||
m_SslIsSet = false;
|
||||
}
|
||||
org::openapitools::server::model::Spot_finding_settings Jfjoch_settings::getSpotFinding() const
|
||||
{
|
||||
return m_Spot_finding;
|
||||
|
||||
@@ -36,7 +36,6 @@
|
||||
#include "Image_pusher_type.h"
|
||||
#include "Zeromq_settings.h"
|
||||
#include "Instrument_metadata.h"
|
||||
#include "Jfjoch_settings_ssl.h"
|
||||
#include <nlohmann/json.hpp>
|
||||
|
||||
namespace org::openapitools::server::model
|
||||
@@ -179,13 +178,6 @@ public:
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
org::openapitools::server::model::Jfjoch_settings_ssl getSsl() const;
|
||||
void setSsl(org::openapitools::server::model::Jfjoch_settings_ssl const& value);
|
||||
bool sslIsSet() const;
|
||||
void unsetSsl();
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
org::openapitools::server::model::Spot_finding_settings getSpotFinding() const;
|
||||
void setSpotFinding(org::openapitools::server::model::Spot_finding_settings const& value);
|
||||
bool spotFindingIsSet() const;
|
||||
@@ -250,8 +242,6 @@ protected:
|
||||
bool m_Numa_policyIsSet;
|
||||
std::string m_Frontend_directory;
|
||||
|
||||
org::openapitools::server::model::Jfjoch_settings_ssl m_Ssl;
|
||||
bool m_SslIsSet;
|
||||
org::openapitools::server::model::Spot_finding_settings m_Spot_finding;
|
||||
bool m_Spot_findingIsSet;
|
||||
org::openapitools::server::model::Image_pusher_type m_Image_pusher;
|
||||
|
||||
@@ -2241,20 +2241,6 @@ components:
|
||||
frontend_directory:
|
||||
type: string
|
||||
description: Location of built JavaScript web frontend
|
||||
ssl:
|
||||
type: object
|
||||
required:
|
||||
- certificate
|
||||
- key
|
||||
properties:
|
||||
certificate:
|
||||
type: string
|
||||
minLength: 1
|
||||
example: "server.crt"
|
||||
key:
|
||||
type: string
|
||||
minLength: 1
|
||||
example: "server.key"
|
||||
spot_finding:
|
||||
$ref: '#/components/schemas/spot_finding_settings'
|
||||
image_pusher:
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -198,7 +198,6 @@ Class | Method | HTTP request | Description
|
||||
- [IndexingSettings](docs/IndexingSettings.md)
|
||||
- [InstrumentMetadata](docs/InstrumentMetadata.md)
|
||||
- [JfjochSettings](docs/JfjochSettings.md)
|
||||
- [JfjochSettingsSsl](docs/JfjochSettingsSsl.md)
|
||||
- [JfjochStatistics](docs/JfjochStatistics.md)
|
||||
- [MeasurementStatistics](docs/MeasurementStatistics.md)
|
||||
- [PcieDevicesInner](docs/PcieDevicesInner.md)
|
||||
|
||||
@@ -21,7 +21,6 @@ Name | Type | Description | Notes
|
||||
**receiver_threads** | **int** | Number of threads used by the receiver | [optional] [default to 64]
|
||||
**numa_policy** | **str** | NUMA policy to bind CPUs | [optional]
|
||||
**frontend_directory** | **str** | Location of built JavaScript web frontend |
|
||||
**ssl** | [**JfjochSettingsSsl**](JfjochSettingsSsl.md) | | [optional]
|
||||
**spot_finding** | [**SpotFindingSettings**](SpotFindingSettings.md) | | [optional]
|
||||
**image_pusher** | [**ImagePusherType**](ImagePusherType.md) | | [default to ImagePusherType.NONE]
|
||||
**zeromq_preview** | [**ZeromqPreviewSettings**](ZeromqPreviewSettings.md) | | [optional]
|
||||
|
||||
@@ -55,10 +55,6 @@ export type jfjoch_settings = {
|
||||
* Location of built JavaScript web frontend
|
||||
*/
|
||||
frontend_directory: string;
|
||||
ssl?: {
|
||||
certificate: string;
|
||||
key: string;
|
||||
};
|
||||
spot_finding?: spot_finding_settings;
|
||||
image_pusher: image_pusher_type;
|
||||
zeromq_preview?: zeromq_preview_settings;
|
||||
|
||||
Reference in New Issue
Block a user