Remove Asset class

Remove it from the Environment and the tests Signed-off-by: Tobias Klausmann <[email protected]>
eclipse-basyx · Sep 12, 2023 · c0bf5a0 · c0bf5a0
1 parent 9e0f513
commit c0bf5a0
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 93 deletions.
diff --git a/src/libaas/basyx/asset/asset.cpp b/src/libaas/basyx/asset/asset.cpp
diff --git a/src/libaas/basyx/asset/asset.h b/src/libaas/basyx/asset/asset.h
diff --git a/src/libaas/basyx/environment.h b/src/libaas/basyx/environment.h
@@ -4,7 +4,6 @@
 #include <basyx/base/elementcontainer.h>
 #include <basyx/base/elementvector.h>
 #include <basyx/assetadministrationshell.h>
-#include <basyx/asset/asset.h>
 
 namespace basyx
 {
@@ -17,7 +16,6 @@ class Environment
 {
 private:
    ElementContainer<AssetAdministrationShell> aass;
-   ElementVector<Asset> assets;
 public:
    Environment() = default;
 public:
@@ -30,10 +28,6 @@ class Environment
    const ElementContainer<AssetAdministrationShell> & getAssetAdministrationShells() const { return this->aass; };
    ElementContainer<AssetAdministrationShell> & getAssetAdministrationShells() { return this->aass; };
    void setAssetAdministrationShells(ElementContainer<AssetAdministrationShell> aass) { this->aass = aass; };
-
-   const ElementVector<Asset> & getAssets() const { return this->assets; };
-   ElementVector<Asset> & getAssets() { return this->assets; };
-   void setAssets(ElementVector<Asset> assets) { this->assets = std::move(assets); };
 };
 
 };

diff --git a/src/libaas/basyx/serialization/json/serializer.cpp b/src/libaas/basyx/serialization/json/serializer.cpp
@@ -278,11 +278,6 @@ void serialize_helper(json_t & json, const Submodel & submodel)
 };
 
 
