diff --git a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/OnOffClientFragment.kt b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/OnOffClientFragment.kt index 7f31b7485ce141..02188301d2ec40 100644 --- a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/OnOffClientFragment.kt +++ b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/OnOffClientFragment.kt @@ -129,8 +129,8 @@ class OnOffClientFragment : Fragment() { showReportMessage(message) } - override fun onSubscriptionEstablished() { - val message = "Subscription for on/off established" + override fun onSubscriptionEstablished(subscriptionId: Long) { + val message = "Subscription for on/off established with subscriptionId: $subscriptionId" Log.v(TAG, message) showMessage(message) } diff --git a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/SensorClientFragment.kt b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/SensorClientFragment.kt index a7ac8728f814ca..2d4abab5b668e9 100644 --- a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/SensorClientFragment.kt +++ b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/SensorClientFragment.kt @@ -181,7 +181,7 @@ class SensorClientFragment : Fragment() { return try { - ChipClient.getDeviceController(requireContext()).shutdownSubscriptions(subscribedDevicePtr) + ChipClient.getDeviceController(requireContext()).shutdownSubscriptions() subscribedDevicePtr = 0 } catch (ex: Exception) { showMessage(R.string.sensor_client_unsubscribe_error_text, ex.toString()) diff --git a/examples/chip-tool/commands/clusters/SubscriptionsCommands.h b/examples/chip-tool/commands/clusters/SubscriptionsCommands.h index 7fabd8c24ecf1b..afb4b40b92f416 100644 --- a/examples/chip-tool/commands/clusters/SubscriptionsCommands.h +++ b/examples/chip-tool/commands/clusters/SubscriptionsCommands.h @@ -30,7 +30,7 @@ class ShutdownSubscription : public CHIPCommand CHIPCommand("shutdown-one", credsIssuerConfig, "Shut down a single subscription, identified by its subscription id and target node id.") { - AddArgument("subscription-id", 0, UINT64_MAX, &mSubscriptionId); + AddArgument("subscription-id", 0, UINT32_MAX, &mSubscriptionId); AddArgument("node-id", 0, UINT64_MAX, &mNodeId, "The node id, scoped to the commissioner name the command is running under."); } diff --git a/examples/java-matter-controller/BUILD.gn b/examples/java-matter-controller/BUILD.gn index 7724d5fcd80516..f48c17ff3c9519 100644 --- a/examples/java-matter-controller/BUILD.gn +++ b/examples/java-matter-controller/BUILD.gn @@ -69,6 +69,7 @@ kotlin_binary("java-matter-controller") { "java/src/com/matter/controller/commands/pairing/PairOnNetworkInstanceNameCommand.kt", "java/src/com/matter/controller/commands/pairing/PairOnNetworkLongCommand.kt", "java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImInvokeCommand.kt", + "java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImSubscribeCommand.kt", "java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImWriteCommand.kt", "java/src/com/matter/controller/commands/pairing/PairOnNetworkShortCommand.kt", "java/src/com/matter/controller/commands/pairing/PairOnNetworkVendorCommand.kt", diff --git a/examples/java-matter-controller/args.gni b/examples/java-matter-controller/args.gni index 188c73238f6a2b..5d279bfa552053 100644 --- a/examples/java-matter-controller/args.gni +++ b/examples/java-matter-controller/args.gni @@ -23,4 +23,4 @@ chip_system_project_config_include = "" chip_project_config_include_dirs = [ "${chip_root}/examples/java-matter-controller/include" ] chip_project_config_include_dirs += [ "${chip_root}/config/standalone" ] -chip_stack_lock_tracking = "none" +chip_stack_lock_tracking = "fatal" diff --git a/examples/java-matter-controller/java/src/com/matter/controller/Main.kt b/examples/java-matter-controller/java/src/com/matter/controller/Main.kt index 3aad410c3ddbf1..b3604caf582186 100644 --- a/examples/java-matter-controller/java/src/com/matter/controller/Main.kt +++ b/examples/java-matter-controller/java/src/com/matter/controller/Main.kt @@ -62,6 +62,7 @@ private fun getImCommands( credentialsIssuer: CredentialsIssuer ): List { return listOf( + PairOnNetworkLongImSubscribeCommand(controller, credentialsIssuer), PairOnNetworkLongImWriteCommand(controller, credentialsIssuer), PairOnNetworkLongImInvokeCommand(controller, credentialsIssuer), ) diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImSubscribeCommand.kt b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImSubscribeCommand.kt new file mode 100644 index 00000000000000..d99b25c8ce620f --- /dev/null +++ b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImSubscribeCommand.kt @@ -0,0 +1,98 @@ +package com.matter.controller.commands.pairing + +import chip.devicecontroller.ChipDeviceController +import chip.devicecontroller.GetConnectedDeviceCallbackJni.GetConnectedDeviceCallback +import chip.devicecontroller.ReportCallback +import chip.devicecontroller.SubscriptionEstablishedCallback +import chip.devicecontroller.ResubscriptionAttemptCallback +import chip.devicecontroller.model.NodeState +import chip.devicecontroller.model.ChipAttributePath +import chip.devicecontroller.model.ChipEventPath +import com.matter.controller.commands.common.CredentialsIssuer +import java.util.Collections +import java.util.logging.Level +import java.util.logging.Logger + +class PairOnNetworkLongImSubscribeCommand( + controller: ChipDeviceController, credsIssue: CredentialsIssuer? +) : PairingCommand( + controller, + "onnetwork-long-im-subscribe", + credsIssue, + PairingModeType.ON_NETWORK, + PairingNetworkType.NONE, + DiscoveryFilterType.LONG_DISCRIMINATOR +) { + private var devicePointer: Long = 0 + private var subscriptionId: Long = 0 + + private inner class InternalReportCallback : ReportCallback { + override fun onError(attributePath: ChipAttributePath?, eventPath: ChipEventPath?, e: Exception) { + logger.log(Level.INFO, "Subscribe receive onError") + setFailure("write failure") + } + + override fun onReport(nodeState: NodeState) { + logger.log(Level.INFO, "Subscribe receve onReport") + } + } + + private inner class InternalGetConnectedDeviceCallback : GetConnectedDeviceCallback { + override fun onDeviceConnected(devicePointer: Long) { + this@PairOnNetworkLongImSubscribeCommand.devicePointer = devicePointer + logger.log(Level.INFO, "onDeviceConnected") + } + + override fun onConnectionFailure(nodeId: Long, error: Exception?) { + logger.log(Level.INFO, "onConnectionFailure") + } + } + + private inner class InternalSubscriptionEstablishedCallback : SubscriptionEstablishedCallback { + override fun onSubscriptionEstablished(subscriptionId: Long) { + this@PairOnNetworkLongImSubscribeCommand.subscriptionId = subscriptionId + logger.log(Level.INFO, "onSubscriptionEstablished with Id" + subscriptionId) + setSuccess() + } + } + + private inner class InternalResubscriptionAttemptCallback : ResubscriptionAttemptCallback { + override fun onResubscriptionAttempt(terminationCause: Int, nextResubscribeIntervalMsec: Int) { + logger.log(Level.INFO, "ResubscriptionAttemptCallback"); + } + } + + override fun runCommand() { + val attributePathList = listOf(ChipAttributePath.newInstance( + /* endpointId= */ 0, CLUSTER_ID_BASIC, ATTR_ID_LOCAL_CONFIG_DISABLED)) + + currentCommissioner() + .pairDeviceWithAddress( + getNodeId(), + getRemoteAddr().getHostAddress(), + MATTER_PORT, + getDiscriminator(), + getSetupPINCode(), + null + ) + currentCommissioner().setCompletionListener(this) + waitCompleteMs(getTimeoutMillis()) + currentCommissioner() + .getConnectedDevicePointer(getNodeId(), InternalGetConnectedDeviceCallback()) + clear() + currentCommissioner() + .subscribeToPath(InternalSubscriptionEstablishedCallback(), InternalResubscriptionAttemptCallback(), InternalReportCallback(), devicePointer, attributePathList, Collections.emptyList(), 0, 5, false, false) + waitCompleteMs(getTimeoutMillis()) + currentCommissioner().shutdownSubscriptions(currentCommissioner().getFabricIndex(), getNodeId(), subscriptionId); + } + + companion object { + private val logger = Logger.getLogger( + PairOnNetworkLongImSubscribeCommand::class.java.name + ) + + private const val MATTER_PORT = 5540 + private const val CLUSTER_ID_BASIC = 0x0028L + private const val ATTR_ID_LOCAL_CONFIG_DISABLED = 16L + } +} diff --git a/examples/tv-casting-app/linux/CastingUtils.cpp b/examples/tv-casting-app/linux/CastingUtils.cpp index 294339bed585a1..5e15a2e30e3e17 100644 --- a/examples/tv-casting-app/linux/CastingUtils.cpp +++ b/examples/tv-casting-app/linux/CastingUtils.cpp @@ -160,7 +160,7 @@ void OnCurrentStateReadResponseFailure(void * context, CHIP_ERROR err) ChipLogProgress(AppServer, "OnCurrentStateReadResponseFailure called with %" CHIP_ERROR_FORMAT, err.Format()); } -void OnCurrentStateSubscriptionEstablished(void * context) +void OnCurrentStateSubscriptionEstablished(void * context, SubscriptionId aSubscriptionId) { ChipLogProgress(AppServer, "OnCurrentStateSubscriptionEstablished called"); if (context != nullptr) diff --git a/src/app/DeviceProxy.h b/src/app/DeviceProxy.h index 3315576065b6ed..9d00845bcfc420 100644 --- a/src/app/DeviceProxy.h +++ b/src/app/DeviceProxy.h @@ -46,8 +46,6 @@ class DLL_EXPORT DeviceProxy virtual NodeId GetDeviceId() const = 0; - virtual void ShutdownSubscriptions() = 0; - virtual CHIP_ERROR SendCommands(app::CommandSender * commandObj, chip::Optional timeout = NullOptional); virtual Messaging::ExchangeManager * GetExchangeManager() const = 0; diff --git a/src/app/InteractionModelEngine.cpp b/src/app/InteractionModelEngine.cpp index 3fe465637e225c..08f3266f522b1d 100644 --- a/src/app/InteractionModelEngine.cpp +++ b/src/app/InteractionModelEngine.cpp @@ -253,14 +253,18 @@ uint32_t InteractionModelEngine::GetNumActiveWriteHandlers() const CHIP_ERROR InteractionModelEngine::ShutdownSubscription(const ScopedNodeId & aPeerNodeId, SubscriptionId aSubscriptionId) { - for (auto * readClient = mpActiveReadClientList; readClient != nullptr; readClient = readClient->GetNextClient()) + assertChipStackLockedByCurrentThread(); + for (auto * readClient = mpActiveReadClientList; readClient != nullptr;) { + // Grab the next client now, because we might be about to delete readClient. + auto * nextClient = readClient->GetNextClient(); if (readClient->IsSubscriptionType() && readClient->IsMatchingSubscriptionId(aSubscriptionId) && readClient->GetFabricIndex() == aPeerNodeId.GetFabricIndex() && readClient->GetPeerNodeId() == aPeerNodeId.GetNodeId()) { readClient->Close(CHIP_NO_ERROR); return CHIP_NO_ERROR; } + readClient = nextClient; } return CHIP_ERROR_KEY_NOT_FOUND; @@ -268,15 +272,18 @@ CHIP_ERROR InteractionModelEngine::ShutdownSubscription(const ScopedNodeId & aPe void InteractionModelEngine::ShutdownSubscriptions(FabricIndex aFabricIndex, NodeId aPeerNodeId) { + assertChipStackLockedByCurrentThread(); ShutdownMatchingSubscriptions(MakeOptional(aFabricIndex), MakeOptional(aPeerNodeId)); } void InteractionModelEngine::ShutdownSubscriptions(FabricIndex aFabricIndex) { + assertChipStackLockedByCurrentThread(); ShutdownMatchingSubscriptions(MakeOptional(aFabricIndex)); } void InteractionModelEngine::ShutdownAllSubscriptions() { + assertChipStackLockedByCurrentThread(); ShutdownMatchingSubscriptions(); } diff --git a/src/app/OperationalSessionSetup.h b/src/app/OperationalSessionSetup.h index 653cb61a5682f7..cb3f624ba6724e 100644 --- a/src/app/OperationalSessionSetup.h +++ b/src/app/OperationalSessionSetup.h @@ -84,8 +84,6 @@ class OperationalDeviceProxy : public DeviceProxy {} OperationalDeviceProxy() {} - // Recommended to use InteractionModelEngine::ShutdownSubscriptions directly. - void ShutdownSubscriptions() override { VerifyOrDie(false); } // Currently not implemented. void Disconnect() override { if (IsSecureConnected()) diff --git a/src/controller/CHIPCluster.h b/src/controller/CHIPCluster.h index f3e198d1f278fd..ab37a52ece8e24 100644 --- a/src/controller/CHIPCluster.h +++ b/src/controller/CHIPCluster.h @@ -50,7 +50,7 @@ template using ReadResponseSuccessCallback = void (*)(void * context, T responseData); using ReadResponseFailureCallback = void (*)(void * context, CHIP_ERROR err); using ReadDoneCallback = void (*)(void * context); -using SubscriptionEstablishedCallback = void (*)(void * context); +using SubscriptionEstablishedCallback = void (*)(void * context, SubscriptionId subscriptionId); using ResubscriptionAttemptCallback = void (*)(void * context, CHIP_ERROR aError, uint32_t aNextResubscribeIntervalMsec); using SubscriptionOnDoneCallback = std::function; @@ -298,10 +298,11 @@ class DLL_EXPORT ClusterBase } }; - auto onSubscriptionEstablishedCb = [context, subscriptionEstablishedCb](const app::ReadClient & readClient) { + auto onSubscriptionEstablishedCb = [context, subscriptionEstablishedCb](const app::ReadClient & readClient, + SubscriptionId subscriptionId) { if (subscriptionEstablishedCb != nullptr) { - subscriptionEstablishedCb(context); + subscriptionEstablishedCb(context, subscriptionId); } }; @@ -377,10 +378,11 @@ class DLL_EXPORT ClusterBase } }; - auto onSubscriptionEstablishedCb = [context, subscriptionEstablishedCb](const app::ReadClient & readClient) { + auto onSubscriptionEstablishedCb = [context, subscriptionEstablishedCb](const app::ReadClient & readClient, + SubscriptionId subscriptionId) { if (subscriptionEstablishedCb != nullptr) { - subscriptionEstablishedCb(context); + subscriptionEstablishedCb(context, subscriptionId); } }; diff --git a/src/controller/CommissioneeDeviceProxy.h b/src/controller/CommissioneeDeviceProxy.h index 931c76d1da7918..e5c4ac1d8a9626 100644 --- a/src/controller/CommissioneeDeviceProxy.h +++ b/src/controller/CommissioneeDeviceProxy.h @@ -133,7 +133,6 @@ class CommissioneeDeviceProxy : public DeviceProxy, public SessionDelegate bool IsSessionSetupInProgress() const { return mState == ConnectionState::Connecting; } NodeId GetDeviceId() const override { return mPeerId.GetNodeId(); } - void ShutdownSubscriptions() override {} PeerId GetPeerId() const { return mPeerId; } CHIP_ERROR SetPeerId(ByteSpan rcac, ByteSpan noc) override; const Transport::PeerAddress & GetPeerAddress() const { return mDeviceAddress; } diff --git a/src/controller/TypedReadCallback.h b/src/controller/TypedReadCallback.h index 65f4b51a11cd78..aa0e4394ad4e5e 100644 --- a/src/controller/TypedReadCallback.h +++ b/src/controller/TypedReadCallback.h @@ -52,7 +52,8 @@ class TypedReadAttributeCallback final : public app::ReadClient::Callback std::function; using OnErrorCallbackType = std::function; using OnDoneCallbackType = std::function; - using OnSubscriptionEstablishedCallbackType = std::function; + using OnSubscriptionEstablishedCallbackType = + std::function; using OnResubscriptionAttemptCallbackType = std::function; TypedReadAttributeCallback(ClusterId aClusterId, AttributeId aAttributeId, OnSuccessCallbackType aOnSuccess, @@ -127,7 +128,7 @@ class TypedReadAttributeCallback final : public app::ReadClient::Callback { if (mOnSubscriptionEstablished) { - mOnSubscriptionEstablished(*mReadClient.get()); + mOnSubscriptionEstablished(*mReadClient.get(), aSubscriptionId); } } @@ -175,7 +176,8 @@ class TypedReadEventCallback final : public app::ReadClient::Callback using OnSuccessCallbackType = std::function; using OnErrorCallbackType = std::function; using OnDoneCallbackType = std::function; - using OnSubscriptionEstablishedCallbackType = std::function; + using OnSubscriptionEstablishedCallbackType = + std::function; using OnResubscriptionAttemptCallbackType = std::function; @@ -260,7 +262,7 @@ class TypedReadEventCallback final : public app::ReadClient::Callback { if (mOnSubscriptionEstablished) { - mOnSubscriptionEstablished(*mReadClient.get()); + mOnSubscriptionEstablished(*mReadClient.get(), aSubscriptionId); } } diff --git a/src/controller/java/AndroidCallbacks.cpp b/src/controller/java/AndroidCallbacks.cpp index f8b113a768b0d1..e530e051fd337a 100644 --- a/src/controller/java/AndroidCallbacks.cpp +++ b/src/controller/java/AndroidCallbacks.cpp @@ -15,7 +15,6 @@ * limitations under the License. */ #include "AndroidCallbacks.h" - #include #include #include @@ -511,6 +510,12 @@ void ReportCallback::OnDone(app::ReadClient *) err = JniReferences::GetInstance().FindMethod(env, mReportCallbackRef, "onDone", "()V", &onDoneMethod); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Controller, "Could not find onDone method")); + if (mReadClient != nullptr) + { + Platform::Delete(mReadClient); + } + mReadClient = nullptr; + DeviceLayer::StackUnlock unlock; env->CallVoidMethod(mReportCallbackRef, onDoneMethod); VerifyOrReturn(!env->ExceptionCheck(), env->ExceptionDescribe()); @@ -519,7 +524,8 @@ void ReportCallback::OnDone(app::ReadClient *) void ReportCallback::OnSubscriptionEstablished(SubscriptionId aSubscriptionId) { - JniReferences::GetInstance().CallSubscriptionEstablished(mSubscriptionEstablishedCallbackRef); + DeviceLayer::StackUnlock unlock; + JniReferences::GetInstance().CallSubscriptionEstablished(mSubscriptionEstablishedCallbackRef, aSubscriptionId); } CHIP_ERROR ReportCallback::OnResubscriptionNeeded(app::ReadClient * apReadClient, CHIP_ERROR aTerminationCause) @@ -771,7 +777,8 @@ void ReportEventCallback::OnDone(app::ReadClient *) void ReportEventCallback::OnSubscriptionEstablished(SubscriptionId aSubscriptionId) { - JniReferences::GetInstance().CallSubscriptionEstablished(mSubscriptionEstablishedCallbackRef); + chip::DeviceLayer::StackUnlock unlock; + JniReferences::GetInstance().CallSubscriptionEstablished(mSubscriptionEstablishedCallbackRef, aSubscriptionId); } CHIP_ERROR ReportEventCallback::OnResubscriptionNeeded(app::ReadClient * apReadClient, CHIP_ERROR aTerminationCause) diff --git a/src/controller/java/CHIPDeviceController-JNI.cpp b/src/controller/java/CHIPDeviceController-JNI.cpp index c70511c4366bf9..52dca9d77e3a04 100644 --- a/src/controller/java/CHIPDeviceController-JNI.cpp +++ b/src/controller/java/CHIPDeviceController-JNI.cpp @@ -958,19 +958,52 @@ JNI_METHOD(void, releaseOperationalDevicePointer)(JNIEnv * env, jobject self, jl } } -JNI_METHOD(void, shutdownSubscriptions)(JNIEnv * env, jobject self, jlong handle, jlong devicePtr) +JNI_METHOD(jint, getFabricIndex)(JNIEnv * env, jobject self, jlong handle) { chip::DeviceLayer::StackLock lock; - DeviceProxy * device = reinterpret_cast(devicePtr); + AndroidDeviceControllerWrapper * wrapper = AndroidDeviceControllerWrapper::FromJNIHandle(handle); + + return wrapper->Controller()->GetFabricIndex(); +} - // - // We should move away from this model of shutting down subscriptions in this manner and instead, - // have Java own the ReadClient objects directly and manage their lifetimes. - // - // #13163 tracks this issue. - // - device->ShutdownSubscriptions(); +JNI_METHOD(void, shutdownSubscriptions) +(JNIEnv * env, jobject self, jobject handle, jobject fabricIndex, jobject peerNodeId, jobject subscriptionId) +{ + chip::DeviceLayer::StackLock lock; + if (fabricIndex == nullptr && peerNodeId == nullptr && subscriptionId == nullptr) + { + app::InteractionModelEngine::GetInstance()->ShutdownAllSubscriptions(); + return; + } + + if (fabricIndex != nullptr && peerNodeId != nullptr && subscriptionId == nullptr) + { + jint jFabricIndex = chip::JniReferences::GetInstance().IntegerToPrimitive(fabricIndex); + jlong jPeerNodeId = chip::JniReferences::GetInstance().LongToPrimitive(peerNodeId); + app::InteractionModelEngine::GetInstance()->ShutdownSubscriptions(static_cast(jFabricIndex), + static_cast(jPeerNodeId)); + return; + } + + if (fabricIndex != nullptr && peerNodeId == nullptr && subscriptionId == nullptr) + { + jint jFabricIndex = chip::JniReferences::GetInstance().IntegerToPrimitive(fabricIndex); + app::InteractionModelEngine::GetInstance()->ShutdownSubscriptions(static_cast(jFabricIndex)); + return; + } + + if (fabricIndex != nullptr && peerNodeId != nullptr && subscriptionId != nullptr) + { + jint jFabricIndex = chip::JniReferences::GetInstance().IntegerToPrimitive(fabricIndex); + jlong jPeerNodeId = chip::JniReferences::GetInstance().LongToPrimitive(peerNodeId); + jlong jSubscriptionId = chip::JniReferences::GetInstance().LongToPrimitive(subscriptionId); + app::InteractionModelEngine::GetInstance()->ShutdownSubscription( + chip::ScopedNodeId(static_cast(jPeerNodeId), static_cast(jFabricIndex)), + static_cast(jSubscriptionId)); + return; + } + ChipLogError(Controller, "Failed to shutdown subscriptions with correct input paramemeter"); } JNI_METHOD(jstring, getIpAddress)(JNIEnv * env, jobject self, jlong handle, jlong deviceId) diff --git a/src/controller/java/src/chip/devicecontroller/ChipDeviceController.java b/src/controller/java/src/chip/devicecontroller/ChipDeviceController.java index 277090685f5a4b..c1b7fa64959aca 100644 --- a/src/controller/java/src/chip/devicecontroller/ChipDeviceController.java +++ b/src/controller/java/src/chip/devicecontroller/ChipDeviceController.java @@ -488,9 +488,44 @@ public boolean openPairingWindowWithPINCallback( deviceControllerPtr, devicePtr, duration, iteration, discriminator, setupPinCode, callback); } - /* Shutdown all cluster attribute subscriptions for a given device */ - public void shutdownSubscriptions(long devicePtr) { - shutdownSubscriptions(deviceControllerPtr, devicePtr); + public int getFabricIndex() { + return getFabricIndex(deviceControllerPtr); + } + + /* Shuts down all active subscriptions. */ + public void shutdownSubscriptions() { + shutdownSubscriptions(deviceControllerPtr, null, null, null); + } + + /* Shuts down all active subscriptions for the fabric at the given fabricIndex */ + public void shutdownSubscriptions(int fabricIndex) { + shutdownSubscriptions(deviceControllerPtr, new Integer(fabricIndex), null, null); + } + + /** + * Shuts down all subscriptions for a particular node. + * + * @param fabricIndex the fabric index of to which the node belongs + * @param peerNodeId the node ID of the device for which subscriptions should be canceled + */ + public void shutdownSubscriptions(int fabricIndex, long peerNodeId) { + shutdownSubscriptions( + deviceControllerPtr, new Integer(fabricIndex), new Long(peerNodeId), null); + } + + /** + * Shuts down all subscriptions for a particular node. + * + * @param fabricIndex the fabric index of to which the node belongs + * @param peerNodeId the node ID of the device for which subscriptions should be canceled + * @param subscriptionId the ID of the subscription on the node which should be canceled + */ + public void shutdownSubscriptions(int fabricIndex, long peerNodeId, long subscriptionId) { + shutdownSubscriptions( + deviceControllerPtr, + new Integer(fabricIndex), + new Long(peerNodeId), + new Long(subscriptionId)); } /** @@ -833,7 +868,13 @@ private native void updateCommissioningNetworkCredentials( private native int onNOCChainGeneration(long deviceControllerPtr, ControllerParams params); - private native void shutdownSubscriptions(long deviceControllerPtr, long devicePtr); + private native int getFabricIndex(long deviceControllerPtr); + + private native void shutdownSubscriptions( + long deviceControllerPtr, + @Nullable Integer fabricIndex, + @Nullable Long peerNodeId, + @Nullable Long subscriptionId); private native void shutdownCommissioning(long deviceControllerPtr); diff --git a/src/controller/java/src/chip/devicecontroller/SubscriptionEstablishedCallback.java b/src/controller/java/src/chip/devicecontroller/SubscriptionEstablishedCallback.java index 0e648ef6684831..15bff795e7fb11 100644 --- a/src/controller/java/src/chip/devicecontroller/SubscriptionEstablishedCallback.java +++ b/src/controller/java/src/chip/devicecontroller/SubscriptionEstablishedCallback.java @@ -18,5 +18,5 @@ package chip.devicecontroller; public interface SubscriptionEstablishedCallback { - void onSubscriptionEstablished(); + void onSubscriptionEstablished(long subscriptionId); } diff --git a/src/controller/java/templates/CHIPReadCallbacks.zapt b/src/controller/java/templates/CHIPReadCallbacks.zapt index 41c01c2ad44e21..056f7a85a24a56 100644 --- a/src/controller/java/templates/CHIPReadCallbacks.zapt +++ b/src/controller/java/templates/CHIPReadCallbacks.zapt @@ -24,8 +24,8 @@ public: } static void CallbackFn(void * context, {{chipCallback.type}} value); - static void OnSubscriptionEstablished(void * context) { - CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(reinterpret_cast(context)->javaCallbackRef); + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { + CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -56,8 +56,8 @@ public: } static void CallbackFn(void * context, {{zapTypeToDecodableClusterObjectType type ns=parent.name isArgument=true}} {{#if isArray}}list{{else}}value{{/if}}); - static void OnSubscriptionEstablished(void * context) { - CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(reinterpret_cast(context)->javaCallbackRef); + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { + CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; diff --git a/src/controller/java/templates/ChipClusters-java.zapt b/src/controller/java/templates/ChipClusters-java.zapt index 6337aafbddc2c5..56f6eacaf00ac9 100644 --- a/src/controller/java/templates/ChipClusters-java.zapt +++ b/src/controller/java/templates/ChipClusters-java.zapt @@ -21,44 +21,44 @@ public class ChipClusters { void onSuccess(String value); void onError(Exception error); {{! TODO: use SubscriptionEstablishedCallback instead, here and below. }} - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface OctetStringAttributeCallback { /** Indicates a successful read for an OCTET_STRING attribute. */ void onSuccess(byte[] value); void onError(Exception error); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface IntegerAttributeCallback { void onSuccess(int value); void onError(Exception error); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface LongAttributeCallback { void onSuccess(long value); void onError(Exception error); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface BooleanAttributeCallback { void onSuccess(boolean value); void onError(Exception error); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface FloatAttributeCallback { void onSuccess(float value); void onError(Exception error); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface DoubleAttributeCallback { void onSuccess(double value); void onError(Exception error); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public static abstract class BaseChipCluster { @@ -152,13 +152,13 @@ public class ChipClusters { public interface {{asUpperCamelCase name}}AttributeCallback { void onSuccess({{#if isNullable}}@Nullable{{/if}} List<{{>asJavaTypeForEntry isArray=false}}> valueList); void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } {{else}} public interface {{asUpperCamelCase name}}AttributeCallback { void onSuccess({{#if isNullable}}@Nullable{{/if}} {{>asJavaTypeForEntry isArray=false}} value); void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } {{/if}} {{/if_basic_global_response}} diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.h b/src/controller/java/zap-generated/CHIPReadCallbacks.h index c61e125fe4d2f6..341a8fffd2284b 100644 --- a/src/controller/java/zap-generated/CHIPReadCallbacks.h +++ b/src/controller/java/zap-generated/CHIPReadCallbacks.h @@ -41,10 +41,10 @@ class CHIPBooleanAttributeCallback : public chip::Callback::Callback(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -69,10 +69,10 @@ class CHIPCharStringAttributeCallback : public chip::Callback::Callback(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -97,10 +97,10 @@ class CHIPDoubleAttributeCallback : public chip::Callback::Callback(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -125,10 +125,10 @@ class CHIPFloatAttributeCallback : public chip::Callback::Callback(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -153,10 +153,10 @@ class CHIPInt8sAttributeCallback : public chip::Callback::Callback(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -181,10 +181,10 @@ class CHIPInt8uAttributeCallback : public chip::Callback::Callback(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -209,10 +209,10 @@ class CHIPInt16sAttributeCallback : public chip::Callback::Callback(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -237,10 +237,10 @@ class CHIPInt16uAttributeCallback : public chip::Callback::Callback(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -265,10 +265,10 @@ class CHIPInt32sAttributeCallback : public chip::Callback::Callback(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -293,10 +293,10 @@ class CHIPInt32uAttributeCallback : public chip::Callback::Callback(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -321,10 +321,10 @@ class CHIPInt64sAttributeCallback : public chip::Callback::Callback(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -349,10 +349,10 @@ class CHIPInt64uAttributeCallback : public chip::Callback::Callback(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -377,10 +377,10 @@ class CHIPOctetStringAttributeCallback : public chip::Callback::Callback(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -407,10 +407,10 @@ class CHIPIdentifyGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -437,10 +437,10 @@ class CHIPIdentifyAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -466,10 +466,10 @@ class CHIPIdentifyEventListAttributeCallback : public chip::Callback::Callback & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -496,10 +496,10 @@ class CHIPIdentifyAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -526,10 +526,10 @@ class CHIPGroupsGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -556,10 +556,10 @@ class CHIPGroupsAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -585,10 +585,10 @@ class CHIPGroupsEventListAttributeCallback : public chip::Callback::Callback & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -615,10 +615,10 @@ class CHIPGroupsAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -644,10 +644,10 @@ class CHIPScenesCurrentGroupAttributeCallback : public chip::Callback::Callback< } static void CallbackFn(void * context, chip::GroupId value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -674,10 +674,10 @@ class CHIPScenesGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -704,10 +704,10 @@ class CHIPScenesAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -733,10 +733,10 @@ class CHIPScenesEventListAttributeCallback : public chip::Callback::Callback & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -763,10 +763,10 @@ class CHIPScenesAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -793,10 +793,10 @@ class CHIPOnOffStartUpOnOffAttributeCallback : public chip::Callback::Callback & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -823,10 +823,10 @@ class CHIPOnOffGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -853,10 +853,10 @@ class CHIPOnOffAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -882,10 +882,10 @@ class CHIPOnOffEventListAttributeCallback : public chip::Callback::Callback & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -911,10 +911,10 @@ class CHIPOnOffAttributeListAttributeCallback : public chip::Callback::Callback< } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -941,10 +941,11 @@ class CHIPOnOffSwitchConfigurationGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -971,10 +972,11 @@ class CHIPOnOffSwitchConfigurationAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -1001,10 +1003,10 @@ class CHIPOnOffSwitchConfigurationEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -1031,10 +1033,11 @@ class CHIPOnOffSwitchConfigurationAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -1061,10 +1064,10 @@ class CHIPLevelControlCurrentLevelAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -1091,10 +1094,10 @@ class CHIPLevelControlOnLevelAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -1121,10 +1124,10 @@ class CHIPLevelControlOnTransitionTimeAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -1151,10 +1154,10 @@ class CHIPLevelControlOffTransitionTimeAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -1181,10 +1184,10 @@ class CHIPLevelControlDefaultMoveRateAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -1211,10 +1214,10 @@ class CHIPLevelControlStartUpCurrentLevelAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -1241,10 +1244,10 @@ class CHIPLevelControlGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -1271,10 +1274,10 @@ class CHIPLevelControlAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -1301,10 +1304,10 @@ class CHIPLevelControlEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -1331,10 +1334,10 @@ class CHIPLevelControlAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -1361,10 +1364,11 @@ class CHIPBinaryInputBasicGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -1391,10 +1395,10 @@ class CHIPBinaryInputBasicAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -1421,10 +1425,10 @@ class CHIPBinaryInputBasicEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -1451,10 +1455,10 @@ class CHIPBinaryInputBasicAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -1484,10 +1488,10 @@ class CHIPDescriptorDeviceTypeListAttributeCallback void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -1514,10 +1518,10 @@ class CHIPDescriptorServerListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -1544,10 +1548,10 @@ class CHIPDescriptorClientListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -1574,10 +1578,10 @@ class CHIPDescriptorPartsListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -1604,10 +1608,10 @@ class CHIPDescriptorGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -1634,10 +1638,10 @@ class CHIPDescriptorAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -1664,10 +1668,10 @@ class CHIPDescriptorEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -1694,10 +1698,10 @@ class CHIPDescriptorAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -1725,10 +1729,10 @@ class CHIPBindingBindingAttributeCallback : public chip::Callback::Callback & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -1755,10 +1759,10 @@ class CHIPBindingGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -1785,10 +1789,10 @@ class CHIPBindingAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -1814,10 +1818,10 @@ class CHIPBindingEventListAttributeCallback : public chip::Callback::Callback & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -1844,10 +1848,10 @@ class CHIPBindingAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -1875,10 +1879,10 @@ class CHIPAccessControlAclAttributeCallback : public chip::Callback::Callback & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -1907,10 +1911,10 @@ class CHIPAccessControlExtensionAttributeCallback static void CallbackFn(void * context, const chip::app::DataModel::DecodableList< chip::app::Clusters::AccessControl::Structs::AccessControlExtensionStruct::DecodableType> & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -1937,10 +1941,10 @@ class CHIPAccessControlGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -1967,10 +1971,10 @@ class CHIPAccessControlAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -1997,10 +2001,10 @@ class CHIPAccessControlEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -2027,10 +2031,10 @@ class CHIPAccessControlAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -2058,10 +2062,10 @@ class CHIPActionsActionListAttributeCallback : public chip::Callback::Callback & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -2090,10 +2094,10 @@ class CHIPActionsEndpointListsAttributeCallback static void CallbackFn( void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -2120,10 +2124,10 @@ class CHIPActionsGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -2150,10 +2154,10 @@ class CHIPActionsAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -2179,10 +2183,10 @@ class CHIPActionsEventListAttributeCallback : public chip::Callback::Callback & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -2209,10 +2213,10 @@ class CHIPActionsAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -2239,10 +2243,10 @@ class CHIPBasicInformationVendorIDAttributeCallback } static void CallbackFn(void * context, chip::VendorId value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -2269,10 +2273,11 @@ class CHIPBasicInformationGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -2299,10 +2304,10 @@ class CHIPBasicInformationAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -2329,10 +2334,10 @@ class CHIPBasicInformationEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -2359,10 +2364,10 @@ class CHIPBasicInformationAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -2389,10 +2394,11 @@ class CHIPOtaSoftwareUpdateProviderGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -2419,10 +2425,11 @@ class CHIPOtaSoftwareUpdateProviderAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -2449,10 +2456,10 @@ class CHIPOtaSoftwareUpdateProviderEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -2479,10 +2486,11 @@ class CHIPOtaSoftwareUpdateProviderAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -2511,10 +2519,11 @@ class CHIPOtaSoftwareUpdateRequestorDefaultOTAProvidersAttributeCallback static void CallbackFn(void * context, const chip::app::DataModel::DecodableList< chip::app::Clusters::OtaSoftwareUpdateRequestor::Structs::ProviderLocation::DecodableType> & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -2541,10 +2550,11 @@ class CHIPOtaSoftwareUpdateRequestorUpdateStateProgressAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -2571,10 +2581,11 @@ class CHIPOtaSoftwareUpdateRequestorGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -2601,10 +2612,11 @@ class CHIPOtaSoftwareUpdateRequestorAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -2631,10 +2643,10 @@ class CHIPOtaSoftwareUpdateRequestorEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -2661,10 +2673,11 @@ class CHIPOtaSoftwareUpdateRequestorAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -2691,10 +2704,11 @@ class CHIPLocalizationConfigurationSupportedLocalesAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -2721,10 +2735,11 @@ class CHIPLocalizationConfigurationGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -2751,10 +2766,11 @@ class CHIPLocalizationConfigurationAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -2781,10 +2797,10 @@ class CHIPLocalizationConfigurationEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -2811,10 +2827,11 @@ class CHIPLocalizationConfigurationAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -2843,10 +2860,11 @@ class CHIPTimeFormatLocalizationSupportedCalendarTypesAttributeCallback static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -2873,10 +2891,11 @@ class CHIPTimeFormatLocalizationGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -2903,10 +2922,11 @@ class CHIPTimeFormatLocalizationAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -2933,10 +2953,10 @@ class CHIPTimeFormatLocalizationEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -2963,10 +2983,10 @@ class CHIPTimeFormatLocalizationAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -2993,10 +3013,11 @@ class CHIPUnitLocalizationGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -3023,10 +3044,10 @@ class CHIPUnitLocalizationAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -3053,10 +3074,10 @@ class CHIPUnitLocalizationEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -3083,10 +3104,10 @@ class CHIPUnitLocalizationAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -3113,10 +3134,10 @@ class CHIPPowerSourceConfigurationSourcesAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -3143,10 +3164,11 @@ class CHIPPowerSourceConfigurationGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -3173,10 +3195,11 @@ class CHIPPowerSourceConfigurationAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -3203,10 +3226,10 @@ class CHIPPowerSourceConfigurationEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -3233,10 +3256,11 @@ class CHIPPowerSourceConfigurationAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -3263,10 +3287,11 @@ class CHIPPowerSourceWiredAssessedInputVoltageAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -3293,10 +3318,11 @@ class CHIPPowerSourceWiredAssessedInputFrequencyAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -3323,10 +3349,10 @@ class CHIPPowerSourceWiredAssessedCurrentAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -3354,10 +3380,10 @@ class CHIPPowerSourceActiveWiredFaultsAttributeCallback static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -3384,10 +3410,10 @@ class CHIPPowerSourceBatVoltageAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -3414,10 +3440,10 @@ class CHIPPowerSourceBatPercentRemainingAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -3444,10 +3470,10 @@ class CHIPPowerSourceBatTimeRemainingAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -3475,10 +3501,10 @@ class CHIPPowerSourceActiveBatFaultsAttributeCallback static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -3505,10 +3531,10 @@ class CHIPPowerSourceBatTimeToFullChargeAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -3535,10 +3561,10 @@ class CHIPPowerSourceBatChargingCurrentAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -3566,10 +3592,10 @@ class CHIPPowerSourceActiveBatChargeFaultsAttributeCallback static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -3596,10 +3622,10 @@ class CHIPPowerSourceGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -3626,10 +3652,10 @@ class CHIPPowerSourceAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -3656,10 +3682,10 @@ class CHIPPowerSourceEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -3686,10 +3712,10 @@ class CHIPPowerSourceAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -3716,10 +3742,11 @@ class CHIPGeneralCommissioningGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -3746,10 +3773,11 @@ class CHIPGeneralCommissioningAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -3776,10 +3804,10 @@ class CHIPGeneralCommissioningEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -3806,10 +3834,10 @@ class CHIPGeneralCommissioningAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -3839,10 +3867,10 @@ class CHIPNetworkCommissioningNetworksAttributeCallback void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -3871,10 +3899,11 @@ class CHIPNetworkCommissioningLastNetworkingStatusAttributeCallback static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -3901,10 +3930,10 @@ class CHIPNetworkCommissioningLastNetworkIDAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -3931,10 +3960,11 @@ class CHIPNetworkCommissioningLastConnectErrorValueAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -3961,10 +3991,11 @@ class CHIPNetworkCommissioningGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -3991,10 +4022,11 @@ class CHIPNetworkCommissioningAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -4021,10 +4053,10 @@ class CHIPNetworkCommissioningEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -4051,10 +4083,10 @@ class CHIPNetworkCommissioningAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -4081,10 +4113,10 @@ class CHIPDiagnosticLogsGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -4111,10 +4143,10 @@ class CHIPDiagnosticLogsAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -4141,10 +4173,10 @@ class CHIPDiagnosticLogsEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -4171,10 +4203,10 @@ class CHIPDiagnosticLogsAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -4203,10 +4235,10 @@ class CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback static void CallbackFn(void * context, const chip::app::DataModel::DecodableList< chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterface::DecodableType> & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -4235,10 +4267,11 @@ class CHIPGeneralDiagnosticsActiveHardwareFaultsAttributeCallback static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -4267,10 +4300,10 @@ class CHIPGeneralDiagnosticsActiveRadioFaultsAttributeCallback static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -4299,10 +4332,11 @@ class CHIPGeneralDiagnosticsActiveNetworkFaultsAttributeCallback static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -4329,10 +4363,11 @@ class CHIPGeneralDiagnosticsGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -4359,10 +4394,11 @@ class CHIPGeneralDiagnosticsAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -4389,10 +4425,10 @@ class CHIPGeneralDiagnosticsEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -4419,10 +4455,10 @@ class CHIPGeneralDiagnosticsAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -4451,10 +4487,10 @@ class CHIPSoftwareDiagnosticsThreadMetricsAttributeCallback static void CallbackFn(void * context, const chip::app::DataModel::DecodableList< chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetricsStruct::DecodableType> & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -4481,10 +4517,11 @@ class CHIPSoftwareDiagnosticsGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -4511,10 +4548,11 @@ class CHIPSoftwareDiagnosticsAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -4541,10 +4579,10 @@ class CHIPSoftwareDiagnosticsEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -4571,10 +4609,10 @@ class CHIPSoftwareDiagnosticsAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -4601,10 +4639,10 @@ class CHIPThreadNetworkDiagnosticsChannelAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -4633,10 +4671,10 @@ class CHIPThreadNetworkDiagnosticsRoutingRoleAttributeCallback static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -4663,10 +4701,10 @@ class CHIPThreadNetworkDiagnosticsNetworkNameAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -4693,10 +4731,10 @@ class CHIPThreadNetworkDiagnosticsPanIdAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -4723,10 +4761,11 @@ class CHIPThreadNetworkDiagnosticsExtendedPanIdAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -4753,10 +4792,11 @@ class CHIPThreadNetworkDiagnosticsMeshLocalPrefixAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -4785,10 +4825,11 @@ class CHIPThreadNetworkDiagnosticsNeighborTableAttributeCallback static void CallbackFn(void * context, const chip::app::DataModel::DecodableList< chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTable::DecodableType> & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -4817,10 +4858,10 @@ class CHIPThreadNetworkDiagnosticsRouteTableAttributeCallback static void CallbackFn(void * context, const chip::app::DataModel::DecodableList< chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTable::DecodableType> & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -4847,10 +4888,10 @@ class CHIPThreadNetworkDiagnosticsPartitionIdAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -4877,10 +4918,10 @@ class CHIPThreadNetworkDiagnosticsWeightingAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -4907,10 +4948,10 @@ class CHIPThreadNetworkDiagnosticsDataVersionAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -4937,10 +4978,11 @@ class CHIPThreadNetworkDiagnosticsStableDataVersionAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -4967,10 +5009,11 @@ class CHIPThreadNetworkDiagnosticsLeaderRouterIdAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -4997,10 +5040,11 @@ class CHIPThreadNetworkDiagnosticsActiveTimestampAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -5027,10 +5071,11 @@ class CHIPThreadNetworkDiagnosticsPendingTimestampAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -5057,10 +5102,10 @@ class CHIPThreadNetworkDiagnosticsDelayAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -5087,10 +5132,11 @@ class CHIPThreadNetworkDiagnosticsChannelPage0MaskAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -5119,10 +5165,11 @@ class CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -5149,10 +5196,11 @@ class CHIPThreadNetworkDiagnosticsGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -5179,10 +5227,11 @@ class CHIPThreadNetworkDiagnosticsAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -5209,10 +5258,10 @@ class CHIPThreadNetworkDiagnosticsEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -5239,10 +5288,11 @@ class CHIPThreadNetworkDiagnosticsAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -5269,10 +5319,10 @@ class CHIPWiFiNetworkDiagnosticsBssidAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -5301,10 +5351,10 @@ class CHIPWiFiNetworkDiagnosticsSecurityTypeAttributeCallback static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -5333,10 +5383,10 @@ class CHIPWiFiNetworkDiagnosticsWiFiVersionAttributeCallback static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -5363,10 +5413,10 @@ class CHIPWiFiNetworkDiagnosticsChannelNumberAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -5393,10 +5443,10 @@ class CHIPWiFiNetworkDiagnosticsRssiAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -5423,10 +5473,11 @@ class CHIPWiFiNetworkDiagnosticsBeaconLostCountAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -5453,10 +5504,10 @@ class CHIPWiFiNetworkDiagnosticsBeaconRxCountAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -5483,10 +5534,11 @@ class CHIPWiFiNetworkDiagnosticsPacketMulticastRxCountAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -5513,10 +5565,11 @@ class CHIPWiFiNetworkDiagnosticsPacketMulticastTxCountAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -5543,10 +5596,11 @@ class CHIPWiFiNetworkDiagnosticsPacketUnicastRxCountAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -5573,10 +5627,11 @@ class CHIPWiFiNetworkDiagnosticsPacketUnicastTxCountAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -5603,10 +5658,11 @@ class CHIPWiFiNetworkDiagnosticsCurrentMaxRateAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -5633,10 +5689,10 @@ class CHIPWiFiNetworkDiagnosticsOverrunCountAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -5663,10 +5719,11 @@ class CHIPWiFiNetworkDiagnosticsGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -5693,10 +5750,11 @@ class CHIPWiFiNetworkDiagnosticsAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -5723,10 +5781,10 @@ class CHIPWiFiNetworkDiagnosticsEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -5753,10 +5811,10 @@ class CHIPWiFiNetworkDiagnosticsAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -5785,10 +5843,10 @@ class CHIPEthernetNetworkDiagnosticsPHYRateAttributeCallback static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -5815,10 +5873,11 @@ class CHIPEthernetNetworkDiagnosticsFullDuplexAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -5845,10 +5904,11 @@ class CHIPEthernetNetworkDiagnosticsCarrierDetectAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -5875,10 +5935,11 @@ class CHIPEthernetNetworkDiagnosticsGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -5905,10 +5966,11 @@ class CHIPEthernetNetworkDiagnosticsAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -5935,10 +5997,10 @@ class CHIPEthernetNetworkDiagnosticsEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -5965,10 +6027,11 @@ class CHIPEthernetNetworkDiagnosticsAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -5995,10 +6058,11 @@ class CHIPBridgedDeviceBasicInformationVendorIDAttributeCallback } static void CallbackFn(void * context, chip::VendorId value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -6025,10 +6089,11 @@ class CHIPBridgedDeviceBasicInformationGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -6055,10 +6120,11 @@ class CHIPBridgedDeviceBasicInformationAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -6085,10 +6151,11 @@ class CHIPBridgedDeviceBasicInformationEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -6115,10 +6182,11 @@ class CHIPBridgedDeviceBasicInformationAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -6145,10 +6213,10 @@ class CHIPSwitchGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -6175,10 +6243,10 @@ class CHIPSwitchAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -6204,10 +6272,10 @@ class CHIPSwitchEventListAttributeCallback : public chip::Callback::Callback & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -6234,10 +6302,10 @@ class CHIPSwitchAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -6264,10 +6332,11 @@ class CHIPAdministratorCommissioningAdminFabricIndexAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -6294,10 +6363,11 @@ class CHIPAdministratorCommissioningAdminVendorIdAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -6324,10 +6394,11 @@ class CHIPAdministratorCommissioningGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -6354,10 +6425,11 @@ class CHIPAdministratorCommissioningAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -6384,10 +6456,10 @@ class CHIPAdministratorCommissioningEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -6414,10 +6486,11 @@ class CHIPAdministratorCommissioningAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -6447,10 +6520,10 @@ class CHIPOperationalCredentialsNOCsAttributeCallback void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -6479,10 +6552,10 @@ class CHIPOperationalCredentialsFabricsAttributeCallback static void CallbackFn(void * context, const chip::app::DataModel::DecodableList< chip::app::Clusters::OperationalCredentials::Structs::FabricDescriptorStruct::DecodableType> & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -6509,10 +6582,11 @@ class CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -6539,10 +6613,11 @@ class CHIPOperationalCredentialsGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -6569,10 +6644,11 @@ class CHIPOperationalCredentialsAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -6599,10 +6675,10 @@ class CHIPOperationalCredentialsEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -6629,10 +6705,10 @@ class CHIPOperationalCredentialsAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -6661,10 +6737,10 @@ class CHIPGroupKeyManagementGroupKeyMapAttributeCallback static void CallbackFn(void * context, const chip::app::DataModel::DecodableList< chip::app::Clusters::GroupKeyManagement::Structs::GroupKeyMapStruct::DecodableType> & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -6693,10 +6769,10 @@ class CHIPGroupKeyManagementGroupTableAttributeCallback static void CallbackFn(void * context, const chip::app::DataModel::DecodableList< chip::app::Clusters::GroupKeyManagement::Structs::GroupInfoMapStruct::DecodableType> & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -6723,10 +6799,11 @@ class CHIPGroupKeyManagementGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -6753,10 +6830,11 @@ class CHIPGroupKeyManagementAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -6783,10 +6861,10 @@ class CHIPGroupKeyManagementEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -6813,10 +6891,10 @@ class CHIPGroupKeyManagementAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -6845,10 +6923,10 @@ class CHIPFixedLabelLabelListAttributeCallback static void CallbackFn( void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -6875,10 +6953,10 @@ class CHIPFixedLabelGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -6905,10 +6983,10 @@ class CHIPFixedLabelAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -6935,10 +7013,10 @@ class CHIPFixedLabelEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -6965,10 +7043,10 @@ class CHIPFixedLabelAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -6996,10 +7074,10 @@ class CHIPUserLabelLabelListAttributeCallback : public chip::Callback::Callback< static void CallbackFn( void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -7026,10 +7104,10 @@ class CHIPUserLabelGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -7056,10 +7134,10 @@ class CHIPUserLabelAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -7085,10 +7163,10 @@ class CHIPUserLabelEventListAttributeCallback : public chip::Callback::Callback< } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -7115,10 +7193,10 @@ class CHIPUserLabelAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -7145,10 +7223,10 @@ class CHIPBooleanStateGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -7175,10 +7253,10 @@ class CHIPBooleanStateAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -7205,10 +7283,10 @@ class CHIPBooleanStateEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -7235,10 +7313,10 @@ class CHIPBooleanStateAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -7265,10 +7343,10 @@ class CHIPModeSelectStandardNamespaceAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -7298,10 +7376,10 @@ class CHIPModeSelectSupportedModesAttributeCallback void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -7328,10 +7406,10 @@ class CHIPModeSelectStartUpModeAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -7357,10 +7435,10 @@ class CHIPModeSelectOnModeAttributeCallback : public chip::Callback::Callback & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -7387,10 +7465,10 @@ class CHIPModeSelectGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -7417,10 +7495,10 @@ class CHIPModeSelectAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -7447,10 +7525,10 @@ class CHIPModeSelectEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -7477,10 +7555,10 @@ class CHIPModeSelectAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -7507,10 +7585,10 @@ class CHIPDoorLockLockStateAttributeCallback : public chip::Callback::Callback & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -7537,10 +7615,10 @@ class CHIPDoorLockDoorStateAttributeCallback : public chip::Callback::Callback & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -7567,10 +7645,10 @@ class CHIPDoorLockGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -7597,10 +7675,10 @@ class CHIPDoorLockAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -7626,10 +7704,10 @@ class CHIPDoorLockEventListAttributeCallback : public chip::Callback::Callback & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -7656,10 +7734,10 @@ class CHIPDoorLockAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -7686,10 +7764,10 @@ class CHIPWindowCoveringCurrentPositionLiftAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -7716,10 +7794,10 @@ class CHIPWindowCoveringCurrentPositionTiltAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -7746,10 +7824,11 @@ class CHIPWindowCoveringCurrentPositionLiftPercentageAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -7776,10 +7855,11 @@ class CHIPWindowCoveringCurrentPositionTiltPercentageAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -7806,10 +7886,11 @@ class CHIPWindowCoveringTargetPositionLiftPercent100thsAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -7836,10 +7917,11 @@ class CHIPWindowCoveringTargetPositionTiltPercent100thsAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -7866,10 +7948,11 @@ class CHIPWindowCoveringCurrentPositionLiftPercent100thsAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -7896,10 +7979,11 @@ class CHIPWindowCoveringCurrentPositionTiltPercent100thsAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -7926,10 +8010,10 @@ class CHIPWindowCoveringGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -7956,10 +8040,10 @@ class CHIPWindowCoveringAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -7986,10 +8070,10 @@ class CHIPWindowCoveringEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -8016,10 +8100,10 @@ class CHIPWindowCoveringAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -8046,10 +8130,10 @@ class CHIPBarrierControlGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -8076,10 +8160,10 @@ class CHIPBarrierControlAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -8106,10 +8190,10 @@ class CHIPBarrierControlEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -8136,10 +8220,10 @@ class CHIPBarrierControlAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -8166,10 +8250,11 @@ class CHIPPumpConfigurationAndControlMaxPressureAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -8196,10 +8281,10 @@ class CHIPPumpConfigurationAndControlMaxSpeedAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -8226,10 +8311,10 @@ class CHIPPumpConfigurationAndControlMaxFlowAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -8256,10 +8341,11 @@ class CHIPPumpConfigurationAndControlMinConstPressureAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -8286,10 +8372,11 @@ class CHIPPumpConfigurationAndControlMaxConstPressureAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -8316,10 +8403,11 @@ class CHIPPumpConfigurationAndControlMinCompPressureAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -8346,10 +8434,11 @@ class CHIPPumpConfigurationAndControlMaxCompPressureAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -8376,10 +8465,11 @@ class CHIPPumpConfigurationAndControlMinConstSpeedAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -8406,10 +8496,11 @@ class CHIPPumpConfigurationAndControlMaxConstSpeedAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -8436,10 +8527,11 @@ class CHIPPumpConfigurationAndControlMinConstFlowAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -8466,10 +8558,11 @@ class CHIPPumpConfigurationAndControlMaxConstFlowAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -8496,10 +8589,11 @@ class CHIPPumpConfigurationAndControlMinConstTempAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -8526,10 +8620,11 @@ class CHIPPumpConfigurationAndControlMaxConstTempAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -8556,10 +8651,10 @@ class CHIPPumpConfigurationAndControlCapacityAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -8586,10 +8681,10 @@ class CHIPPumpConfigurationAndControlSpeedAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -8616,10 +8711,11 @@ class CHIPPumpConfigurationAndControlLifetimeRunningHoursAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -8646,10 +8742,10 @@ class CHIPPumpConfigurationAndControlPowerAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -8676,10 +8772,11 @@ class CHIPPumpConfigurationAndControlLifetimeEnergyConsumedAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -8706,10 +8803,11 @@ class CHIPPumpConfigurationAndControlGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -8736,10 +8834,11 @@ class CHIPPumpConfigurationAndControlAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -8766,10 +8865,11 @@ class CHIPPumpConfigurationAndControlEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -8796,10 +8896,11 @@ class CHIPPumpConfigurationAndControlAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -8826,10 +8927,10 @@ class CHIPThermostatLocalTemperatureAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -8856,10 +8957,10 @@ class CHIPThermostatGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -8886,10 +8987,10 @@ class CHIPThermostatAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -8916,10 +9017,10 @@ class CHIPThermostatEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -8946,10 +9047,10 @@ class CHIPThermostatAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -8976,10 +9077,10 @@ class CHIPFanControlPercentSettingAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -9006,10 +9107,10 @@ class CHIPFanControlSpeedSettingAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -9036,10 +9137,10 @@ class CHIPFanControlGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -9066,10 +9167,10 @@ class CHIPFanControlAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -9096,10 +9197,10 @@ class CHIPFanControlEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -9126,10 +9227,10 @@ class CHIPFanControlAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -9156,11 +9257,12 @@ class CHIPThermostatUserInterfaceConfigurationGeneratedCommandListAttributeCallb } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( reinterpret_cast(context) - ->javaCallbackRef); + ->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -9187,11 +9289,12 @@ class CHIPThermostatUserInterfaceConfigurationAcceptedCommandListAttributeCallba } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( reinterpret_cast(context) - ->javaCallbackRef); + ->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -9218,10 +9321,11 @@ class CHIPThermostatUserInterfaceConfigurationEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -9248,10 +9352,11 @@ class CHIPThermostatUserInterfaceConfigurationAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -9278,10 +9383,10 @@ class CHIPColorControlNumberOfPrimariesAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -9308,10 +9413,10 @@ class CHIPColorControlPrimary1IntensityAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -9338,10 +9443,10 @@ class CHIPColorControlPrimary2IntensityAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -9368,10 +9473,10 @@ class CHIPColorControlPrimary3IntensityAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -9398,10 +9503,10 @@ class CHIPColorControlPrimary4IntensityAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -9428,10 +9533,10 @@ class CHIPColorControlPrimary5IntensityAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -9458,10 +9563,10 @@ class CHIPColorControlPrimary6IntensityAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -9488,10 +9593,10 @@ class CHIPColorControlColorPointRIntensityAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -9518,10 +9623,10 @@ class CHIPColorControlColorPointGIntensityAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -9548,10 +9653,10 @@ class CHIPColorControlColorPointBIntensityAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -9578,10 +9683,11 @@ class CHIPColorControlStartUpColorTemperatureMiredsAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -9608,10 +9714,10 @@ class CHIPColorControlGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -9638,10 +9744,10 @@ class CHIPColorControlAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -9668,10 +9774,10 @@ class CHIPColorControlEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -9698,10 +9804,10 @@ class CHIPColorControlAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -9728,10 +9834,11 @@ class CHIPBallastConfigurationIntrinsicBallastFactorAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -9758,10 +9865,11 @@ class CHIPBallastConfigurationBallastFactorAdjustmentAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -9788,10 +9896,10 @@ class CHIPBallastConfigurationLampRatedHoursAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -9818,10 +9926,10 @@ class CHIPBallastConfigurationLampBurnHoursAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -9848,10 +9956,11 @@ class CHIPBallastConfigurationLampBurnHoursTripPointAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -9878,10 +9987,11 @@ class CHIPBallastConfigurationGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -9908,10 +10018,11 @@ class CHIPBallastConfigurationAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -9938,10 +10049,10 @@ class CHIPBallastConfigurationEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -9968,10 +10079,10 @@ class CHIPBallastConfigurationAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -9998,10 +10109,10 @@ class CHIPIlluminanceMeasurementMeasuredValueAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -10028,10 +10139,11 @@ class CHIPIlluminanceMeasurementMinMeasuredValueAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -10058,10 +10170,11 @@ class CHIPIlluminanceMeasurementMaxMeasuredValueAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -10088,10 +10201,11 @@ class CHIPIlluminanceMeasurementLightSensorTypeAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -10118,10 +10232,11 @@ class CHIPIlluminanceMeasurementGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -10148,10 +10263,11 @@ class CHIPIlluminanceMeasurementAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -10178,10 +10294,10 @@ class CHIPIlluminanceMeasurementEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -10208,10 +10324,10 @@ class CHIPIlluminanceMeasurementAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -10238,10 +10354,10 @@ class CHIPTemperatureMeasurementMeasuredValueAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -10268,10 +10384,11 @@ class CHIPTemperatureMeasurementMinMeasuredValueAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -10298,10 +10415,11 @@ class CHIPTemperatureMeasurementMaxMeasuredValueAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -10328,10 +10446,11 @@ class CHIPTemperatureMeasurementGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -10358,10 +10477,11 @@ class CHIPTemperatureMeasurementAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -10388,10 +10508,10 @@ class CHIPTemperatureMeasurementEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -10418,10 +10538,10 @@ class CHIPTemperatureMeasurementAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -10448,10 +10568,10 @@ class CHIPPressureMeasurementMeasuredValueAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -10478,10 +10598,10 @@ class CHIPPressureMeasurementMinMeasuredValueAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -10508,10 +10628,10 @@ class CHIPPressureMeasurementMaxMeasuredValueAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -10538,10 +10658,10 @@ class CHIPPressureMeasurementScaledValueAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -10568,10 +10688,10 @@ class CHIPPressureMeasurementMinScaledValueAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -10598,10 +10718,10 @@ class CHIPPressureMeasurementMaxScaledValueAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -10628,10 +10748,11 @@ class CHIPPressureMeasurementGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -10658,10 +10779,11 @@ class CHIPPressureMeasurementAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -10688,10 +10810,10 @@ class CHIPPressureMeasurementEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -10718,10 +10840,10 @@ class CHIPPressureMeasurementAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -10748,10 +10870,10 @@ class CHIPFlowMeasurementMeasuredValueAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -10778,10 +10900,10 @@ class CHIPFlowMeasurementMinMeasuredValueAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -10808,10 +10930,10 @@ class CHIPFlowMeasurementMaxMeasuredValueAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -10838,10 +10960,10 @@ class CHIPFlowMeasurementGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -10868,10 +10990,10 @@ class CHIPFlowMeasurementAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -10898,10 +11020,10 @@ class CHIPFlowMeasurementEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -10928,10 +11050,10 @@ class CHIPFlowMeasurementAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -10958,10 +11080,11 @@ class CHIPRelativeHumidityMeasurementMeasuredValueAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -10988,10 +11111,11 @@ class CHIPRelativeHumidityMeasurementMinMeasuredValueAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -11018,10 +11142,11 @@ class CHIPRelativeHumidityMeasurementMaxMeasuredValueAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -11048,10 +11173,11 @@ class CHIPRelativeHumidityMeasurementGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -11078,10 +11204,11 @@ class CHIPRelativeHumidityMeasurementAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -11108,10 +11235,11 @@ class CHIPRelativeHumidityMeasurementEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -11138,10 +11266,11 @@ class CHIPRelativeHumidityMeasurementAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -11168,10 +11297,11 @@ class CHIPOccupancySensingGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -11198,10 +11328,10 @@ class CHIPOccupancySensingAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -11228,10 +11358,10 @@ class CHIPOccupancySensingEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -11258,10 +11388,10 @@ class CHIPOccupancySensingAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -11288,10 +11418,10 @@ class CHIPWakeOnLanGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -11318,10 +11448,10 @@ class CHIPWakeOnLanAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -11347,10 +11477,10 @@ class CHIPWakeOnLanEventListAttributeCallback : public chip::Callback::Callback< } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -11377,10 +11507,10 @@ class CHIPWakeOnLanAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -11408,10 +11538,10 @@ class CHIPChannelChannelListAttributeCallback : public chip::Callback::Callback< static void CallbackFn( void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -11438,10 +11568,10 @@ class CHIPChannelGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -11468,10 +11598,10 @@ class CHIPChannelAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -11497,10 +11627,10 @@ class CHIPChannelEventListAttributeCallback : public chip::Callback::Callback & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -11527,10 +11657,10 @@ class CHIPChannelAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -11560,10 +11690,10 @@ class CHIPTargetNavigatorTargetListAttributeCallback void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -11590,10 +11720,10 @@ class CHIPTargetNavigatorGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -11620,10 +11750,10 @@ class CHIPTargetNavigatorAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -11650,10 +11780,10 @@ class CHIPTargetNavigatorEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -11680,10 +11810,10 @@ class CHIPTargetNavigatorAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -11710,10 +11840,10 @@ class CHIPMediaPlaybackStartTimeAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -11740,10 +11870,10 @@ class CHIPMediaPlaybackDurationAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -11770,10 +11900,10 @@ class CHIPMediaPlaybackSeekRangeEndAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -11800,10 +11930,10 @@ class CHIPMediaPlaybackSeekRangeStartAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -11830,10 +11960,10 @@ class CHIPMediaPlaybackGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -11860,10 +11990,10 @@ class CHIPMediaPlaybackAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -11890,10 +12020,10 @@ class CHIPMediaPlaybackEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -11920,10 +12050,10 @@ class CHIPMediaPlaybackAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -11952,10 +12082,10 @@ class CHIPMediaInputInputListAttributeCallback static void CallbackFn( void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -11982,10 +12112,10 @@ class CHIPMediaInputGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -12012,10 +12142,10 @@ class CHIPMediaInputAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -12042,10 +12172,10 @@ class CHIPMediaInputEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -12072,10 +12202,10 @@ class CHIPMediaInputAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -12102,10 +12232,10 @@ class CHIPLowPowerGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -12132,10 +12262,10 @@ class CHIPLowPowerAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -12161,10 +12291,10 @@ class CHIPLowPowerEventListAttributeCallback : public chip::Callback::Callback & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -12191,10 +12321,10 @@ class CHIPLowPowerAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -12221,10 +12351,10 @@ class CHIPKeypadInputGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -12251,10 +12381,10 @@ class CHIPKeypadInputAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -12281,10 +12411,10 @@ class CHIPKeypadInputEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -12311,10 +12441,10 @@ class CHIPKeypadInputAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -12341,10 +12471,10 @@ class CHIPContentLauncherAcceptHeaderAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -12371,10 +12501,10 @@ class CHIPContentLauncherGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -12401,10 +12531,10 @@ class CHIPContentLauncherAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -12431,10 +12561,10 @@ class CHIPContentLauncherEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -12461,10 +12591,10 @@ class CHIPContentLauncherAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -12494,10 +12624,10 @@ class CHIPAudioOutputOutputListAttributeCallback void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -12524,10 +12654,10 @@ class CHIPAudioOutputGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -12554,10 +12684,10 @@ class CHIPAudioOutputAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -12584,10 +12714,10 @@ class CHIPAudioOutputEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -12614,10 +12744,10 @@ class CHIPAudioOutputAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -12644,10 +12774,10 @@ class CHIPApplicationLauncherCatalogListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -12674,10 +12804,11 @@ class CHIPApplicationLauncherGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -12704,10 +12835,11 @@ class CHIPApplicationLauncherAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -12734,10 +12866,10 @@ class CHIPApplicationLauncherEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -12764,10 +12896,10 @@ class CHIPApplicationLauncherAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -12794,10 +12926,10 @@ class CHIPApplicationBasicVendorIDAttributeCallback } static void CallbackFn(void * context, chip::VendorId value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -12824,10 +12956,10 @@ class CHIPApplicationBasicAllowedVendorListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -12854,10 +12986,11 @@ class CHIPApplicationBasicGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -12884,10 +13017,10 @@ class CHIPApplicationBasicAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -12914,10 +13047,10 @@ class CHIPApplicationBasicEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -12944,10 +13077,10 @@ class CHIPApplicationBasicAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -12974,10 +13107,10 @@ class CHIPAccountLoginGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -13004,10 +13137,10 @@ class CHIPAccountLoginAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -13034,10 +13167,10 @@ class CHIPAccountLoginEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -13064,10 +13197,10 @@ class CHIPAccountLoginAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -13094,10 +13227,11 @@ class CHIPElectricalMeasurementGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -13124,10 +13258,11 @@ class CHIPElectricalMeasurementAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -13154,10 +13289,10 @@ class CHIPElectricalMeasurementEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -13184,10 +13319,10 @@ class CHIPElectricalMeasurementAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -13216,10 +13351,10 @@ class CHIPClientMonitoringExpectedClientsAttributeCallback static void CallbackFn(void * context, const chip::app::DataModel::DecodableList< chip::app::Clusters::ClientMonitoring::Structs::MonitoringRegistration::DecodableType> & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -13246,10 +13381,11 @@ class CHIPClientMonitoringGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -13276,10 +13412,10 @@ class CHIPClientMonitoringAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -13306,10 +13442,10 @@ class CHIPClientMonitoringEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -13336,10 +13472,10 @@ class CHIPClientMonitoringAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -13366,10 +13502,10 @@ class CHIPUnitTestingListInt8uAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -13396,10 +13532,10 @@ class CHIPUnitTestingListOctetStringAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -13429,10 +13565,10 @@ class CHIPUnitTestingListStructOctetStringAttributeCallback void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -13459,10 +13595,10 @@ class CHIPUnitTestingVendorIdAttributeCallback } static void CallbackFn(void * context, chip::VendorId value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -13491,10 +13627,11 @@ class CHIPUnitTestingListNullablesAndOptionalsStructAttributeCallback static void CallbackFn(void * context, const chip::app::DataModel::DecodableList< chip::app::Clusters::UnitTesting::Structs::NullablesAndOptionalsStruct::DecodableType> & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -13521,10 +13658,10 @@ class CHIPUnitTestingListLongOctetStringAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -13554,10 +13691,10 @@ class CHIPUnitTestingListFabricScopedAttributeCallback void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -13584,10 +13721,10 @@ class CHIPUnitTestingNullableBooleanAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -13616,10 +13753,10 @@ class CHIPUnitTestingNullableBitmap8AttributeCallback static void CallbackFn(void * context, const chip::app::DataModel::Nullable> & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -13648,10 +13785,10 @@ class CHIPUnitTestingNullableBitmap16AttributeCallback static void CallbackFn(void * context, const chip::app::DataModel::Nullable> & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -13680,10 +13817,10 @@ class CHIPUnitTestingNullableBitmap32AttributeCallback static void CallbackFn(void * context, const chip::app::DataModel::Nullable> & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -13712,10 +13849,10 @@ class CHIPUnitTestingNullableBitmap64AttributeCallback static void CallbackFn(void * context, const chip::app::DataModel::Nullable> & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -13742,10 +13879,10 @@ class CHIPUnitTestingNullableInt8uAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -13772,10 +13909,10 @@ class CHIPUnitTestingNullableInt16uAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -13802,10 +13939,10 @@ class CHIPUnitTestingNullableInt24uAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -13832,10 +13969,10 @@ class CHIPUnitTestingNullableInt32uAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -13862,10 +13999,10 @@ class CHIPUnitTestingNullableInt40uAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -13892,10 +14029,10 @@ class CHIPUnitTestingNullableInt48uAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -13922,10 +14059,10 @@ class CHIPUnitTestingNullableInt56uAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -13952,10 +14089,10 @@ class CHIPUnitTestingNullableInt64uAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -13982,10 +14119,10 @@ class CHIPUnitTestingNullableInt8sAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -14012,10 +14149,10 @@ class CHIPUnitTestingNullableInt16sAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -14042,10 +14179,10 @@ class CHIPUnitTestingNullableInt24sAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -14072,10 +14209,10 @@ class CHIPUnitTestingNullableInt32sAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -14102,10 +14239,10 @@ class CHIPUnitTestingNullableInt40sAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -14132,10 +14269,10 @@ class CHIPUnitTestingNullableInt48sAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -14162,10 +14299,10 @@ class CHIPUnitTestingNullableInt56sAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -14192,10 +14329,10 @@ class CHIPUnitTestingNullableInt64sAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -14222,10 +14359,10 @@ class CHIPUnitTestingNullableEnum8AttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -14252,10 +14389,10 @@ class CHIPUnitTestingNullableEnum16AttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -14282,10 +14419,10 @@ class CHIPUnitTestingNullableFloatSingleAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -14312,10 +14449,10 @@ class CHIPUnitTestingNullableFloatDoubleAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -14342,10 +14479,10 @@ class CHIPUnitTestingNullableOctetStringAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -14372,10 +14509,10 @@ class CHIPUnitTestingNullableCharStringAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -14403,10 +14540,10 @@ class CHIPUnitTestingNullableEnumAttrAttributeCallback static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -14433,10 +14570,11 @@ class CHIPUnitTestingNullableRangeRestrictedInt8uAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -14463,10 +14601,11 @@ class CHIPUnitTestingNullableRangeRestrictedInt8sAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -14493,10 +14632,11 @@ class CHIPUnitTestingNullableRangeRestrictedInt16uAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -14523,10 +14663,11 @@ class CHIPUnitTestingNullableRangeRestrictedInt16sAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, + subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -14553,10 +14694,10 @@ class CHIPUnitTestingGeneratedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -14583,10 +14724,10 @@ class CHIPUnitTestingAcceptedCommandListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -14613,10 +14754,10 @@ class CHIPUnitTestingEventListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -14643,10 +14784,10 @@ class CHIPUnitTestingAttributeListAttributeCallback } static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); - static void OnSubscriptionEstablished(void * context) + static void OnSubscriptionEstablished(void * context, chip::SubscriptionId subscriptionId) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef, subscriptionId); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java index 3003a74046cffc..19b825c44928b6 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java @@ -38,7 +38,7 @@ public interface CharStringAttributeCallback { void onError(Exception error); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface OctetStringAttributeCallback { @@ -47,7 +47,7 @@ public interface OctetStringAttributeCallback { void onError(Exception error); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface IntegerAttributeCallback { @@ -55,7 +55,7 @@ public interface IntegerAttributeCallback { void onError(Exception error); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface LongAttributeCallback { @@ -63,7 +63,7 @@ public interface LongAttributeCallback { void onError(Exception error); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface BooleanAttributeCallback { @@ -71,7 +71,7 @@ public interface BooleanAttributeCallback { void onError(Exception error); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface FloatAttributeCallback { @@ -79,7 +79,7 @@ public interface FloatAttributeCallback { void onError(Exception error); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface DoubleAttributeCallback { @@ -87,7 +87,7 @@ public interface DoubleAttributeCallback { void onError(Exception error); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public abstract static class BaseChipCluster { @@ -182,7 +182,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -190,7 +190,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -198,7 +198,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -206,7 +206,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readIdentifyTimeAttribute(IntegerAttributeCallback callback) { @@ -494,7 +494,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -502,7 +502,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -510,7 +510,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -518,7 +518,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readNameSupportAttribute(IntegerAttributeCallback callback) { @@ -857,7 +857,7 @@ public interface CurrentGroupAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface GeneratedCommandListAttributeCallback { @@ -865,7 +865,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -873,7 +873,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -881,7 +881,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -889,7 +889,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readSceneCountAttribute(IntegerAttributeCallback callback) { @@ -1188,7 +1188,7 @@ public interface StartUpOnOffAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface GeneratedCommandListAttributeCallback { @@ -1196,7 +1196,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -1204,7 +1204,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -1212,7 +1212,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -1220,7 +1220,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readOnOffAttribute(BooleanAttributeCallback callback) { @@ -1459,7 +1459,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -1467,7 +1467,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -1475,7 +1475,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -1483,7 +1483,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readSwitchTypeAttribute(IntegerAttributeCallback callback) { @@ -1922,7 +1922,7 @@ public interface CurrentLevelAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface OnLevelAttributeCallback { @@ -1930,7 +1930,7 @@ public interface OnLevelAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface OnTransitionTimeAttributeCallback { @@ -1938,7 +1938,7 @@ public interface OnTransitionTimeAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface OffTransitionTimeAttributeCallback { @@ -1946,7 +1946,7 @@ public interface OffTransitionTimeAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface DefaultMoveRateAttributeCallback { @@ -1954,7 +1954,7 @@ public interface DefaultMoveRateAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface StartUpCurrentLevelAttributeCallback { @@ -1962,7 +1962,7 @@ public interface StartUpCurrentLevelAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface GeneratedCommandListAttributeCallback { @@ -1970,7 +1970,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -1978,7 +1978,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -1986,7 +1986,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -1994,7 +1994,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readCurrentLevelAttribute(CurrentLevelAttributeCallback callback) { @@ -2442,7 +2442,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -2450,7 +2450,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -2458,7 +2458,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -2466,7 +2466,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readOutOfServiceAttribute(BooleanAttributeCallback callback) { @@ -2659,7 +2659,7 @@ public interface DeviceTypeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface ServerListAttributeCallback { @@ -2667,7 +2667,7 @@ public interface ServerListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface ClientListAttributeCallback { @@ -2675,7 +2675,7 @@ public interface ClientListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface PartsListAttributeCallback { @@ -2683,7 +2683,7 @@ public interface PartsListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface GeneratedCommandListAttributeCallback { @@ -2691,7 +2691,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -2699,7 +2699,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -2707,7 +2707,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -2715,7 +2715,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readDeviceTypeListAttribute(DeviceTypeListAttributeCallback callback) { @@ -2902,7 +2902,7 @@ public interface BindingAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface GeneratedCommandListAttributeCallback { @@ -2910,7 +2910,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -2918,7 +2918,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -2926,7 +2926,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -2934,7 +2934,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readBindingAttribute(BindingAttributeCallback callback) { @@ -3085,7 +3085,7 @@ public interface AclAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface ExtensionAttributeCallback { @@ -3093,7 +3093,7 @@ public interface ExtensionAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface GeneratedCommandListAttributeCallback { @@ -3101,7 +3101,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -3109,7 +3109,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -3117,7 +3117,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -3125,7 +3125,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readAclAttribute(AclAttributeCallback callback) { @@ -3617,7 +3617,7 @@ public interface ActionListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EndpointListsAttributeCallback { @@ -3625,7 +3625,7 @@ public interface EndpointListsAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface GeneratedCommandListAttributeCallback { @@ -3633,7 +3633,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -3641,7 +3641,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -3649,7 +3649,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -3657,7 +3657,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readActionListAttribute(ActionListAttributeCallback callback) { @@ -3829,7 +3829,7 @@ public interface VendorIDAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface GeneratedCommandListAttributeCallback { @@ -3837,7 +3837,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -3845,7 +3845,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -3853,7 +3853,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -3861,7 +3861,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readDataModelRevisionAttribute(IntegerAttributeCallback callback) { @@ -4468,7 +4468,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -4476,7 +4476,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -4484,7 +4484,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -4492,7 +4492,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) { @@ -4657,7 +4657,7 @@ public interface DefaultOTAProvidersAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface UpdateStateProgressAttributeCallback { @@ -4665,7 +4665,7 @@ public interface UpdateStateProgressAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface GeneratedCommandListAttributeCallback { @@ -4673,7 +4673,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -4681,7 +4681,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -4689,7 +4689,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -4697,7 +4697,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readDefaultOTAProvidersAttribute(DefaultOTAProvidersAttributeCallback callback) { @@ -4900,7 +4900,7 @@ public interface SupportedLocalesAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface GeneratedCommandListAttributeCallback { @@ -4908,7 +4908,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -4916,7 +4916,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -4924,7 +4924,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -4932,7 +4932,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readActiveLocaleAttribute(CharStringAttributeCallback callback) { @@ -5101,7 +5101,7 @@ public interface SupportedCalendarTypesAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface GeneratedCommandListAttributeCallback { @@ -5109,7 +5109,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -5117,7 +5117,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -5125,7 +5125,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -5133,7 +5133,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readHourFormatAttribute(IntegerAttributeCallback callback) { @@ -5330,7 +5330,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -5338,7 +5338,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -5346,7 +5346,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -5354,7 +5354,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readTemperatureUnitAttribute(IntegerAttributeCallback callback) { @@ -5502,7 +5502,7 @@ public interface SourcesAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface GeneratedCommandListAttributeCallback { @@ -5510,7 +5510,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -5518,7 +5518,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -5526,7 +5526,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -5534,7 +5534,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readSourcesAttribute(SourcesAttributeCallback callback) { @@ -5667,7 +5667,7 @@ public interface WiredAssessedInputVoltageAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface WiredAssessedInputFrequencyAttributeCallback { @@ -5675,7 +5675,7 @@ public interface WiredAssessedInputFrequencyAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface WiredAssessedCurrentAttributeCallback { @@ -5683,7 +5683,7 @@ public interface WiredAssessedCurrentAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface ActiveWiredFaultsAttributeCallback { @@ -5691,7 +5691,7 @@ public interface ActiveWiredFaultsAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface BatVoltageAttributeCallback { @@ -5699,7 +5699,7 @@ public interface BatVoltageAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface BatPercentRemainingAttributeCallback { @@ -5707,7 +5707,7 @@ public interface BatPercentRemainingAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface BatTimeRemainingAttributeCallback { @@ -5715,7 +5715,7 @@ public interface BatTimeRemainingAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface ActiveBatFaultsAttributeCallback { @@ -5723,7 +5723,7 @@ public interface ActiveBatFaultsAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface BatTimeToFullChargeAttributeCallback { @@ -5731,7 +5731,7 @@ public interface BatTimeToFullChargeAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface BatChargingCurrentAttributeCallback { @@ -5739,7 +5739,7 @@ public interface BatChargingCurrentAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface ActiveBatChargeFaultsAttributeCallback { @@ -5747,7 +5747,7 @@ public interface ActiveBatChargeFaultsAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface GeneratedCommandListAttributeCallback { @@ -5755,7 +5755,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -5763,7 +5763,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -5771,7 +5771,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -5779,7 +5779,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readStatusAttribute(IntegerAttributeCallback callback) { @@ -6497,7 +6497,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -6505,7 +6505,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -6513,7 +6513,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -6521,7 +6521,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readBreadcrumbAttribute(LongAttributeCallback callback) { @@ -6878,7 +6878,7 @@ public interface NetworksAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface LastNetworkingStatusAttributeCallback { @@ -6886,7 +6886,7 @@ public interface LastNetworkingStatusAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface LastNetworkIDAttributeCallback { @@ -6894,7 +6894,7 @@ public interface LastNetworkIDAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface LastConnectErrorValueAttributeCallback { @@ -6902,7 +6902,7 @@ public interface LastConnectErrorValueAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface GeneratedCommandListAttributeCallback { @@ -6910,7 +6910,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -6918,7 +6918,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -6926,7 +6926,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -6934,7 +6934,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readMaxNetworksAttribute(IntegerAttributeCallback callback) { @@ -7239,7 +7239,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -7247,7 +7247,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -7255,7 +7255,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -7263,7 +7263,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) { @@ -7401,7 +7401,7 @@ public interface NetworkInterfacesAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface ActiveHardwareFaultsAttributeCallback { @@ -7409,7 +7409,7 @@ public interface ActiveHardwareFaultsAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface ActiveRadioFaultsAttributeCallback { @@ -7417,7 +7417,7 @@ public interface ActiveRadioFaultsAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface ActiveNetworkFaultsAttributeCallback { @@ -7425,7 +7425,7 @@ public interface ActiveNetworkFaultsAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface GeneratedCommandListAttributeCallback { @@ -7433,7 +7433,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -7441,7 +7441,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -7449,7 +7449,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -7457,7 +7457,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readNetworkInterfacesAttribute(NetworkInterfacesAttributeCallback callback) { @@ -7736,7 +7736,7 @@ public interface ThreadMetricsAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface GeneratedCommandListAttributeCallback { @@ -7744,7 +7744,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -7752,7 +7752,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -7760,7 +7760,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -7768,7 +7768,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readThreadMetricsAttribute(ThreadMetricsAttributeCallback callback) { @@ -7964,7 +7964,7 @@ public interface ChannelAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface RoutingRoleAttributeCallback { @@ -7972,7 +7972,7 @@ public interface RoutingRoleAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface NetworkNameAttributeCallback { @@ -7980,7 +7980,7 @@ public interface NetworkNameAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface PanIdAttributeCallback { @@ -7988,7 +7988,7 @@ public interface PanIdAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface ExtendedPanIdAttributeCallback { @@ -7996,7 +7996,7 @@ public interface ExtendedPanIdAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface MeshLocalPrefixAttributeCallback { @@ -8004,7 +8004,7 @@ public interface MeshLocalPrefixAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface NeighborTableAttributeCallback { @@ -8012,7 +8012,7 @@ public interface NeighborTableAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface RouteTableAttributeCallback { @@ -8020,7 +8020,7 @@ public interface RouteTableAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface PartitionIdAttributeCallback { @@ -8028,7 +8028,7 @@ public interface PartitionIdAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface WeightingAttributeCallback { @@ -8036,7 +8036,7 @@ public interface WeightingAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface DataVersionAttributeCallback { @@ -8044,7 +8044,7 @@ public interface DataVersionAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface StableDataVersionAttributeCallback { @@ -8052,7 +8052,7 @@ public interface StableDataVersionAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface LeaderRouterIdAttributeCallback { @@ -8060,7 +8060,7 @@ public interface LeaderRouterIdAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface ActiveTimestampAttributeCallback { @@ -8068,7 +8068,7 @@ public interface ActiveTimestampAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface PendingTimestampAttributeCallback { @@ -8076,7 +8076,7 @@ public interface PendingTimestampAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface DelayAttributeCallback { @@ -8084,7 +8084,7 @@ public interface DelayAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface ChannelPage0MaskAttributeCallback { @@ -8092,7 +8092,7 @@ public interface ChannelPage0MaskAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface ActiveNetworkFaultsListAttributeCallback { @@ -8100,7 +8100,7 @@ public interface ActiveNetworkFaultsListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface GeneratedCommandListAttributeCallback { @@ -8108,7 +8108,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -8116,7 +8116,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -8124,7 +8124,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -8132,7 +8132,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readChannelAttribute(ChannelAttributeCallback callback) { @@ -9225,7 +9225,7 @@ public interface BssidAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface SecurityTypeAttributeCallback { @@ -9233,7 +9233,7 @@ public interface SecurityTypeAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface WiFiVersionAttributeCallback { @@ -9241,7 +9241,7 @@ public interface WiFiVersionAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface ChannelNumberAttributeCallback { @@ -9249,7 +9249,7 @@ public interface ChannelNumberAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface RssiAttributeCallback { @@ -9257,7 +9257,7 @@ public interface RssiAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface BeaconLostCountAttributeCallback { @@ -9265,7 +9265,7 @@ public interface BeaconLostCountAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface BeaconRxCountAttributeCallback { @@ -9273,7 +9273,7 @@ public interface BeaconRxCountAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface PacketMulticastRxCountAttributeCallback { @@ -9281,7 +9281,7 @@ public interface PacketMulticastRxCountAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface PacketMulticastTxCountAttributeCallback { @@ -9289,7 +9289,7 @@ public interface PacketMulticastTxCountAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface PacketUnicastRxCountAttributeCallback { @@ -9297,7 +9297,7 @@ public interface PacketUnicastRxCountAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface PacketUnicastTxCountAttributeCallback { @@ -9305,7 +9305,7 @@ public interface PacketUnicastTxCountAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface CurrentMaxRateAttributeCallback { @@ -9313,7 +9313,7 @@ public interface CurrentMaxRateAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface OverrunCountAttributeCallback { @@ -9321,7 +9321,7 @@ public interface OverrunCountAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface GeneratedCommandListAttributeCallback { @@ -9329,7 +9329,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -9337,7 +9337,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -9345,7 +9345,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -9353,7 +9353,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readBssidAttribute(BssidAttributeCallback callback) { @@ -9713,7 +9713,7 @@ public interface PHYRateAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface FullDuplexAttributeCallback { @@ -9721,7 +9721,7 @@ public interface FullDuplexAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface CarrierDetectAttributeCallback { @@ -9729,7 +9729,7 @@ public interface CarrierDetectAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface GeneratedCommandListAttributeCallback { @@ -9737,7 +9737,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -9745,7 +9745,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -9753,7 +9753,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -9761,7 +9761,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readPHYRateAttribute(PHYRateAttributeCallback callback) { @@ -10020,7 +10020,7 @@ public interface VendorIDAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface GeneratedCommandListAttributeCallback { @@ -10028,7 +10028,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -10036,7 +10036,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -10044,7 +10044,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -10052,7 +10052,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readVendorNameAttribute(CharStringAttributeCallback callback) { @@ -10443,7 +10443,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -10451,7 +10451,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -10459,7 +10459,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -10467,7 +10467,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readNumberOfPositionsAttribute(IntegerAttributeCallback callback) { @@ -10681,7 +10681,7 @@ public interface AdminFabricIndexAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AdminVendorIdAttributeCallback { @@ -10689,7 +10689,7 @@ public interface AdminVendorIdAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface GeneratedCommandListAttributeCallback { @@ -10697,7 +10697,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -10705,7 +10705,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -10713,7 +10713,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -10721,7 +10721,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readWindowStatusAttribute(IntegerAttributeCallback callback) { @@ -11080,7 +11080,7 @@ public interface NOCsAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface FabricsAttributeCallback { @@ -11089,7 +11089,7 @@ void onSuccess( void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface TrustedRootCertificatesAttributeCallback { @@ -11097,7 +11097,7 @@ public interface TrustedRootCertificatesAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface GeneratedCommandListAttributeCallback { @@ -11105,7 +11105,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -11113,7 +11113,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -11121,7 +11121,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -11129,7 +11129,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readNOCsAttribute(NOCsAttributeCallback callback) { @@ -11419,7 +11419,7 @@ public interface GroupKeyMapAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface GroupTableAttributeCallback { @@ -11427,7 +11427,7 @@ public interface GroupTableAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface GeneratedCommandListAttributeCallback { @@ -11435,7 +11435,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -11443,7 +11443,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -11451,7 +11451,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -11459,7 +11459,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readGroupKeyMapAttribute(GroupKeyMapAttributeCallback callback) { @@ -11662,7 +11662,7 @@ public interface LabelListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface GeneratedCommandListAttributeCallback { @@ -11670,7 +11670,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -11678,7 +11678,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -11686,7 +11686,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -11694,7 +11694,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readLabelListAttribute(LabelListAttributeCallback callback) { @@ -11827,7 +11827,7 @@ public interface LabelListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface GeneratedCommandListAttributeCallback { @@ -11835,7 +11835,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -11843,7 +11843,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -11851,7 +11851,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -11859,7 +11859,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readLabelListAttribute(LabelListAttributeCallback callback) { @@ -12010,7 +12010,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -12018,7 +12018,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -12026,7 +12026,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -12034,7 +12034,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readStateValueAttribute(BooleanAttributeCallback callback) { @@ -12182,7 +12182,7 @@ public interface StandardNamespaceAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface SupportedModesAttributeCallback { @@ -12190,7 +12190,7 @@ public interface SupportedModesAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface StartUpModeAttributeCallback { @@ -12198,7 +12198,7 @@ public interface StartUpModeAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface OnModeAttributeCallback { @@ -12206,7 +12206,7 @@ public interface OnModeAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface GeneratedCommandListAttributeCallback { @@ -12214,7 +12214,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -12222,7 +12222,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -12230,7 +12230,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -12238,7 +12238,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readDescriptionAttribute(CharStringAttributeCallback callback) { @@ -12967,7 +12967,7 @@ public interface LockStateAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface DoorStateAttributeCallback { @@ -12975,7 +12975,7 @@ public interface DoorStateAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface GeneratedCommandListAttributeCallback { @@ -12983,7 +12983,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -12991,7 +12991,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -12999,7 +12999,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -13007,7 +13007,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readLockStateAttribute(LockStateAttributeCallback callback) { @@ -13751,7 +13751,7 @@ public interface CurrentPositionLiftAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface CurrentPositionTiltAttributeCallback { @@ -13759,7 +13759,7 @@ public interface CurrentPositionTiltAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface CurrentPositionLiftPercentageAttributeCallback { @@ -13767,7 +13767,7 @@ public interface CurrentPositionLiftPercentageAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface CurrentPositionTiltPercentageAttributeCallback { @@ -13775,7 +13775,7 @@ public interface CurrentPositionTiltPercentageAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface TargetPositionLiftPercent100thsAttributeCallback { @@ -13783,7 +13783,7 @@ public interface TargetPositionLiftPercent100thsAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface TargetPositionTiltPercent100thsAttributeCallback { @@ -13791,7 +13791,7 @@ public interface TargetPositionTiltPercent100thsAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface CurrentPositionLiftPercent100thsAttributeCallback { @@ -13799,7 +13799,7 @@ public interface CurrentPositionLiftPercent100thsAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface CurrentPositionTiltPercent100thsAttributeCallback { @@ -13807,7 +13807,7 @@ public interface CurrentPositionTiltPercent100thsAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface GeneratedCommandListAttributeCallback { @@ -13815,7 +13815,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -13823,7 +13823,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -13831,7 +13831,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -13839,7 +13839,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readTypeAttribute(IntegerAttributeCallback callback) { @@ -14375,7 +14375,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -14383,7 +14383,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -14391,7 +14391,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -14399,7 +14399,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readBarrierMovingStateAttribute(IntegerAttributeCallback callback) { @@ -14577,7 +14577,7 @@ public interface MaxPressureAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface MaxSpeedAttributeCallback { @@ -14585,7 +14585,7 @@ public interface MaxSpeedAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface MaxFlowAttributeCallback { @@ -14593,7 +14593,7 @@ public interface MaxFlowAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface MinConstPressureAttributeCallback { @@ -14601,7 +14601,7 @@ public interface MinConstPressureAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface MaxConstPressureAttributeCallback { @@ -14609,7 +14609,7 @@ public interface MaxConstPressureAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface MinCompPressureAttributeCallback { @@ -14617,7 +14617,7 @@ public interface MinCompPressureAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface MaxCompPressureAttributeCallback { @@ -14625,7 +14625,7 @@ public interface MaxCompPressureAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface MinConstSpeedAttributeCallback { @@ -14633,7 +14633,7 @@ public interface MinConstSpeedAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface MaxConstSpeedAttributeCallback { @@ -14641,7 +14641,7 @@ public interface MaxConstSpeedAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface MinConstFlowAttributeCallback { @@ -14649,7 +14649,7 @@ public interface MinConstFlowAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface MaxConstFlowAttributeCallback { @@ -14657,7 +14657,7 @@ public interface MaxConstFlowAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface MinConstTempAttributeCallback { @@ -14665,7 +14665,7 @@ public interface MinConstTempAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface MaxConstTempAttributeCallback { @@ -14673,7 +14673,7 @@ public interface MaxConstTempAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface CapacityAttributeCallback { @@ -14681,7 +14681,7 @@ public interface CapacityAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface SpeedAttributeCallback { @@ -14689,7 +14689,7 @@ public interface SpeedAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface LifetimeRunningHoursAttributeCallback { @@ -14697,7 +14697,7 @@ public interface LifetimeRunningHoursAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface PowerAttributeCallback { @@ -14705,7 +14705,7 @@ public interface PowerAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface LifetimeEnergyConsumedAttributeCallback { @@ -14713,7 +14713,7 @@ public interface LifetimeEnergyConsumedAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface GeneratedCommandListAttributeCallback { @@ -14721,7 +14721,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -14729,7 +14729,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -14737,7 +14737,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -14745,7 +14745,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readMaxPressureAttribute(MaxPressureAttributeCallback callback) { @@ -15408,7 +15408,7 @@ public interface LocalTemperatureAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface GeneratedCommandListAttributeCallback { @@ -15416,7 +15416,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -15424,7 +15424,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -15432,7 +15432,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -15440,7 +15440,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readLocalTemperatureAttribute(LocalTemperatureAttributeCallback callback) { @@ -15958,7 +15958,7 @@ public interface PercentSettingAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface SpeedSettingAttributeCallback { @@ -15966,7 +15966,7 @@ public interface SpeedSettingAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface GeneratedCommandListAttributeCallback { @@ -15974,7 +15974,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -15982,7 +15982,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -15990,7 +15990,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -15998,7 +15998,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readFanModeAttribute(IntegerAttributeCallback callback) { @@ -16377,7 +16377,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -16385,7 +16385,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -16393,7 +16393,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -16401,7 +16401,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readTemperatureDisplayModeAttribute(IntegerAttributeCallback callback) { @@ -17440,7 +17440,7 @@ public interface NumberOfPrimariesAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface Primary1IntensityAttributeCallback { @@ -17448,7 +17448,7 @@ public interface Primary1IntensityAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface Primary2IntensityAttributeCallback { @@ -17456,7 +17456,7 @@ public interface Primary2IntensityAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface Primary3IntensityAttributeCallback { @@ -17464,7 +17464,7 @@ public interface Primary3IntensityAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface Primary4IntensityAttributeCallback { @@ -17472,7 +17472,7 @@ public interface Primary4IntensityAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface Primary5IntensityAttributeCallback { @@ -17480,7 +17480,7 @@ public interface Primary5IntensityAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface Primary6IntensityAttributeCallback { @@ -17488,7 +17488,7 @@ public interface Primary6IntensityAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface ColorPointRIntensityAttributeCallback { @@ -17496,7 +17496,7 @@ public interface ColorPointRIntensityAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface ColorPointGIntensityAttributeCallback { @@ -17504,7 +17504,7 @@ public interface ColorPointGIntensityAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface ColorPointBIntensityAttributeCallback { @@ -17512,7 +17512,7 @@ public interface ColorPointBIntensityAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface StartUpColorTemperatureMiredsAttributeCallback { @@ -17520,7 +17520,7 @@ public interface StartUpColorTemperatureMiredsAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface GeneratedCommandListAttributeCallback { @@ -17528,7 +17528,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -17536,7 +17536,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -17544,7 +17544,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -17552,7 +17552,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readCurrentHueAttribute(IntegerAttributeCallback callback) { @@ -18690,7 +18690,7 @@ public interface IntrinsicBallastFactorAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface BallastFactorAdjustmentAttributeCallback { @@ -18698,7 +18698,7 @@ public interface BallastFactorAdjustmentAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface LampRatedHoursAttributeCallback { @@ -18706,7 +18706,7 @@ public interface LampRatedHoursAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface LampBurnHoursAttributeCallback { @@ -18714,7 +18714,7 @@ public interface LampBurnHoursAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface LampBurnHoursTripPointAttributeCallback { @@ -18722,7 +18722,7 @@ public interface LampBurnHoursTripPointAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface GeneratedCommandListAttributeCallback { @@ -18730,7 +18730,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -18738,7 +18738,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -18746,7 +18746,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -18754,7 +18754,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readPhysicalMinLevelAttribute(IntegerAttributeCallback callback) { @@ -19258,7 +19258,7 @@ public interface MeasuredValueAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface MinMeasuredValueAttributeCallback { @@ -19266,7 +19266,7 @@ public interface MinMeasuredValueAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface MaxMeasuredValueAttributeCallback { @@ -19274,7 +19274,7 @@ public interface MaxMeasuredValueAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface LightSensorTypeAttributeCallback { @@ -19282,7 +19282,7 @@ public interface LightSensorTypeAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface GeneratedCommandListAttributeCallback { @@ -19290,7 +19290,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -19298,7 +19298,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -19306,7 +19306,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -19314,7 +19314,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readMeasuredValueAttribute(MeasuredValueAttributeCallback callback) { @@ -19519,7 +19519,7 @@ public interface MeasuredValueAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface MinMeasuredValueAttributeCallback { @@ -19527,7 +19527,7 @@ public interface MinMeasuredValueAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface MaxMeasuredValueAttributeCallback { @@ -19535,7 +19535,7 @@ public interface MaxMeasuredValueAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface GeneratedCommandListAttributeCallback { @@ -19543,7 +19543,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -19551,7 +19551,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -19559,7 +19559,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -19567,7 +19567,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readMeasuredValueAttribute(MeasuredValueAttributeCallback callback) { @@ -19754,7 +19754,7 @@ public interface MeasuredValueAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface MinMeasuredValueAttributeCallback { @@ -19762,7 +19762,7 @@ public interface MinMeasuredValueAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface MaxMeasuredValueAttributeCallback { @@ -19770,7 +19770,7 @@ public interface MaxMeasuredValueAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface ScaledValueAttributeCallback { @@ -19778,7 +19778,7 @@ public interface ScaledValueAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface MinScaledValueAttributeCallback { @@ -19786,7 +19786,7 @@ public interface MinScaledValueAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface MaxScaledValueAttributeCallback { @@ -19794,7 +19794,7 @@ public interface MaxScaledValueAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface GeneratedCommandListAttributeCallback { @@ -19802,7 +19802,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -19810,7 +19810,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -19818,7 +19818,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -19826,7 +19826,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readMeasuredValueAttribute(MeasuredValueAttributeCallback callback) { @@ -20096,7 +20096,7 @@ public interface MeasuredValueAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface MinMeasuredValueAttributeCallback { @@ -20104,7 +20104,7 @@ public interface MinMeasuredValueAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface MaxMeasuredValueAttributeCallback { @@ -20112,7 +20112,7 @@ public interface MaxMeasuredValueAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface GeneratedCommandListAttributeCallback { @@ -20120,7 +20120,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -20128,7 +20128,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -20136,7 +20136,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -20144,7 +20144,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readMeasuredValueAttribute(MeasuredValueAttributeCallback callback) { @@ -20331,7 +20331,7 @@ public interface MeasuredValueAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface MinMeasuredValueAttributeCallback { @@ -20339,7 +20339,7 @@ public interface MinMeasuredValueAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface MaxMeasuredValueAttributeCallback { @@ -20347,7 +20347,7 @@ public interface MaxMeasuredValueAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface GeneratedCommandListAttributeCallback { @@ -20355,7 +20355,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -20363,7 +20363,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -20371,7 +20371,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -20379,7 +20379,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readMeasuredValueAttribute(MeasuredValueAttributeCallback callback) { @@ -20566,7 +20566,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -20574,7 +20574,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -20582,7 +20582,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -20590,7 +20590,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readOccupancyAttribute(IntegerAttributeCallback callback) { @@ -20754,7 +20754,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -20762,7 +20762,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -20770,7 +20770,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -20778,7 +20778,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readMACAddressAttribute(CharStringAttributeCallback callback) { @@ -20971,7 +20971,7 @@ public interface ChannelListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface GeneratedCommandListAttributeCallback { @@ -20979,7 +20979,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -20987,7 +20987,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -20995,7 +20995,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -21003,7 +21003,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readChannelListAttribute(ChannelListAttributeCallback callback) { @@ -21165,7 +21165,7 @@ public interface TargetListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface GeneratedCommandListAttributeCallback { @@ -21173,7 +21173,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -21181,7 +21181,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -21189,7 +21189,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -21197,7 +21197,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readTargetListAttribute(TargetListAttributeCallback callback) { @@ -21514,7 +21514,7 @@ public interface StartTimeAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface DurationAttributeCallback { @@ -21522,7 +21522,7 @@ public interface DurationAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface SeekRangeEndAttributeCallback { @@ -21530,7 +21530,7 @@ public interface SeekRangeEndAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface SeekRangeStartAttributeCallback { @@ -21538,7 +21538,7 @@ public interface SeekRangeStartAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface GeneratedCommandListAttributeCallback { @@ -21546,7 +21546,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -21554,7 +21554,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -21562,7 +21562,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -21570,7 +21570,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readCurrentStateAttribute(IntegerAttributeCallback callback) { @@ -21843,7 +21843,7 @@ public interface InputListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface GeneratedCommandListAttributeCallback { @@ -21851,7 +21851,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -21859,7 +21859,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -21867,7 +21867,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -21875,7 +21875,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readInputListAttribute(InputListAttributeCallback callback) { @@ -22037,7 +22037,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -22045,7 +22045,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -22053,7 +22053,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -22061,7 +22061,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) { @@ -22200,7 +22200,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -22208,7 +22208,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -22216,7 +22216,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -22224,7 +22224,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) { @@ -22404,7 +22404,7 @@ public interface AcceptHeaderAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface GeneratedCommandListAttributeCallback { @@ -22412,7 +22412,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -22420,7 +22420,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -22428,7 +22428,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -22436,7 +22436,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readAcceptHeaderAttribute(AcceptHeaderAttributeCallback callback) { @@ -22636,7 +22636,7 @@ public interface OutputListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface GeneratedCommandListAttributeCallback { @@ -22644,7 +22644,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -22652,7 +22652,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -22660,7 +22660,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -22668,7 +22668,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readOutputListAttribute(OutputListAttributeCallback callback) { @@ -22885,7 +22885,7 @@ public interface CatalogListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface GeneratedCommandListAttributeCallback { @@ -22893,7 +22893,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -22901,7 +22901,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -22909,7 +22909,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -22917,7 +22917,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readCatalogListAttribute(CatalogListAttributeCallback callback) { @@ -23053,7 +23053,7 @@ public interface VendorIDAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AllowedVendorListAttributeCallback { @@ -23061,7 +23061,7 @@ public interface AllowedVendorListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface GeneratedCommandListAttributeCallback { @@ -23069,7 +23069,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -23077,7 +23077,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -23085,7 +23085,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -23093,7 +23093,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readVendorNameAttribute(CharStringAttributeCallback callback) { @@ -23371,7 +23371,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -23379,7 +23379,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -23387,7 +23387,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -23395,7 +23395,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) { @@ -23513,7 +23513,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -23521,7 +23521,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -23529,7 +23529,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -23537,7 +23537,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readMeasurementTypeAttribute(LongAttributeCallback callback) { @@ -23855,7 +23855,7 @@ public interface ExpectedClientsAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface GeneratedCommandListAttributeCallback { @@ -23863,7 +23863,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -23871,7 +23871,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -23879,7 +23879,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -23887,7 +23887,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readIdleModeIntervalAttribute(LongAttributeCallback callback) { @@ -24422,7 +24422,7 @@ public interface ListInt8uAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface ListOctetStringAttributeCallback { @@ -24430,7 +24430,7 @@ public interface ListOctetStringAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface ListStructOctetStringAttributeCallback { @@ -24438,7 +24438,7 @@ public interface ListStructOctetStringAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface VendorIdAttributeCallback { @@ -24446,7 +24446,7 @@ public interface VendorIdAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface ListNullablesAndOptionalsStructAttributeCallback { @@ -24454,7 +24454,7 @@ public interface ListNullablesAndOptionalsStructAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface ListLongOctetStringAttributeCallback { @@ -24462,7 +24462,7 @@ public interface ListLongOctetStringAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface ListFabricScopedAttributeCallback { @@ -24470,7 +24470,7 @@ public interface ListFabricScopedAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface NullableBooleanAttributeCallback { @@ -24478,7 +24478,7 @@ public interface NullableBooleanAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface NullableBitmap8AttributeCallback { @@ -24486,7 +24486,7 @@ public interface NullableBitmap8AttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface NullableBitmap16AttributeCallback { @@ -24494,7 +24494,7 @@ public interface NullableBitmap16AttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface NullableBitmap32AttributeCallback { @@ -24502,7 +24502,7 @@ public interface NullableBitmap32AttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface NullableBitmap64AttributeCallback { @@ -24510,7 +24510,7 @@ public interface NullableBitmap64AttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface NullableInt8uAttributeCallback { @@ -24518,7 +24518,7 @@ public interface NullableInt8uAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface NullableInt16uAttributeCallback { @@ -24526,7 +24526,7 @@ public interface NullableInt16uAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface NullableInt24uAttributeCallback { @@ -24534,7 +24534,7 @@ public interface NullableInt24uAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface NullableInt32uAttributeCallback { @@ -24542,7 +24542,7 @@ public interface NullableInt32uAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface NullableInt40uAttributeCallback { @@ -24550,7 +24550,7 @@ public interface NullableInt40uAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface NullableInt48uAttributeCallback { @@ -24558,7 +24558,7 @@ public interface NullableInt48uAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface NullableInt56uAttributeCallback { @@ -24566,7 +24566,7 @@ public interface NullableInt56uAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface NullableInt64uAttributeCallback { @@ -24574,7 +24574,7 @@ public interface NullableInt64uAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface NullableInt8sAttributeCallback { @@ -24582,7 +24582,7 @@ public interface NullableInt8sAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface NullableInt16sAttributeCallback { @@ -24590,7 +24590,7 @@ public interface NullableInt16sAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface NullableInt24sAttributeCallback { @@ -24598,7 +24598,7 @@ public interface NullableInt24sAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface NullableInt32sAttributeCallback { @@ -24606,7 +24606,7 @@ public interface NullableInt32sAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface NullableInt40sAttributeCallback { @@ -24614,7 +24614,7 @@ public interface NullableInt40sAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface NullableInt48sAttributeCallback { @@ -24622,7 +24622,7 @@ public interface NullableInt48sAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface NullableInt56sAttributeCallback { @@ -24630,7 +24630,7 @@ public interface NullableInt56sAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface NullableInt64sAttributeCallback { @@ -24638,7 +24638,7 @@ public interface NullableInt64sAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface NullableEnum8AttributeCallback { @@ -24646,7 +24646,7 @@ public interface NullableEnum8AttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface NullableEnum16AttributeCallback { @@ -24654,7 +24654,7 @@ public interface NullableEnum16AttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface NullableFloatSingleAttributeCallback { @@ -24662,7 +24662,7 @@ public interface NullableFloatSingleAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface NullableFloatDoubleAttributeCallback { @@ -24670,7 +24670,7 @@ public interface NullableFloatDoubleAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface NullableOctetStringAttributeCallback { @@ -24678,7 +24678,7 @@ public interface NullableOctetStringAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface NullableCharStringAttributeCallback { @@ -24686,7 +24686,7 @@ public interface NullableCharStringAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface NullableEnumAttrAttributeCallback { @@ -24694,7 +24694,7 @@ public interface NullableEnumAttrAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface NullableRangeRestrictedInt8uAttributeCallback { @@ -24702,7 +24702,7 @@ public interface NullableRangeRestrictedInt8uAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface NullableRangeRestrictedInt8sAttributeCallback { @@ -24710,7 +24710,7 @@ public interface NullableRangeRestrictedInt8sAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface NullableRangeRestrictedInt16uAttributeCallback { @@ -24718,7 +24718,7 @@ public interface NullableRangeRestrictedInt16uAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface NullableRangeRestrictedInt16sAttributeCallback { @@ -24726,7 +24726,7 @@ public interface NullableRangeRestrictedInt16sAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface GeneratedCommandListAttributeCallback { @@ -24734,7 +24734,7 @@ public interface GeneratedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AcceptedCommandListAttributeCallback { @@ -24742,7 +24742,7 @@ public interface AcceptedCommandListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface EventListAttributeCallback { @@ -24750,7 +24750,7 @@ public interface EventListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public interface AttributeListAttributeCallback { @@ -24758,7 +24758,7 @@ public interface AttributeListAttributeCallback { void onError(Exception ex); - default void onSubscriptionEstablished() {} + default void onSubscriptionEstablished(long subscriptionId) {} } public void readBooleanAttribute(BooleanAttributeCallback callback) { diff --git a/src/controller/tests/data_model/TestRead.cpp b/src/controller/tests/data_model/TestRead.cpp index c9fb756200e273..aa9dd0218ed50f 100644 --- a/src/controller/tests/data_model/TestRead.cpp +++ b/src/controller/tests/data_model/TestRead.cpp @@ -1831,7 +1831,8 @@ void TestReadInteraction::TestReadHandler_MultipleSubscriptions(nlTestSuite * ap NL_TEST_ASSERT(apSuite, false); }; - auto onSubscriptionEstablishedCb = [&numSubscriptionEstablishedCalls](const app::ReadClient & readClient) { + auto onSubscriptionEstablishedCb = [&numSubscriptionEstablishedCalls](const app::ReadClient & readClient, + chip::SubscriptionId aSubscriptionId) { numSubscriptionEstablishedCalls++; }; @@ -1897,7 +1898,8 @@ void TestReadInteraction::TestReadHandler_SubscriptionAppRejection(nlTestSuite * numFailureCalls++; }; - auto onSubscriptionEstablishedCb = [&numSubscriptionEstablishedCalls](const app::ReadClient & readClient) { + auto onSubscriptionEstablishedCb = [&numSubscriptionEstablishedCalls](const app::ReadClient & readClient, + chip::SubscriptionId aSubscriptionId) { numSubscriptionEstablishedCalls++; }; @@ -1961,7 +1963,8 @@ void TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest1(nl numFailureCalls++; }; - auto onSubscriptionEstablishedCb = [&numSubscriptionEstablishedCalls, &apSuite](const app::ReadClient & readClient) { + auto onSubscriptionEstablishedCb = [&numSubscriptionEstablishedCalls, &apSuite](const app::ReadClient & readClient, + chip::SubscriptionId aSubscriptionId) { uint16_t minInterval = 0, maxInterval = 0; CHIP_ERROR err = readClient.GetReportingIntervals(minInterval, maxInterval); @@ -2036,7 +2039,8 @@ void TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest2(nl numFailureCalls++; }; - auto onSubscriptionEstablishedCb = [&numSubscriptionEstablishedCalls, &apSuite](const app::ReadClient & readClient) { + auto onSubscriptionEstablishedCb = [&numSubscriptionEstablishedCalls, &apSuite](const app::ReadClient & readClient, + chip::SubscriptionId aSubscriptionId) { uint16_t minInterval = 0, maxInterval = 0; CHIP_ERROR err = readClient.GetReportingIntervals(minInterval, maxInterval); @@ -2111,7 +2115,8 @@ void TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest3(nl numFailureCalls++; }; - auto onSubscriptionEstablishedCb = [&numSubscriptionEstablishedCalls, &apSuite](const app::ReadClient & readClient) { + auto onSubscriptionEstablishedCb = [&numSubscriptionEstablishedCalls, &apSuite](const app::ReadClient & readClient, + chip::SubscriptionId aSubscriptionId) { uint16_t minInterval = 0, maxInterval = 0; CHIP_ERROR err = readClient.GetReportingIntervals(minInterval, maxInterval); @@ -2186,7 +2191,8 @@ void TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest4(nl numFailureCalls++; }; - auto onSubscriptionEstablishedCb = [&numSubscriptionEstablishedCalls](const app::ReadClient & readClient) { + auto onSubscriptionEstablishedCb = [&numSubscriptionEstablishedCalls](const app::ReadClient & readClient, + chip::SubscriptionId aSubscriptionId) { numSubscriptionEstablishedCalls++; }; @@ -2251,7 +2257,8 @@ void TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest5(nl numFailureCalls++; }; - auto onSubscriptionEstablishedCb = [&numSubscriptionEstablishedCalls, &apSuite](const app::ReadClient & readClient) { + auto onSubscriptionEstablishedCb = [&numSubscriptionEstablishedCalls, &apSuite](const app::ReadClient & readClient, + chip::SubscriptionId aSubscriptionId) { uint16_t minInterval = 0, maxInterval = 0; CHIP_ERROR err = readClient.GetReportingIntervals(minInterval, maxInterval); @@ -2326,7 +2333,8 @@ void TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest6(nl numFailureCalls++; }; - auto onSubscriptionEstablishedCb = [&numSubscriptionEstablishedCalls, &apSuite](const app::ReadClient & readClient) { + auto onSubscriptionEstablishedCb = [&numSubscriptionEstablishedCalls, &apSuite](const app::ReadClient & readClient, + chip::SubscriptionId aSubscriptionId) { uint16_t minInterval = 0, maxInterval = 0; CHIP_ERROR err = readClient.GetReportingIntervals(minInterval, maxInterval); @@ -2401,7 +2409,8 @@ void TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest7(nl numFailureCalls++; }; - auto onSubscriptionEstablishedCb = [&numSubscriptionEstablishedCalls, &apSuite](const app::ReadClient & readClient) { + auto onSubscriptionEstablishedCb = [&numSubscriptionEstablishedCalls, &apSuite](const app::ReadClient & readClient, + chip::SubscriptionId aSubscriptionId) { uint16_t minInterval = 0, maxInterval = 0; CHIP_ERROR err = readClient.GetReportingIntervals(minInterval, maxInterval); @@ -2475,7 +2484,8 @@ void TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest8(nl numFailureCalls++; }; - auto onSubscriptionEstablishedCb = [&numSubscriptionEstablishedCalls](const app::ReadClient & readClient) { + auto onSubscriptionEstablishedCb = [&numSubscriptionEstablishedCalls](const app::ReadClient & readClient, + chip::SubscriptionId aSubscriptionId) { numSubscriptionEstablishedCalls++; }; // @@ -2538,7 +2548,8 @@ void TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest9(nl numFailureCalls++; }; - auto onSubscriptionEstablishedCb = [&numSubscriptionEstablishedCalls](const app::ReadClient & readClient) { + auto onSubscriptionEstablishedCb = [&numSubscriptionEstablishedCalls](const app::ReadClient & readClient, + chip::SubscriptionId aSubscriptionId) { numSubscriptionEstablishedCalls++; }; @@ -2648,7 +2659,8 @@ void TestReadInteraction::SubscribeThenReadHelper(nlTestSuite * apSuite, TestCon }; auto onSubscriptionEstablishedCb = [&numSubscriptionEstablishedCalls, &apSuite, &aCtx, aSubscribeCount, aReadCount, - &numReadSuccessCalls, &numReadFailureCalls](const app::ReadClient & readClient) { + &numReadSuccessCalls, &numReadFailureCalls](const app::ReadClient & readClient, + chip::SubscriptionId aSubscriptionId) { numSubscriptionEstablishedCalls++; if (numSubscriptionEstablishedCalls == aSubscribeCount) { @@ -2745,7 +2757,8 @@ void TestReadInteraction::TestReadHandler_MultipleSubscriptionsWithDataVersionFi NL_TEST_ASSERT(apSuite, false); }; - auto onSubscriptionEstablishedCb = [&numSubscriptionEstablishedCalls](const app::ReadClient & readClient) { + auto onSubscriptionEstablishedCb = [&numSubscriptionEstablishedCalls](const app::ReadClient & readClient, + chip::SubscriptionId aSubscriptionId) { numSubscriptionEstablishedCalls++; }; diff --git a/src/lib/support/JniReferences.cpp b/src/lib/support/JniReferences.cpp index 50568e3438aaf5..c7834348e06a1a 100644 --- a/src/lib/support/JniReferences.cpp +++ b/src/lib/support/JniReferences.cpp @@ -139,6 +139,7 @@ void JniReferences::CallVoidInt(JNIEnv * env, jobject object, const char * metho env->ExceptionClear(); env->CallVoidMethod(object, method, argument); + VerifyOrReturn(!env->ExceptionCheck(), env->ExceptionDescribe()); } void JniReferences::ReportError(JNIEnv * env, CHIP_ERROR cbErr, const char * functName) @@ -279,17 +280,17 @@ jdouble JniReferences::DoubleToPrimitive(jobject boxedDouble) return env->CallDoubleMethod(boxedDouble, valueMethod); } -CHIP_ERROR JniReferences::CallSubscriptionEstablished(jobject javaCallback) +CHIP_ERROR JniReferences::CallSubscriptionEstablished(jobject javaCallback, long subscriptionId) { CHIP_ERROR err = CHIP_NO_ERROR; JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); jmethodID subscriptionEstablishedMethod; - err = chip::JniReferences::GetInstance().FindMethod(env, javaCallback, "onSubscriptionEstablished", "()V", + err = chip::JniReferences::GetInstance().FindMethod(env, javaCallback, "onSubscriptionEstablished", "(J)V", &subscriptionEstablishedMethod); VerifyOrReturnError(err == CHIP_NO_ERROR, CHIP_JNI_ERROR_METHOD_NOT_FOUND); - env->CallVoidMethod(javaCallback, subscriptionEstablishedMethod); + env->CallVoidMethod(javaCallback, subscriptionEstablishedMethod, subscriptionId); VerifyOrReturnError(!env->ExceptionCheck(), CHIP_JNI_ERROR_EXCEPTION_THROWN); return err; diff --git a/src/lib/support/JniReferences.h b/src/lib/support/JniReferences.h index 0a515a06012e43..f2e357de2db46a 100644 --- a/src/lib/support/JniReferences.h +++ b/src/lib/support/JniReferences.h @@ -127,9 +127,9 @@ class JniReferences CHIP_ERROR GetObjectField(jobject objectToRead, const char * name, const char * signature, jobject & outObject); /** - * Call a void method with no arguments named "OnSubscriptionEstablished" on the provided jobject. + * Call a void method with subscriptionId named "OnSubscriptionEstablished" on the provided jobject. */ - CHIP_ERROR CallSubscriptionEstablished(jobject javaCallback); + CHIP_ERROR CallSubscriptionEstablished(jobject javaCallback, long subscriptionId); /** * Creates a boxed type (e.g. java.lang.Integer) based on the the class name ("java/lang/Integer"), constructor JNI signature