Make model operation a top-level construct

.gencode_hash.txt

@@ -7,14 +7,14 @@ d6a260ed6dca30f85d18ca7c96421d1a70204816b4fd382cca1716e18ed506e8  gencode/docs/c
 11b21f73b6a4065102968a4c09979639b8a7ea6efb20e40d52cd21b2a60167bb  gencode/docs/configuration_pod.html
 01495c82f15040bb307cbfd39e0bbc7af21ce0d70008cbd19878a9046dcda814  gencode/docs/configuration_pubber.html
 1057fa40fb7a31a23bb2773d21c38cf4590a935bd8b5ea4218e695c6204f5dd9  gencode/docs/data_template.html
-23948cddb6c580547ec8731414d814256cb1c2488d362b1fabc5a88cada3ab85  gencode/docs/events.html
-39f92aeb39f5be8c152389664315de9e54a070022956a88e048cff892addb485  gencode/docs/events_discovery.html
+95be7481d8c86d9ec32bdc70b1ad26cba2beab9e97c4b49a1e67191e10b2e41f  gencode/docs/events.html
+0c4e28c46a1bcb3f8450ae1aa7b176b119569e4053e569710092cfb34eeccad4  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
-f282f7756318e544254c94055f68abfc7e78a0cf37e10bca4314d6e5e75b23a7  gencode/docs/metadata.html
+c5d9a49a05be86365ffca744fe81b4336769d049c612d4cd1617ee2462f55b5b  gencode/docs/metadata.html
 123276c35494a06b615642da3de61aa9a54cf76d16da795e4b20dd711d57f837  gencode/docs/monitoring.html
 474ca16edc9f3cad2bb3ab40b6993cbced90263f762f66ee6cd246a6c4a0d18f  gencode/docs/persistent_device.html
 e11595fd11477947a27461f8ef4fb6facb5f60e2abd6212193f7581ab123ff84  gencode/docs/properties.html
@@ -36,13 +36,13 @@ 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
-79b678b524b3edce833fe56691dcd8c47b53a12f7491e761121408e6e7ceb5e3  gencode/java/udmi/schema/BuildingTranslation.java
+519ead2ee2fe3e6fe48547266dec9a545521d52d262646f261ebfbbf8500d25f  gencode/java/udmi/schema/BuildingTranslation.java
 27ca4f61bd43beca0871b465f3906785a1030a4526605f1fa9b10e3adda8df05  gencode/java/udmi/schema/CapabilityValidationState.java
 224c6be2cb6d90a47d181fa30ba1418cf6cc5385ec1c010fe112728382a70216  gencode/java/udmi/schema/Category.java
 65a892c39e687a00e66e02f7ace2e17f07d3633a1b20b3dfd1e4ac3ec72a8788  gencode/java/udmi/schema/CloudConfigModel.java
-5fcf687fa0167889a63a1fbaafc8c3f2d9ac16609c8e804fdce8171903c37a1f  gencode/java/udmi/schema/CloudModel.java
+d35424caf30021b9480bd7f73039b32dfb0c528bc748f86db20467d0c202b069  gencode/java/udmi/schema/CloudModel.java
 051b4a7c85a2f1a310787f88f336be2fc9b87c99a94ac2f970955d2fe1daa931  gencode/java/udmi/schema/CloudQuery.java
 3e6572b16184bde7557eb67334405e7c5b58446e64802658cf0d5ef3b0018909  gencode/java/udmi/schema/Common.java
 c44f25ab2b9f17ea18c7cd5b78e4c5565ba4ecc20d426105d778c28bb6b32263  gencode/java/udmi/schema/Config.java
@@ -55,16 +55,16 @@ 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
-600a630adbaad68fe5f912f871c145ea13f5b9d5a5495591b84aa8cd93c04b83  gencode/java/udmi/schema/DiscoveryConfig.java
+62d5f97b1664651b3d2791e73e3727e46cce045ba330c12d55be6ad483ca0c3a  gencode/java/udmi/schema/DiscoveryConfig.java
 f72c9f04a8d25dc25854254eb6711040c47cd09942ed9c1ee885be4e1d729b10  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
 e0ca9b52b4cfb4be9d6c911a549a9f2f69f5f948f05a9e3a7b224c988f932ae3  gencode/java/udmi/schema/Envelope.java