-void serialize_helper(json_t & json, const Asset & asset)
-{
-	serialize_helper_h<Identifiable>(json, asset);
-}
-
 void serialize_helper(json_t & json, const AssetInformation & assetInf)
 {
 	json["assetKind"] = AssetKind_::to_string(assetInf.getAssetKind());

diff --git a/src/libaas/basyx/serialization/json/serializer_fwd.h b/src/libaas/basyx/serialization/json/serializer_fwd.h
@@ -28,7 +28,6 @@ namespace basyx
 	class Submodel;
 	class File;
 	class Blob;
-	class Asset;
 	class AssetInformation;
 
 	template<typename T>
@@ -49,7 +48,6 @@ namespace basyx::serialization::json
 	void serialize_helper(json_t & json, const HasSemantics &);
 	void serialize_helper(json_t & json, const HasKind &);
 	void serialize_helper(json_t & json, const modeltype_base &);
-	void serialize_helper(json_t & json, const Asset &);
 	void serialize_helper(json_t & json, const AssetInformation &);
 	void serialize_helper(json_t & json, const Identifier &);
 	void serialize_helper(json_t & json, const IdentifierKeyValuePair &);

diff --git a/src/libaas/basyx/serialization/xml/xmldeserializer.cpp b/src/libaas/basyx/serialization/xml/xmldeserializer.cpp
@@ -12,9 +12,7 @@ using namespace pugi;
 
 // Environment
 #define XML_ENV "aas:aasenv"
-// Asset
-#define XML_assets "aas:assets"
-#define XML_asset "aas:asset"
+
 #define XML_assetKind "aas:kind"
 #define XML_billOfMaterialRef "aas:billOfMaterialRef"
 #define XML_assetIdentificationModelRef "aas:assetIdentificationModelRef"
@@ -58,6 +56,11 @@ using namespace pugi;
 #define XML_ATTR_idType "idType"
 #define XML_ATTR_type "type"
 
+// Legacy V2
+// Asset
+#define XML_assets "aas:assets"
+#define XML_asset "aas:asset"
+
 XMLDeSerializer::XMLDeSerializer() {
    ds = new Deserializer();
 }
@@ -78,12 +81,14 @@ Environment XMLDeSerializer::deSerializeEnvNode(xml_node node) {
    Environment env;
 
    // Legacy AAS Part 1 - V2
+   /*
    xml_node asset_container_node = findChildByName(node, XML_assets);
    ElementVector<Asset> assets;
    if (asset_container_node.root()) {
       assets = deSerializeAssets(asset_container_node);
       env.setAssets(assets);
    }
+   */
 
    xml_node submodel_container_node = findChildByName(node, XML_submodels);
    ElementVector<Submodel> submodels;
@@ -102,7 +107,7 @@ Environment XMLDeSerializer::deSerializeEnvNode(xml_node node) {
    return env;
 }
 
-/* TODO: Convert legacy V2 -> V3 (asset -> assetInformation)
+/* TODO: Convert legacy V2 -> V3 (asset -> assetInformation) */
 /*
 ElementVector<AssetInformation> XMLDeSerializer::convertAssetToAssetInformation(
       ElementVector<Asset> assets) {
@@ -133,6 +138,7 @@ ElementVector<AssetInformation> XMLDeSerializer::convertAssetToAssetInformation(
 }
 */
 
+/*
 ElementVector<Asset> XMLDeSerializer::deSerializeAssets(
       xml_node node) {
 
@@ -181,6 +187,7 @@ Asset XMLDeSerializer::deSerializeAssetMetamodel_V2(xml_node node) {
    }
    return a;
 }
+*/
 
 AssetKind XMLDeSerializer::deSerializeAssetKind(xml_node node) {
    std::string kind = deSerializeString(node);

diff --git a/src/libaas/basyx/serialization/xml/xmldeserializer.h b/src/libaas/basyx/serialization/xml/xmldeserializer.h
@@ -30,12 +30,17 @@ class XMLDeSerializer {
    Environment deSerializeEnv(util::string_view node);
    Environment deSerializeEnvNode(pugi::xml_node node);
 
+   /* V2 Legacy */
+   /*
    ElementVector<Asset> deSerializeAssets(
          pugi::xml_node node);
 
+
    ElementVector<AssetInformation> convertAssetToAssetInformation(
          ElementVector<Asset> assets);
    Asset deSerializeAssetMetamodel_V2(pugi::xml_node node);
+   */
+
    AssetKind deSerializeAssetKind(pugi::xml_node node);
 
    ElementContainer<AssetAdministrationShell> deSerializeAASs(

diff --git a/src/libaas/sources.cmake b/src/libaas/sources.cmake
@@ -1,6 +1,5 @@
 SET(SOURCE_FILES_BASYX_AAS
     ${CMAKE_CURRENT_SOURCE_DIR}/basyx/administrative_information.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/basyx/asset/asset.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/basyx/asset/assetinformation.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/basyx/assetadministrationshell.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/basyx/base/basyx_enums.cpp
@@ -64,7 +63,6 @@ SET(SOURCE_FILES_BASYX_AAS
 
 SET(HEADER_FILES_BASYX_AAS
     ${CMAKE_CURRENT_SOURCE_DIR}/basyx/administrative_information.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/basyx/asset/asset.h
     ${CMAKE_CURRENT_SOURCE_DIR}/basyx/asset/assetinformation.h
     ${CMAKE_CURRENT_SOURCE_DIR}/basyx/assetadministrationshell.h
     ${CMAKE_CURRENT_SOURCE_DIR}/basyx/base/basyx_enum_base.h

diff --git a/tests/tests_libaas/test_basyx.cpp b/tests/tests_libaas/test_basyx.cpp
@@ -5,7 +5,6 @@
 #include <basyx/reference.h>
 #include <basyx/environment.h>
 #include <basyx/assetadministrationshell.h>
-#include <basyx/asset/asset.h>
 #include <basyx/asset/assetinformation.h>
 #include <basyx/submodel.h>
 
@@ -313,8 +312,6 @@ TEST_F(BaseTest, QualifierTest)
 
 TEST_F(BaseTest, AutoIdentifierTest)
 {
-	Asset asset{ "testAsset", "0173-1#02-AAR972#002" };
-
 	AssetAdministrationShell aas{ "aas", "https://admin-shell.io/aas", { AssetKind::Instance } };
 
 	Submodel sm{ "sm", "test/sm1" };
@@ -341,8 +338,6 @@ TEST_F(BaseTest, Environment)
 	env.getAssetAdministrationShells().add(
 		AssetAdministrationShell("aas", "https://admin-shell.io/aas", AssetInformation{ AssetKind::Instance })
 	);
-
-   env.getAssets().emplace_back(Asset("cppTestAsset", basyx::Identifier("cppTestAsset")));
 }
 
 TEST_F(BaseTest, AssetInfoInAas)

diff --git a/tests/tests_libaas/test_copyable.cpp b/tests/tests_libaas/test_copyable.cpp
@@ -5,7 +5,6 @@
 #include <basyx/reference.h>
 #include <basyx/environment.h>
 #include <basyx/assetadministrationshell.h>
-#include <basyx/asset/asset.h>
 #include <basyx/asset/assetinformation.h>
 #include <basyx/submodel.h>
 

diff --git a/tests/tests_libaas/test_property.cpp b/tests/tests_libaas/test_property.cpp
@@ -5,7 +5,6 @@
 #include <basyx/reference.h>
 #include <basyx/environment.h>
 #include <basyx/assetadministrationshell.h>
-#include <basyx/asset/asset.h>
 #include <basyx/asset/assetinformation.h>
 #include <basyx/submodel.h>
 

diff --git a/tests/tests_libaas/test_qualifier.cpp b/tests/tests_libaas/test_qualifier.cpp
@@ -5,7 +5,6 @@
 #include <basyx/reference.h>
 #include <basyx/environment.h>
 #include <basyx/assetadministrationshell.h>
-#include <basyx/asset/asset.h>
 #include <basyx/asset/assetinformation.h>
 #include <basyx/submodel.h>