Merge branch 'refs/heads/master' into feature/lwm2m/obj-19-ota-update

This commit is contained in:
nickAS21 2025-04-14 11:41:22 +03:00
commit b375d30527

View File

@ -158,12 +158,12 @@ public class DeviceConnectivityControllerTest extends AbstractControllerTest {
mqttProfile.setName("Mqtt device profile"); mqttProfile.setName("Mqtt device profile");
mqttProfile.setType(DeviceProfileType.DEFAULT); mqttProfile.setType(DeviceProfileType.DEFAULT);
mqttProfile.setTransportType(DeviceTransportType.MQTT); mqttProfile.setTransportType(DeviceTransportType.MQTT);
DeviceProfileData deviceProfileData = new DeviceProfileData(); DeviceProfileData mqttProfileData = new DeviceProfileData();
deviceProfileData.setConfiguration(new DefaultDeviceProfileConfiguration()); mqttProfileData.setConfiguration(new DefaultDeviceProfileConfiguration());
MqttDeviceProfileTransportConfiguration transportConfiguration = new MqttDeviceProfileTransportConfiguration(); MqttDeviceProfileTransportConfiguration transportConfiguration = new MqttDeviceProfileTransportConfiguration();
transportConfiguration.setDeviceTelemetryTopic(DEVICE_TELEMETRY_TOPIC); transportConfiguration.setDeviceTelemetryTopic(DEVICE_TELEMETRY_TOPIC);
deviceProfileData.setTransportConfiguration(transportConfiguration); mqttProfileData.setTransportConfiguration(transportConfiguration);
mqttProfile.setProfileData(deviceProfileData); mqttProfile.setProfileData(mqttProfileData);
mqttProfile.setDefault(false); mqttProfile.setDefault(false);
mqttProfile.setDefaultRuleChainId(null); mqttProfile.setDefaultRuleChainId(null);
@ -173,10 +173,10 @@ public class DeviceConnectivityControllerTest extends AbstractControllerTest {
coapProfile.setName("Coap device profile"); coapProfile.setName("Coap device profile");
coapProfile.setType(DeviceProfileType.DEFAULT); coapProfile.setType(DeviceProfileType.DEFAULT);
coapProfile.setTransportType(DeviceTransportType.COAP); coapProfile.setTransportType(DeviceTransportType.COAP);
DeviceProfileData deviceProfileData2 = new DeviceProfileData(); DeviceProfileData coapProfileData = new DeviceProfileData();
deviceProfileData2.setConfiguration(new DefaultDeviceProfileConfiguration()); coapProfileData.setConfiguration(new DefaultDeviceProfileConfiguration());
deviceProfileData2.setTransportConfiguration(new CoapDeviceProfileTransportConfiguration()); coapProfileData.setTransportConfiguration(new CoapDeviceProfileTransportConfiguration());
coapProfile.setProfileData(deviceProfileData); coapProfile.setProfileData(coapProfileData);
coapProfile.setDefault(false); coapProfile.setDefault(false);
coapProfile.setDefaultRuleChainId(null); coapProfile.setDefaultRuleChainId(null);