@ -420,7 +420,8 @@ public class DeviceProfileServiceImpl extends AbstractEntityService implements D
}
} else if ( transportConfiguration instanceof Lwm2mDeviceProfileTransportConfiguration ) {
List < LwM2MBootstrapServerCredential > lwM2MBootstrapServersConfigurations = ( ( Lwm2mDeviceProfileTransportConfiguration ) transportConfiguration ) . getBootstrap ( ) ;
validateLwm2mServersConfigOfBootstrapForClient ( lwM2MBootstrapServersConfigurations ) ;
validateLwm2mServersConfigOfBootstrapForClient ( lwM2MBootstrapServersConfigurations ,
( ( Lwm2mDeviceProfileTransportConfiguration ) transportConfiguration ) . isBootstrapServerUpdateEnable ( ) ) ;
for ( LwM2MBootstrapServerCredential bootstrapServerCredential : lwM2MBootstrapServersConfigurations ) {
validateLwm2mServersCredentialOfBootstrapForClient ( bootstrapServerCredential ) ;
}
@ -707,11 +708,14 @@ public class DeviceProfileServiceImpl extends AbstractEntityService implements D
}
}
private void validateLwm2mServersConfigOfBootstrapForClient ( List < LwM2MBootstrapServerCredential > lwM2MBootstrapServersConfigurations ) {
private void validateLwm2mServersConfigOfBootstrapForClient ( List < LwM2MBootstrapServerCredential > lwM2MBootstrapServersConfigurations , boolean isBootstrapServerUpdateEnable ) {
Set < String > uris = new HashSet < > ( ) ;
Set < Integer > shortServerIds = new HashSet < > ( ) ;
for ( LwM2MBootstrapServerCredential bootstrapServerCredential : lwM2MBootstrapServersConfigurations ) {
AbstractLwM2MBootstrapServerCredential serverConfig = ( AbstractLwM2MBootstrapServerCredential ) bootstrapServerCredential ;
if ( ! isBootstrapServerUpdateEnable & & serverConfig . isBootstrapServerIs ( ) ) {
throw new DeviceCredentialsValidationException ( "Bootstrap config must not include \"Bootstrap Server\". \"Include Bootstrap Server updates\" is " + isBootstrapServerUpdateEnable + "." ) ;
}
String server = serverConfig . isBootstrapServerIs ( ) ? "Bootstrap Server" : "LwM2M Server" + " shortServerId: " + serverConfig . getShortServerId ( ) + ":" ;
if ( serverConfig . getShortServerId ( ) < 1 | | serverConfig . getShortServerId ( ) > 65534 ) {
throw new DeviceCredentialsValidationException ( server + " ShortServerId must not be less than 1 and more than 65534!" ) ;