Skip to content

Commit a61efc0

Browse files
Metal-MightyMetal-Mighty
authored
Add trim on strings in Mappers (#3344)
* Add trim on strings in Mappers Fixes #3339 * Fix nullref exception
1 parent 85728a7 commit a61efc0

5 files changed

Lines changed: 21 additions & 21 deletions

File tree

‎src/IoTHub.Portal.Infrastructure/Mappers/ConcentratorTwinMapper.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,17 @@ public void UpdateTwin(Twin twin, ConcentratorDto item)
2727
ArgumentNullException.ThrowIfNull(twin, nameof(twin));
2828
ArgumentNullException.ThrowIfNull(item, nameof(item));
2929

30-
DeviceHelper.SetTagValue(twin, nameof(item.DeviceName), item.DeviceName);
30+
DeviceHelper.SetTagValue(twin, nameof(item.DeviceName), item.DeviceName?.Trim());
3131
DeviceHelper.SetTagValue(twin, nameof(item.LoraRegion), item.LoraRegion);
3232
DeviceHelper.SetTagValue(twin, nameof(item.DeviceType), item.DeviceType);
3333

3434
if (!string.IsNullOrWhiteSpace(item.ClientThumbprint))
3535
{
36-
DeviceHelper.SetDesiredProperty(twin, nameof(item.ClientThumbprint).ToCamelCase(), new[] { item.ClientThumbprint });
36+
DeviceHelper.SetDesiredProperty(twin, nameof(item.ClientThumbprint).ToCamelCase().Trim(), new[] { item.ClientThumbprint });
3737
}
3838
else
3939
{
40-
DeviceHelper.SetDesiredProperty(twin, nameof(item.ClientThumbprint).ToCamelCase(), null);
40+
DeviceHelper.SetDesiredProperty(twin, nameof(item.ClientThumbprint).ToCamelCase().Trim(), null);
4141
}
4242

4343
DeviceHelper.SetDesiredProperty(twin, nameof(item.RouterConfig).ToCamelCase(), item.RouterConfig);

‎src/IoTHub.Portal.Infrastructure/Mappers/DeviceModelMapper.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ public DeviceModelDto CreateDeviceModel(TableEntity entity)
2828
{
2929
ModelId = entity.RowKey,
3030
IsBuiltin = bool.Parse(entity[nameof(DeviceModelDto.IsBuiltin)]?.ToString() ?? "false"),
31-
Image = entity[nameof(DeviceModelDto.Image)]?.ToString(),
32-
Name = entity[nameof(DeviceModelDto.Name)]?.ToString(),
33-
Description = entity[nameof(DeviceModelDto.Description)]?.ToString()
31+
Image = entity[nameof(DeviceModelDto.Image)]?.ToString()?.Trim(),
32+
Name = entity[nameof(DeviceModelDto.Name)]?.ToString()?.Trim(),
33+
Description = entity[nameof(DeviceModelDto.Description)]?.ToString()?.Trim()
3434
};
3535
}
3636

‎src/IoTHub.Portal.Infrastructure/Mappers/DeviceTwinMapper.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public void UpdateTwin(Twin twin, DeviceDetails item)
7070
ArgumentNullException.ThrowIfNull(item);
7171

7272
// Update the twin properties
73-
DeviceHelper.SetTagValue(twin, nameof(item.DeviceName), item.DeviceName);
73+
DeviceHelper.SetTagValue(twin, nameof(item.DeviceName), item.DeviceName?.Trim());
7474
DeviceHelper.SetTagValue(twin, nameof(item.ModelId), item.ModelId);
7575
DeviceHelper.SetTagValue(twin, nameof(item.LayerId), item.LayerId ?? string.Empty);
7676

‎src/IoTHub.Portal.Infrastructure/Mappers/LoRaDeviceMapper.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -161,28 +161,28 @@ public void UpdateTwin(Twin twin, LoRaDeviceDetails item)
161161
ArgumentNullException.ThrowIfNull(item);
162162

163163
// Update the twin properties
164-
DeviceHelper.SetTagValue(twin, nameof(item.DeviceName), item.DeviceName);
164+
DeviceHelper.SetTagValue(twin, nameof(item.DeviceName), item.DeviceName.Trim());
165165
DeviceHelper.SetTagValue(twin, nameof(DeviceListItem.SupportLoRaFeatures), "true");
166166

167167
DeviceHelper.SetTagValue(twin, nameof(item.ModelId), item.ModelId);
168168

169169
DeviceHelper.SetTagValue(twin, nameof(item.LayerId), item.LayerId ?? string.Empty);
170170

