From 4484f2f68197d41d8a5325910510aff2393c1274 Mon Sep 17 00:00:00 2001
From: Ash Beitz <8304894+ashbeitz@users.noreply.github.com>
Date: Fri, 1 Mar 2024 12:04:07 -0800
Subject: [PATCH] Improved seat massager sample

---
 .../dtdl/dtmi/sdv/airbag_seat_massager-1.json          |  2 +-
 digital-twin-model/dtdl/dtmi/sdv/obd-1.json            |  2 +-
 digital-twin-model/dtdl/dtmi/sdv/seat_massager-1.json  | 10 +++++-----
 .../dtdl-validator/ModelsRepositoryClientExtensions.cs |  2 +-
 samples/interfaces/async_rpc/v1/request.proto          |  2 +-
 samples/seat_massager/provider/src/request_impl.rs     |  2 --
 6 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/digital-twin-model/dtdl/dtmi/sdv/airbag_seat_massager-1.json b/digital-twin-model/dtdl/dtmi/sdv/airbag_seat_massager-1.json
index ee6e14f9..558abb5e 100644
--- a/digital-twin-model/dtdl/dtmi/sdv/airbag_seat_massager-1.json
+++ b/digital-twin-model/dtdl/dtmi/sdv/airbag_seat_massager-1.json
@@ -44,7 +44,7 @@
     {
       "@type": "Command",
       "@id": "dtmi:sdv:airbag_seat_massager:perform_step;1",
-      "name": "perfom_step",
+      "name": "perform_step",
       "description": "Perform a step in the sequence.",
       "request": {
         "name": "request",
diff --git a/digital-twin-model/dtdl/dtmi/sdv/obd-1.json b/digital-twin-model/dtdl/dtmi/sdv/obd-1.json
index 062c18d1..4f19133f 100644
--- a/digital-twin-model/dtdl/dtmi/sdv/obd-1.json
+++ b/digital-twin-model/dtdl/dtmi/sdv/obd-1.json
@@ -6,7 +6,7 @@
   "contents": [
     {
       "@type": "Property",
-      "@id": "dtmi:sdv:obd:hybri_bBattery_remaining;1",
+      "@id": "dtmi:sdv:obd:hybrid_battery_remaining;1",
       "name": "hybrid_battery_remaining",
       "description": "The remaining hybrid battery life.",
       "schema": "integer"
diff --git a/digital-twin-model/dtdl/dtmi/sdv/seat_massager-1.json b/digital-twin-model/dtdl/dtmi/sdv/seat_massager-1.json
index 34b533da..e2cdf891 100644
--- a/digital-twin-model/dtdl/dtmi/sdv/seat_massager-1.json
+++ b/digital-twin-model/dtdl/dtmi/sdv/seat_massager-1.json
@@ -40,7 +40,7 @@
           "fields": [
             {
               "name": "status",
-              "schema": "dtmi:sdv:seatmassager:status;1"
+              "schema": "dtmi:sdv:seat_massager:status;1"
             }
           ]
         }
@@ -59,7 +59,7 @@
           "fields": [
             {
               "name": "status",
-              "schema": "dtmi:sdv:seatmassager:status;1"
+              "schema": "dtmi:sdv:seat_massager:status;1"
             }
           ]
         }
@@ -78,7 +78,7 @@
           "fields": [
             {
               "name": "status",
-              "schema": "dtmi:sdv:seatmassager:status;1"
+              "schema": "dtmi:sdv:seat_massager:status;1"
             }
           ]
         }
@@ -97,7 +97,7 @@
           "fields": [
             {
               "name": "status",
-              "schema": "dtmi:sdv:seatmassager:status;1"
+              "schema": "dtmi:sdv:seat_massager:status;1"
             }
           ]
         }
@@ -106,7 +106,7 @@
   ],
   "schemas": [
     {
-      "@id": "dtmi:sdv:seatmassager:status;1",
+      "@id": "dtmi:sdv:seat_massager:status;1",
       "@type": "Object",
       "fields": [
         {
diff --git a/dtdl-tools/src/dtdl-validator/ModelsRepositoryClientExtensions.cs b/dtdl-tools/src/dtdl-validator/ModelsRepositoryClientExtensions.cs
index 650210d7..03a195ac 100644
--- a/dtdl-tools/src/dtdl-validator/ModelsRepositoryClientExtensions.cs
+++ b/dtdl-tools/src/dtdl-validator/ModelsRepositoryClientExtensions.cs
@@ -10,7 +10,7 @@ internal static class ModelsRepositoryClientExtensions
 {
     /// <summary>
     /// The Parser's DTMI resolver.
-    /// It asynchronously gets from the models repositpory the DTDL content associated witn each of the provided DTMIs.
+    /// It asynchronously gets the DTDL content associated with each of the provided DTMIs from the models repository.
     /// </summary>
     /// <param name="modelRepoClient">The models repository client.</param>
     /// <param name="dtmis"></param>
diff --git a/samples/interfaces/async_rpc/v1/request.proto b/samples/interfaces/async_rpc/v1/request.proto
index b3bce5fe..37e6a979 100644
--- a/samples/interfaces/async_rpc/v1/request.proto
+++ b/samples/interfaces/async_rpc/v1/request.proto
@@ -11,7 +11,7 @@ service Request {
    rpc Ask (AskRequest) returns (AskResponse);
 
    // Send a notification.
-   // This is similar to an ask expect that there is no corresponding answer.
+   // This is similar to an ask except that there is no corresponding answer.
    rpc Notify (NotifyRequest) returns (NotifyResponse);
 }
 
diff --git a/samples/seat_massager/provider/src/request_impl.rs b/samples/seat_massager/provider/src/request_impl.rs
index bd7d7048..e0e76d88 100644
--- a/samples/seat_massager/provider/src/request_impl.rs
+++ b/samples/seat_massager/provider/src/request_impl.rs
@@ -22,8 +22,6 @@ pub struct RequestImpl {
     pub state: Arc<Mutex<RequestState>>,
 }
 
-impl RequestImpl {}
-
 #[tonic::async_trait]
 impl Request for RequestImpl {
     /// Ask implementation.