diff --git a/OmniCore.sln b/OmniCore.sln index 5f48ba8..1ff6cd7 100644 --- a/OmniCore.sln +++ b/OmniCore.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OmniCore", "src\OmniCore\OmniCore.csproj", "{3D511DA2-B6B0-4D32-9C40-656CDE65DF0F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OmniCore", "src\OmniCore\OmniCore.csproj", "{E9FE9401-0019-48E2-BD20-14CF8D7E56E4}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OmniCore.Test", "src\OmniCore.Test\OmniCore.Test.csproj", "{19F1DEBC-DE5E-4517-8062-F000CD499087}" EndProject @@ -12,10 +12,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {3D511DA2-B6B0-4D32-9C40-656CDE65DF0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3D511DA2-B6B0-4D32-9C40-656CDE65DF0F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3D511DA2-B6B0-4D32-9C40-656CDE65DF0F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3D511DA2-B6B0-4D32-9C40-656CDE65DF0F}.Release|Any CPU.Build.0 = Release|Any CPU + {E9FE9401-0019-48E2-BD20-14CF8D7E56E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E9FE9401-0019-48E2-BD20-14CF8D7E56E4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E9FE9401-0019-48E2-BD20-14CF8D7E56E4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E9FE9401-0019-48E2-BD20-14CF8D7E56E4}.Release|Any CPU.Build.0 = Release|Any CPU {19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.Build.0 = Debug|Any CPU {19F1DEBC-DE5E-4517-8062-F000CD499087}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/README.md b/README.md index b59cac4..ef2057b 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ This is an OmniCore Model and State Management server. This C# SDK is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project: - API version: 1.0 -- SDK version: 1.7.3 +- SDK version: 1.7.4 - Build package: org.openapitools.codegen.languages.CSharpNetCoreClientCodegen For more information, please visit [http://www.korewireless.com](http://www.korewireless.com) diff --git a/docs/DeviceRegistry.md b/docs/DeviceRegistry.md index 80bb67e..57479fb 100644 --- a/docs/DeviceRegistry.md +++ b/docs/DeviceRegistry.md @@ -13,6 +13,7 @@ Name | Type | Description | Notes **HttpConfig** | [**HttpConfig**](HttpConfig.md) | | [optional] **MqttConfig** | [**MqttConfig**](MqttConfig.md) | | [optional] **LogLevel** | **LogLevel** | | [optional] +**IsNatsRoute** | **bool** | | [optional] **EventNotificationConfigs** | [**List<EventNotificationConfig>**](EventNotificationConfig.md) | | [optional] **LogNotificationConfig** | [**NotificationConfig**](NotificationConfig.md) | | [optional] **StateNotificationConfig** | [**NotificationConfig**](NotificationConfig.md) | | [optional] diff --git a/docs/EventNotificationConfig.md b/docs/EventNotificationConfig.md index bf197db..9907204 100644 --- a/docs/EventNotificationConfig.md +++ b/docs/EventNotificationConfig.md @@ -5,7 +5,6 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **PubsubTopicName** | **string** | PubsubTopicName: A Topic name. For example, `projects/myProject/topics/deviceEvents`. | [optional] -**IsGcpPubSub** | **bool** | Describe whether the topic is Gcp pubsub topic or Omni topic | [optional] **SubfolderMatches** | **string** | SubfolderMatches: If the subfolder name matches this string exactly, this configuration will be used. The string must not include the leading '/' character. If empty, all strings are matched. This field is used only for telemetry events; subfolders are not supported for state changes. | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/docs/NotificationConfig.md b/docs/NotificationConfig.md index eb6a138..8618d26 100644 --- a/docs/NotificationConfig.md +++ b/docs/NotificationConfig.md @@ -5,7 +5,6 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **PubsubTopicName** | **string** | PubsubTopicName: A Topic name. For example, `projects/myProject/topics/deviceEvents`. | [optional] -**IsGcpPubSub** | **bool** | Describe whether the topic is Gcp pubsub topic or Omni topic | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/src/OmniCore/Client/Configuration.cs b/src/OmniCore/Client/Configuration.cs index 521e950..e3f51f6 100644 --- a/src/OmniCore/Client/Configuration.cs +++ b/src/OmniCore/Client/Configuration.cs @@ -33,7 +33,7 @@ public class Configuration : IReadableConfiguration /// Version of the package. /// /// Version of the package. - public const string Version = "1.7.3"; + public const string Version = "1.7.4"; /// /// Identifier for ISO 8601 DateTime Format @@ -110,7 +110,7 @@ public class Configuration : IReadableConfiguration public Configuration() { Proxy = null; - UserAgent = WebUtility.UrlEncode("OpenAPI-Generator/1.7.3/csharp"); + UserAgent = WebUtility.UrlEncode("OpenAPI-Generator/1.7.4/csharp"); BasePath = "https://api.korewireless.com/omnicore"; DefaultHeaders = new ConcurrentDictionary(); ApiKey = new ConcurrentDictionary(); @@ -524,7 +524,7 @@ public static string ToDebugReport() report += " OS: " + System.Environment.OSVersion + "\n"; report += " .NET Framework Version: " + System.Environment.Version + "\n"; report += " Version of the API: 1.0\n"; - report += " SDK Package Version: 1.7.3\n"; + report += " SDK Package Version: 1.7.4\n"; return report; } diff --git a/src/OmniCore/Model/DeviceRegistry.cs b/src/OmniCore/Model/DeviceRegistry.cs index f366810..fd31a30 100644 --- a/src/OmniCore/Model/DeviceRegistry.cs +++ b/src/OmniCore/Model/DeviceRegistry.cs @@ -51,12 +51,13 @@ protected DeviceRegistry() { } /// httpConfig. /// mqttConfig. /// logLevel. + /// isNatsRoute. /// eventNotificationConfigs. /// logNotificationConfig. /// stateNotificationConfig. /// customOnboardNotificationConfig. /// customOnboardEnabled. - public DeviceRegistry(string id = default(string), List credentials = default(List), HttpConfig httpConfig = default(HttpConfig), MqttConfig mqttConfig = default(MqttConfig), LogLevel? logLevel = default(LogLevel?), List eventNotificationConfigs = default(List), NotificationConfig logNotificationConfig = default(NotificationConfig), NotificationConfig stateNotificationConfig = default(NotificationConfig), NotificationConfig customOnboardNotificationConfig = default(NotificationConfig), bool customOnboardEnabled = default(bool)) + public DeviceRegistry(string id = default(string), List credentials = default(List), HttpConfig httpConfig = default(HttpConfig), MqttConfig mqttConfig = default(MqttConfig), LogLevel? logLevel = default(LogLevel?), bool isNatsRoute = default(bool), List eventNotificationConfigs = default(List), NotificationConfig logNotificationConfig = default(NotificationConfig), NotificationConfig stateNotificationConfig = default(NotificationConfig), NotificationConfig customOnboardNotificationConfig = default(NotificationConfig), bool customOnboardEnabled = default(bool)) { // to ensure "id" is required (not null) if (id == null) @@ -68,6 +69,7 @@ protected DeviceRegistry() { } this.HttpConfig = httpConfig; this.MqttConfig = mqttConfig; this.LogLevel = logLevel; + this.IsNatsRoute = isNatsRoute; this.EventNotificationConfigs = eventNotificationConfigs; this.LogNotificationConfig = logNotificationConfig; this.StateNotificationConfig = stateNotificationConfig; @@ -155,6 +157,12 @@ public bool ShouldSerializeUpdatedOn() [DataMember(Name = "mqttConfig", EmitDefaultValue = false)] public MqttConfig MqttConfig { get; set; } + /// + /// Gets or Sets IsNatsRoute + /// + [DataMember(Name = "isNatsRoute", EmitDefaultValue = true)] + public bool IsNatsRoute { get; set; } + /// /// Gets or Sets EventNotificationConfigs /// @@ -230,6 +238,7 @@ public override string ToString() sb.Append(" HttpConfig: ").Append(HttpConfig).Append("\n"); sb.Append(" MqttConfig: ").Append(MqttConfig).Append("\n"); sb.Append(" LogLevel: ").Append(LogLevel).Append("\n"); + sb.Append(" IsNatsRoute: ").Append(IsNatsRoute).Append("\n"); sb.Append(" EventNotificationConfigs: ").Append(EventNotificationConfigs).Append("\n"); sb.Append(" LogNotificationConfig: ").Append(LogNotificationConfig).Append("\n"); sb.Append(" StateNotificationConfig: ").Append(StateNotificationConfig).Append("\n"); @@ -317,6 +326,10 @@ public bool Equals(DeviceRegistry input) this.LogLevel == input.LogLevel || this.LogLevel.Equals(input.LogLevel) ) && + ( + this.IsNatsRoute == input.IsNatsRoute || + this.IsNatsRoute.Equals(input.IsNatsRoute) + ) && ( this.EventNotificationConfigs == input.EventNotificationConfigs || this.EventNotificationConfigs != null && @@ -394,6 +407,7 @@ public override int GetHashCode() hashCode = (hashCode * 59) + this.MqttConfig.GetHashCode(); } hashCode = (hashCode * 59) + this.LogLevel.GetHashCode(); + hashCode = (hashCode * 59) + this.IsNatsRoute.GetHashCode(); if (this.EventNotificationConfigs != null) { hashCode = (hashCode * 59) + this.EventNotificationConfigs.GetHashCode(); diff --git a/src/OmniCore/Model/EventNotificationConfig.cs b/src/OmniCore/Model/EventNotificationConfig.cs index 335ae79..e75da3d 100644 --- a/src/OmniCore/Model/EventNotificationConfig.cs +++ b/src/OmniCore/Model/EventNotificationConfig.cs @@ -36,12 +36,10 @@ public partial class EventNotificationConfig : IEquatable class. /// /// PubsubTopicName: A Topic name. For example, `projects/myProject/topics/deviceEvents`.. - /// Describe whether the topic is Gcp pubsub topic or Omni topic. /// SubfolderMatches: If the subfolder name matches this string exactly, this configuration will be used. The string must not include the leading '/' character. If empty, all strings are matched. This field is used only for telemetry events; subfolders are not supported for state changes.. - public EventNotificationConfig(string pubsubTopicName = default(string), bool isGcpPubSub = default(bool), string subfolderMatches = default(string)) + public EventNotificationConfig(string pubsubTopicName = default(string), string subfolderMatches = default(string)) { this.PubsubTopicName = pubsubTopicName; - this.IsGcpPubSub = isGcpPubSub; this.SubfolderMatches = subfolderMatches; } @@ -52,13 +50,6 @@ public partial class EventNotificationConfig : IEquatable - /// Describe whether the topic is Gcp pubsub topic or Omni topic - /// - /// Describe whether the topic is Gcp pubsub topic or Omni topic - [DataMember(Name = "isGcpPubSub", EmitDefaultValue = true)] - public bool IsGcpPubSub { get; set; } - /// /// SubfolderMatches: If the subfolder name matches this string exactly, this configuration will be used. The string must not include the leading '/' character. If empty, all strings are matched. This field is used only for telemetry events; subfolders are not supported for state changes. /// @@ -75,7 +66,6 @@ public override string ToString() StringBuilder sb = new StringBuilder(); sb.Append("class EventNotificationConfig {\n"); sb.Append(" PubsubTopicName: ").Append(PubsubTopicName).Append("\n"); - sb.Append(" IsGcpPubSub: ").Append(IsGcpPubSub).Append("\n"); sb.Append(" SubfolderMatches: ").Append(SubfolderMatches).Append("\n"); sb.Append("}\n"); return sb.ToString(); @@ -117,10 +107,6 @@ public bool Equals(EventNotificationConfig input) (this.PubsubTopicName != null && this.PubsubTopicName.Equals(input.PubsubTopicName)) ) && - ( - this.IsGcpPubSub == input.IsGcpPubSub || - this.IsGcpPubSub.Equals(input.IsGcpPubSub) - ) && ( this.SubfolderMatches == input.SubfolderMatches || (this.SubfolderMatches != null && @@ -141,7 +127,6 @@ public override int GetHashCode() { hashCode = (hashCode * 59) + this.PubsubTopicName.GetHashCode(); } - hashCode = (hashCode * 59) + this.IsGcpPubSub.GetHashCode(); if (this.SubfolderMatches != null) { hashCode = (hashCode * 59) + this.SubfolderMatches.GetHashCode(); diff --git a/src/OmniCore/Model/NotificationConfig.cs b/src/OmniCore/Model/NotificationConfig.cs index 1992e63..932365b 100644 --- a/src/OmniCore/Model/NotificationConfig.cs +++ b/src/OmniCore/Model/NotificationConfig.cs @@ -36,11 +36,9 @@ public partial class NotificationConfig : IEquatable, IValid /// Initializes a new instance of the class. /// /// PubsubTopicName: A Topic name. For example, `projects/myProject/topics/deviceEvents`.. - /// Describe whether the topic is Gcp pubsub topic or Omni topic. - public NotificationConfig(string pubsubTopicName = default(string), bool isGcpPubSub = default(bool)) + public NotificationConfig(string pubsubTopicName = default(string)) { this.PubsubTopicName = pubsubTopicName; - this.IsGcpPubSub = isGcpPubSub; } /// @@ -50,13 +48,6 @@ public partial class NotificationConfig : IEquatable, IValid [DataMember(Name = "pubsubTopicName", EmitDefaultValue = false)] public string PubsubTopicName { get; set; } - /// - /// Describe whether the topic is Gcp pubsub topic or Omni topic - /// - /// Describe whether the topic is Gcp pubsub topic or Omni topic - [DataMember(Name = "isGcpPubSub", EmitDefaultValue = true)] - public bool IsGcpPubSub { get; set; } - /// /// Returns the string presentation of the object /// @@ -66,7 +57,6 @@ public override string ToString() StringBuilder sb = new StringBuilder(); sb.Append("class NotificationConfig {\n"); sb.Append(" PubsubTopicName: ").Append(PubsubTopicName).Append("\n"); - sb.Append(" IsGcpPubSub: ").Append(IsGcpPubSub).Append("\n"); sb.Append("}\n"); return sb.ToString(); } @@ -106,10 +96,6 @@ public bool Equals(NotificationConfig input) this.PubsubTopicName == input.PubsubTopicName || (this.PubsubTopicName != null && this.PubsubTopicName.Equals(input.PubsubTopicName)) - ) && - ( - this.IsGcpPubSub == input.IsGcpPubSub || - this.IsGcpPubSub.Equals(input.IsGcpPubSub) ); } @@ -126,7 +112,6 @@ public override int GetHashCode() { hashCode = (hashCode * 59) + this.PubsubTopicName.GetHashCode(); } - hashCode = (hashCode * 59) + this.IsGcpPubSub.GetHashCode(); return hashCode; } } diff --git a/src/OmniCore/OmniCore.csproj b/src/OmniCore/OmniCore.csproj index 136969f..217c19c 100644 --- a/src/OmniCore/OmniCore.csproj +++ b/src/OmniCore/OmniCore.csproj @@ -12,7 +12,7 @@ A library generated from a OpenAPI doc No Copyright OmniCore - 1.7.3 + 1.7.4 bin\$(Configuration)\$(TargetFramework)\OmniCore.xml https://github.com/korewireless/OmniCore-CSharp-SDK.git git