Skip to content

Commit b15c826

Browse files
didier-wenzekdidier-wenzek
committed
Remove unused arg from EntityMetadata::main_device()
The external device id of the main device is now maintain by the mappers, each being able to have its own external id. Signed-off-by: Didier Wenzek <[email protected]>
1 parent cbbb2ee commit b15c826

File tree

6 files changed

+25
-44
lines changed

6 files changed

+25
-44
lines changed

‎crates/core/tedge_agent/src/entity_manager/tests.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ async fn new_entity_store() {
1010

1111
assert_eq!(
1212
entity::get(&mut entity_store, "device/main//").await,
13-
Some(EntityMetadata::main_device("device-under-test".to_string()))
13+
Some(EntityMetadata::main_device())
1414
)
1515
}
1616

‎crates/core/tedge_agent/src/http_server/entity_store.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@ mod tests {
479479
if let EntityStoreRequest::List(_) = req.request {
480480
req.reply_to
481481
.send(EntityStoreResponse::List(Ok(vec![
482-
EntityMetadata::main_device("main".to_string()),
482+
EntityMetadata::main_device(),
483483
EntityMetadata::child_device("child0".to_string()).unwrap(),
484484
EntityMetadata::child_device("child1".to_string()).unwrap(),
485485
])))

‎crates/core/tedge_api/src/entity.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@ pub struct EntityMetadata {
7878

7979
impl EntityMetadata {
8080
/// Creates a entity metadata for the main device.
81-
pub fn main_device(device_id: String) -> Self {
81+
pub fn main_device() -> Self {
8282
Self {
8383
topic_id: EntityTopicId::default_main_device(),
84-
external_id: Some(device_id.clone().into()),
84+
external_id: None,
8585
r#type: EntityType::MainDevice,
8686
parent: None,
8787
other: Map::new(),

‎crates/extensions/c8y_mapper_ext/src/entity_cache.rs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,8 @@ impl EntityCache {
9595
SF: Fn(&str) -> Result<EntityExternalId, InvalidExternalIdError>,
9696
SF: 'static + Send + Sync,
9797
{
98-
let main_device_metadata = CloudEntityMetadata::new(
99-
main_device_xid.clone(),
100-
EntityMetadata::main_device(main_device_xid.clone().into()),
101-
);
98+
let main_device_metadata =
99+
CloudEntityMetadata::new(main_device_xid.clone(), EntityMetadata::main_device());
102100

103101
Self {
104102
main_device_xid: main_device_xid.clone(),

‎crates/extensions/c8y_mapper_ext/src/json.rs‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
//! "temperature": 23,
1313
//! "pressure": 220
1414
//! }"#;
15-
//! let entity = CloudEntityMetadata::new("foo".into(), EntityMetadata::main_device("foo".to_string()));
15+
//! let entity = CloudEntityMetadata::new("foo".into(), EntityMetadata::main_device());
1616
//! let output = from_thin_edge_json(single_value_thin_edge_json, &entity,"");
1717
//! ```
1818
@@ -76,8 +76,7 @@ mod tests {
7676

7777
let timestamp = datetime!(2021-04-08 0:00:0 +05:00);
7878

79-
let entity =
80-
CloudEntityMetadata::new("foo".into(), EntityMetadata::main_device("foo".to_string()));
79+
let entity = CloudEntityMetadata::new("foo".into(), EntityMetadata::main_device());
8180
let output =
8281
from_thin_edge_json_with_timestamp(single_value_thin_edge_json, timestamp, &entity, "");
8382

@@ -114,8 +113,7 @@ mod tests {
114113

115114
let timestamp = datetime!(2021-04-08 0:00:0 +05:00);
116115

117-
let entity =
118-
CloudEntityMetadata::new("foo".into(), EntityMetadata::main_device("foo".to_string()));
116+
let entity = CloudEntityMetadata::new("foo".into(), EntityMetadata::main_device());
119117
let output =
120118
from_thin_edge_json_with_timestamp(single_value_thin_edge_json, timestamp, &entity, "");
121119

@@ -161,8 +159,7 @@ mod tests {
161159
"type": "ThinEdgeMeasurement"
162160
}"#;
163161

164-
let entity =
165-
CloudEntityMetadata::new("foo".into(), EntityMetadata::main_device("foo".to_string()));
162+
let entity = CloudEntityMetadata::new("foo".into(), EntityMetadata::main_device());
166163
let output = from_thin_edge_json(single_value_thin_edge_json, &entity, "");
167164

168165
assert_eq!(
@@ -185,8 +182,7 @@ mod tests {
185182

186183
let timestamp = datetime!(2021-04-08 0:00:0 +05:00);
187184

188-
let entity =
189-
CloudEntityMetadata::new("foo".into(), EntityMetadata::main_device("foo".to_string()));
185+
let entity = CloudEntityMetadata::new("foo".into(), EntityMetadata::main_device());
190186
let output =
191187
from_thin_edge_json_with_timestamp(multi_value_thin_edge_json, timestamp, &entity, "");
192188

@@ -242,8 +238,7 @@ mod tests {
242238
"type": "ThinEdgeMeasurement"
243239
}"#;
244240

245-
let entity =
246-
CloudEntityMetadata::new("foo".into(), EntityMetadata::main_device("foo".to_string()));
241+
let entity = CloudEntityMetadata::new("foo".into(), EntityMetadata::main_device());
247242
let output = from_thin_edge_json(input, &entity, "");
248243

249244
let actual_output = output.unwrap().split_whitespace().collect::<String>();
@@ -276,7 +271,7 @@ mod tests {
276271
"type": "ThinEdgeMeasurement"
277272
}}"#, time, measurement, measurement);
278273

279-
let entity = CloudEntityMetadata::new("foo".into(), EntityMetadata::main_device("foo".to_string()));
274+
let entity = CloudEntityMetadata::new("foo".into(), EntityMetadata::main_device());
280275
let output = from_thin_edge_json(input.as_str(), &entity, "").unwrap();
281276
assert_eq!(
282277
expected_output.split_whitespace().collect::<String>(),

‎crates/extensions/c8y_mapper_ext/src/serializer.rs‎

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,7 @@ mod tests {
229229
fn serialize_single_value_message() -> anyhow::Result<()> {
230230
let timestamp = datetime!(2021-06-22 17:03:14.123456789 +05:00);
231231

232-
let entity =
233-
CloudEntityMetadata::new("foo".into(), EntityMetadata::main_device("foo".to_string()));
232+
let entity = CloudEntityMetadata::new("foo".into(), EntityMetadata::main_device());
234233
let mut serializer = C8yJsonSerializer::new(timestamp, &entity, "");
235234
serializer.visit_timestamp(timestamp)?;
236235
serializer.visit_measurement("temperature", 25.5)?;
@@ -258,8 +257,7 @@ mod tests {
258257
fn serialize_single_value_message_with_custom_type() -> anyhow::Result<()> {
259258
let timestamp = datetime!(2021-06-22 17:03:14.123456789 +05:00);
260259

261-
let entity =
262-
CloudEntityMetadata::new("foo".into(), EntityMetadata::main_device("foo".to_string()));
260+
let entity = CloudEntityMetadata::new("foo".into(), EntityMetadata::main_device());
263261
let mut serializer = C8yJsonSerializer::new(timestamp, &entity, "test_type");
264262
serializer.visit_timestamp(timestamp)?;
265263
serializer.visit_measurement("temperature", 25.5)?;
@@ -287,8 +285,7 @@ mod tests {
287285
fn invalid_to_have_type_as_measurement() -> anyhow::Result<()> {
288286
let timestamp = datetime!(2021-06-22 17:03:14.123456789 +05:00);
289287

290-
let entity =
291-
CloudEntityMetadata::new("foo".into(), EntityMetadata::main_device("foo".to_string()));
288+
let entity = CloudEntityMetadata::new("foo".into(), EntityMetadata::main_device());
292289
let mut serializer = C8yJsonSerializer::new(timestamp, &entity, "");
293290
serializer.visit_timestamp(timestamp)?;
294291
serializer.visit_measurement("temperature", 25.5)?;
@@ -304,8 +301,7 @@ mod tests {
304301
fn invalid_to_have_externalsource_as_measurement() -> anyhow::Result<()> {
305302
let timestamp = datetime!(2021-06-22 17:03:14.123456789 +05:00);
306303

307-
let entity =
308-
CloudEntityMetadata::new("foo".into(), EntityMetadata::main_device("foo".to_string()));
304+
let entity = CloudEntityMetadata::new("foo".into(), EntityMetadata::main_device());
309305
let mut serializer = C8yJsonSerializer::new(timestamp, &entity, "");
310306
serializer.visit_timestamp(timestamp)?;
311307
serializer.visit_measurement("temperature", 25.5)?;
@@ -324,8 +320,7 @@ mod tests {
324320
fn serialize_multi_value_message() -> anyhow::Result<()> {
325321
let timestamp = datetime!(2021-06-22 17:03:14.123456789 +05:00);
326322

327-
let entity =
328-
CloudEntityMetadata::new("foo".into(), EntityMetadata::main_device("foo".to_string()));
323+
let entity = CloudEntityMetadata::new("foo".into(), EntityMetadata::main_device());
329324

330325
let mut serializer = C8yJsonSerializer::new(timestamp, &entity, "");
331326
serializer.visit_timestamp(timestamp)?;
@@ -378,8 +373,7 @@ mod tests {
378373
fn type_inside_a_group_is_not_valid() -> anyhow::Result<()> {
379374
let timestamp = datetime!(2021-06-22 17:03:14.123456789 +05:00);
380375

381-
let entity =
382-
CloudEntityMetadata::new("foo".into(), EntityMetadata::main_device("foo".to_string()));
376+
let entity = CloudEntityMetadata::new("foo".into(), EntityMetadata::main_device());
383377
let mut serializer = C8yJsonSerializer::new(timestamp, &entity, "");
384378
serializer.visit_timestamp(timestamp)?;
385379
serializer.visit_measurement("temperature", 25.5)?;
@@ -397,8 +391,7 @@ mod tests {
397391
fn serialize_empty_message() -> anyhow::Result<()> {
398392
let timestamp = datetime!(2021-06-22 17:03:14.123456789 +05:00);
399393

400-
let entity =
401-
CloudEntityMetadata::new("foo".into(), EntityMetadata::main_device("foo".to_string()));
394+
let entity = CloudEntityMetadata::new("foo".into(), EntityMetadata::main_device());
402395
let serializer = C8yJsonSerializer::new(timestamp, &entity, "");
403396

404397
let expected_output =
@@ -418,8 +411,7 @@ mod tests {
418411
fn serialize_timestamp_message() -> anyhow::Result<()> {
419412
let timestamp = datetime!(2021-06-22 17:03:14.123456789 +05:00);
420413

421-
let entity =
422-
CloudEntityMetadata::new("foo".into(), EntityMetadata::main_device("foo".to_string()));
414+
let entity = CloudEntityMetadata::new("foo".into(), EntityMetadata::main_device());
423415
let mut serializer = C8yJsonSerializer::new(timestamp, &entity, "");
424416
serializer.visit_timestamp(timestamp)?;
425417

@@ -442,8 +434,7 @@ mod tests {
442434
fn serialize_timestamp_within_group() -> anyhow::Result<()> {
443435
let timestamp = datetime!(2021-06-22 17:03:14.123456789 +05:00);
444436

445-
let entity =
446-
CloudEntityMetadata::new("foo".into(), EntityMetadata::main_device("foo".to_string()));
437+
let entity = CloudEntityMetadata::new("foo".into(), EntityMetadata::main_device());
447438
let mut serializer = C8yJsonSerializer::new(timestamp, &entity, "");
448439
serializer.visit_start_group("location")?;
449440

@@ -462,8 +453,7 @@ mod tests {
462453
fn serialize_unexpected_end_of_group() -> anyhow::Result<()> {
463454
let timestamp = datetime!(2021-06-22 17:03:14.123456789 +05:00);
464455

465-
let entity =
466-
CloudEntityMetadata::new("foo".into(), EntityMetadata::main_device("foo".to_string()));
456+
let entity = CloudEntityMetadata::new("foo".into(), EntityMetadata::main_device());
467457
let mut serializer = C8yJsonSerializer::new(timestamp, &entity, "");
468458
serializer.visit_measurement("alti", 2100.4)?;
469459
serializer.visit_measurement("longi", 2200.4)?;
@@ -484,8 +474,7 @@ mod tests {
484474
fn serialize_unexpected_start_of_group() -> anyhow::Result<()> {
485475
let timestamp = datetime!(2021-06-22 17:03:14.123456789 +05:00);
486476

487-
let entity =
488-
CloudEntityMetadata::new("foo".into(), EntityMetadata::main_device("foo".to_string()));
477+
let entity = CloudEntityMetadata::new("foo".into(), EntityMetadata::main_device());
489478
let mut serializer = C8yJsonSerializer::new(timestamp, &entity, "");
490479
serializer.visit_start_group("location")?;
491480
serializer.visit_measurement("alti", 2100.4)?;
@@ -507,8 +496,7 @@ mod tests {
507496
fn serialize_unexpected_end_of_message() -> anyhow::Result<()> {
508497
let timestamp = datetime!(2021-06-22 17:03:14.123456789 +05:00);
509498

510-
let entity =
511-
CloudEntityMetadata::new("foo".into(), EntityMetadata::main_device("foo".to_string()));
499+
let entity = CloudEntityMetadata::new("foo".into(), EntityMetadata::main_device());
512500
let mut serializer = C8yJsonSerializer::new(timestamp, &entity, "");
513501
serializer.visit_start_group("location")?;
514502
serializer.visit_measurement("alti", 2100.4)?;

0 commit comments

Comments
 (0)