Merge branch 'main' into define_general_uattributes_requirements

uprotocol/core/utwin/v1/utwin.proto → uprotocol/core/utwin/v2/utwin.proto

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 General Motors GTO LLC
+ * Copyright (c) 2024 General Motors GTO LLC
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -19,7 +19,7 @@
  * under the License.
  *
  * SPDX-FileType: SOURCE
- * SPDX-FileCopyrightText: 2023 General Motors GTO LLC
+ * SPDX-FileCopyrightText: 2024 General Motors GTO LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 syntax = "proto3";
@@ -38,7 +38,7 @@ option java_multiple_files = true;
 // uTwin Service interface definition
 service uTwin {
   option (name) = "core.utwin"; // Service name
-  option (version_major) = 1;
+  option (version_major) = 2;
   option (version_minor) = 0;
   option (id) = 26;
 

uprotocol/uattributes.proto

@@ -132,22 +132,24 @@ message CallOptions {
 enum UMessageType {
     // Unspecified message type
     UMESSAGE_TYPE_UNSPECIFIED = 0;
+
     // Publish
     // A message that is used to notify all interested consumers of an event that has occurred.
-    //
-    // or
-    //
-    // Notification
-    // A message that is used to inform a specific consumer about an event that has occurred.
     UMESSAGE_TYPE_PUBLISH = 1 [(uprotocol.ce_name) = "pub.v1"];
+
     // RPC Request
     // A message that is used by a service consumer to invoke one of a service provider's methods with some input data, expecting the service
     // provider to reply with a response message.
     UMESSAGE_TYPE_REQUEST = 2 [(uprotocol.ce_name) = "req.v1"];
+
     // RPC Response
     // A message that is used by a service provider to send the outcome of processing a request message
     // from a servcice consumer.
     UMESSAGE_TYPE_RESPONSE = 3 [(uprotocol.ce_name) = "res.v1"];
+
+    // Notification
+    // A message that is used to inform a specific consumer about an event that has occurred.
+    UMESSAGE_TYPE_NOTIFICATION = 4 [(uprotocol.ce_name) = "not.v1"]; // Notification
 }