specificAssetId: Renamed for identifierkeyvaluepair

Adapt properties to the new specification As the types are final, rename them according to the new specification Signed-off-by: Tobias Klausmann <[email protected]>
eclipse-basyx · Sep 13, 2023 · be9be55 · be9be55
1 parent d7dfd3a
commit be9be55
Show file tree

Hide file tree

Showing 8 changed files with 63 additions and 60 deletions.
diff --git a/src/libaas/basyx/asset/assetinformation.h b/src/libaas/basyx/asset/assetinformation.h
@@ -3,7 +3,7 @@
 #include <basyx/submodelelement/file.h>
 #include <basyx/reference.h>
 #include <basyx/identifiable.h>
-#include <basyx/identifierkeyvaluepair.h>
+#include <basyx/specificAssetId.h>
 
 #include <basyx/enums/AssetKind.h>
 
@@ -17,7 +17,7 @@ class AssetInformation
 private:
 	AssetKind assetKind;
    util::optional<Identifier> globalAssetId;
-	std::vector<IdentifierKeyValuePair> specificAssetId;
+   std::vector<SpecificAssetId> specificAssetId;
    util::optional<Identifier> assetType;
 	util::optional<File> defaultThumbnail;
 public:
@@ -35,9 +35,9 @@ class AssetInformation
    const util::optional<Identifier> & getGlobalAssetId() const { return this->globalAssetId; };
    void setGlobalAssetId(Identifier globalAssetId) { this->globalAssetId.emplace(std::move(globalAssetId)); };
 
-	void addSpecificAssetId(IdentifierKeyValuePair specificAssetId) { this->specificAssetId.emplace_back(std::move(specificAssetId)); };
-	const std::vector<IdentifierKeyValuePair> & getSpecificAssetIds() const { return this->specificAssetId; };
-	std::vector<IdentifierKeyValuePair> & getSpecificAssetIds() { return this->specificAssetId; };
+   void addSpecificAssetId(SpecificAssetId specificAssetId) { this->specificAssetId.emplace_back(std::move(specificAssetId)); };
+   const std::vector<SpecificAssetId> & getSpecificAssetIds() const { return this->specificAssetId; };
+   std::vector<SpecificAssetId> & getSpecificAssetIds() { return this->specificAssetId; };
 
    const util::optional<Identifier> & getAssetType() const { return this->assetType; };
    void setAssetType(Identifier assetType) { this->assetType.emplace(std::move(assetType)); };

diff --git a/src/libaas/basyx/identifierkeyvaluepair.h b/src/libaas/basyx/identifierkeyvaluepair.h
diff --git a/src/libaas/basyx/serialization/json/serializer.cpp b/src/libaas/basyx/serialization/json/serializer.cpp
@@ -115,15 +115,13 @@ void serialize_helper(json_t & json, const langstringset_t & langstrings)
 	}
 };
 