-4163478ed17191461b0a65abd11c4ddf912cbc104f040a734efd290306fab7b7  gencode/java/udmi/schema/Events.java
+b8542a0908719901405220783e85be33197cf16ef5be6458cec5ae92c274e88f  gencode/java/udmi/schema/Events.java
 3347e406bb6e65bf0b7f3f811729f8e1be3eadc3e1a37a1523b233fe7c06879e  gencode/java/udmi/schema/ExecutionConfiguration.java
 bd8350cd05a4091851cf0361cb3a8eb98701ba30df21ff14414e2dabf1289b7f  gencode/java/udmi/schema/FamilyDiscovery.java
 c8358eb137e72cb92cd6979105fda299346ae5b2950af6f7ea9bf582698117d6  gencode/java/udmi/schema/FamilyDiscoveryConfig.java
@@ -77,7 +77,7 @@ b39e12241d1bdabe0db583dc01a7a6b87efb5b57957dae5a3571cfec077b397c  gencode/java/u
 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
@@ -92,7 +92,7 @@ ca932e3a0d0da213950aa89ad7a19d94505dd478bf196946aa93436c5c8b7512  gencode/java/u
 edbb091621a6f5e3f7e6804c7c30c0877fab0b0455661186f37b303ed108ff26  gencode/java/udmi/schema/MappingEvents.java
 2742b162c3524152f3f5fce62015139295fab7cbf8f58beb7f8287ea5d294e7c  gencode/java/udmi/schema/MappingState.java
 8b15a8982ccadc52d52a8083cb9e101c73f2a48e069c4d41d6e59ea914352507  gencode/java/udmi/schema/MessageTemplateData.java
-cdbe66f2fe5e02bfcf37729e407a66ec2c942f763d61054462f37f258eee9c4e  gencode/java/udmi/schema/Metadata.java
+df82ad3f7d4229e41c39dde105a90e33732330ee2131b1f8e6907b69e62a69a3  gencode/java/udmi/schema/Metadata.java
 a64167bfcec809442cff132bb59ae0600055731407858656cc7147c3a38bb7cc  gencode/java/udmi/schema/Metrics.java
 e986aff1efca08188441a246392f8c524c2cdaae107e475657402872a9a01561  gencode/java/udmi/schema/Monitoring.java
 25210c7f94b6369c43c68ed1fefba1ab3dedfe3201352055c536fd5225a4c590  gencode/java/udmi/schema/MonitoringMetric.java
@@ -114,14 +114,14 @@ c73ad6dde0db8a520f3fee5a563c55a79fc7e6d1cd7875723b10c3d34036a46b  gencode/java/u
 d87deaba67bb3272c528e3491d378bde059b626964a4a2aed15f5643305c2463  gencode/java/udmi/schema/Properties.java
 4cdd5dc6b2e054a43f2e70adeb46ef8e3ff78288d4315923a925415f87e871aa  gencode/java/udmi/schema/PubberConfiguration.java
 3bf0638ae4606ba3c3a1daf477d41c19d88c2a07a3700da7a6a61a3eeb4b2c32  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
 376a30d35d87827c356fd4ce8b071eaf739bbbdaa24d39be5c0f23a503d435ea  gencode/java/udmi/schema/SiteMetadata.java
 dc2fd582fffefbdeaf3bf7724ca34e94475c3cc820891ea4cc829847eb9ba79d  gencode/java/udmi/schema/State.java
 a371232810e8a2ffb380384ca717da1ee5cc0b2e1129df9b5d8faa07ab4b1f46  gencode/java/udmi/schema/StateSystemHardware.java
@@ -151,7 +151,7 @@ dab4f5fca272ec48c2881bca2b6bc43786ada47fa1f6dd935c35f7ce0eb6b0f6  gencode/python
 470b688984b89b25fcdfa8e08bd95b0c5d8c551d53a6ab5512503ee39419e6fa  gencode/python/udmi/schema/category.py
 cfaeca16d0420f4553acf594f85a80ceb149487f1c41d02ee6e73a6ce5e1ac5b  gencode/python/udmi/schema/commands_discovery.py
 69dac232428f6c79855cd5a13b24d341679133068a707d1281e1922168cabf93  gencode/python/udmi/schema/commands_mapping.py