171171
// Update OTAA settings
172-
DeviceHelper.SetDesiredProperty(twin, nameof(item.AppEUI), item.AppEUI);
173-
DeviceHelper.SetDesiredProperty(twin, nameof(item.AppKey), item.AppKey);
172+
DeviceHelper.SetDesiredProperty(twin, nameof(item.AppEUI), item.AppEUI?.Trim());
173+
DeviceHelper.SetDesiredProperty(twin, nameof(item.AppKey), item.AppKey?.Trim());
174174

175175
// Update ABP settings
176-
DeviceHelper.SetDesiredProperty(twin, nameof(item.NwkSKey), item.NwkSKey);
177-
DeviceHelper.SetDesiredProperty(twin, nameof(item.AppSKey), item.AppSKey);
178-
DeviceHelper.SetDesiredProperty(twin, nameof(item.DevAddr), item.DevAddr);
176+
DeviceHelper.SetDesiredProperty(twin, nameof(item.NwkSKey), item.NwkSKey?.Trim());
177+
DeviceHelper.SetDesiredProperty(twin, nameof(item.AppSKey), item.AppSKey?.Trim());
178+
DeviceHelper.SetDesiredProperty(twin, nameof(item.DevAddr), item.DevAddr?.Trim());
179179

180-
DeviceHelper.SetDesiredProperty(twin, nameof(item.GatewayID), item.GatewayID);
180+
DeviceHelper.SetDesiredProperty(twin, nameof(item.GatewayID), item.GatewayID?.Trim());
181181

182182
if (item.Tags != null)
183183
{
184184
foreach (var customTag in item.Tags)
185-
DeviceHelper.SetTagValue(twin, customTag.Key, customTag.Value);
185+
DeviceHelper.SetTagValue(twin, customTag.Key, customTag.Value.Trim());
186186
}
187187
}
188188
}

‎src/IoTHub.Portal.Infrastructure/Mappers/LoRaDeviceModelMapper.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ public DeviceModelDto CreateDeviceModelListItem(TableEntity entity)
1414
ModelId = entity.RowKey,
1515
IsBuiltin = bool.Parse(entity[nameof(LoRaDeviceModelDto.IsBuiltin)]?.ToString() ?? "false"),
1616
SupportLoRaFeatures = bool.Parse(entity[nameof(LoRaDeviceModelDto.SupportLoRaFeatures)]?.ToString() ?? "false"),
17-
Image = entity[nameof(DeviceModelDto.Image)]?.ToString(),
18-
Name = entity[nameof(LoRaDeviceModelDto.Name)]?.ToString(),
19-
Description = entity[nameof(LoRaDeviceModelDto.Description)]?.ToString(),
17+
Image = entity[nameof(DeviceModelDto.Image)]?.ToString()?.Trim(),
18+
Name = entity[nameof(LoRaDeviceModelDto.Name)]?.ToString()?.Trim(),
19+
Description = entity[nameof(LoRaDeviceModelDto.Description)]?.ToString()?.Trim(),
2020
};
2121
}
2222

@@ -29,9 +29,9 @@ public LoRaDeviceModelDto CreateDeviceModel(TableEntity entity)
2929
ModelId = entity.RowKey,
3030
IsBuiltin = bool.Parse(entity[nameof(LoRaDeviceModelDto.IsBuiltin)]?.ToString() ?? "false"),
3131
Image = entity[nameof(DeviceModelDto.Image)]?.ToString(),
32-
Name = entity[nameof(LoRaDeviceModelDto.Name)]?.ToString(),
33-
Description = entity[nameof(LoRaDeviceModelDto.Description)]?.ToString(),
34-
SensorDecoder = entity[nameof(LoRaDeviceModelDto.SensorDecoder)]?.ToString(),
32+
Name = entity[nameof(LoRaDeviceModelDto.Name)]?.ToString()?.Trim(),
33+
Description = entity[nameof(LoRaDeviceModelDto.Description)]?.ToString()?.Trim(),
34+
SensorDecoder = entity[nameof(LoRaDeviceModelDto.SensorDecoder)]?.ToString()?.Trim(),
3535
UseOTAA = bool.Parse(entity[nameof(LoRaDeviceModelDto.UseOTAA)]?.ToString() ?? "true"),
3636
ClassType = Enum.TryParse<ClassType>(entity[nameof(LoRaDeviceModelDto.ClassType)]?.ToString(), out var classType) ? classType : ClassType.A,
3737
PreferredWindow = int.TryParse(entity[nameof(LoRaDeviceModelDto.PreferredWindow)]?.ToString(), out var intResult) ? intResult : 1,

0 commit comments

Comments
 (0)