-void serialize_helper(json_t & json, const IdentifierKeyValuePair & kvPair)
+void serialize_helper(json_t & json, const SpecificAssetId & kvPair)
 {
 	serialize_helper_h<HasSemantics>(json, kvPair);
 
-	json["key"] = kvPair.getKey();
+   json["key"] = kvPair.getName();
 
-	json["value"] = json_t();
-	if(kvPair.getValue())
-		json["value"] = *kvPair.getValue();
+   json["value"] = kvPair.getValue().getId();
 
 	json["subjectId"] = json_t();
 	if(kvPair.getExternalSubjectId())

diff --git a/src/libaas/basyx/serialization/json/serializer_fwd.h b/src/libaas/basyx/serialization/json/serializer_fwd.h
@@ -12,7 +12,7 @@ namespace basyx
 	class Referable;
 	class Identifiable;
 	class Identifier;
-	class IdentifierKeyValuePair;
+   class SpecificAssetId;
 	class modeltype_base;
 	class AssetAdministrationShell;
 	class MultiLanguageProperty;
@@ -50,7 +50,7 @@ namespace basyx::serialization::json
 	void serialize_helper(json_t & json, const modeltype_base &);
 	void serialize_helper(json_t & json, const AssetInformation &);
 	void serialize_helper(json_t & json, const Identifier &);
-	void serialize_helper(json_t & json, const IdentifierKeyValuePair &);
+   void serialize_helper(json_t & json, const SpecificAssetId &);
 	void serialize_helper(json_t & json, const AdministrativeInformation&);
 	void serialize_helper(json_t & json, const Referable&);
 	void serialize_helper(json_t & json, const Identifiable&);

diff --git a/src/libaas/basyx/identifierkeyvaluepair.cpp → src/libaas/basyx/specificAssetId.cpp b/src/libaas/basyx/identifierkeyvaluepair.cpp → src/libaas/basyx/specificAssetId.cpp
diff --git a/src/libaas/basyx/specificAssetId.h b/src/libaas/basyx/specificAssetId.h
@@ -0,0 +1,46 @@
+#ifndef SPECIFICASSETID_H
+#define SPECIFICASSETID_H
+
+#include <basyx/reference.h>
+#include <basyx/hassemantics.h>
+
+#include <basyx/util/optional/optional.hpp>
+#include <basyx/util/string_view/string_view.hpp>
+
+#include <basyx/identifier.h>
+#include <basyx/labelType.h>
+
+#include <string>
+
+namespace basyx
+{
+
+class SpecificAssetId : public HasSemantics
+{
+private:
+   LabelType name;
+   Identifier value;
+	util::optional<Reference> externalSubjectId;
+public:
+   SpecificAssetId(util::string_view name) : name(name.to_string()) {};
+
+   SpecificAssetId(const SpecificAssetId&) = default;
+   SpecificAssetId(SpecificAssetId&&) = default;
+
+   SpecificAssetId & operator=(const SpecificAssetId&) noexcept = default;
+   SpecificAssetId & operator=(SpecificAssetId&&) noexcept = default;
+
+   ~SpecificAssetId() = default;
+public:
+   const std::string getName() const { return name.getLabel(); };
+   void setName(util::string_view name) { this->name = name.to_string(); };
+
+   const Identifier & getValue() const { return this->value; };
+   void setValue(Identifier value) { this->value = value; }
+
+	const util::optional<Reference> & getExternalSubjectId() const { return this->externalSubjectId; };
+	template<typename Ref> void setExternalSubjectId(Ref && ref) { this->externalSubjectId = std::forward<Ref>(ref); };
+};
+};
+
+#endif /* SPECIFICASSETID_H */
diff --git a/src/libaas/basyx/submodelelement/entity.h b/src/libaas/basyx/submodelelement/entity.h
@@ -4,7 +4,7 @@
 #include <basyx/enums/EntityType.h>
 #include <basyx/submodelelement/submodelelement.h>
 #include <basyx/serialization/serializable.h>
-#include <basyx/identifierkeyvaluepair.h>
+#include <basyx/specificAssetId.h>
 #include <basyx/modeltype.h>
 
 namespace basyx
@@ -21,7 +21,7 @@ class Entity :
 	statementList_t statement;
 	EntityType entityType;
 	util::optional<Reference> globalAssetId;
-	util::optional<IdentifierKeyValuePair> specificAssetId;
+   util::optional<SpecificAssetId> specificAssetId;
 public:
 	Entity(util::string_view idShort) : DataElement(idShort) {};
 
@@ -43,8 +43,8 @@ class Entity :
 	statementList_t & getStatement() { return this->statement; };
 	void setStatement(statementList_t statement) { this->statement = std::move(statement); };
 
-	const util::optional<IdentifierKeyValuePair> & getSpecificAssetId() const { return this->specificAssetId; };
-	void setSpecificAssetId(IdentifierKeyValuePair specificAssetId) { this->specificAssetId = std::move(specificAssetId); };
+   const util::optional<SpecificAssetId> & getSpecificAssetId() const { return this->specificAssetId; };
+   void setSpecificAssetId(SpecificAssetId specificAssetId) { this->specificAssetId = std::move(specificAssetId); };
 };
 
-}
+}
diff --git a/src/libaas/sources.cmake b/src/libaas/sources.cmake
@@ -28,7 +28,6 @@ SET(SOURCE_FILES_BASYX_AAS
     ${CMAKE_CURRENT_SOURCE_DIR}/basyx/hassemantics.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/basyx/identifiable.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/basyx/identifier.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/basyx/identifierkeyvaluepair.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/basyx/key.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/basyx/labelType.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/basyx/langstringset.cpp
@@ -44,6 +43,7 @@ SET(SOURCE_FILES_BASYX_AAS
     ${CMAKE_CURRENT_SOURCE_DIR}/basyx/serialization/private/deserializer_priv.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/basyx/serialization/xml/deserializer.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/basyx/serialization/xml/xmldeserializer.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/basyx/specificAssetId.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/basyx/submodel.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/basyx/submodelelement/annotatedrelationshipelement.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/basyx/submodelelement/basicevent.cpp
@@ -103,7 +103,6 @@ SET(HEADER_FILES_BASYX_AAS
     ${CMAKE_CURRENT_SOURCE_DIR}/basyx/hassemantics.h
     ${CMAKE_CURRENT_SOURCE_DIR}/basyx/identifiable.h
     ${CMAKE_CURRENT_SOURCE_DIR}/basyx/identifier.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/basyx/identifierkeyvaluepair.h
     ${CMAKE_CURRENT_SOURCE_DIR}/basyx/key.h
     ${CMAKE_CURRENT_SOURCE_DIR}/basyx/labelType.h
     ${CMAKE_CURRENT_SOURCE_DIR}/basyx/langstringset.h
@@ -127,6 +126,7 @@ SET(HEADER_FILES_BASYX_AAS
     ${CMAKE_CURRENT_SOURCE_DIR}/basyx/serialization/serializer.h
     ${CMAKE_CURRENT_SOURCE_DIR}/basyx/serialization/xml/deserializer.h
     ${CMAKE_CURRENT_SOURCE_DIR}/basyx/serialization/xml/xmldeserializer.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/basyx/specificAssetId.h
     ${CMAKE_CURRENT_SOURCE_DIR}/basyx/submodel.h
     ${CMAKE_CURRENT_SOURCE_DIR}/basyx/submodelelement/annotatedrelationshipelement.h
     ${CMAKE_CURRENT_SOURCE_DIR}/basyx/submodelelement/basicevent.h