-7be9cf5102de91953662a3e42a202482fa34404be2e1beb9d330fe91454c15ff  gencode/python/udmi/schema/common.py
+8d752fde86eb65450284f80711b631ee0d6c45ffbad913bc63f0f958e7bc6a24  gencode/python/udmi/schema/common.py
 53961cd8a6ddd118143457ca60d765e12b21bcdf98fc2d648ebac0172ffca880  gencode/python/udmi/schema/config.py
 79eb0299b3751d93c01a5de65eacc717283e99caf0996f3db48a15247f69c8eb  gencode/python/udmi/schema/config_blobset.py
 59039eaf2812392329c641ad387f7e27790cf804fc94a014626d2da5ab426e3d  gencode/python/udmi/schema/config_blobset_blob.py
@@ -192,7 +192,7 @@ dc4bef0026ac8d9b0e5b13fe675b16df889e38671a7946371fe47d0443d82e4d  gencode/python
 0423bfd2158a71a1ce3961054aceacbe6603ad1f65a707b586d17bfabb2a99cb  gencode/python/udmi/schema/events_udmi.py
 8f4ec5b4d717a0c497e914a2e15c72d96bfd3bbb119fa3b1e21ac96243c195bd  gencode/python/udmi/schema/events_validation.py
 3707a9a5a07b7cf80e4ce6b0ca81584de74a9d5fe361214a4d3b6f22dd30cad8  gencode/python/udmi/schema/events_validation_device.py
-4e4cd57d7688873b1751e72abe1cd715b92374ff2325ac5e15e6e620022c1a69  gencode/python/udmi/schema/metadata.py
+08b264888144afa79f36b02cd3b855bf938afee5f519e84a37e4b8f18c94d6d5  gencode/python/udmi/schema/metadata.py
 375fe28a8f98a1644b2b58d3e204b934b1a5d60e6eb3cfa1a7cb85e375b2cbae  gencode/python/udmi/schema/model_cloud.py
 2ec91522178789a3d5ec27ad8ed13a94b8619139359dc3dcad9601b9adc1582d  gencode/python/udmi/schema/model_cloud_config.py
 387e3f68dad9ddd6211a4e10d25c35026a4c0083b606819fdb4e338be9e135ca  gencode/python/udmi/schema/model_discovery.py

.github/workflows/integration.yaml

@@ -32,7 +32,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
       - name: Log in to the github registry
         uses: docker/login-action@v3
         with:
@@ -85,7 +85,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
       - name: Publish maven package
         run:  pubber/bin/publish
 

.github/workflows/testing.yml

@@ -22,7 +22,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
       - uses: actions/setup-python@v5
         with:
           python-version: '3.10'
@@ -78,7 +78,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
       - name: base setup
         run: |
           bin/setup_base
@@ -129,7 +129,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
       - name: base setup
         run: bin/run_tests install_dependencies
       - name: local setup
@@ -184,7 +184,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
       - name: base setup
         run: bin/run_tests install_dependencies
       - name: local setup
@@ -236,7 +236,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
       - name: base setup
         run: |
           bin/setup_base
@@ -291,7 +291,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
       - name: base setup
         run: bin/run_tests install_dependencies
       - name: local setup
@@ -369,7 +369,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
       - name: Setup prerequisites
         run: |
           bin/setup_base

bin/test_runlocal

@@ -15,13 +15,13 @@ echo Captured $(wc -l out/message_capture.log) messages.
 systems=$(find out/registries/ -name \*update_model.json | xargs jq .system | fgrep -v null | wc -l) || true
 [[ $systems == 269 ]] || fail Expected 269 system operations, found $systems
 
-deletes=$(find out/registries/ -name \*update_model.json | xargs jq .cloud.operation | fgrep DELETE | wc -l) || true
+deletes=$(find out/registries/ -name \*update_model.json | xargs jq .operation | fgrep DELETE | wc -l) || true
 [[ $deletes == 1 ]] || fail Expected 1 delete operations, found $deletes
 
-binds=$(find out/registries/ -name \*update_model.json | xargs jq .cloud.operation | fgrep BIND | wc -l) || true
+binds=$(find out/registries/ -name \*update_model.json | xargs jq .operation | fgrep BIND | wc -l) || true
 [[ $binds == 3 ]] || fail Expected 3 bind operations, found $binds
 
-blocks=$(find out/registries/ -name \*update_model.json | xargs jq .cloud.operation | fgrep BLOCK | wc -l) || true
+blocks=$(find out/registries/ -name \*update_model.json | xargs jq .operation | fgrep BLOCK | wc -l) || true
 [[ $blocks == 1 ]] || fail Expected 1 block operations, found $blocks
 
 echo Done with successful runlocal validation.