cleanup

eclipse-uprotocol · Mar 5, 2024 · 905f3ca · 905f3ca
1 parent 171acb7
commit 905f3ca
Show file tree

Hide file tree

Showing 52 changed files with 271 additions and 272 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
- # 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

diff --git a/Changelog b/Changelog
@@ -1,9 +1,9 @@
 ## Changelog
 
-- June 04 2023 17:52:23  Giorgio Zoppi <[email protected]>
+- June 04 2024 17:52:23  Giorgio Zoppi <[email protected]>
 	* Restructuring old code and deleting unused code.
     * Adding coverage and ctest support
-- June 10 2023 17:52:23  Giorgio Zoppi <[email protected]>
+- June 10 2024 17:52:23  Giorgio Zoppi <[email protected]>
 	* Cleanup uuid as much it was possible
     * Replaced current Meyer's singleton
 	* Separate include directory.
diff --git a/cmake/up-core-api-protos.cmake b/cmake/up-core-api-protos.cmake
@@ -1,4 +1,4 @@
-# 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

diff --git a/include/up-cpp/cloudevent/datamodel/attributes.h b/include/up-cpp/cloudevent/datamodel/attributes.h
@@ -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
  */
 #ifndef CPP_COULDEVENT_ATTRIBUTES_H_

diff --git a/include/up-cpp/cloudevent/datamodel/cloud_event.h b/include/up-cpp/cloudevent/datamodel/cloud_event.h
@@ -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
  */
 

diff --git a/include/up-cpp/cloudevent/datamodel/format.h b/include/up-cpp/cloudevent/datamodel/format.h
@@ -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
  */
 

diff --git a/include/up-cpp/cloudevent/datamodel/priority.h b/include/up-cpp/cloudevent/datamodel/priority.h
@@ -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
  */
 

diff --git a/include/up-cpp/cloudevent/datamodel/service_type.h b/include/up-cpp/cloudevent/datamodel/service_type.h
@@ -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
  */
 

diff --git a/include/up-cpp/cloudevent/datamodel/spec_version.h b/include/up-cpp/cloudevent/datamodel/spec_version.h
@@ -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
  */
 

diff --git a/include/up-cpp/cloudevent/factory/cloud_event_factory.h b/include/up-cpp/cloudevent/factory/cloud_event_factory.h
@@ -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
  */
 

diff --git a/include/up-cpp/cloudevent/serialize/binary_serializer.h b/include/up-cpp/cloudevent/serialize/binary_serializer.h
@@ -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
  */
 

diff --git a/include/up-cpp/cloudevent/serialize/json_serializer.h b/include/up-cpp/cloudevent/serialize/json_serializer.h
@@ -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
  */
 

diff --git a/include/up-cpp/rpc/RpcClient.h b/include/up-cpp/rpc/RpcClient.h
@@ -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
  */
 #ifndef _RPC_CLIENT_H_
@@ -49,8 +49,8 @@ class RpcClient
         * @param attributes Metadata for the method invocation (i.e. priority, timeout, etc.)
         * @return Returns the CompletableFuture with the result or exception.
         */
-        virtual std::future<upayload> invokeMethod(const UUri &topic, 
-                                                   const upayload &payload, 
+        virtual std::future<UPayload> invokeMethod(const UUri &topic, 
+                                                   const UPayload &payload, 
                                                    const UAttributes &attributes) = 0;
 
         virtual ~RpcClient() {} 

diff --git a/...de/up-cpp/transport/datamodel/UListener.h → include/up-cpp/transport/UListener.h b/...de/up-cpp/transport/datamodel/UListener.h → include/up-cpp/transport/UListener.h
@@ -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
  */
 
@@ -28,8 +28,8 @@
 
 #include <up-core-api/ustatus.pb.h>
 #include <up-core-api/uri.pb.h>
-#include "up-core-api/uattributes.pb.h"
-#include "UPayload.h"
+#include <up-core-api/uattributes.pb.h>
+#include <up-cpp/transport/datamodel/UPayload.h>
 
 using namespace uprotocol::v1;
 
@@ -46,7 +46,7 @@ namespace uprotocol::utransport {
 			* @return Returns an Ack every time a message is received and processed.
 			*/
 			virtual UStatus onReceive(const UUri &uri, 
-									const upayload &payload, 
+									const UPayload &payload, 
 									const UAttributes &attributes) const = 0; 
 
 			virtual ~UListener() {} 

diff --git a/include/up-cpp/transport/UTransport.h b/include/up-cpp/transport/UTransport.h
@@ -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
  */
 
@@ -28,12 +28,11 @@
 
 #include <stdint.h>
 #include <cstddef>
-#include <up-cpp/transport/datamodel/UListener.h>
+#include <up-cpp/transport/UListener.h>
 #include <up-cpp/transport/datamodel/UPayload.h>
 #include <up-core-api/uri.pb.h>
 #include <up-core-api/ustatus.pb.h>
 #include <up-core-api/uattributes.pb.h>
-#include <up-core-api/upayload.pb.h>
 
 using namespace uprotocol::utransport;
 using namespace uprotocol::v1;
@@ -45,19 +44,19 @@ namespace uprotocol::utransport {
           public:
 
                /**
-               * Transmit upayload to the topic using the attributes defined in UTransportAttributes.
+               * Transmit UPayload to the topic using the attributes defined in UTransportAttributes.
                * @param topic Resolved UUri topic to send the payload to.
                * @param payload Actual payload.
                * @param attributes Additional transport attributes.
                * @return Returns OKSTATUS if the payload has been successfully sent (ACK'ed), otherwise it
                * returns FAILSTATUS with the appropriate failure.
                */
                virtual UStatus send(const UUri &uri, 
-                                    const upayload &payload,
+                                    const UPayload &payload,
                                     const UAttributes &attributes) = 0;
 
                /**
-               * Register listener to be called when upayload is received for the specific topic.
+               * Register listener to be called when UPayload is received for the specific topic.
                * @param topic Resolved UUri for where the message arrived via the underlying transport technology.
                * @param listener The method to execute to process the date for the topic.
                * @return Returns OKSTATUS if the listener is unregistered correctly, otherwise it returns FAILSTATUS
@@ -77,10 +76,6 @@ namespace uprotocol::utransport {
                */
                virtual UStatus unregisterListener(const UUri &uri, 
                                                   const UListener &listner) = 0;
-
-               virtual UStatus receive(const UUri &uri, 
-                                       const upayload &payload, 
-                                       const UAttributes &attributes) = 0;
 
                virtual ~UTransport() {} 
      };