From ea595335dcb4aac98a5665ae21c76065a2780281 Mon Sep 17 00:00:00 2001 From: Noureddine Date: Wed, 22 Oct 2025 15:03:20 +0000 Subject: [PATCH 1/3] Add stagnant limit --- schema/model_pointset_point.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/schema/model_pointset_point.json b/schema/model_pointset_point.json index 5d1def63d5..1f68587eca 100644 --- a/schema/model_pointset_point.json +++ b/schema/model_pointset_point.json @@ -47,6 +47,11 @@ "type": "number", "examples": [100] }, + "stagnant_limit_seconds": { + "description": "Represents the limit in seconds that a point can be stagnant/unchanged for", + "type": "integer", + "examples": [3600] + }, "cov_increment": { "description": "Triggering threshold for partial cov update publishing", "examples": [1], From 696cb2def248ddd7e4c43fbe95e33d89a3c2d9b3 Mon Sep 17 00:00:00 2001 From: Noureddine Date: Thu, 30 Oct 2025 15:53:34 +0000 Subject: [PATCH 2/3] add policies and state threshold --- .gencode_hash.txt | 43 +++--- gencode/docs/events.html | 59 +++++++++ gencode/docs/events_discovery.html | 52 ++++++++ gencode/docs/metadata.html | 125 ++++++++++++++++++ gencode/docs/model_policies.html | 105 +++++++++++++++ gencode/docs/readme.md | 1 + .../udmi/schema/BridgePodConfiguration.java | 4 +- .../udmi/schema/BuildingConfigEntity.java | 4 +- .../java/udmi/schema/BuildingTranslation.java | 4 +- gencode/java/udmi/schema/DiscoveryConfig.java | 4 +- .../udmi/schema/EndpointConfiguration.java | 18 +-- gencode/java/udmi/schema/Events.java | 4 +- .../java/udmi/schema/FamilyLocalnetModel.java | 6 +- gencode/java/udmi/schema/GatewayModel.java | 4 +- .../java/udmi/schema/PointPointsetModel.java | 11 +- gencode/java/udmi/schema/PoliciesModel.java | 50 +++++++ gencode/java/udmi/schema/RefDiscovery.java | 12 +- gencode/java/udmi/schema/SiteLinks.java | 6 +- gencode/java/udmi/schema/SiteLocation.java | 4 +- .../dist/udmi_schema-0.1.0-py3-none-any.whl | Bin 47017 -> 47415 bytes gencode/python/dist/udmi_schema-0.1.0.tar.gz | Bin 12561 -> 12618 bytes gencode/python/udmi/schema/__init__.py | 1 + .../udmi/schema/model_pointset_point.py | 1 + gencode/python/udmi/schema/model_policies.py | 18 +++ schema/model_pointset_point.json | 2 +- schema/model_policies.json | 19 +++ 26 files changed, 500 insertions(+), 57 deletions(-) create mode 100644 gencode/docs/model_policies.html create mode 100644 gencode/java/udmi/schema/PoliciesModel.java create mode 100644 gencode/python/udmi/schema/model_policies.py create mode 100644 schema/model_policies.json diff --git a/.gencode_hash.txt b/.gencode_hash.txt index f3d0e96950..33d14e3342 100644 --- a/.gencode_hash.txt +++ b/.gencode_hash.txt @@ -7,19 +7,20 @@ c21266e8de23b6e8acfac16a177db782375bf71df470c343c3f8eb8b822ef56a gencode/docs/c 11b21f73b6a4065102968a4c09979639b8a7ea6efb20e40d52cd21b2a60167bb gencode/docs/configuration_pod.html b34c136cee32cb88f32a427ff400c3898ed49168f6dcaca1bc9ba65365bc5ae4 gencode/docs/configuration_pubber.html 1057fa40fb7a31a23bb2773d21c38cf4590a935bd8b5ea4218e695c6204f5dd9 gencode/docs/data_template.html -f9fc60fd9a17e7e0961e83d86d762edbf53c9e4867c723798a7e8d5074411407 gencode/docs/events.html -01064f050b446f4cf23c6f6c1c86b6ce29acfa4cc4f56c8830df096c93d04ff8 gencode/docs/events_discovery.html +398b0652a7533c4a96f2e2b48cd985b9638793c5d84b10d4297226cacac2ea11 gencode/docs/events.html +2642dd5d52dddf6994084f18e3e52aca56b8906ff6dd9e1e2244f223f1d0772d gencode/docs/events_discovery.html e550539d52ce1f63b35247d425c038e5d5ba33f997eedd09e486a3bd9838c2c2 gencode/docs/events_mapping.html 66e19faae60f9502749391889dbe24bd709963e658b61d989c7ba780672fa447 gencode/docs/events_pointset.html cac253f57c5c92ef32e2a5f91b6cec8229e8db1dcffcc96a58f06da068e741e7 gencode/docs/events_system.html 151c1b62db35e84e51d5ff2a7464f61ced4d7fb0c7eb795715c245ee0a1b3436 gencode/docs/events_udmi.html 73dbe799e7943ec20ac58b544998e986a39539d4ef0cb4f5023e92e7634d3124 gencode/docs/events_validation.html -8713e90241e3e5aa8840f361202980fefaf886f3ec18f49537e1b2695d0ec5a6 gencode/docs/metadata.html +5199f1513f33d7deeb3b4e52e6a5f2445f6c49146908ea5f59e2d6f0d091d047 gencode/docs/metadata.html +2c0080326d5e614bd505840fde1a567d2a6b3d5ff830ac675b36d49b8d1bcac3 gencode/docs/model_policies.html c86682715d348bd3dd971fa5bd925a8a3d0f3c2944c65a47c4b64fe1a5ccdea2 gencode/docs/monitoring.html 474ca16edc9f3cad2bb3ab40b6993cbced90263f762f66ee6cd246a6c4a0d18f gencode/docs/persistent_device.html e11595fd11477947a27461f8ef4fb6facb5f60e2abd6212193f7581ab123ff84 gencode/docs/properties.html c006d0f46c8f007caa90ac76c713cead907669c14c09f4a288fac5b25afe05dd gencode/docs/query_cloud.html -9bd8f0df472e9bb98dd547afd0e9561bc96b423eebd5cafde14b374ab408a3c0 gencode/docs/readme.md +6d08e42fe6133ade93cbad47455668ba7420ae59cb51e41c66acaede33685d4b gencode/docs/readme.md 2768fd01a875d1f58273e76fef9b421986824d2ab02251853840bca777b625c0 gencode/docs/schema_doc.css 165a29291d7d66653e46fd1ac5868f63e18f9d67c06ea9ebcb95d4830a528e68 gencode/docs/schema_doc.min.js 7ed934930aee763e0beebc349725ba3909115e8d346bb762f28bcbe745bb163a gencode/docs/schema_extras.js @@ -36,10 +37,10 @@ fa94295bc0c97518634c7232e7e55e1c923d7eb42bfa3004651ed183e1ccbb40 gencode/java/u 14055abcc28b9dccc8807ff0e3de201a3fa94cd57b879c22bd7f4fab40d109d9 gencode/java/udmi/schema/BlobBlobsetState.java 1fe0e6cd4b82a54a0d696f0dd43998c3b08cf7d8b78f63b53fcd9c06d49f589c gencode/java/udmi/schema/BlobsetConfig.java 8c8e8941e34da08cddb0401ec296828d8b7aac1810dbfab6ae9ba5d7019c0dd0 gencode/java/udmi/schema/BlobsetState.java -1110d57d04d4e5da14f6b02d40053cc9b9dabf8e24e44b7441a4a7c66cb546ac gencode/java/udmi/schema/BridgePodConfiguration.java +31cc92287358c87acfbc41d24c71f000b23a3e96b0f18fed9331f1c349efab91 gencode/java/udmi/schema/BridgePodConfiguration.java 2e7c0912c6f43b8dae9e9149b7361d3640bde4f01de6e13d8e487fe01be2c2c0 gencode/java/udmi/schema/Bucket.java -8773da8131fdc0f9409df0c04132abdaa01f658d0ec0e73dd8aa714b24454bdc gencode/java/udmi/schema/BuildingConfigEntity.java -519ead2ee2fe3e6fe48547266dec9a545521d52d262646f261ebfbbf8500d25f gencode/java/udmi/schema/BuildingTranslation.java +534627b0799ca9089332b949c89fdd614f3b8a679b08e3f697d10801ff89c4dc gencode/java/udmi/schema/BuildingConfigEntity.java +79b678b524b3edce833fe56691dcd8c47b53a12f7491e761121408e6e7ceb5e3 gencode/java/udmi/schema/BuildingTranslation.java 27ca4f61bd43beca0871b465f3906785a1030a4526605f1fa9b10e3adda8df05 gencode/java/udmi/schema/CapabilityValidationState.java 224c6be2cb6d90a47d181fa30ba1418cf6cc5385ec1c010fe112728382a70216 gencode/java/udmi/schema/Category.java 0101d742dbaa23fb2152b044e5eabd6d219047cddbb973e9626a026946b7ddfc gencode/java/udmi/schema/CloudModel.java @@ -56,29 +57,29 @@ fd289a9a132a880bf0a14b80ed082ab1dcd77caab54175f8d6ccfc381d2d21ab gencode/java/u 6869d00b063748e9995ba6940f6a323916074a7af28ab1d227772b86a39600bb gencode/java/udmi/schema/DeviceValidationEvents.java ec863d0b69880bd2c3030abcdce1d2b8992a475908ead979cc30722b25c1ead2 gencode/java/udmi/schema/Dimension.java 09c9d674ffdde05f00878924a00ef81dc18d1135d5969e8ab9a8db80038198b7 gencode/java/udmi/schema/DiscoveryCommand.java -ff98f706c967bbef7be35d826f5abad822c89d2fa981c4d8e6cffbb106d3740c gencode/java/udmi/schema/DiscoveryConfig.java +8b9832181020921d31c9991086dca86dc8bd0ab1bf3c1adbce8b436d1f8ae8e6 gencode/java/udmi/schema/DiscoveryConfig.java 752faf5921575c895cf984e136effd0dc4837f095c66c26dd0c54fcd31b4a486 gencode/java/udmi/schema/DiscoveryEvents.java 1a04079116f4032b17108e873719bbb2c60c19f392136e7c906122199b472227 gencode/java/udmi/schema/DiscoveryModel.java b41f59d0c1aa74bb9abbdc7525d726f45a4ba8df3866c2dd40458601ffab60fb gencode/java/udmi/schema/DiscoveryState.java 7019b8a1522261a69d708e2e7725b8bc44510c5c80f5c056543af2b7728bfa42 gencode/java/udmi/schema/Electricity.java -a9ab0b95408ee04fc98cbc2363bead24c67e64e279e6088e0dd3e4b97154c65d gencode/java/udmi/schema/EndpointConfiguration.java +695ba089a30cbcb6b101147031e0546cef728322bad349392462cb57688d473a gencode/java/udmi/schema/EndpointConfiguration.java d2e7afd6e1a9250480144c114ee8877afb9b0dd7048495fe96a821d9e6c80475 gencode/java/udmi/schema/Entry.java d4bfd2c997937cd1b0f9b1c73ed46b0133b2b264d367ca9001b7d84ecd598611 gencode/java/udmi/schema/Enumerations.java 11ccad9b1ed4a4745e7bf321adc4bb7f684e9bfa90877314094533b9749512b7 gencode/java/udmi/schema/Envelope.java -b8542a0908719901405220783e85be33197cf16ef5be6458cec5ae92c274e88f gencode/java/udmi/schema/Events.java +4163478ed17191461b0a65abd11c4ddf912cbc104f040a734efd290306fab7b7 gencode/java/udmi/schema/Events.java 80f49ae6ee6a870a92267a9d8510d8b7faef456cd516a5148e9ed491fd8e0857 gencode/java/udmi/schema/ExecutionConfiguration.java bd8350cd05a4091851cf0361cb3a8eb98701ba30df21ff14414e2dabf1289b7f gencode/java/udmi/schema/FamilyDiscovery.java a5e06026eaff51d62d42b447d458d83a310772865f8f3ebd66ac2855e7f381a4 gencode/java/udmi/schema/FamilyDiscoveryConfig.java 56a08262985bff885a11ff686e8f2fcb8d2f6ed258c03aada576693740fc3f61 gencode/java/udmi/schema/FamilyDiscoveryModel.java c242fa94f3cbbfc801c96fa1e9409c8ec84db2a5d0b3a861acff0fc85d7976c7 gencode/java/udmi/schema/FamilyDiscoveryState.java 2145077e0e2f43d6a4d9c54a3b92b952ee47bbf86866f6052807a70987cefc28 gencode/java/udmi/schema/FamilyLocalnetConfig.java -e46f9d833d13b4aaa0ba56cafdf52d888307d11801d638898677147011e816b9 gencode/java/udmi/schema/FamilyLocalnetModel.java +3820172aee203da9b60fcfc426819c02e8f7c65ecd9829314b25a87640871475 gencode/java/udmi/schema/FamilyLocalnetModel.java 54a115b97388b0d8e46a05db5677e4391e5ccb148c0f2348883151928c885845 gencode/java/udmi/schema/FamilyLocalnetState.java b39e12241d1bdabe0db583dc01a7a6b87efb5b57957dae5a3571cfec077b397c gencode/java/udmi/schema/FeatureDiscovery.java 7206888cd092db347e7e92168987798eb0a3f290f2ed307427d971f15b18c49a gencode/java/udmi/schema/FeatureValidationState.java e256275d840d94c6e61316e756b0dad6d823db8900e35e785f6ef5001fdb5fc9 gencode/java/udmi/schema/Gas.java b63fed8a190948ee3924946c1ad3bc9cf06fdeafc7cea0886bfe52e390448ddf gencode/java/udmi/schema/GatewayConfig.java -0e842669c4ca03cc2b938b6d2b4eea50bf54e13937130d1ab1fa7bc70883e728 gencode/java/udmi/schema/GatewayModel.java +0d2e02095e119ecdf4b35fb827f560c89f4f9e9ae8bdcf8648cb07432ff234c8 gencode/java/udmi/schema/GatewayModel.java 1f7f6809e143e9e3e13e6fa73776a893b62b0c05f8802087b1e276dc0ab83e19 gencode/java/udmi/schema/GatewayState.java 175bdf9cc0b376b7f6c6b21174cb0ec568c49a1026e99bbdbc264b3cea7e7702 gencode/java/udmi/schema/IotAccess.java d0858bd7ba306176f4e3c19eeb69ef2467afec0832b6917b72d3ab87469e4974 gencode/java/udmi/schema/Jwt.java @@ -106,25 +107,26 @@ d48a48484965295327ef553a4f8552c44b9345224d7dbb847877c68c1e1b307e gencode/java/u 34704328b6074f96dbf6ce2f926c2e5bafcde5f1412ea50da74e9fa294de32ea gencode/java/udmi/schema/PodConfiguration.java 4825f705cea374dd24668a7711931fef2ca53d0d19d7696c1c16eb610f00ab1b gencode/java/udmi/schema/PointPointsetConfig.java 4f5e88735f2f66f3b92fe19a3a7724eaad5b575d74b75573f437f3236d3175f3 gencode/java/udmi/schema/PointPointsetEvents.java -4b4a70f116a8c60ce5670345c5b2a755b1bbda2f38242dd06a24142d999e7824 gencode/java/udmi/schema/PointPointsetModel.java +7bda6f3f0856d62e9a14ecb03a0a6543f629ec66e9bef0c3425f88fed1d7b03d gencode/java/udmi/schema/PointPointsetModel.java 88ea66c1a8a1db71ee805a8facabafa0954690d0afd8a559758e50ec9624ed94 gencode/java/udmi/schema/PointPointsetState.java a9250e3208649032e954be0ce63e55ed7b50575a07a821a6ac725c7f10c8cb4b gencode/java/udmi/schema/PointsetConfig.java f4735049f0c27c3f0669d8cf2d6dda6e25dc7d20cef598d5677e3a72943ff019 gencode/java/udmi/schema/PointsetEvents.java 235e6fbd00880e36328fba8f099f788c85dcaaa94cf49ca53fa9b11429a8dc1a gencode/java/udmi/schema/PointsetModel.java c73ad6dde0db8a520f3fee5a563c55a79fc7e6d1cd7875723b10c3d34036a46b gencode/java/udmi/schema/PointsetState.java 34bd8b883ee2a29fc53960142e82fab5a6edd6d8e89e327f242a0b745579edb7 gencode/java/udmi/schema/PointsetSummary.java +587bd58d570b292c43963690fd0ebbf24a6d4b80495e3e0c1c91a867780c50a4 gencode/java/udmi/schema/PoliciesModel.java 9637f95e8a1185b1b028308a8caa2ca5a78cb46ae97f9cc11e2731066129540e gencode/java/udmi/schema/Position.java d87deaba67bb3272c528e3491d378bde059b626964a4a2aed15f5643305c2463 gencode/java/udmi/schema/Properties.java 4cdd5dc6b2e054a43f2e70adeb46ef8e3ff78288d4315923a925415f87e871aa gencode/java/udmi/schema/PubberConfiguration.java 86b4de51f2ba6e9afe34a5a9069e34cf5aa14b7e08d7ac2ed688bad42a769205 gencode/java/udmi/schema/PubberOptions.java -cd2c7580a75391393c2f761f4434e4e7e83e2d2d1f35e9e62d69c19e65ea2557 gencode/java/udmi/schema/RefDiscovery.java +9b208315dae017c35f2c31234348413dd8f569fd3d9922ea46259959662cc7fc gencode/java/udmi/schema/RefDiscovery.java 14faa115d13ee46d10935b13753bff85758f3b64b5136a59f60d36b5b541687c gencode/java/udmi/schema/SchemaValidationState.java fadf083200e73d46cfdec2f710d40e3d2bc4dbf05196e4d0900186e72b62d95e gencode/java/udmi/schema/Scoring.java ad70168de2e1801e26f2c1a8c33a6169e236682de59fd3f6038a77ac264aca14 gencode/java/udmi/schema/SequenceValidationState.java 72e3a07ce890c73fccd3d0cf757d073746b60b722c94edd5425dc066951a048f gencode/java/udmi/schema/SetupUdmiConfig.java e5ce202bcf889287faa7d2d262d2f53f2241a10c659a83687de478803bdab127 gencode/java/udmi/schema/SetupUdmiState.java -7774221174299a7f137576a591d4ae76aaaec5a1950804e73403acf0157b31b5 gencode/java/udmi/schema/SiteLinks.java -956c8af0bb83a33d05bcbcd211d161f9a76723c270372cd443838e31f97c09e3 gencode/java/udmi/schema/SiteLocation.java +2f802c738dd4c19211af8b6dec71b7659c51177c2774cfd34fc07e617bbe5b3e gencode/java/udmi/schema/SiteLinks.java +a3dc7f14d4270ea370db2015785ad12d4bd61825213ab7ac4ee03dda21dde4f2 gencode/java/udmi/schema/SiteLocation.java 5e2f813e0d0a0986b4f1a0613732344bd8c0fd53acfe6afe3d7bdfedda13fa34 gencode/java/udmi/schema/SiteMetadata.java dc2fd582fffefbdeaf3bf7724ca34e94475c3cc820891ea4cc829847eb9ba79d gencode/java/udmi/schema/State.java a371232810e8a2ffb380384ca717da1ee5cc0b2e1129df9b5d8faa07ab4b1f46 gencode/java/udmi/schema/StateSystemHardware.java @@ -148,10 +150,10 @@ eadc72e31b4796273479967303513b16563af0f946d1e1c7eba1748f9b133d40 gencode/java/u 5596535c39826e904949eed7894c3ecd1ee982d974beb7469f888965af2c7845 gencode/java/udmi/schema/VirtualEquipmentLinks.java 11f8dab5296d41e86cd623a4ed27b972ae673b141907cb913397d4eb53880c59 gencode/java/udmi/schema/Water.java d2a53a067185447ce672e5521cdb073a2b2100b9384b68e87211cafc5ef8cb2a gencode/presentation/presentation.json -b8f3e06b7e7c7c4fb7ac37adb2674ab661ebbc63574ab0e1794645c653aef0fa gencode/python/dist/udmi_schema-0.1.0-py3-none-any.whl -736a565b4d86ae48baa965721eb81fceda168a048030b885ad68eaf74640fd9d gencode/python/dist/udmi_schema-0.1.0.tar.gz +87fb99fe3f9345d19d8a6cbdf77fceea1264ecd4256aa9ebaeac239af0018316 gencode/python/dist/udmi_schema-0.1.0-py3-none-any.whl +d3774d3daaae88ad278fd3be8f255fe16026f87253b0d020483e08e5a2bb8b2c gencode/python/dist/udmi_schema-0.1.0.tar.gz 4cf98cbd132cde0cc8813ac35cf3712cb46014154c817c04ad2902c268cdd8fe gencode/python/pyproject.toml -25c06f5e266f18797041492d5c17ae386abec5106da7d129e2b54e8de32e3980 gencode/python/udmi/schema/__init__.py +cd645687ba5c00b42f5323e185e23b586145aa0886dbbc053c2874f3f087bd41 gencode/python/udmi/schema/__init__.py 478b09b7e26c07441e86e1778f7e5ce8f8fa1b3fce88b8089064347d1e2fc67b gencode/python/udmi/schema/_base.py 0e18050ec17fde8162f75a76d9dc623d3f6ddca4396441bd603189827ed21a80 gencode/python/udmi/schema/access_iot.py 32a951e2bf13f556082f8d94be079b3df6cc081b6ff59f71a82d32782cf8f8f6 gencode/python/udmi/schema/ancillary_properties.py @@ -213,7 +215,8 @@ c799ce667100201d81f02f0a5d22a4d0ef7db01035e7f08219a76a04c4507a15 gencode/python 9b1a39ef5d3b2ca52036ff6d2c351d689ce73c1867489651788605976b9ee798 gencode/python/udmi/schema/model_localnet.py 977c2a40651b65aa68d8051fd09c796adb723575356c0791adc87e4331cdbebd gencode/python/udmi/schema/model_localnet_family.py 7a252256cce946af6750c644e91b0f09363c8e28b03dbb41c8ae3e5d0758d615 gencode/python/udmi/schema/model_pointset.py -7271212f7afa718dbcb81ff01af488c64cc4bfbd756f4e54efa8c4a5359ea47b gencode/python/udmi/schema/model_pointset_point.py +b85fea54e6aa14bb7b8c4e0ff817b9518e0123ccaa67124eed2360452382ed77 gencode/python/udmi/schema/model_pointset_point.py +250acb5924dfbb5b8887938e2ee88eb2f1a026b909973601bc3326a77530a473 gencode/python/udmi/schema/model_policies.py 241c702f6a877f41c0ebd997c7e431ba8e6d6c0d1b21bc95a9fc57592ff094a7 gencode/python/udmi/schema/model_system.py 1db2fca012d3da953438b78acd2a5c15d94e46df8b77c459876e20ef2598dfbd gencode/python/udmi/schema/model_system_hardware.py 954806649d0e7364c482f84f75e19b01ce926990d64a79e76400f32043ddda66 gencode/python/udmi/schema/model_testing.py diff --git a/gencode/docs/events.html b/gencode/docs/events.html index aa764f7739..930708327c 100644 --- a/gencode/docs/events.html +++ b/gencode/docs/events.html @@ -10520,6 +10520,65 @@

+
+
+
+

+ +

+
+ +
+
+ + Type: integer
+

Represents the limit in seconds that a point can be stagnant/unchanged for

+
+ + + + + +
+
Example:
+
3600
+
+
+
+
+
+
diff --git a/gencode/docs/events_discovery.html b/gencode/docs/events_discovery.html index c4cb4f3c2d..105a711e97 100644 --- a/gencode/docs/events_discovery.html +++ b/gencode/docs/events_discovery.html @@ -6168,6 +6168,58 @@

+
+
+
+

+ +

+
+ +
+
+ + Type: integer
+

Represents the limit in seconds that a point can be stagnant/unchanged for

+
+ + + + + +
+
Example:
+
3600
+
+
+
+
+
+
diff --git a/gencode/docs/metadata.html b/gencode/docs/metadata.html index 23306200d0..5ff8b6c9d6 100644 --- a/gencode/docs/metadata.html +++ b/gencode/docs/metadata.html @@ -6425,6 +6425,65 @@

+
+
+
+

+ +

+
+ +
+
+ + Type: integer
+

Represents the limit in seconds that a point can be stagnant/unchanged for

+
+ + + + + +
+
Example:
+
3600
+
+
+
+
+
+
@@ -19972,6 +20031,72 @@

+
+
+
+

+ +

+
+ +
+
+ + Type: integer
+

Represents the limit in seconds that a point can be stagnant/unchanged for

+
+ + + + + +
+
Example:
+
3600
+
+
+
+
+
+
diff --git a/gencode/docs/model_policies.html b/gencode/docs/model_policies.html new file mode 100644 index 0000000000..ae959fa635 --- /dev/null +++ b/gencode/docs/model_policies.html @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + Policies Model + +
+ + +
+ +

Policies Model

Type: object
+

Device policies

+
No Additional Properties + + + + + + +
+
+
+

+ +

+
+ +
+
+ + Type: array of string
+

An array of policies which are applicable to the device

+
+ + + + + + No Additional Items

Each item of this array must be:

+
+
+ + + Type: string
+Must match regular expression: ^[a-z_0-9]*$ + + + + + + +
+

+
Example:
+
[
+    "ip",
+    "mqtt"
+]
+
+
+
+
+
+
+ + + \ No newline at end of file diff --git a/gencode/docs/readme.md b/gencode/docs/readme.md index 463c8affb6..461d32c894 100644 --- a/gencode/docs/readme.md +++ b/gencode/docs/readme.md @@ -31,6 +31,7 @@ * [**events**](events.html) - Container object for all event schemas, not directly used. * [**events_mapping**](events_mapping.html) - [Mapping result](../../docs/specs/mapping.md) with implicit enumeration * [**events_validation**](events_validation.html) - Validation device result +* [**model_policies**](model_policies.html) - Device policies * [**monitoring**](monitoring.html) - Output from UDMIS monitoring * [**persistent_device**](persistent_device.html) - Device persistent data * [**properties**](properties.html) diff --git a/gencode/java/udmi/schema/BridgePodConfiguration.java b/gencode/java/udmi/schema/BridgePodConfiguration.java index 09122ccf95..1d46d69146 100644 --- a/gencode/java/udmi/schema/BridgePodConfiguration.java +++ b/gencode/java/udmi/schema/BridgePodConfiguration.java @@ -45,9 +45,9 @@ public class BridgePodConfiguration { @Override public int hashCode() { int result = 1; + result = ((result* 31)+((this.from == null)? 0 :this.from.hashCode())); result = ((result* 31)+((this.morf == null)? 0 :this.morf.hashCode())); result = ((result* 31)+((this.enabled == null)? 0 :this.enabled.hashCode())); - result = ((result* 31)+((this.from == null)? 0 :this.from.hashCode())); return result; } @@ -60,7 +60,7 @@ public boolean equals(Object other) { return false; } BridgePodConfiguration rhs = ((BridgePodConfiguration) other); - return ((((this.morf == rhs.morf)||((this.morf!= null)&&this.morf.equals(rhs.morf)))&&((this.enabled == rhs.enabled)||((this.enabled!= null)&&this.enabled.equals(rhs.enabled))))&&((this.from == rhs.from)||((this.from!= null)&&this.from.equals(rhs.from)))); + return ((((this.from == rhs.from)||((this.from!= null)&&this.from.equals(rhs.from)))&&((this.morf == rhs.morf)||((this.morf!= null)&&this.morf.equals(rhs.morf))))&&((this.enabled == rhs.enabled)||((this.enabled!= null)&&this.enabled.equals(rhs.enabled)))); } } diff --git a/gencode/java/udmi/schema/BuildingConfigEntity.java b/gencode/java/udmi/schema/BuildingConfigEntity.java index 3186c44beb..212e30a3f7 100644 --- a/gencode/java/udmi/schema/BuildingConfigEntity.java +++ b/gencode/java/udmi/schema/BuildingConfigEntity.java @@ -30,9 +30,9 @@ public class BuildingConfigEntity { @Override public int hashCode() { int result = 1; - result = ((result* 31)+((this.type == null)? 0 :this.type.hashCode())); result = ((result* 31)+((this.etag == null)? 0 :this.etag.hashCode())); result = ((result* 31)+((this.code == null)? 0 :this.code.hashCode())); + result = ((result* 31)+((this.type == null)? 0 :this.type.hashCode())); return result; } @@ -45,7 +45,7 @@ public boolean equals(Object other) { return false; } BuildingConfigEntity rhs = ((BuildingConfigEntity) other); - return ((((this.type == rhs.type)||((this.type!= null)&&this.type.equals(rhs.type)))&&((this.etag == rhs.etag)||((this.etag!= null)&&this.etag.equals(rhs.etag))))&&((this.code == rhs.code)||((this.code!= null)&&this.code.equals(rhs.code)))); + return ((((this.etag == rhs.etag)||((this.etag!= null)&&this.etag.equals(rhs.etag)))&&((this.code == rhs.code)||((this.code!= null)&&this.code.equals(rhs.code))))&&((this.type == rhs.type)||((this.type!= null)&&this.type.equals(rhs.type)))); } } diff --git a/gencode/java/udmi/schema/BuildingTranslation.java b/gencode/java/udmi/schema/BuildingTranslation.java index 871aa773f8..3eb59f86c4 100644 --- a/gencode/java/udmi/schema/BuildingTranslation.java +++ b/gencode/java/udmi/schema/BuildingTranslation.java @@ -36,8 +36,8 @@ public class BuildingTranslation { @Override public int hashCode() { int result = 1; - result = ((result* 31)+((this.present_value == null)? 0 :this.present_value.hashCode())); result = ((result* 31)+((this.units == null)? 0 :this.units.hashCode())); + result = ((result* 31)+((this.present_value == null)? 0 :this.present_value.hashCode())); result = ((result* 31)+((this.states == null)? 0 :this.states.hashCode())); return result; } @@ -51,7 +51,7 @@ public boolean equals(Object other) { return false; } BuildingTranslation rhs = ((BuildingTranslation) other); - return ((((this.present_value == rhs.present_value)||((this.present_value!= null)&&this.present_value.equals(rhs.present_value)))&&((this.units == rhs.units)||((this.units!= null)&&this.units.equals(rhs.units))))&&((this.states == rhs.states)||((this.states!= null)&&this.states.equals(rhs.states)))); + return ((((this.units == rhs.units)||((this.units!= null)&&this.units.equals(rhs.units)))&&((this.present_value == rhs.present_value)||((this.present_value!= null)&&this.present_value.equals(rhs.present_value))))&&((this.states == rhs.states)||((this.states!= null)&&this.states.equals(rhs.states)))); } } diff --git a/gencode/java/udmi/schema/DiscoveryConfig.java b/gencode/java/udmi/schema/DiscoveryConfig.java index 91ed927a43..a9bdca6bca 100644 --- a/gencode/java/udmi/schema/DiscoveryConfig.java +++ b/gencode/java/udmi/schema/DiscoveryConfig.java @@ -49,8 +49,8 @@ public class DiscoveryConfig { public int hashCode() { int result = 1; result = ((result* 31)+((this.generation == null)? 0 :this.generation.hashCode())); - result = ((result* 31)+((this.families == null)? 0 :this.families.hashCode())); result = ((result* 31)+((this.enumerations == null)? 0 :this.enumerations.hashCode())); + result = ((result* 31)+((this.families == null)? 0 :this.families.hashCode())); return result; } @@ -63,7 +63,7 @@ public boolean equals(Object other) { return false; } DiscoveryConfig rhs = ((DiscoveryConfig) other); - return ((((this.generation == rhs.generation)||((this.generation!= null)&&this.generation.equals(rhs.generation)))&&((this.families == rhs.families)||((this.families!= null)&&this.families.equals(rhs.families))))&&((this.enumerations == rhs.enumerations)||((this.enumerations!= null)&&this.enumerations.equals(rhs.enumerations)))); + return ((((this.generation == rhs.generation)||((this.generation!= null)&&this.generation.equals(rhs.generation)))&&((this.enumerations == rhs.enumerations)||((this.enumerations!= null)&&this.enumerations.equals(rhs.enumerations))))&&((this.families == rhs.families)||((this.families!= null)&&this.families.equals(rhs.families)))); } } diff --git a/gencode/java/udmi/schema/EndpointConfiguration.java b/gencode/java/udmi/schema/EndpointConfiguration.java index ebfba2835a..40ec7da079 100644 --- a/gencode/java/udmi/schema/EndpointConfiguration.java +++ b/gencode/java/udmi/schema/EndpointConfiguration.java @@ -184,30 +184,30 @@ public class EndpointConfiguration { @Override public int hashCode() { int result = 1; - result = ((result* 31)+((this.generation == null)? 0 :this.generation.hashCode())); result = ((result* 31)+((this.keyBytes == null)? 0 :this.keyBytes.hashCode())); result = ((result* 31)+((this.side_id == null)? 0 :this.side_id.hashCode())); - result = ((result* 31)+((this.transport == null)? 0 :this.transport.hashCode())); - result = ((result* 31)+((this.publish_delay_sec == null)? 0 :this.publish_delay_sec.hashCode())); result = ((result* 31)+((this.error == null)? 0 :this.error.hashCode())); - result = ((result* 31)+((this.config_sync_sec == null)? 0 :this.config_sync_sec.hashCode())); result = ((result* 31)+((this.deviceId == null)? 0 :this.deviceId.hashCode())); result = ((result* 31)+((this.client_id == null)? 0 :this.client_id.hashCode())); result = ((result* 31)+((this.enabled == null)? 0 :this.enabled.hashCode())); result = ((result* 31)+((this.capacity == null)? 0 :this.capacity.hashCode())); - result = ((result* 31)+((this.send_id == null)? 0 :this.send_id.hashCode())); result = ((result* 31)+((this.protocol == null)? 0 :this.protocol.hashCode())); result = ((result* 31)+((this.hostname == null)? 0 :this.hostname.hashCode())); result = ((result* 31)+((this.payload == null)? 0 :this.payload.hashCode())); - result = ((result* 31)+((this.port == null)? 0 :this.port.hashCode())); result = ((result* 31)+((this.topic_prefix == null)? 0 :this.topic_prefix.hashCode())); + result = ((result* 31)+((this.recv_id == null)? 0 :this.recv_id.hashCode())); + result = ((result* 31)+((this.algorithm == null)? 0 :this.algorithm.hashCode())); + result = ((result* 31)+((this.generation == null)? 0 :this.generation.hashCode())); + result = ((result* 31)+((this.transport == null)? 0 :this.transport.hashCode())); + result = ((result* 31)+((this.publish_delay_sec == null)? 0 :this.publish_delay_sec.hashCode())); + result = ((result* 31)+((this.config_sync_sec == null)? 0 :this.config_sync_sec.hashCode())); + result = ((result* 31)+((this.send_id == null)? 0 :this.send_id.hashCode())); + result = ((result* 31)+((this.port == null)? 0 :this.port.hashCode())); result = ((result* 31)+((this.name == null)? 0 :this.name.hashCode())); result = ((result* 31)+((this.periodic_sec == null)? 0 :this.periodic_sec.hashCode())); result = ((result* 31)+((this.noConfigAck == null)? 0 :this.noConfigAck.hashCode())); - result = ((result* 31)+((this.recv_id == null)? 0 :this.recv_id.hashCode())); result = ((result* 31)+((this.gatewayId == null)? 0 :this.gatewayId.hashCode())); result = ((result* 31)+((this.auth_provider == null)? 0 :this.auth_provider.hashCode())); - result = ((result* 31)+((this.algorithm == null)? 0 :this.algorithm.hashCode())); return result; } @@ -220,7 +220,7 @@ public boolean equals(Object other) { return false; } EndpointConfiguration rhs = ((EndpointConfiguration) other); - return (((((((((((((((((((((((((this.generation == rhs.generation)||((this.generation!= null)&&this.generation.equals(rhs.generation)))&&((this.keyBytes == rhs.keyBytes)||((this.keyBytes!= null)&&this.keyBytes.equals(rhs.keyBytes))))&&((this.side_id == rhs.side_id)||((this.side_id!= null)&&this.side_id.equals(rhs.side_id))))&&((this.transport == rhs.transport)||((this.transport!= null)&&this.transport.equals(rhs.transport))))&&((this.publish_delay_sec == rhs.publish_delay_sec)||((this.publish_delay_sec!= null)&&this.publish_delay_sec.equals(rhs.publish_delay_sec))))&&((this.error == rhs.error)||((this.error!= null)&&this.error.equals(rhs.error))))&&((this.config_sync_sec == rhs.config_sync_sec)||((this.config_sync_sec!= null)&&this.config_sync_sec.equals(rhs.config_sync_sec))))&&((this.deviceId == rhs.deviceId)||((this.deviceId!= null)&&this.deviceId.equals(rhs.deviceId))))&&((this.client_id == rhs.client_id)||((this.client_id!= null)&&this.client_id.equals(rhs.client_id))))&&((this.enabled == rhs.enabled)||((this.enabled!= null)&&this.enabled.equals(rhs.enabled))))&&((this.capacity == rhs.capacity)||((this.capacity!= null)&&this.capacity.equals(rhs.capacity))))&&((this.send_id == rhs.send_id)||((this.send_id!= null)&&this.send_id.equals(rhs.send_id))))&&((this.protocol == rhs.protocol)||((this.protocol!= null)&&this.protocol.equals(rhs.protocol))))&&((this.hostname == rhs.hostname)||((this.hostname!= null)&&this.hostname.equals(rhs.hostname))))&&((this.payload == rhs.payload)||((this.payload!= null)&&this.payload.equals(rhs.payload))))&&((this.port == rhs.port)||((this.port!= null)&&this.port.equals(rhs.port))))&&((this.topic_prefix == rhs.topic_prefix)||((this.topic_prefix!= null)&&this.topic_prefix.equals(rhs.topic_prefix))))&&((this.name == rhs.name)||((this.name!= null)&&this.name.equals(rhs.name))))&&((this.periodic_sec == rhs.periodic_sec)||((this.periodic_sec!= null)&&this.periodic_sec.equals(rhs.periodic_sec))))&&((this.noConfigAck == rhs.noConfigAck)||((this.noConfigAck!= null)&&this.noConfigAck.equals(rhs.noConfigAck))))&&((this.recv_id == rhs.recv_id)||((this.recv_id!= null)&&this.recv_id.equals(rhs.recv_id))))&&((this.gatewayId == rhs.gatewayId)||((this.gatewayId!= null)&&this.gatewayId.equals(rhs.gatewayId))))&&((this.auth_provider == rhs.auth_provider)||((this.auth_provider!= null)&&this.auth_provider.equals(rhs.auth_provider))))&&((this.algorithm == rhs.algorithm)||((this.algorithm!= null)&&this.algorithm.equals(rhs.algorithm)))); + return (((((((((((((((((((((((((this.keyBytes == rhs.keyBytes)||((this.keyBytes!= null)&&this.keyBytes.equals(rhs.keyBytes)))&&((this.side_id == rhs.side_id)||((this.side_id!= null)&&this.side_id.equals(rhs.side_id))))&&((this.error == rhs.error)||((this.error!= null)&&this.error.equals(rhs.error))))&&((this.deviceId == rhs.deviceId)||((this.deviceId!= null)&&this.deviceId.equals(rhs.deviceId))))&&((this.client_id == rhs.client_id)||((this.client_id!= null)&&this.client_id.equals(rhs.client_id))))&&((this.enabled == rhs.enabled)||((this.enabled!= null)&&this.enabled.equals(rhs.enabled))))&&((this.capacity == rhs.capacity)||((this.capacity!= null)&&this.capacity.equals(rhs.capacity))))&&((this.protocol == rhs.protocol)||((this.protocol!= null)&&this.protocol.equals(rhs.protocol))))&&((this.hostname == rhs.hostname)||((this.hostname!= null)&&this.hostname.equals(rhs.hostname))))&&((this.payload == rhs.payload)||((this.payload!= null)&&this.payload.equals(rhs.payload))))&&((this.topic_prefix == rhs.topic_prefix)||((this.topic_prefix!= null)&&this.topic_prefix.equals(rhs.topic_prefix))))&&((this.recv_id == rhs.recv_id)||((this.recv_id!= null)&&this.recv_id.equals(rhs.recv_id))))&&((this.algorithm == rhs.algorithm)||((this.algorithm!= null)&&this.algorithm.equals(rhs.algorithm))))&&((this.generation == rhs.generation)||((this.generation!= null)&&this.generation.equals(rhs.generation))))&&((this.transport == rhs.transport)||((this.transport!= null)&&this.transport.equals(rhs.transport))))&&((this.publish_delay_sec == rhs.publish_delay_sec)||((this.publish_delay_sec!= null)&&this.publish_delay_sec.equals(rhs.publish_delay_sec))))&&((this.config_sync_sec == rhs.config_sync_sec)||((this.config_sync_sec!= null)&&this.config_sync_sec.equals(rhs.config_sync_sec))))&&((this.send_id == rhs.send_id)||((this.send_id!= null)&&this.send_id.equals(rhs.send_id))))&&((this.port == rhs.port)||((this.port!= null)&&this.port.equals(rhs.port))))&&((this.name == rhs.name)||((this.name!= null)&&this.name.equals(rhs.name))))&&((this.periodic_sec == rhs.periodic_sec)||((this.periodic_sec!= null)&&this.periodic_sec.equals(rhs.periodic_sec))))&&((this.noConfigAck == rhs.noConfigAck)||((this.noConfigAck!= null)&&this.noConfigAck.equals(rhs.noConfigAck))))&&((this.gatewayId == rhs.gatewayId)||((this.gatewayId!= null)&&this.gatewayId.equals(rhs.gatewayId))))&&((this.auth_provider == rhs.auth_provider)||((this.auth_provider!= null)&&this.auth_provider.equals(rhs.auth_provider)))); } public enum Protocol { diff --git a/gencode/java/udmi/schema/Events.java b/gencode/java/udmi/schema/Events.java index a431206d31..280293bc37 100644 --- a/gencode/java/udmi/schema/Events.java +++ b/gencode/java/udmi/schema/Events.java @@ -53,8 +53,8 @@ public class Events { public int hashCode() { int result = 1; result = ((result* 31)+((this.pointset == null)? 0 :this.pointset.hashCode())); - result = ((result* 31)+((this.discovery == null)? 0 :this.discovery.hashCode())); result = ((result* 31)+((this.system == null)? 0 :this.system.hashCode())); + result = ((result* 31)+((this.discovery == null)? 0 :this.discovery.hashCode())); return result; } @@ -67,7 +67,7 @@ public boolean equals(Object other) { return false; } Events rhs = ((Events) other); - return ((((this.pointset == rhs.pointset)||((this.pointset!= null)&&this.pointset.equals(rhs.pointset)))&&((this.discovery == rhs.discovery)||((this.discovery!= null)&&this.discovery.equals(rhs.discovery))))&&((this.system == rhs.system)||((this.system!= null)&&this.system.equals(rhs.system)))); + return ((((this.pointset == rhs.pointset)||((this.pointset!= null)&&this.pointset.equals(rhs.pointset)))&&((this.system == rhs.system)||((this.system!= null)&&this.system.equals(rhs.system))))&&((this.discovery == rhs.discovery)||((this.discovery!= null)&&this.discovery.equals(rhs.discovery)))); } } diff --git a/gencode/java/udmi/schema/FamilyLocalnetModel.java b/gencode/java/udmi/schema/FamilyLocalnetModel.java index 3d1813f19c..0310d47482 100644 --- a/gencode/java/udmi/schema/FamilyLocalnetModel.java +++ b/gencode/java/udmi/schema/FamilyLocalnetModel.java @@ -66,11 +66,11 @@ public class FamilyLocalnetModel { @Override public int hashCode() { int result = 1; + result = ((result* 31)+((this.shadow_id == null)? 0 :this.shadow_id.hashCode())); + result = ((result* 31)+((this.parent_id == null)? 0 :this.parent_id.hashCode())); result = ((result* 31)+((this.addr == null)? 0 :this.addr.hashCode())); result = ((result* 31)+((this.adjunct == null)? 0 :this.adjunct.hashCode())); result = ((result* 31)+((this.family == null)? 0 :this.family.hashCode())); - result = ((result* 31)+((this.shadow_id == null)? 0 :this.shadow_id.hashCode())); - result = ((result* 31)+((this.parent_id == null)? 0 :this.parent_id.hashCode())); result = ((result* 31)+((this.network == null)? 0 :this.network.hashCode())); return result; } @@ -84,7 +84,7 @@ public boolean equals(Object other) { return false; } FamilyLocalnetModel rhs = ((FamilyLocalnetModel) other); - return (((((((this.addr == rhs.addr)||((this.addr!= null)&&this.addr.equals(rhs.addr)))&&((this.adjunct == rhs.adjunct)||((this.adjunct!= null)&&this.adjunct.equals(rhs.adjunct))))&&((this.family == rhs.family)||((this.family!= null)&&this.family.equals(rhs.family))))&&((this.shadow_id == rhs.shadow_id)||((this.shadow_id!= null)&&this.shadow_id.equals(rhs.shadow_id))))&&((this.parent_id == rhs.parent_id)||((this.parent_id!= null)&&this.parent_id.equals(rhs.parent_id))))&&((this.network == rhs.network)||((this.network!= null)&&this.network.equals(rhs.network)))); + return (((((((this.shadow_id == rhs.shadow_id)||((this.shadow_id!= null)&&this.shadow_id.equals(rhs.shadow_id)))&&((this.parent_id == rhs.parent_id)||((this.parent_id!= null)&&this.parent_id.equals(rhs.parent_id))))&&((this.addr == rhs.addr)||((this.addr!= null)&&this.addr.equals(rhs.addr))))&&((this.adjunct == rhs.adjunct)||((this.adjunct!= null)&&this.adjunct.equals(rhs.adjunct))))&&((this.family == rhs.family)||((this.family!= null)&&this.family.equals(rhs.family))))&&((this.network == rhs.network)||((this.network!= null)&&this.network.equals(rhs.network)))); } } diff --git a/gencode/java/udmi/schema/GatewayModel.java b/gencode/java/udmi/schema/GatewayModel.java index f474d979a9..22876706e5 100644 --- a/gencode/java/udmi/schema/GatewayModel.java +++ b/gencode/java/udmi/schema/GatewayModel.java @@ -49,8 +49,8 @@ public class GatewayModel { @Override public int hashCode() { int result = 1; - result = ((result* 31)+((this.gateway_id == null)? 0 :this.gateway_id.hashCode())); result = ((result* 31)+((this.proxy_ids == null)? 0 :this.proxy_ids.hashCode())); + result = ((result* 31)+((this.gateway_id == null)? 0 :this.gateway_id.hashCode())); result = ((result* 31)+((this.target == null)? 0 :this.target.hashCode())); return result; } @@ -64,7 +64,7 @@ public boolean equals(Object other) { return false; } GatewayModel rhs = ((GatewayModel) other); - return ((((this.gateway_id == rhs.gateway_id)||((this.gateway_id!= null)&&this.gateway_id.equals(rhs.gateway_id)))&&((this.proxy_ids == rhs.proxy_ids)||((this.proxy_ids!= null)&&this.proxy_ids.equals(rhs.proxy_ids))))&&((this.target == rhs.target)||((this.target!= null)&&this.target.equals(rhs.target)))); + return ((((this.proxy_ids == rhs.proxy_ids)||((this.proxy_ids!= null)&&this.proxy_ids.equals(rhs.proxy_ids)))&&((this.gateway_id == rhs.gateway_id)||((this.gateway_id!= null)&&this.gateway_id.equals(rhs.gateway_id))))&&((this.target == rhs.target)||((this.target!= null)&&this.target.equals(rhs.target)))); } } diff --git a/gencode/java/udmi/schema/PointPointsetModel.java b/gencode/java/udmi/schema/PointPointsetModel.java index 83da8ebaf4..f244f16f77 100644 --- a/gencode/java/udmi/schema/PointPointsetModel.java +++ b/gencode/java/udmi/schema/PointPointsetModel.java @@ -29,6 +29,7 @@ "baseline_state", "range_min", "range_max", + "stale_threshold_sec", "cov_increment", "ref", "adjunct", @@ -93,6 +94,13 @@ public class PointPointsetModel { @JsonProperty("range_max") @JsonPropertyDescription("Represents the upper bound of the error threshold for a point") public Double range_max; + /** + * Represents the limit in seconds that a point can be stagnant/unchanged for + * + */ + @JsonProperty("stale_threshold_sec") + @JsonPropertyDescription("Represents the limit in seconds that a point can be stagnant/unchanged for") + public Integer stale_threshold_sec; /** * Triggering threshold for partial cov update publishing * @@ -140,6 +148,7 @@ public int hashCode() { result = ((result* 31)+((this.baseline_value == null)? 0 :this.baseline_value.hashCode())); result = ((result* 31)+((this.range_max == null)? 0 :this.range_max.hashCode())); result = ((result* 31)+((this.adjunct == null)? 0 :this.adjunct.hashCode())); + result = ((result* 31)+((this.stale_threshold_sec == null)? 0 :this.stale_threshold_sec.hashCode())); result = ((result* 31)+((this.cov_increment == null)? 0 :this.cov_increment.hashCode())); return result; } @@ -153,7 +162,7 @@ public boolean equals(Object other) { return false; } PointPointsetModel rhs = ((PointPointsetModel) other); - return ((((((((((((((this.baseline_state == rhs.baseline_state)||((this.baseline_state!= null)&&this.baseline_state.equals(rhs.baseline_state)))&&((this.range_min == rhs.range_min)||((this.range_min!= null)&&this.range_min.equals(rhs.range_min))))&&((this.description == rhs.description)||((this.description!= null)&&this.description.equals(rhs.description))))&&((this.units == rhs.units)||((this.units!= null)&&this.units.equals(rhs.units))))&&((this.baseline_tolerance == rhs.baseline_tolerance)||((this.baseline_tolerance!= null)&&this.baseline_tolerance.equals(rhs.baseline_tolerance))))&&((this.structure == rhs.structure)||((this.structure!= null)&&this.structure.equals(rhs.structure))))&&((this.writable == rhs.writable)||((this.writable!= null)&&this.writable.equals(rhs.writable))))&&((this.tags == rhs.tags)||((this.tags!= null)&&this.tags.equals(rhs.tags))))&&((this.ref == rhs.ref)||((this.ref!= null)&&this.ref.equals(rhs.ref))))&&((this.baseline_value == rhs.baseline_value)||((this.baseline_value!= null)&&this.baseline_value.equals(rhs.baseline_value))))&&((this.range_max == rhs.range_max)||((this.range_max!= null)&&this.range_max.equals(rhs.range_max))))&&((this.adjunct == rhs.adjunct)||((this.adjunct!= null)&&this.adjunct.equals(rhs.adjunct))))&&((this.cov_increment == rhs.cov_increment)||((this.cov_increment!= null)&&this.cov_increment.equals(rhs.cov_increment)))); + return (((((((((((((((this.baseline_state == rhs.baseline_state)||((this.baseline_state!= null)&&this.baseline_state.equals(rhs.baseline_state)))&&((this.range_min == rhs.range_min)||((this.range_min!= null)&&this.range_min.equals(rhs.range_min))))&&((this.description == rhs.description)||((this.description!= null)&&this.description.equals(rhs.description))))&&((this.units == rhs.units)||((this.units!= null)&&this.units.equals(rhs.units))))&&((this.baseline_tolerance == rhs.baseline_tolerance)||((this.baseline_tolerance!= null)&&this.baseline_tolerance.equals(rhs.baseline_tolerance))))&&((this.structure == rhs.structure)||((this.structure!= null)&&this.structure.equals(rhs.structure))))&&((this.writable == rhs.writable)||((this.writable!= null)&&this.writable.equals(rhs.writable))))&&((this.tags == rhs.tags)||((this.tags!= null)&&this.tags.equals(rhs.tags))))&&((this.ref == rhs.ref)||((this.ref!= null)&&this.ref.equals(rhs.ref))))&&((this.baseline_value == rhs.baseline_value)||((this.baseline_value!= null)&&this.baseline_value.equals(rhs.baseline_value))))&&((this.range_max == rhs.range_max)||((this.range_max!= null)&&this.range_max.equals(rhs.range_max))))&&((this.adjunct == rhs.adjunct)||((this.adjunct!= null)&&this.adjunct.equals(rhs.adjunct))))&&((this.stale_threshold_sec == rhs.stale_threshold_sec)||((this.stale_threshold_sec!= null)&&this.stale_threshold_sec.equals(rhs.stale_threshold_sec))))&&((this.cov_increment == rhs.cov_increment)||((this.cov_increment!= null)&&this.cov_increment.equals(rhs.cov_increment)))); } diff --git a/gencode/java/udmi/schema/PoliciesModel.java b/gencode/java/udmi/schema/PoliciesModel.java new file mode 100644 index 0000000000..492f09513d --- /dev/null +++ b/gencode/java/udmi/schema/PoliciesModel.java @@ -0,0 +1,50 @@ + +package udmi.schema; + +import java.util.List; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyDescription; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; + + +/** + * Policies Model + *

+ * Device policies + * + */ +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "named_policies" +}) +public class PoliciesModel { + + /** + * An array of policies which are applicable to the device + * + */ + @JsonProperty("named_policies") + @JsonPropertyDescription("An array of policies which are applicable to the device") + public List named_policies; + + @Override + public int hashCode() { + int result = 1; + result = ((result* 31)+((this.named_policies == null)? 0 :this.named_policies.hashCode())); + return result; + } + + @Override + public boolean equals(Object other) { + if (other == this) { + return true; + } + if ((other instanceof PoliciesModel) == false) { + return false; + } + PoliciesModel rhs = ((PoliciesModel) other); + return ((this.named_policies == rhs.named_policies)||((this.named_policies!= null)&&this.named_policies.equals(rhs.named_policies))); + } + +} diff --git a/gencode/java/udmi/schema/RefDiscovery.java b/gencode/java/udmi/schema/RefDiscovery.java index 7bdebeeda7..e50aeb6bf9 100644 --- a/gencode/java/udmi/schema/RefDiscovery.java +++ b/gencode/java/udmi/schema/RefDiscovery.java @@ -113,17 +113,17 @@ public class RefDiscovery { @Override public int hashCode() { int result = 1; - result = ((result* 31)+((this.ref == null)? 0 :this.ref.hashCode())); - result = ((result* 31)+((this.possible_values == null)? 0 :this.possible_values.hashCode())); - result = ((result* 31)+((this.name == null)? 0 :this.name.hashCode())); result = ((result* 31)+((this.description == null)? 0 :this.description.hashCode())); result = ((result* 31)+((this.units == null)? 0 :this.units.hashCode())); result = ((result* 31)+((this.type == null)? 0 :this.type.hashCode())); - result = ((result* 31)+((this.ancillary == null)? 0 :this.ancillary.hashCode())); - result = ((result* 31)+((this.adjunct == null)? 0 :this.adjunct.hashCode())); result = ((result* 31)+((this.point == null)? 0 :this.point.hashCode())); result = ((result* 31)+((this.structure == null)? 0 :this.structure.hashCode())); result = ((result* 31)+((this.writable == null)? 0 :this.writable.hashCode())); + result = ((result* 31)+((this.ref == null)? 0 :this.ref.hashCode())); + result = ((result* 31)+((this.possible_values == null)? 0 :this.possible_values.hashCode())); + result = ((result* 31)+((this.name == null)? 0 :this.name.hashCode())); + result = ((result* 31)+((this.ancillary == null)? 0 :this.ancillary.hashCode())); + result = ((result* 31)+((this.adjunct == null)? 0 :this.adjunct.hashCode())); result = ((result* 31)+((this.status == null)? 0 :this.status.hashCode())); return result; } @@ -137,7 +137,7 @@ public boolean equals(java.lang.Object other) { return false; } RefDiscovery rhs = ((RefDiscovery) other); - return (((((((((((((this.ref == rhs.ref)||((this.ref!= null)&&this.ref.equals(rhs.ref)))&&((this.possible_values == rhs.possible_values)||((this.possible_values!= null)&&this.possible_values.equals(rhs.possible_values))))&&((this.name == rhs.name)||((this.name!= null)&&this.name.equals(rhs.name))))&&((this.description == rhs.description)||((this.description!= null)&&this.description.equals(rhs.description))))&&((this.units == rhs.units)||((this.units!= null)&&this.units.equals(rhs.units))))&&((this.type == rhs.type)||((this.type!= null)&&this.type.equals(rhs.type))))&&((this.ancillary == rhs.ancillary)||((this.ancillary!= null)&&this.ancillary.equals(rhs.ancillary))))&&((this.adjunct == rhs.adjunct)||((this.adjunct!= null)&&this.adjunct.equals(rhs.adjunct))))&&((this.point == rhs.point)||((this.point!= null)&&this.point.equals(rhs.point))))&&((this.structure == rhs.structure)||((this.structure!= null)&&this.structure.equals(rhs.structure))))&&((this.writable == rhs.writable)||((this.writable!= null)&&this.writable.equals(rhs.writable))))&&((this.status == rhs.status)||((this.status!= null)&&this.status.equals(rhs.status)))); + return (((((((((((((this.description == rhs.description)||((this.description!= null)&&this.description.equals(rhs.description)))&&((this.units == rhs.units)||((this.units!= null)&&this.units.equals(rhs.units))))&&((this.type == rhs.type)||((this.type!= null)&&this.type.equals(rhs.type))))&&((this.point == rhs.point)||((this.point!= null)&&this.point.equals(rhs.point))))&&((this.structure == rhs.structure)||((this.structure!= null)&&this.structure.equals(rhs.structure))))&&((this.writable == rhs.writable)||((this.writable!= null)&&this.writable.equals(rhs.writable))))&&((this.ref == rhs.ref)||((this.ref!= null)&&this.ref.equals(rhs.ref))))&&((this.possible_values == rhs.possible_values)||((this.possible_values!= null)&&this.possible_values.equals(rhs.possible_values))))&&((this.name == rhs.name)||((this.name!= null)&&this.name.equals(rhs.name))))&&((this.ancillary == rhs.ancillary)||((this.ancillary!= null)&&this.ancillary.equals(rhs.ancillary))))&&((this.adjunct == rhs.adjunct)||((this.adjunct!= null)&&this.adjunct.equals(rhs.adjunct))))&&((this.status == rhs.status)||((this.status!= null)&&this.status.equals(rhs.status)))); } } diff --git a/gencode/java/udmi/schema/SiteLinks.java b/gencode/java/udmi/schema/SiteLinks.java index 3f3527402e..41fc94ca6c 100644 --- a/gencode/java/udmi/schema/SiteLinks.java +++ b/gencode/java/udmi/schema/SiteLinks.java @@ -71,11 +71,11 @@ public class SiteLinks { public int hashCode() { int result = 1; result = ((result* 31)+((this.image == null)? 0 :this.image.hashCode())); - result = ((result* 31)+((this.sheet == null)? 0 :this.sheet.hashCode())); result = ((result* 31)+((this.folder == null)? 0 :this.folder.hashCode())); result = ((result* 31)+((this.docs == null)? 0 :this.docs.hashCode())); - result = ((result* 31)+((this.dashboard == null)? 0 :this.dashboard.hashCode())); result = ((result* 31)+((this.repo == null)? 0 :this.repo.hashCode())); + result = ((result* 31)+((this.sheet == null)? 0 :this.sheet.hashCode())); + result = ((result* 31)+((this.dashboard == null)? 0 :this.dashboard.hashCode())); return result; } @@ -88,7 +88,7 @@ public boolean equals(Object other) { return false; } SiteLinks rhs = ((SiteLinks) other); - return (((((((this.image == rhs.image)||((this.image!= null)&&this.image.equals(rhs.image)))&&((this.sheet == rhs.sheet)||((this.sheet!= null)&&this.sheet.equals(rhs.sheet))))&&((this.folder == rhs.folder)||((this.folder!= null)&&this.folder.equals(rhs.folder))))&&((this.docs == rhs.docs)||((this.docs!= null)&&this.docs.equals(rhs.docs))))&&((this.dashboard == rhs.dashboard)||((this.dashboard!= null)&&this.dashboard.equals(rhs.dashboard))))&&((this.repo == rhs.repo)||((this.repo!= null)&&this.repo.equals(rhs.repo)))); + return (((((((this.image == rhs.image)||((this.image!= null)&&this.image.equals(rhs.image)))&&((this.folder == rhs.folder)||((this.folder!= null)&&this.folder.equals(rhs.folder))))&&((this.docs == rhs.docs)||((this.docs!= null)&&this.docs.equals(rhs.docs))))&&((this.repo == rhs.repo)||((this.repo!= null)&&this.repo.equals(rhs.repo))))&&((this.sheet == rhs.sheet)||((this.sheet!= null)&&this.sheet.equals(rhs.sheet))))&&((this.dashboard == rhs.dashboard)||((this.dashboard!= null)&&this.dashboard.equals(rhs.dashboard)))); } } diff --git a/gencode/java/udmi/schema/SiteLocation.java b/gencode/java/udmi/schema/SiteLocation.java index c49ba57283..1318d4e57e 100644 --- a/gencode/java/udmi/schema/SiteLocation.java +++ b/gencode/java/udmi/schema/SiteLocation.java @@ -46,9 +46,9 @@ public class SiteLocation { @Override public int hashCode() { int result = 1; + result = ((result* 31)+((this.address == null)? 0 :this.address.hashCode())); result = ((result* 31)+((this.lat == null)? 0 :this.lat.hashCode())); result = ((result* 31)+((this._long == null)? 0 :this._long.hashCode())); - result = ((result* 31)+((this.address == null)? 0 :this.address.hashCode())); return result; } @@ -61,7 +61,7 @@ public boolean equals(Object other) { return false; } SiteLocation rhs = ((SiteLocation) other); - return ((((this.lat == rhs.lat)||((this.lat!= null)&&this.lat.equals(rhs.lat)))&&((this._long == rhs._long)||((this._long!= null)&&this._long.equals(rhs._long))))&&((this.address == rhs.address)||((this.address!= null)&&this.address.equals(rhs.address)))); + return ((((this.address == rhs.address)||((this.address!= null)&&this.address.equals(rhs.address)))&&((this.lat == rhs.lat)||((this.lat!= null)&&this.lat.equals(rhs.lat))))&&((this._long == rhs._long)||((this._long!= null)&&this._long.equals(rhs._long)))); } } diff --git a/gencode/python/dist/udmi_schema-0.1.0-py3-none-any.whl b/gencode/python/dist/udmi_schema-0.1.0-py3-none-any.whl index 97f18d7fd4c24e1070199661ae412cdb97ee36b2..208b79ebcdf4d3d97d5c3ddd27e6aa2af5db9176 100644 GIT binary patch delta 7155 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 s357) zKi`Yi_&z9VL;zCM2sa}Grz$xCKXU}qfs9p% zes~V*R;dDQ7GUQKIYPK!GUTOpv)dT z3LylUYB&KwM+6dqnhu!YP9`46O zjPd+uFvaUWSm}ump1sEdPY^fz?tO1L*P(;#b({d(tG`kl`0R6!9d-PGzTaO&1##_&-mj5Rkfw8r*B-1HvK^!)ku$f6uS~(=&w- aim3Z(c3cxKt`(9Mk{t{QsX6^$3I7AQiX2k_ delta 6725 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 WpT3cV#0F*qV`PNEyi@;Y#{U52YflOQ diff --git a/gencode/python/dist/udmi_schema-0.1.0.tar.gz b/gencode/python/dist/udmi_schema-0.1.0.tar.gz index ba9035bbb9f426fbb541d72fa6a74f80f471d6e2..8d4094837b83429bd9bf20d45ac3495004ab474f 100644 GIT binary patch delta 12261 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 NKtVNRK;lI~`X6z)*E9eC delta 12193 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 diff --git a/gencode/python/udmi/schema/__init__.py b/gencode/python/udmi/schema/__init__.py index ced506c690..f76db767af 100644 --- a/gencode/python/udmi/schema/__init__.py +++ b/gencode/python/udmi/schema/__init__.py @@ -60,6 +60,7 @@ from .model_localnet_family import * from .model_pointset import * from .model_pointset_point import * +from .model_policies import * from .model_system import * from .model_system_hardware import * from .model_testing import * diff --git a/gencode/python/udmi/schema/model_pointset_point.py b/gencode/python/udmi/schema/model_pointset_point.py index 78d2690d6c..aecb857ee1 100644 --- a/gencode/python/udmi/schema/model_pointset_point.py +++ b/gencode/python/udmi/schema/model_pointset_point.py @@ -40,6 +40,7 @@ class PointPointsetModel(DataModel): baseline_state: Optional[BaselineState] = None range_min: Optional[float] = None range_max: Optional[float] = None + stale_threshold_sec: Optional[int] = None cov_increment: Optional[float] = None ref: Optional[str] = None adjunct: Optional[Dict[str, str]] = None diff --git a/gencode/python/udmi/schema/model_policies.py b/gencode/python/udmi/schema/model_policies.py new file mode 100644 index 0000000000..897a16ff1c --- /dev/null +++ b/gencode/python/udmi/schema/model_policies.py @@ -0,0 +1,18 @@ +# generated by datamodel-codegen: +# filename: model_policies.json + +from __future__ import annotations + +from dataclasses import dataclass +from typing import List, Optional + +from ._base import DataModel + + +@dataclass +class PoliciesModel(DataModel): + """ + Device policies + """ + + named_policies: Optional[List[str]] = None diff --git a/schema/model_pointset_point.json b/schema/model_pointset_point.json index 1f68587eca..91fe8e4d09 100644 --- a/schema/model_pointset_point.json +++ b/schema/model_pointset_point.json @@ -47,7 +47,7 @@ "type": "number", "examples": [100] }, - "stagnant_limit_seconds": { + "stale_threshold_sec": { "description": "Represents the limit in seconds that a point can be stagnant/unchanged for", "type": "integer", "examples": [3600] diff --git a/schema/model_policies.json b/schema/model_policies.json new file mode 100644 index 0000000000..13419ff6bb --- /dev/null +++ b/schema/model_policies.json @@ -0,0 +1,19 @@ +{ + "$udmi_version": "1.5.2", + "title": "Policies Model", + "description": "Device policies", + "type": "object", + "$schema": "http://json-schema.org/draft-04/schema#", + "additionalProperties": false, + "properties": { + "named_policies": { + "description": "An array of policies which are applicable to the device", + "type": "array", + "items": { + "type": "string", + "pattern": "^[a-z_0-9]*$" + }, + "examples": [["ip", "mqtt"]] + } + } +} From a3a5a1c3886c79d20a9b9e456918c6ff595a7fd3 Mon Sep 17 00:00:00 2001 From: Noureddine Date: Wed, 5 Nov 2025 22:21:26 +0000 Subject: [PATCH 3/3] comments and gencode --- .gencode_hash.txt | 43 ++++--- gencode/docs/events.html | 20 ++-- gencode/docs/events_discovery.html | 20 ++-- gencode/docs/metadata.html | 40 +++---- gencode/docs/model_policies.html | 105 ------------------ gencode/docs/readme.md | 1 - .../udmi/schema/BridgePodConfiguration.java | 4 +- .../udmi/schema/BuildingConfigEntity.java | 4 +- .../java/udmi/schema/BuildingTranslation.java | 4 +- gencode/java/udmi/schema/DiscoveryConfig.java | 4 +- .../udmi/schema/EndpointConfiguration.java | 18 +-- gencode/java/udmi/schema/Events.java | 4 +- .../java/udmi/schema/FamilyLocalnetModel.java | 6 +- gencode/java/udmi/schema/GatewayModel.java | 4 +- .../java/udmi/schema/PointPointsetModel.java | 14 +-- gencode/java/udmi/schema/PoliciesModel.java | 14 +-- gencode/java/udmi/schema/RefDiscovery.java | 12 +- gencode/java/udmi/schema/SiteLinks.java | 6 +- gencode/java/udmi/schema/SiteLocation.java | 4 +- .../dist/udmi_schema-0.1.0-py3-none-any.whl | Bin 47415 -> 47416 bytes gencode/python/dist/udmi_schema-0.1.0.tar.gz | Bin 12618 -> 12614 bytes .../udmi/schema/model_pointset_point.py | 2 +- gencode/python/udmi/schema/model_policies.py | 2 +- schema/metadata.json | 3 + schema/model_pointset_point.json | 4 +- schema/model_policies.json | 4 +- 26 files changed, 119 insertions(+), 223 deletions(-) delete mode 100644 gencode/docs/model_policies.html diff --git a/.gencode_hash.txt b/.gencode_hash.txt index 33d14e3342..79192f50bf 100644 --- a/.gencode_hash.txt +++ b/.gencode_hash.txt @@ -7,20 +7,19 @@ c21266e8de23b6e8acfac16a177db782375bf71df470c343c3f8eb8b822ef56a gencode/docs/c 11b21f73b6a4065102968a4c09979639b8a7ea6efb20e40d52cd21b2a60167bb gencode/docs/configuration_pod.html b34c136cee32cb88f32a427ff400c3898ed49168f6dcaca1bc9ba65365bc5ae4 gencode/docs/configuration_pubber.html 1057fa40fb7a31a23bb2773d21c38cf4590a935bd8b5ea4218e695c6204f5dd9 gencode/docs/data_template.html -398b0652a7533c4a96f2e2b48cd985b9638793c5d84b10d4297226cacac2ea11 gencode/docs/events.html -2642dd5d52dddf6994084f18e3e52aca56b8906ff6dd9e1e2244f223f1d0772d gencode/docs/events_discovery.html +7fceae12574a987820736713e7e5b06b7334223b91f22a8ef0fb8fde4216e31d gencode/docs/events.html +1e9af1680cdd51957790b988934c37a2076f075e36de1ee76700638628950164 gencode/docs/events_discovery.html e550539d52ce1f63b35247d425c038e5d5ba33f997eedd09e486a3bd9838c2c2 gencode/docs/events_mapping.html 66e19faae60f9502749391889dbe24bd709963e658b61d989c7ba780672fa447 gencode/docs/events_pointset.html cac253f57c5c92ef32e2a5f91b6cec8229e8db1dcffcc96a58f06da068e741e7 gencode/docs/events_system.html 151c1b62db35e84e51d5ff2a7464f61ced4d7fb0c7eb795715c245ee0a1b3436 gencode/docs/events_udmi.html 73dbe799e7943ec20ac58b544998e986a39539d4ef0cb4f5023e92e7634d3124 gencode/docs/events_validation.html -5199f1513f33d7deeb3b4e52e6a5f2445f6c49146908ea5f59e2d6f0d091d047 gencode/docs/metadata.html -2c0080326d5e614bd505840fde1a567d2a6b3d5ff830ac675b36d49b8d1bcac3 gencode/docs/model_policies.html +74f915256d39795af23f3732aa7330d9717f4a66ebc017d65ddb2123c84c8b3b gencode/docs/metadata.html c86682715d348bd3dd971fa5bd925a8a3d0f3c2944c65a47c4b64fe1a5ccdea2 gencode/docs/monitoring.html 474ca16edc9f3cad2bb3ab40b6993cbced90263f762f66ee6cd246a6c4a0d18f gencode/docs/persistent_device.html e11595fd11477947a27461f8ef4fb6facb5f60e2abd6212193f7581ab123ff84 gencode/docs/properties.html c006d0f46c8f007caa90ac76c713cead907669c14c09f4a288fac5b25afe05dd gencode/docs/query_cloud.html -6d08e42fe6133ade93cbad47455668ba7420ae59cb51e41c66acaede33685d4b gencode/docs/readme.md +9bd8f0df472e9bb98dd547afd0e9561bc96b423eebd5cafde14b374ab408a3c0 gencode/docs/readme.md 2768fd01a875d1f58273e76fef9b421986824d2ab02251853840bca777b625c0 gencode/docs/schema_doc.css 165a29291d7d66653e46fd1ac5868f63e18f9d67c06ea9ebcb95d4830a528e68 gencode/docs/schema_doc.min.js 7ed934930aee763e0beebc349725ba3909115e8d346bb762f28bcbe745bb163a gencode/docs/schema_extras.js @@ -37,10 +36,10 @@ fa94295bc0c97518634c7232e7e55e1c923d7eb42bfa3004651ed183e1ccbb40 gencode/java/u 14055abcc28b9dccc8807ff0e3de201a3fa94cd57b879c22bd7f4fab40d109d9 gencode/java/udmi/schema/BlobBlobsetState.java 1fe0e6cd4b82a54a0d696f0dd43998c3b08cf7d8b78f63b53fcd9c06d49f589c gencode/java/udmi/schema/BlobsetConfig.java 8c8e8941e34da08cddb0401ec296828d8b7aac1810dbfab6ae9ba5d7019c0dd0 gencode/java/udmi/schema/BlobsetState.java -31cc92287358c87acfbc41d24c71f000b23a3e96b0f18fed9331f1c349efab91 gencode/java/udmi/schema/BridgePodConfiguration.java +1110d57d04d4e5da14f6b02d40053cc9b9dabf8e24e44b7441a4a7c66cb546ac gencode/java/udmi/schema/BridgePodConfiguration.java 2e7c0912c6f43b8dae9e9149b7361d3640bde4f01de6e13d8e487fe01be2c2c0 gencode/java/udmi/schema/Bucket.java -534627b0799ca9089332b949c89fdd614f3b8a679b08e3f697d10801ff89c4dc gencode/java/udmi/schema/BuildingConfigEntity.java -79b678b524b3edce833fe56691dcd8c47b53a12f7491e761121408e6e7ceb5e3 gencode/java/udmi/schema/BuildingTranslation.java +8773da8131fdc0f9409df0c04132abdaa01f658d0ec0e73dd8aa714b24454bdc gencode/java/udmi/schema/BuildingConfigEntity.java +519ead2ee2fe3e6fe48547266dec9a545521d52d262646f261ebfbbf8500d25f gencode/java/udmi/schema/BuildingTranslation.java 27ca4f61bd43beca0871b465f3906785a1030a4526605f1fa9b10e3adda8df05 gencode/java/udmi/schema/CapabilityValidationState.java 224c6be2cb6d90a47d181fa30ba1418cf6cc5385ec1c010fe112728382a70216 gencode/java/udmi/schema/Category.java 0101d742dbaa23fb2152b044e5eabd6d219047cddbb973e9626a026946b7ddfc gencode/java/udmi/schema/CloudModel.java @@ -57,29 +56,29 @@ fd289a9a132a880bf0a14b80ed082ab1dcd77caab54175f8d6ccfc381d2d21ab gencode/java/u 6869d00b063748e9995ba6940f6a323916074a7af28ab1d227772b86a39600bb gencode/java/udmi/schema/DeviceValidationEvents.java ec863d0b69880bd2c3030abcdce1d2b8992a475908ead979cc30722b25c1ead2 gencode/java/udmi/schema/Dimension.java 09c9d674ffdde05f00878924a00ef81dc18d1135d5969e8ab9a8db80038198b7 gencode/java/udmi/schema/DiscoveryCommand.java -8b9832181020921d31c9991086dca86dc8bd0ab1bf3c1adbce8b436d1f8ae8e6 gencode/java/udmi/schema/DiscoveryConfig.java +ff98f706c967bbef7be35d826f5abad822c89d2fa981c4d8e6cffbb106d3740c gencode/java/udmi/schema/DiscoveryConfig.java 752faf5921575c895cf984e136effd0dc4837f095c66c26dd0c54fcd31b4a486 gencode/java/udmi/schema/DiscoveryEvents.java 1a04079116f4032b17108e873719bbb2c60c19f392136e7c906122199b472227 gencode/java/udmi/schema/DiscoveryModel.java b41f59d0c1aa74bb9abbdc7525d726f45a4ba8df3866c2dd40458601ffab60fb gencode/java/udmi/schema/DiscoveryState.java 7019b8a1522261a69d708e2e7725b8bc44510c5c80f5c056543af2b7728bfa42 gencode/java/udmi/schema/Electricity.java -695ba089a30cbcb6b101147031e0546cef728322bad349392462cb57688d473a gencode/java/udmi/schema/EndpointConfiguration.java +a9ab0b95408ee04fc98cbc2363bead24c67e64e279e6088e0dd3e4b97154c65d gencode/java/udmi/schema/EndpointConfiguration.java d2e7afd6e1a9250480144c114ee8877afb9b0dd7048495fe96a821d9e6c80475 gencode/java/udmi/schema/Entry.java d4bfd2c997937cd1b0f9b1c73ed46b0133b2b264d367ca9001b7d84ecd598611 gencode/java/udmi/schema/Enumerations.java 11ccad9b1ed4a4745e7bf321adc4bb7f684e9bfa90877314094533b9749512b7 gencode/java/udmi/schema/Envelope.java -4163478ed17191461b0a65abd11c4ddf912cbc104f040a734efd290306fab7b7 gencode/java/udmi/schema/Events.java +b8542a0908719901405220783e85be33197cf16ef5be6458cec5ae92c274e88f gencode/java/udmi/schema/Events.java 80f49ae6ee6a870a92267a9d8510d8b7faef456cd516a5148e9ed491fd8e0857 gencode/java/udmi/schema/ExecutionConfiguration.java bd8350cd05a4091851cf0361cb3a8eb98701ba30df21ff14414e2dabf1289b7f gencode/java/udmi/schema/FamilyDiscovery.java a5e06026eaff51d62d42b447d458d83a310772865f8f3ebd66ac2855e7f381a4 gencode/java/udmi/schema/FamilyDiscoveryConfig.java 56a08262985bff885a11ff686e8f2fcb8d2f6ed258c03aada576693740fc3f61 gencode/java/udmi/schema/FamilyDiscoveryModel.java c242fa94f3cbbfc801c96fa1e9409c8ec84db2a5d0b3a861acff0fc85d7976c7 gencode/java/udmi/schema/FamilyDiscoveryState.java 2145077e0e2f43d6a4d9c54a3b92b952ee47bbf86866f6052807a70987cefc28 gencode/java/udmi/schema/FamilyLocalnetConfig.java -3820172aee203da9b60fcfc426819c02e8f7c65ecd9829314b25a87640871475 gencode/java/udmi/schema/FamilyLocalnetModel.java +e46f9d833d13b4aaa0ba56cafdf52d888307d11801d638898677147011e816b9 gencode/java/udmi/schema/FamilyLocalnetModel.java 54a115b97388b0d8e46a05db5677e4391e5ccb148c0f2348883151928c885845 gencode/java/udmi/schema/FamilyLocalnetState.java b39e12241d1bdabe0db583dc01a7a6b87efb5b57957dae5a3571cfec077b397c gencode/java/udmi/schema/FeatureDiscovery.java 7206888cd092db347e7e92168987798eb0a3f290f2ed307427d971f15b18c49a gencode/java/udmi/schema/FeatureValidationState.java e256275d840d94c6e61316e756b0dad6d823db8900e35e785f6ef5001fdb5fc9 gencode/java/udmi/schema/Gas.java b63fed8a190948ee3924946c1ad3bc9cf06fdeafc7cea0886bfe52e390448ddf gencode/java/udmi/schema/GatewayConfig.java -0d2e02095e119ecdf4b35fb827f560c89f4f9e9ae8bdcf8648cb07432ff234c8 gencode/java/udmi/schema/GatewayModel.java +0e842669c4ca03cc2b938b6d2b4eea50bf54e13937130d1ab1fa7bc70883e728 gencode/java/udmi/schema/GatewayModel.java 1f7f6809e143e9e3e13e6fa73776a893b62b0c05f8802087b1e276dc0ab83e19 gencode/java/udmi/schema/GatewayState.java 175bdf9cc0b376b7f6c6b21174cb0ec568c49a1026e99bbdbc264b3cea7e7702 gencode/java/udmi/schema/IotAccess.java d0858bd7ba306176f4e3c19eeb69ef2467afec0832b6917b72d3ab87469e4974 gencode/java/udmi/schema/Jwt.java @@ -107,26 +106,26 @@ d48a48484965295327ef553a4f8552c44b9345224d7dbb847877c68c1e1b307e gencode/java/u 34704328b6074f96dbf6ce2f926c2e5bafcde5f1412ea50da74e9fa294de32ea gencode/java/udmi/schema/PodConfiguration.java 4825f705cea374dd24668a7711931fef2ca53d0d19d7696c1c16eb610f00ab1b gencode/java/udmi/schema/PointPointsetConfig.java 4f5e88735f2f66f3b92fe19a3a7724eaad5b575d74b75573f437f3236d3175f3 gencode/java/udmi/schema/PointPointsetEvents.java -7bda6f3f0856d62e9a14ecb03a0a6543f629ec66e9bef0c3425f88fed1d7b03d gencode/java/udmi/schema/PointPointsetModel.java +2b0ae0ba03f19eb6f15083340d06b095b366381ba3f233876a05f5c7e0cf1772 gencode/java/udmi/schema/PointPointsetModel.java 88ea66c1a8a1db71ee805a8facabafa0954690d0afd8a559758e50ec9624ed94 gencode/java/udmi/schema/PointPointsetState.java a9250e3208649032e954be0ce63e55ed7b50575a07a821a6ac725c7f10c8cb4b gencode/java/udmi/schema/PointsetConfig.java f4735049f0c27c3f0669d8cf2d6dda6e25dc7d20cef598d5677e3a72943ff019 gencode/java/udmi/schema/PointsetEvents.java 235e6fbd00880e36328fba8f099f788c85dcaaa94cf49ca53fa9b11429a8dc1a gencode/java/udmi/schema/PointsetModel.java c73ad6dde0db8a520f3fee5a563c55a79fc7e6d1cd7875723b10c3d34036a46b gencode/java/udmi/schema/PointsetState.java 34bd8b883ee2a29fc53960142e82fab5a6edd6d8e89e327f242a0b745579edb7 gencode/java/udmi/schema/PointsetSummary.java -587bd58d570b292c43963690fd0ebbf24a6d4b80495e3e0c1c91a867780c50a4 gencode/java/udmi/schema/PoliciesModel.java +073c763da8e96e8052225ec338fd84a94a38ff0be2b2f941bde39254846a3e79 gencode/java/udmi/schema/PoliciesModel.java 9637f95e8a1185b1b028308a8caa2ca5a78cb46ae97f9cc11e2731066129540e gencode/java/udmi/schema/Position.java d87deaba67bb3272c528e3491d378bde059b626964a4a2aed15f5643305c2463 gencode/java/udmi/schema/Properties.java 4cdd5dc6b2e054a43f2e70adeb46ef8e3ff78288d4315923a925415f87e871aa gencode/java/udmi/schema/PubberConfiguration.java 86b4de51f2ba6e9afe34a5a9069e34cf5aa14b7e08d7ac2ed688bad42a769205 gencode/java/udmi/schema/PubberOptions.java -9b208315dae017c35f2c31234348413dd8f569fd3d9922ea46259959662cc7fc gencode/java/udmi/schema/RefDiscovery.java +cd2c7580a75391393c2f761f4434e4e7e83e2d2d1f35e9e62d69c19e65ea2557 gencode/java/udmi/schema/RefDiscovery.java 14faa115d13ee46d10935b13753bff85758f3b64b5136a59f60d36b5b541687c gencode/java/udmi/schema/SchemaValidationState.java fadf083200e73d46cfdec2f710d40e3d2bc4dbf05196e4d0900186e72b62d95e gencode/java/udmi/schema/Scoring.java ad70168de2e1801e26f2c1a8c33a6169e236682de59fd3f6038a77ac264aca14 gencode/java/udmi/schema/SequenceValidationState.java 72e3a07ce890c73fccd3d0cf757d073746b60b722c94edd5425dc066951a048f gencode/java/udmi/schema/SetupUdmiConfig.java e5ce202bcf889287faa7d2d262d2f53f2241a10c659a83687de478803bdab127 gencode/java/udmi/schema/SetupUdmiState.java -2f802c738dd4c19211af8b6dec71b7659c51177c2774cfd34fc07e617bbe5b3e gencode/java/udmi/schema/SiteLinks.java -a3dc7f14d4270ea370db2015785ad12d4bd61825213ab7ac4ee03dda21dde4f2 gencode/java/udmi/schema/SiteLocation.java +7774221174299a7f137576a591d4ae76aaaec5a1950804e73403acf0157b31b5 gencode/java/udmi/schema/SiteLinks.java +956c8af0bb83a33d05bcbcd211d161f9a76723c270372cd443838e31f97c09e3 gencode/java/udmi/schema/SiteLocation.java 5e2f813e0d0a0986b4f1a0613732344bd8c0fd53acfe6afe3d7bdfedda13fa34 gencode/java/udmi/schema/SiteMetadata.java dc2fd582fffefbdeaf3bf7724ca34e94475c3cc820891ea4cc829847eb9ba79d gencode/java/udmi/schema/State.java a371232810e8a2ffb380384ca717da1ee5cc0b2e1129df9b5d8faa07ab4b1f46 gencode/java/udmi/schema/StateSystemHardware.java @@ -150,8 +149,8 @@ eadc72e31b4796273479967303513b16563af0f946d1e1c7eba1748f9b133d40 gencode/java/u 5596535c39826e904949eed7894c3ecd1ee982d974beb7469f888965af2c7845 gencode/java/udmi/schema/VirtualEquipmentLinks.java 11f8dab5296d41e86cd623a4ed27b972ae673b141907cb913397d4eb53880c59 gencode/java/udmi/schema/Water.java d2a53a067185447ce672e5521cdb073a2b2100b9384b68e87211cafc5ef8cb2a gencode/presentation/presentation.json -87fb99fe3f9345d19d8a6cbdf77fceea1264ecd4256aa9ebaeac239af0018316 gencode/python/dist/udmi_schema-0.1.0-py3-none-any.whl -d3774d3daaae88ad278fd3be8f255fe16026f87253b0d020483e08e5a2bb8b2c gencode/python/dist/udmi_schema-0.1.0.tar.gz +226397d616571a7d15b3cf3abb971a387c1a23433a4f757fb8644cc3b5faa1ac gencode/python/dist/udmi_schema-0.1.0-py3-none-any.whl +15c232594d5a36ce9b2736245d731362705e9750556c83361b4b23222baf3e78 gencode/python/dist/udmi_schema-0.1.0.tar.gz 4cf98cbd132cde0cc8813ac35cf3712cb46014154c817c04ad2902c268cdd8fe gencode/python/pyproject.toml cd645687ba5c00b42f5323e185e23b586145aa0886dbbc053c2874f3f087bd41 gencode/python/udmi/schema/__init__.py 478b09b7e26c07441e86e1778f7e5ce8f8fa1b3fce88b8089064347d1e2fc67b gencode/python/udmi/schema/_base.py @@ -215,8 +214,8 @@ c799ce667100201d81f02f0a5d22a4d0ef7db01035e7f08219a76a04c4507a15 gencode/python 9b1a39ef5d3b2ca52036ff6d2c351d689ce73c1867489651788605976b9ee798 gencode/python/udmi/schema/model_localnet.py 977c2a40651b65aa68d8051fd09c796adb723575356c0791adc87e4331cdbebd gencode/python/udmi/schema/model_localnet_family.py 7a252256cce946af6750c644e91b0f09363c8e28b03dbb41c8ae3e5d0758d615 gencode/python/udmi/schema/model_pointset.py -b85fea54e6aa14bb7b8c4e0ff817b9518e0123ccaa67124eed2360452382ed77 gencode/python/udmi/schema/model_pointset_point.py -250acb5924dfbb5b8887938e2ee88eb2f1a026b909973601bc3326a77530a473 gencode/python/udmi/schema/model_policies.py +27593e1178ee2d3603121f52644c77027e070e9c07ae916a8580b7856d51a21a gencode/python/udmi/schema/model_pointset_point.py +06cd551d837fbc7a4ad2db9c4ba9441de17e6b777ebaab69c46e002d2950926d gencode/python/udmi/schema/model_policies.py 241c702f6a877f41c0ebd997c7e431ba8e6d6c0d1b21bc95a9fc57592ff094a7 gencode/python/udmi/schema/model_system.py 1db2fca012d3da953438b78acd2a5c15d94e46df8b77c459876e20ef2598dfbd gencode/python/udmi/schema/model_system_hardware.py 954806649d0e7364c482f84f75e19b01ce926990d64a79e76400f32043ddda66 gencode/python/udmi/schema/model_testing.py diff --git a/gencode/docs/events.html b/gencode/docs/events.html index 930708327c..d0d304f669 100644 --- a/gencode/docs/events.html +++ b/gencode/docs/events.html @@ -10520,18 +10520,18 @@

-
+
-
+

- +

-
+
Type: integer
-

Represents the limit in seconds that a point can be stagnant/unchanged for

+ unchanged_limit_sec
Type: integer
+

Represents the limit in seconds that a point can be unchanged for

@@ -10572,7 +10572,7 @@


Example:
-
3600
+
3600
 
diff --git a/gencode/docs/events_discovery.html b/gencode/docs/events_discovery.html index 105a711e97..1698157db9 100644 --- a/gencode/docs/events_discovery.html +++ b/gencode/docs/events_discovery.html @@ -6168,18 +6168,18 @@

-
+
-
+

- +

-
+
Type: integer
-

Represents the limit in seconds that a point can be stagnant/unchanged for

+ unchanged_limit_sec
Type: integer
+

Represents the limit in seconds that a point can be unchanged for

@@ -6213,7 +6213,7 @@


Example:
-
3600
+
3600
 
diff --git a/gencode/docs/metadata.html b/gencode/docs/metadata.html index 5ff8b6c9d6..efea74fa4c 100644 --- a/gencode/docs/metadata.html +++ b/gencode/docs/metadata.html @@ -6425,18 +6425,18 @@

-
+
-
+

- +

-
+
Type: integer
-

Represents the limit in seconds that a point can be stagnant/unchanged for

+ unchanged_limit_sec
Type: integer
+

Represents the limit in seconds that a point can be unchanged for

@@ -6477,7 +6477,7 @@


Example:
-
3600
+
3600
 
@@ -20031,18 +20031,18 @@

-
+
-
+

- +

-
+
Type: integer
-

Represents the limit in seconds that a point can be stagnant/unchanged for

+ unchanged_limit_sec
Type: integer
+

Represents the limit in seconds that a point can be unchanged for

@@ -20090,7 +20090,7 @@


Example:
-
3600
+
3600
 
diff --git a/gencode/docs/model_policies.html b/gencode/docs/model_policies.html deleted file mode 100644 index ae959fa635..0000000000 --- a/gencode/docs/model_policies.html +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - - - - - - - - - - Policies Model - -
- - -
- -

Policies Model

Type: object
-

Device policies

-
No Additional Properties - - - - - - -
-
-
-

- -

-
- -
-
- - Type: array of string
-

An array of policies which are applicable to the device

-
- - - - - - No Additional Items

Each item of this array must be:

-
-
- - - Type: string
-Must match regular expression: ^[a-z_0-9]*$ - - - - - - -
-

-
Example:
-
[
-    "ip",
-    "mqtt"
-]
-
-
-
-
-
-
- - - \ No newline at end of file diff --git a/gencode/docs/readme.md b/gencode/docs/readme.md index 461d32c894..463c8affb6 100644 --- a/gencode/docs/readme.md +++ b/gencode/docs/readme.md @@ -31,7 +31,6 @@ * [**events**](events.html) - Container object for all event schemas, not directly used. * [**events_mapping**](events_mapping.html) - [Mapping result](../../docs/specs/mapping.md) with implicit enumeration * [**events_validation**](events_validation.html) - Validation device result -* [**model_policies**](model_policies.html) - Device policies * [**monitoring**](monitoring.html) - Output from UDMIS monitoring * [**persistent_device**](persistent_device.html) - Device persistent data * [**properties**](properties.html) diff --git a/gencode/java/udmi/schema/BridgePodConfiguration.java b/gencode/java/udmi/schema/BridgePodConfiguration.java index 1d46d69146..09122ccf95 100644 --- a/gencode/java/udmi/schema/BridgePodConfiguration.java +++ b/gencode/java/udmi/schema/BridgePodConfiguration.java @@ -45,9 +45,9 @@ public class BridgePodConfiguration { @Override public int hashCode() { int result = 1; - result = ((result* 31)+((this.from == null)? 0 :this.from.hashCode())); result = ((result* 31)+((this.morf == null)? 0 :this.morf.hashCode())); result = ((result* 31)+((this.enabled == null)? 0 :this.enabled.hashCode())); + result = ((result* 31)+((this.from == null)? 0 :this.from.hashCode())); return result; } @@ -60,7 +60,7 @@ public boolean equals(Object other) { return false; } BridgePodConfiguration rhs = ((BridgePodConfiguration) other); - return ((((this.from == rhs.from)||((this.from!= null)&&this.from.equals(rhs.from)))&&((this.morf == rhs.morf)||((this.morf!= null)&&this.morf.equals(rhs.morf))))&&((this.enabled == rhs.enabled)||((this.enabled!= null)&&this.enabled.equals(rhs.enabled)))); + return ((((this.morf == rhs.morf)||((this.morf!= null)&&this.morf.equals(rhs.morf)))&&((this.enabled == rhs.enabled)||((this.enabled!= null)&&this.enabled.equals(rhs.enabled))))&&((this.from == rhs.from)||((this.from!= null)&&this.from.equals(rhs.from)))); } } diff --git a/gencode/java/udmi/schema/BuildingConfigEntity.java b/gencode/java/udmi/schema/BuildingConfigEntity.java index 212e30a3f7..3186c44beb 100644 --- a/gencode/java/udmi/schema/BuildingConfigEntity.java +++ b/gencode/java/udmi/schema/BuildingConfigEntity.java @@ -30,9 +30,9 @@ public class BuildingConfigEntity { @Override public int hashCode() { int result = 1; + result = ((result* 31)+((this.type == null)? 0 :this.type.hashCode())); result = ((result* 31)+((this.etag == null)? 0 :this.etag.hashCode())); result = ((result* 31)+((this.code == null)? 0 :this.code.hashCode())); - result = ((result* 31)+((this.type == null)? 0 :this.type.hashCode())); return result; } @@ -45,7 +45,7 @@ public boolean equals(Object other) { return false; } BuildingConfigEntity rhs = ((BuildingConfigEntity) other); - return ((((this.etag == rhs.etag)||((this.etag!= null)&&this.etag.equals(rhs.etag)))&&((this.code == rhs.code)||((this.code!= null)&&this.code.equals(rhs.code))))&&((this.type == rhs.type)||((this.type!= null)&&this.type.equals(rhs.type)))); + return ((((this.type == rhs.type)||((this.type!= null)&&this.type.equals(rhs.type)))&&((this.etag == rhs.etag)||((this.etag!= null)&&this.etag.equals(rhs.etag))))&&((this.code == rhs.code)||((this.code!= null)&&this.code.equals(rhs.code)))); } } diff --git a/gencode/java/udmi/schema/BuildingTranslation.java b/gencode/java/udmi/schema/BuildingTranslation.java index 3eb59f86c4..871aa773f8 100644 --- a/gencode/java/udmi/schema/BuildingTranslation.java +++ b/gencode/java/udmi/schema/BuildingTranslation.java @@ -36,8 +36,8 @@ public class BuildingTranslation { @Override public int hashCode() { int result = 1; - result = ((result* 31)+((this.units == null)? 0 :this.units.hashCode())); result = ((result* 31)+((this.present_value == null)? 0 :this.present_value.hashCode())); + result = ((result* 31)+((this.units == null)? 0 :this.units.hashCode())); result = ((result* 31)+((this.states == null)? 0 :this.states.hashCode())); return result; } @@ -51,7 +51,7 @@ public boolean equals(Object other) { return false; } BuildingTranslation rhs = ((BuildingTranslation) other); - return ((((this.units == rhs.units)||((this.units!= null)&&this.units.equals(rhs.units)))&&((this.present_value == rhs.present_value)||((this.present_value!= null)&&this.present_value.equals(rhs.present_value))))&&((this.states == rhs.states)||((this.states!= null)&&this.states.equals(rhs.states)))); + return ((((this.present_value == rhs.present_value)||((this.present_value!= null)&&this.present_value.equals(rhs.present_value)))&&((this.units == rhs.units)||((this.units!= null)&&this.units.equals(rhs.units))))&&((this.states == rhs.states)||((this.states!= null)&&this.states.equals(rhs.states)))); } } diff --git a/gencode/java/udmi/schema/DiscoveryConfig.java b/gencode/java/udmi/schema/DiscoveryConfig.java index a9bdca6bca..91ed927a43 100644 --- a/gencode/java/udmi/schema/DiscoveryConfig.java +++ b/gencode/java/udmi/schema/DiscoveryConfig.java @@ -49,8 +49,8 @@ public class DiscoveryConfig { public int hashCode() { int result = 1; result = ((result* 31)+((this.generation == null)? 0 :this.generation.hashCode())); - result = ((result* 31)+((this.enumerations == null)? 0 :this.enumerations.hashCode())); result = ((result* 31)+((this.families == null)? 0 :this.families.hashCode())); + result = ((result* 31)+((this.enumerations == null)? 0 :this.enumerations.hashCode())); return result; } @@ -63,7 +63,7 @@ public boolean equals(Object other) { return false; } DiscoveryConfig rhs = ((DiscoveryConfig) other); - return ((((this.generation == rhs.generation)||((this.generation!= null)&&this.generation.equals(rhs.generation)))&&((this.enumerations == rhs.enumerations)||((this.enumerations!= null)&&this.enumerations.equals(rhs.enumerations))))&&((this.families == rhs.families)||((this.families!= null)&&this.families.equals(rhs.families)))); + return ((((this.generation == rhs.generation)||((this.generation!= null)&&this.generation.equals(rhs.generation)))&&((this.families == rhs.families)||((this.families!= null)&&this.families.equals(rhs.families))))&&((this.enumerations == rhs.enumerations)||((this.enumerations!= null)&&this.enumerations.equals(rhs.enumerations)))); } } diff --git a/gencode/java/udmi/schema/EndpointConfiguration.java b/gencode/java/udmi/schema/EndpointConfiguration.java index 40ec7da079..ebfba2835a 100644 --- a/gencode/java/udmi/schema/EndpointConfiguration.java +++ b/gencode/java/udmi/schema/EndpointConfiguration.java @@ -184,30 +184,30 @@ public class EndpointConfiguration { @Override public int hashCode() { int result = 1; + result = ((result* 31)+((this.generation == null)? 0 :this.generation.hashCode())); result = ((result* 31)+((this.keyBytes == null)? 0 :this.keyBytes.hashCode())); result = ((result* 31)+((this.side_id == null)? 0 :this.side_id.hashCode())); + result = ((result* 31)+((this.transport == null)? 0 :this.transport.hashCode())); + result = ((result* 31)+((this.publish_delay_sec == null)? 0 :this.publish_delay_sec.hashCode())); result = ((result* 31)+((this.error == null)? 0 :this.error.hashCode())); + result = ((result* 31)+((this.config_sync_sec == null)? 0 :this.config_sync_sec.hashCode())); result = ((result* 31)+((this.deviceId == null)? 0 :this.deviceId.hashCode())); result = ((result* 31)+((this.client_id == null)? 0 :this.client_id.hashCode())); result = ((result* 31)+((this.enabled == null)? 0 :this.enabled.hashCode())); result = ((result* 31)+((this.capacity == null)? 0 :this.capacity.hashCode())); + result = ((result* 31)+((this.send_id == null)? 0 :this.send_id.hashCode())); result = ((result* 31)+((this.protocol == null)? 0 :this.protocol.hashCode())); result = ((result* 31)+((this.hostname == null)? 0 :this.hostname.hashCode())); result = ((result* 31)+((this.payload == null)? 0 :this.payload.hashCode())); - result = ((result* 31)+((this.topic_prefix == null)? 0 :this.topic_prefix.hashCode())); - result = ((result* 31)+((this.recv_id == null)? 0 :this.recv_id.hashCode())); - result = ((result* 31)+((this.algorithm == null)? 0 :this.algorithm.hashCode())); - result = ((result* 31)+((this.generation == null)? 0 :this.generation.hashCode())); - result = ((result* 31)+((this.transport == null)? 0 :this.transport.hashCode())); - result = ((result* 31)+((this.publish_delay_sec == null)? 0 :this.publish_delay_sec.hashCode())); - result = ((result* 31)+((this.config_sync_sec == null)? 0 :this.config_sync_sec.hashCode())); - result = ((result* 31)+((this.send_id == null)? 0 :this.send_id.hashCode())); result = ((result* 31)+((this.port == null)? 0 :this.port.hashCode())); + result = ((result* 31)+((this.topic_prefix == null)? 0 :this.topic_prefix.hashCode())); result = ((result* 31)+((this.name == null)? 0 :this.name.hashCode())); result = ((result* 31)+((this.periodic_sec == null)? 0 :this.periodic_sec.hashCode())); result = ((result* 31)+((this.noConfigAck == null)? 0 :this.noConfigAck.hashCode())); + result = ((result* 31)+((this.recv_id == null)? 0 :this.recv_id.hashCode())); result = ((result* 31)+((this.gatewayId == null)? 0 :this.gatewayId.hashCode())); result = ((result* 31)+((this.auth_provider == null)? 0 :this.auth_provider.hashCode())); + result = ((result* 31)+((this.algorithm == null)? 0 :this.algorithm.hashCode())); return result; } @@ -220,7 +220,7 @@ public boolean equals(Object other) { return false; } EndpointConfiguration rhs = ((EndpointConfiguration) other); - return (((((((((((((((((((((((((this.keyBytes == rhs.keyBytes)||((this.keyBytes!= null)&&this.keyBytes.equals(rhs.keyBytes)))&&((this.side_id == rhs.side_id)||((this.side_id!= null)&&this.side_id.equals(rhs.side_id))))&&((this.error == rhs.error)||((this.error!= null)&&this.error.equals(rhs.error))))&&((this.deviceId == rhs.deviceId)||((this.deviceId!= null)&&this.deviceId.equals(rhs.deviceId))))&&((this.client_id == rhs.client_id)||((this.client_id!= null)&&this.client_id.equals(rhs.client_id))))&&((this.enabled == rhs.enabled)||((this.enabled!= null)&&this.enabled.equals(rhs.enabled))))&&((this.capacity == rhs.capacity)||((this.capacity!= null)&&this.capacity.equals(rhs.capacity))))&&((this.protocol == rhs.protocol)||((this.protocol!= null)&&this.protocol.equals(rhs.protocol))))&&((this.hostname == rhs.hostname)||((this.hostname!= null)&&this.hostname.equals(rhs.hostname))))&&((this.payload == rhs.payload)||((this.payload!= null)&&this.payload.equals(rhs.payload))))&&((this.topic_prefix == rhs.topic_prefix)||((this.topic_prefix!= null)&&this.topic_prefix.equals(rhs.topic_prefix))))&&((this.recv_id == rhs.recv_id)||((this.recv_id!= null)&&this.recv_id.equals(rhs.recv_id))))&&((this.algorithm == rhs.algorithm)||((this.algorithm!= null)&&this.algorithm.equals(rhs.algorithm))))&&((this.generation == rhs.generation)||((this.generation!= null)&&this.generation.equals(rhs.generation))))&&((this.transport == rhs.transport)||((this.transport!= null)&&this.transport.equals(rhs.transport))))&&((this.publish_delay_sec == rhs.publish_delay_sec)||((this.publish_delay_sec!= null)&&this.publish_delay_sec.equals(rhs.publish_delay_sec))))&&((this.config_sync_sec == rhs.config_sync_sec)||((this.config_sync_sec!= null)&&this.config_sync_sec.equals(rhs.config_sync_sec))))&&((this.send_id == rhs.send_id)||((this.send_id!= null)&&this.send_id.equals(rhs.send_id))))&&((this.port == rhs.port)||((this.port!= null)&&this.port.equals(rhs.port))))&&((this.name == rhs.name)||((this.name!= null)&&this.name.equals(rhs.name))))&&((this.periodic_sec == rhs.periodic_sec)||((this.periodic_sec!= null)&&this.periodic_sec.equals(rhs.periodic_sec))))&&((this.noConfigAck == rhs.noConfigAck)||((this.noConfigAck!= null)&&this.noConfigAck.equals(rhs.noConfigAck))))&&((this.gatewayId == rhs.gatewayId)||((this.gatewayId!= null)&&this.gatewayId.equals(rhs.gatewayId))))&&((this.auth_provider == rhs.auth_provider)||((this.auth_provider!= null)&&this.auth_provider.equals(rhs.auth_provider)))); + return (((((((((((((((((((((((((this.generation == rhs.generation)||((this.generation!= null)&&this.generation.equals(rhs.generation)))&&((this.keyBytes == rhs.keyBytes)||((this.keyBytes!= null)&&this.keyBytes.equals(rhs.keyBytes))))&&((this.side_id == rhs.side_id)||((this.side_id!= null)&&this.side_id.equals(rhs.side_id))))&&((this.transport == rhs.transport)||((this.transport!= null)&&this.transport.equals(rhs.transport))))&&((this.publish_delay_sec == rhs.publish_delay_sec)||((this.publish_delay_sec!= null)&&this.publish_delay_sec.equals(rhs.publish_delay_sec))))&&((this.error == rhs.error)||((this.error!= null)&&this.error.equals(rhs.error))))&&((this.config_sync_sec == rhs.config_sync_sec)||((this.config_sync_sec!= null)&&this.config_sync_sec.equals(rhs.config_sync_sec))))&&((this.deviceId == rhs.deviceId)||((this.deviceId!= null)&&this.deviceId.equals(rhs.deviceId))))&&((this.client_id == rhs.client_id)||((this.client_id!= null)&&this.client_id.equals(rhs.client_id))))&&((this.enabled == rhs.enabled)||((this.enabled!= null)&&this.enabled.equals(rhs.enabled))))&&((this.capacity == rhs.capacity)||((this.capacity!= null)&&this.capacity.equals(rhs.capacity))))&&((this.send_id == rhs.send_id)||((this.send_id!= null)&&this.send_id.equals(rhs.send_id))))&&((this.protocol == rhs.protocol)||((this.protocol!= null)&&this.protocol.equals(rhs.protocol))))&&((this.hostname == rhs.hostname)||((this.hostname!= null)&&this.hostname.equals(rhs.hostname))))&&((this.payload == rhs.payload)||((this.payload!= null)&&this.payload.equals(rhs.payload))))&&((this.port == rhs.port)||((this.port!= null)&&this.port.equals(rhs.port))))&&((this.topic_prefix == rhs.topic_prefix)||((this.topic_prefix!= null)&&this.topic_prefix.equals(rhs.topic_prefix))))&&((this.name == rhs.name)||((this.name!= null)&&this.name.equals(rhs.name))))&&((this.periodic_sec == rhs.periodic_sec)||((this.periodic_sec!= null)&&this.periodic_sec.equals(rhs.periodic_sec))))&&((this.noConfigAck == rhs.noConfigAck)||((this.noConfigAck!= null)&&this.noConfigAck.equals(rhs.noConfigAck))))&&((this.recv_id == rhs.recv_id)||((this.recv_id!= null)&&this.recv_id.equals(rhs.recv_id))))&&((this.gatewayId == rhs.gatewayId)||((this.gatewayId!= null)&&this.gatewayId.equals(rhs.gatewayId))))&&((this.auth_provider == rhs.auth_provider)||((this.auth_provider!= null)&&this.auth_provider.equals(rhs.auth_provider))))&&((this.algorithm == rhs.algorithm)||((this.algorithm!= null)&&this.algorithm.equals(rhs.algorithm)))); } public enum Protocol { diff --git a/gencode/java/udmi/schema/Events.java b/gencode/java/udmi/schema/Events.java index 280293bc37..a431206d31 100644 --- a/gencode/java/udmi/schema/Events.java +++ b/gencode/java/udmi/schema/Events.java @@ -53,8 +53,8 @@ public class Events { public int hashCode() { int result = 1; result = ((result* 31)+((this.pointset == null)? 0 :this.pointset.hashCode())); - result = ((result* 31)+((this.system == null)? 0 :this.system.hashCode())); result = ((result* 31)+((this.discovery == null)? 0 :this.discovery.hashCode())); + result = ((result* 31)+((this.system == null)? 0 :this.system.hashCode())); return result; } @@ -67,7 +67,7 @@ public boolean equals(Object other) { return false; } Events rhs = ((Events) other); - return ((((this.pointset == rhs.pointset)||((this.pointset!= null)&&this.pointset.equals(rhs.pointset)))&&((this.system == rhs.system)||((this.system!= null)&&this.system.equals(rhs.system))))&&((this.discovery == rhs.discovery)||((this.discovery!= null)&&this.discovery.equals(rhs.discovery)))); + return ((((this.pointset == rhs.pointset)||((this.pointset!= null)&&this.pointset.equals(rhs.pointset)))&&((this.discovery == rhs.discovery)||((this.discovery!= null)&&this.discovery.equals(rhs.discovery))))&&((this.system == rhs.system)||((this.system!= null)&&this.system.equals(rhs.system)))); } } diff --git a/gencode/java/udmi/schema/FamilyLocalnetModel.java b/gencode/java/udmi/schema/FamilyLocalnetModel.java index 0310d47482..3d1813f19c 100644 --- a/gencode/java/udmi/schema/FamilyLocalnetModel.java +++ b/gencode/java/udmi/schema/FamilyLocalnetModel.java @@ -66,11 +66,11 @@ public class FamilyLocalnetModel { @Override public int hashCode() { int result = 1; - result = ((result* 31)+((this.shadow_id == null)? 0 :this.shadow_id.hashCode())); - result = ((result* 31)+((this.parent_id == null)? 0 :this.parent_id.hashCode())); result = ((result* 31)+((this.addr == null)? 0 :this.addr.hashCode())); result = ((result* 31)+((this.adjunct == null)? 0 :this.adjunct.hashCode())); result = ((result* 31)+((this.family == null)? 0 :this.family.hashCode())); + result = ((result* 31)+((this.shadow_id == null)? 0 :this.shadow_id.hashCode())); + result = ((result* 31)+((this.parent_id == null)? 0 :this.parent_id.hashCode())); result = ((result* 31)+((this.network == null)? 0 :this.network.hashCode())); return result; } @@ -84,7 +84,7 @@ public boolean equals(Object other) { return false; } FamilyLocalnetModel rhs = ((FamilyLocalnetModel) other); - return (((((((this.shadow_id == rhs.shadow_id)||((this.shadow_id!= null)&&this.shadow_id.equals(rhs.shadow_id)))&&((this.parent_id == rhs.parent_id)||((this.parent_id!= null)&&this.parent_id.equals(rhs.parent_id))))&&((this.addr == rhs.addr)||((this.addr!= null)&&this.addr.equals(rhs.addr))))&&((this.adjunct == rhs.adjunct)||((this.adjunct!= null)&&this.adjunct.equals(rhs.adjunct))))&&((this.family == rhs.family)||((this.family!= null)&&this.family.equals(rhs.family))))&&((this.network == rhs.network)||((this.network!= null)&&this.network.equals(rhs.network)))); + return (((((((this.addr == rhs.addr)||((this.addr!= null)&&this.addr.equals(rhs.addr)))&&((this.adjunct == rhs.adjunct)||((this.adjunct!= null)&&this.adjunct.equals(rhs.adjunct))))&&((this.family == rhs.family)||((this.family!= null)&&this.family.equals(rhs.family))))&&((this.shadow_id == rhs.shadow_id)||((this.shadow_id!= null)&&this.shadow_id.equals(rhs.shadow_id))))&&((this.parent_id == rhs.parent_id)||((this.parent_id!= null)&&this.parent_id.equals(rhs.parent_id))))&&((this.network == rhs.network)||((this.network!= null)&&this.network.equals(rhs.network)))); } } diff --git a/gencode/java/udmi/schema/GatewayModel.java b/gencode/java/udmi/schema/GatewayModel.java index 22876706e5..f474d979a9 100644 --- a/gencode/java/udmi/schema/GatewayModel.java +++ b/gencode/java/udmi/schema/GatewayModel.java @@ -49,8 +49,8 @@ public class GatewayModel { @Override public int hashCode() { int result = 1; - result = ((result* 31)+((this.proxy_ids == null)? 0 :this.proxy_ids.hashCode())); result = ((result* 31)+((this.gateway_id == null)? 0 :this.gateway_id.hashCode())); + result = ((result* 31)+((this.proxy_ids == null)? 0 :this.proxy_ids.hashCode())); result = ((result* 31)+((this.target == null)? 0 :this.target.hashCode())); return result; } @@ -64,7 +64,7 @@ public boolean equals(Object other) { return false; } GatewayModel rhs = ((GatewayModel) other); - return ((((this.proxy_ids == rhs.proxy_ids)||((this.proxy_ids!= null)&&this.proxy_ids.equals(rhs.proxy_ids)))&&((this.gateway_id == rhs.gateway_id)||((this.gateway_id!= null)&&this.gateway_id.equals(rhs.gateway_id))))&&((this.target == rhs.target)||((this.target!= null)&&this.target.equals(rhs.target)))); + return ((((this.gateway_id == rhs.gateway_id)||((this.gateway_id!= null)&&this.gateway_id.equals(rhs.gateway_id)))&&((this.proxy_ids == rhs.proxy_ids)||((this.proxy_ids!= null)&&this.proxy_ids.equals(rhs.proxy_ids))))&&((this.target == rhs.target)||((this.target!= null)&&this.target.equals(rhs.target)))); } } diff --git a/gencode/java/udmi/schema/PointPointsetModel.java b/gencode/java/udmi/schema/PointPointsetModel.java index f244f16f77..505fd741ca 100644 --- a/gencode/java/udmi/schema/PointPointsetModel.java +++ b/gencode/java/udmi/schema/PointPointsetModel.java @@ -29,7 +29,7 @@ "baseline_state", "range_min", "range_max", - "stale_threshold_sec", + "unchanged_limit_sec", "cov_increment", "ref", "adjunct", @@ -95,12 +95,12 @@ public class PointPointsetModel { @JsonPropertyDescription("Represents the upper bound of the error threshold for a point") public Double range_max; /** - * Represents the limit in seconds that a point can be stagnant/unchanged for + * Represents the limit in seconds that a point can be unchanged for * */ - @JsonProperty("stale_threshold_sec") - @JsonPropertyDescription("Represents the limit in seconds that a point can be stagnant/unchanged for") - public Integer stale_threshold_sec; + @JsonProperty("unchanged_limit_sec") + @JsonPropertyDescription("Represents the limit in seconds that a point can be unchanged for") + public Integer unchanged_limit_sec; /** * Triggering threshold for partial cov update publishing * @@ -147,8 +147,8 @@ public int hashCode() { result = ((result* 31)+((this.ref == null)? 0 :this.ref.hashCode())); result = ((result* 31)+((this.baseline_value == null)? 0 :this.baseline_value.hashCode())); result = ((result* 31)+((this.range_max == null)? 0 :this.range_max.hashCode())); + result = ((result* 31)+((this.unchanged_limit_sec == null)? 0 :this.unchanged_limit_sec.hashCode())); result = ((result* 31)+((this.adjunct == null)? 0 :this.adjunct.hashCode())); - result = ((result* 31)+((this.stale_threshold_sec == null)? 0 :this.stale_threshold_sec.hashCode())); result = ((result* 31)+((this.cov_increment == null)? 0 :this.cov_increment.hashCode())); return result; } @@ -162,7 +162,7 @@ public boolean equals(Object other) { return false; } PointPointsetModel rhs = ((PointPointsetModel) other); - return (((((((((((((((this.baseline_state == rhs.baseline_state)||((this.baseline_state!= null)&&this.baseline_state.equals(rhs.baseline_state)))&&((this.range_min == rhs.range_min)||((this.range_min!= null)&&this.range_min.equals(rhs.range_min))))&&((this.description == rhs.description)||((this.description!= null)&&this.description.equals(rhs.description))))&&((this.units == rhs.units)||((this.units!= null)&&this.units.equals(rhs.units))))&&((this.baseline_tolerance == rhs.baseline_tolerance)||((this.baseline_tolerance!= null)&&this.baseline_tolerance.equals(rhs.baseline_tolerance))))&&((this.structure == rhs.structure)||((this.structure!= null)&&this.structure.equals(rhs.structure))))&&((this.writable == rhs.writable)||((this.writable!= null)&&this.writable.equals(rhs.writable))))&&((this.tags == rhs.tags)||((this.tags!= null)&&this.tags.equals(rhs.tags))))&&((this.ref == rhs.ref)||((this.ref!= null)&&this.ref.equals(rhs.ref))))&&((this.baseline_value == rhs.baseline_value)||((this.baseline_value!= null)&&this.baseline_value.equals(rhs.baseline_value))))&&((this.range_max == rhs.range_max)||((this.range_max!= null)&&this.range_max.equals(rhs.range_max))))&&((this.adjunct == rhs.adjunct)||((this.adjunct!= null)&&this.adjunct.equals(rhs.adjunct))))&&((this.stale_threshold_sec == rhs.stale_threshold_sec)||((this.stale_threshold_sec!= null)&&this.stale_threshold_sec.equals(rhs.stale_threshold_sec))))&&((this.cov_increment == rhs.cov_increment)||((this.cov_increment!= null)&&this.cov_increment.equals(rhs.cov_increment)))); + return (((((((((((((((this.baseline_state == rhs.baseline_state)||((this.baseline_state!= null)&&this.baseline_state.equals(rhs.baseline_state)))&&((this.range_min == rhs.range_min)||((this.range_min!= null)&&this.range_min.equals(rhs.range_min))))&&((this.description == rhs.description)||((this.description!= null)&&this.description.equals(rhs.description))))&&((this.units == rhs.units)||((this.units!= null)&&this.units.equals(rhs.units))))&&((this.baseline_tolerance == rhs.baseline_tolerance)||((this.baseline_tolerance!= null)&&this.baseline_tolerance.equals(rhs.baseline_tolerance))))&&((this.structure == rhs.structure)||((this.structure!= null)&&this.structure.equals(rhs.structure))))&&((this.writable == rhs.writable)||((this.writable!= null)&&this.writable.equals(rhs.writable))))&&((this.tags == rhs.tags)||((this.tags!= null)&&this.tags.equals(rhs.tags))))&&((this.ref == rhs.ref)||((this.ref!= null)&&this.ref.equals(rhs.ref))))&&((this.baseline_value == rhs.baseline_value)||((this.baseline_value!= null)&&this.baseline_value.equals(rhs.baseline_value))))&&((this.range_max == rhs.range_max)||((this.range_max!= null)&&this.range_max.equals(rhs.range_max))))&&((this.unchanged_limit_sec == rhs.unchanged_limit_sec)||((this.unchanged_limit_sec!= null)&&this.unchanged_limit_sec.equals(rhs.unchanged_limit_sec))))&&((this.adjunct == rhs.adjunct)||((this.adjunct!= null)&&this.adjunct.equals(rhs.adjunct))))&&((this.cov_increment == rhs.cov_increment)||((this.cov_increment!= null)&&this.cov_increment.equals(rhs.cov_increment)))); } diff --git a/gencode/java/udmi/schema/PoliciesModel.java b/gencode/java/udmi/schema/PoliciesModel.java index 492f09513d..2bb257507a 100644 --- a/gencode/java/udmi/schema/PoliciesModel.java +++ b/gencode/java/udmi/schema/PoliciesModel.java @@ -16,22 +16,22 @@ */ @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "named_policies" + "rule_sets" }) public class PoliciesModel { /** - * An array of policies which are applicable to the device + * An array of rule sets which are applicable to the device * */ - @JsonProperty("named_policies") - @JsonPropertyDescription("An array of policies which are applicable to the device") - public List named_policies; + @JsonProperty("rule_sets") + @JsonPropertyDescription("An array of rule sets which are applicable to the device") + public List rule_sets; @Override public int hashCode() { int result = 1; - result = ((result* 31)+((this.named_policies == null)? 0 :this.named_policies.hashCode())); + result = ((result* 31)+((this.rule_sets == null)? 0 :this.rule_sets.hashCode())); return result; } @@ -44,7 +44,7 @@ public boolean equals(Object other) { return false; } PoliciesModel rhs = ((PoliciesModel) other); - return ((this.named_policies == rhs.named_policies)||((this.named_policies!= null)&&this.named_policies.equals(rhs.named_policies))); + return ((this.rule_sets == rhs.rule_sets)||((this.rule_sets!= null)&&this.rule_sets.equals(rhs.rule_sets))); } } diff --git a/gencode/java/udmi/schema/RefDiscovery.java b/gencode/java/udmi/schema/RefDiscovery.java index e50aeb6bf9..7bdebeeda7 100644 --- a/gencode/java/udmi/schema/RefDiscovery.java +++ b/gencode/java/udmi/schema/RefDiscovery.java @@ -113,17 +113,17 @@ public class RefDiscovery { @Override public int hashCode() { int result = 1; + result = ((result* 31)+((this.ref == null)? 0 :this.ref.hashCode())); + result = ((result* 31)+((this.possible_values == null)? 0 :this.possible_values.hashCode())); + result = ((result* 31)+((this.name == null)? 0 :this.name.hashCode())); result = ((result* 31)+((this.description == null)? 0 :this.description.hashCode())); result = ((result* 31)+((this.units == null)? 0 :this.units.hashCode())); result = ((result* 31)+((this.type == null)? 0 :this.type.hashCode())); + result = ((result* 31)+((this.ancillary == null)? 0 :this.ancillary.hashCode())); + result = ((result* 31)+((this.adjunct == null)? 0 :this.adjunct.hashCode())); result = ((result* 31)+((this.point == null)? 0 :this.point.hashCode())); result = ((result* 31)+((this.structure == null)? 0 :this.structure.hashCode())); result = ((result* 31)+((this.writable == null)? 0 :this.writable.hashCode())); - result = ((result* 31)+((this.ref == null)? 0 :this.ref.hashCode())); - result = ((result* 31)+((this.possible_values == null)? 0 :this.possible_values.hashCode())); - result = ((result* 31)+((this.name == null)? 0 :this.name.hashCode())); - result = ((result* 31)+((this.ancillary == null)? 0 :this.ancillary.hashCode())); - result = ((result* 31)+((this.adjunct == null)? 0 :this.adjunct.hashCode())); result = ((result* 31)+((this.status == null)? 0 :this.status.hashCode())); return result; } @@ -137,7 +137,7 @@ public boolean equals(java.lang.Object other) { return false; } RefDiscovery rhs = ((RefDiscovery) other); - return (((((((((((((this.description == rhs.description)||((this.description!= null)&&this.description.equals(rhs.description)))&&((this.units == rhs.units)||((this.units!= null)&&this.units.equals(rhs.units))))&&((this.type == rhs.type)||((this.type!= null)&&this.type.equals(rhs.type))))&&((this.point == rhs.point)||((this.point!= null)&&this.point.equals(rhs.point))))&&((this.structure == rhs.structure)||((this.structure!= null)&&this.structure.equals(rhs.structure))))&&((this.writable == rhs.writable)||((this.writable!= null)&&this.writable.equals(rhs.writable))))&&((this.ref == rhs.ref)||((this.ref!= null)&&this.ref.equals(rhs.ref))))&&((this.possible_values == rhs.possible_values)||((this.possible_values!= null)&&this.possible_values.equals(rhs.possible_values))))&&((this.name == rhs.name)||((this.name!= null)&&this.name.equals(rhs.name))))&&((this.ancillary == rhs.ancillary)||((this.ancillary!= null)&&this.ancillary.equals(rhs.ancillary))))&&((this.adjunct == rhs.adjunct)||((this.adjunct!= null)&&this.adjunct.equals(rhs.adjunct))))&&((this.status == rhs.status)||((this.status!= null)&&this.status.equals(rhs.status)))); + return (((((((((((((this.ref == rhs.ref)||((this.ref!= null)&&this.ref.equals(rhs.ref)))&&((this.possible_values == rhs.possible_values)||((this.possible_values!= null)&&this.possible_values.equals(rhs.possible_values))))&&((this.name == rhs.name)||((this.name!= null)&&this.name.equals(rhs.name))))&&((this.description == rhs.description)||((this.description!= null)&&this.description.equals(rhs.description))))&&((this.units == rhs.units)||((this.units!= null)&&this.units.equals(rhs.units))))&&((this.type == rhs.type)||((this.type!= null)&&this.type.equals(rhs.type))))&&((this.ancillary == rhs.ancillary)||((this.ancillary!= null)&&this.ancillary.equals(rhs.ancillary))))&&((this.adjunct == rhs.adjunct)||((this.adjunct!= null)&&this.adjunct.equals(rhs.adjunct))))&&((this.point == rhs.point)||((this.point!= null)&&this.point.equals(rhs.point))))&&((this.structure == rhs.structure)||((this.structure!= null)&&this.structure.equals(rhs.structure))))&&((this.writable == rhs.writable)||((this.writable!= null)&&this.writable.equals(rhs.writable))))&&((this.status == rhs.status)||((this.status!= null)&&this.status.equals(rhs.status)))); } } diff --git a/gencode/java/udmi/schema/SiteLinks.java b/gencode/java/udmi/schema/SiteLinks.java index 41fc94ca6c..3f3527402e 100644 --- a/gencode/java/udmi/schema/SiteLinks.java +++ b/gencode/java/udmi/schema/SiteLinks.java @@ -71,11 +71,11 @@ public class SiteLinks { public int hashCode() { int result = 1; result = ((result* 31)+((this.image == null)? 0 :this.image.hashCode())); + result = ((result* 31)+((this.sheet == null)? 0 :this.sheet.hashCode())); result = ((result* 31)+((this.folder == null)? 0 :this.folder.hashCode())); result = ((result* 31)+((this.docs == null)? 0 :this.docs.hashCode())); - result = ((result* 31)+((this.repo == null)? 0 :this.repo.hashCode())); - result = ((result* 31)+((this.sheet == null)? 0 :this.sheet.hashCode())); result = ((result* 31)+((this.dashboard == null)? 0 :this.dashboard.hashCode())); + result = ((result* 31)+((this.repo == null)? 0 :this.repo.hashCode())); return result; } @@ -88,7 +88,7 @@ public boolean equals(Object other) { return false; } SiteLinks rhs = ((SiteLinks) other); - return (((((((this.image == rhs.image)||((this.image!= null)&&this.image.equals(rhs.image)))&&((this.folder == rhs.folder)||((this.folder!= null)&&this.folder.equals(rhs.folder))))&&((this.docs == rhs.docs)||((this.docs!= null)&&this.docs.equals(rhs.docs))))&&((this.repo == rhs.repo)||((this.repo!= null)&&this.repo.equals(rhs.repo))))&&((this.sheet == rhs.sheet)||((this.sheet!= null)&&this.sheet.equals(rhs.sheet))))&&((this.dashboard == rhs.dashboard)||((this.dashboard!= null)&&this.dashboard.equals(rhs.dashboard)))); + return (((((((this.image == rhs.image)||((this.image!= null)&&this.image.equals(rhs.image)))&&((this.sheet == rhs.sheet)||((this.sheet!= null)&&this.sheet.equals(rhs.sheet))))&&((this.folder == rhs.folder)||((this.folder!= null)&&this.folder.equals(rhs.folder))))&&((this.docs == rhs.docs)||((this.docs!= null)&&this.docs.equals(rhs.docs))))&&((this.dashboard == rhs.dashboard)||((this.dashboard!= null)&&this.dashboard.equals(rhs.dashboard))))&&((this.repo == rhs.repo)||((this.repo!= null)&&this.repo.equals(rhs.repo)))); } } diff --git a/gencode/java/udmi/schema/SiteLocation.java b/gencode/java/udmi/schema/SiteLocation.java index 1318d4e57e..c49ba57283 100644 --- a/gencode/java/udmi/schema/SiteLocation.java +++ b/gencode/java/udmi/schema/SiteLocation.java @@ -46,9 +46,9 @@ public class SiteLocation { @Override public int hashCode() { int result = 1; - result = ((result* 31)+((this.address == null)? 0 :this.address.hashCode())); result = ((result* 31)+((this.lat == null)? 0 :this.lat.hashCode())); result = ((result* 31)+((this._long == null)? 0 :this._long.hashCode())); + result = ((result* 31)+((this.address == null)? 0 :this.address.hashCode())); return result; } @@ -61,7 +61,7 @@ public boolean equals(Object other) { return false; } SiteLocation rhs = ((SiteLocation) other); - return ((((this.address == rhs.address)||((this.address!= null)&&this.address.equals(rhs.address)))&&((this.lat == rhs.lat)||((this.lat!= null)&&this.lat.equals(rhs.lat))))&&((this._long == rhs._long)||((this._long!= null)&&this._long.equals(rhs._long)))); + return ((((this.lat == rhs.lat)||((this.lat!= null)&&this.lat.equals(rhs.lat)))&&((this._long == rhs._long)||((this._long!= null)&&this._long.equals(rhs._long))))&&((this.address == rhs.address)||((this.address!= null)&&this.address.equals(rhs.address)))); } } diff --git a/gencode/python/dist/udmi_schema-0.1.0-py3-none-any.whl b/gencode/python/dist/udmi_schema-0.1.0-py3-none-any.whl index 208b79ebcdf4d3d97d5c3ddd27e6aa2af5db9176..7b3e69841f669e884eb752deb788dbe47b463d75 100644 GIT binary patch delta 2458 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 Bc%T3P diff --git a/gencode/python/dist/udmi_schema-0.1.0.tar.gz b/gencode/python/dist/udmi_schema-0.1.0.tar.gz index 8d4094837b83429bd9bf20d45ac3495004ab474f..db057fc261ba8e15c48b6a659fbee3d6fe7edb2c 100644 GIT binary patch delta 2475 zcmV;c2~_sVV#Z>yAR=8Gq0oMGg8{up%PJxe#}C~EZbem~=IQX}u{OdPSSwZygpJob zWVq1R$nN)l*7YCPr)|&wV?NgSfAsMm-CqA0N_5EptX+rbI4waObVpRYl(@Ded4M+$ z*}yy2&JH!?v=(Hb-=}=a6{+Ei2laJ3+K27^U)s>1f1P z2Kq8u>gMuaxr9D?{m11*t^Ypm^M7<-{;N=;vjIRNpD+~ib)z7Eph5x`Lud_g=GRv` z%3+GW{1Q z(N*(58=u3HaujLC$(b$LINx9ICB_n%Te5zHk*v>GEDH1vdaJuS;HRzsrJKyhkN=%d zl>A?a0rd3WeflqdP@>!ApH(VS$eO+fwPsu6aSp4(^TX&r^s^{=$l~9G{+CMqmp=bj zcj>=Gi7r)qs)psz{d58Nw(OwwcD3b2N|^ex@Oc*J*?>Ikm$SF8uegbjM1JxZzRs^S zf=;oDru5HdwT=3pBkb%Y*Z*Af{=Z$P{{khtRru`|22l(@E8j7CF4ln3)hJ@spN!mr z(r-PF2qB|>$#$WyZNti}2oAAqxI$4k+SC%)Fw=h&(;Vq>zFNVgCI64k+Bk8r>pF6nkS^vClP=8aH1~|4uG5ax3JP5VUJiBrc%&g znniI;t2D4f>SP+j&|^g!*dc9acf~~=$kDLAjNQ|$OpVqQyD&`O#^}agm?xXSS!C;; zpSQvP+phnv%m23QOgrqM(Wj#Ak15U+v=0 z_czh5uxH7;gJOzW+8xk0(@PKPd)5jMJJ5gs-YGzA`romv{~a&qz5e$Q=)a38K$Xx!gbdb;(h{H6rMxYp{`f@W1Otg*6An>zwIKBS$E7boMKB_J0e-Qgu;y?TN z?{4$|5+%AP0BZQZ&I8{OGD8XV%4;P<0l-j82s`*kH_W%2#5yLlSO^RtP7qAz`M7^A zr7?7%Sj=okE?)ViYo$wduC90X>hBrv0rG!(@c8ooRF(giqkjK?2>hR+#6f$1khGta zrE6S3sPxZjy!oN$-}+t-0?Hso4(^A3=7YfhH*@gd&zYA;90xx23Soys#xl|Sv#W|@ z+Jj~P#P>WH;=bx^$ewtM?(fluk;8u>vn}`m`Ube29S&>Pvu2Ch`_&&f#~E775||bS zQL-t*|G)qzBMzW$R&Xr2DVG2#rsK$EvZ{~L??1jY|8Kee`*^P8e_ZtSKf2BTpQir% z<4gZ_)!=cbR1#iu8P4EH8J~LH`=YPD3aKqhmqz^31*dT_>2JvhTTwBiq2qrnAW~9& z8LFHVK0a47FOO37S^Z8ADgBJ|Or*_V8*G^la^KUO|F>BGS+@UAMx$xZ|GUrs5260E z$}##P(EHJU$><+D{$n(n%k)2)%zOIpKK)lH(cKte++*PkrHs;;HKf!gNEt-70a?i( zQo;vV_Lg#fM21i{17oonB7c9SQf()d{_TYV3N9lQrSxFGZSH?f_&;uGvHrt&zL535 z^LZct(P{oqP@+q_e;tE|SstsYEmLFSQbG?6oVWAPrF9T*h1N<7Ibut)Z9s<l6%w5aM zDwgp_^t8HKP5j7ROsRjc96dRcFV!u4`F0C51y0;3!R3h@)peMp6IOT_sYcounw2VEC{oiCP z#s5ym<39iAfvo>LN_5{1NK_3XCbWij2cb)t=7CW052q_}NDdctP`TU`{x(`?o6~Zh znl4_|6@y!89g~vHD4bKn{@0Qrbq!@bB6>*Rk9zy>f$;wVCAu04%I~M(pE(Sxt=ttmZ?LD*%fGd(n}OT-HhX@J z$gCgT^%K^AuGx|9s0Omvf1SwmKOOb@{{x|ah7wO#3GR#W0PP;OUWZMUHx>?nU_w;`#^k1OF7ukRP?ZFau+5^^bk!sUhfY)yC z4BJSexuYpU(ZR4#izc`U{~a>_FFz(g=8|j{f7|(r|JeD8@o4u;#=BoK+5M7fHTP#euH(#!+b=NJ9(?zYm!spw p@$&iKN5{+K(f2)*?0@~Q|MkEA*Z=xo|N9z#{~zmOX7B(o0sv}dGxq=h delta 2479 zcmV;g2~hUNV#;E$AR=O0a!&)aPG%b<$Y8m^vaBKkas1Ft;8s)xYMu^n9&00XnEm=RpNY>{o76p0-z13YE@YB}+(oN>$ z$N$bJO8zgz0DAiGKK&Ocf6?vo&nguuWKG|LTC=V3IEPi?`C;@Q`dO4bWbto8|4XI* zOP~L%yYye8M3*W)Rl{=Ve!2jBTXxWTyV~+1B}{!;_&kgAY(O6N%h}u4SKLHMB0qTy zU*}gEL8n+nQ~GDK+D84)5q9>H>whkK|KG0De}NL+D*Sc}gD8fTKJOSk7i&Q2Y80{R zPe$%Q>9?Logpg6cWV_JUwqa#f1cz8QT%o8NZEA^YnCU-?X^!+bU#(!$lK;naHdphr zI3;-m0TPq4DKmd_sfymHzpUwqPfT-PDkzSI*`(yb;xdvo4SxWA&Cv**HP?SyD|Mc3oUjL^frCpZ+8~>k< zmHc1hWxxMB2>#z%0k}u>1vSWjMaD{WovyOOX`YZupG1G?!->8?H~?1V0VV-OP zXOXRYe%=QEZ@d1xF8|xIkN@d1|9_(T?+<72b+z3s7L$k7c7G&?fv4bgP3XVn`tPH~ zLaqPU@Be>0P5&LP|1J*DSpU6t^Dh9j_C72d#3=g>3_$v{&&2b_xj&Mp#LtW z0BN@Tt0d9}sawh}(Lq9EAP&>e8i8V*>dVb6Fwr(LgTT+$;q>~~uTcM6_^7s||3U0u ziT~{5zq`%rIuCqD$P6XaE3cId1pq@WA?)BE-7w#766=`IVj(bqI6*L- z=i`62l*Z73VllHFxp?K5u9Ys;xw_ujtG{Qw2gv{F!Q;#SQ&s+7j{5!oA@F~O5(n-5 zLDGIwmacIDq0&FA@#cq~f9rcW2q=RTIk+GCnGXX0-^{^-KWAPZaUA&6D})^m8OucP z&#o$tX%CkD6W{Y-i2JIuA$#I2y1z#sMh<_6%(mbM=o{d6b~vnE&zdc2?^l1|9A{`P zOJG_UM9HQI{{sV@j5vV0S;4X7rd$G~n2sZt$*Mj|zyJ8s{J-V;@8h|W|8ddR|L8XV zf13L5k1ze#RfET!Qb~BtWjKQ)Wqj&&?~A_rDx|h3T^jLA7o5h$q`xI2Y(>S4hK_%; zfJjO8WvFse`1oASygW+PXZ1Thr1Ue+Gm$ofZLnoJ$bC<9{@-H#XW9Ng8I7hr|L;Ek zKZN?vD#z%HK<`KYC8K}r_>a+OF4O;HGVkfX`}AL-M0aC=agT*FlrlZ`;s3a$#rhB9 z`9jwJ&gXsnN2mEeL5VKy{&frCm)1eN6>cYUU2;3T9{HK= zp$WXPf#7ZZt#SC3p19DMcFV)xFf(nwGqe~vww#m+2vb1j!Kw9g(R_cHU(mZW zak;_qmZaD+TI6o<;u|FcH}IjXVSXgbscqU4xW-?+p}qhkAFsK<=N(*doA7^PSlCPQ zZ^Zv6Q>FgLV%huucAEclDDfn#z#iGZsp68XRHeEW6QNB}%xXkeZ>V)5{2msM_?e?EJNmuLq}k`Od9?N4aY26!R({}TyF>xn z_J5PH6#qLJkNfF~Kb)?_Avs*oLFIB&_}gfm zZBEO1YPxt;R}5~YbxcY&qi{|Q`(I0j)HRg#i0CCb5c<};E+Q!sGN55YoFNtyKhv4) z|FOU!fj$54BL9CEQDR4){}2a{U+II-|IGauM@EoJlzc&6&JG~j<*$3q(hl^0@vom> zyngrU{o_5u>i;{I^Z$*Pv)=#rNq$Aq+ZVqU=E%wM^ynR-bq+U<%5H)rM_0vq{By}Y zh@%d(STniq=n}2&K3XqdT-;|HeDyzGPLKcg{O>b#i&Jk5`nW z!gY?;?!k|!om_^Grn|x)|83_h{$uAW#-rUY8Sj3{WcN#^)!d)?xQ;U?Zoj}>d+^;q tUXG3z$IIt`A001`N8k5Mvj6qJ{@4HdU;pcW{qJk|{eJ=jSs(x~0sz20K-d5P diff --git a/gencode/python/udmi/schema/model_pointset_point.py b/gencode/python/udmi/schema/model_pointset_point.py index aecb857ee1..12b2eb9fdc 100644 --- a/gencode/python/udmi/schema/model_pointset_point.py +++ b/gencode/python/udmi/schema/model_pointset_point.py @@ -40,7 +40,7 @@ class PointPointsetModel(DataModel): baseline_state: Optional[BaselineState] = None range_min: Optional[float] = None range_max: Optional[float] = None - stale_threshold_sec: Optional[int] = None + unchanged_limit_sec: Optional[int] = None cov_increment: Optional[float] = None ref: Optional[str] = None adjunct: Optional[Dict[str, str]] = None diff --git a/gencode/python/udmi/schema/model_policies.py b/gencode/python/udmi/schema/model_policies.py index 897a16ff1c..b716bfe044 100644 --- a/gencode/python/udmi/schema/model_policies.py +++ b/gencode/python/udmi/schema/model_policies.py @@ -15,4 +15,4 @@ class PoliciesModel(DataModel): Device policies """ - named_policies: Optional[List[str]] = None + rule_sets: Optional[List[str]] = None diff --git a/schema/metadata.json b/schema/metadata.json index c9190e5a29..f720a2a848 100644 --- a/schema/metadata.json +++ b/schema/metadata.json @@ -85,5 +85,8 @@ } } } + }, + "policies": { + "$ref": "file:model_policies.json#" } } diff --git a/schema/model_pointset_point.json b/schema/model_pointset_point.json index 91fe8e4d09..b9729a678e 100644 --- a/schema/model_pointset_point.json +++ b/schema/model_pointset_point.json @@ -47,8 +47,8 @@ "type": "number", "examples": [100] }, - "stale_threshold_sec": { - "description": "Represents the limit in seconds that a point can be stagnant/unchanged for", + "unchanged_limit_sec": { + "description": "Represents the limit in seconds that a point can be unchanged for", "type": "integer", "examples": [3600] }, diff --git a/schema/model_policies.json b/schema/model_policies.json index 13419ff6bb..c32f20ee48 100644 --- a/schema/model_policies.json +++ b/schema/model_policies.json @@ -6,8 +6,8 @@ "$schema": "http://json-schema.org/draft-04/schema#", "additionalProperties": false, "properties": { - "named_policies": { - "description": "An array of policies which are applicable to the device", + "rule_sets": { + "description": "An array of rule sets which are applicable to the device", "type": "array", "items": { "type": "string",