From c0bf5a0ca97499ffde9be50865ddde828f8668cb Mon Sep 17 00:00:00 2001 From: Tobias Klausmann Date: Tue, 12 Sep 2023 11:12:19 +0200 Subject: [PATCH] Remove Asset class Remove it from the Environment and the tests Signed-off-by: Tobias Klausmann --- src/libaas/basyx/asset/asset.cpp | 0 src/libaas/basyx/asset/asset.h | 66 ------------------- src/libaas/basyx/environment.h | 6 -- .../basyx/serialization/json/serializer.cpp | 5 -- .../basyx/serialization/json/serializer_fwd.h | 2 - .../serialization/xml/xmldeserializer.cpp | 15 +++-- .../basyx/serialization/xml/xmldeserializer.h | 5 ++ src/libaas/sources.cmake | 2 - tests/tests_libaas/test_basyx.cpp | 5 -- tests/tests_libaas/test_copyable.cpp | 1 - tests/tests_libaas/test_property.cpp | 1 - tests/tests_libaas/test_qualifier.cpp | 1 - 12 files changed, 16 insertions(+), 93 deletions(-) delete mode 100644 src/libaas/basyx/asset/asset.cpp delete mode 100644 src/libaas/basyx/asset/asset.h diff --git a/src/libaas/basyx/asset/asset.cpp b/src/libaas/basyx/asset/asset.cpp deleted file mode 100644 index e69de29..0000000 diff --git a/src/libaas/basyx/asset/asset.h b/src/libaas/basyx/asset/asset.h deleted file mode 100644 index e5e2004..0000000 --- a/src/libaas/basyx/asset/asset.h +++ /dev/null @@ -1,66 +0,0 @@ -#pragma once - -#include - -#include - -#include -#include -#include -#include -#include - -#include - -namespace basyx -{ - -using namespace basyx::base; -using namespace basyx::serialization::priv; - -class Asset : - public Identifiable, - public ModelType -{ -private: - // Legacy AAS Part 1 - V2 - util::optional assetKind; - util::optional billOfMaterialModelRef; - util::optional assetIdentificationModelRef; -public: - Asset(util::string_view idShort, Identifier identifier) : Identifiable(idShort, std::move(identifier)) {}; - Asset(util::string_view idShort, util::string_view id) : Identifiable(idShort, id) {}; -public: - Asset(const Asset &) = default; - Asset& operator=(const Asset &) = default; - - Asset(Asset &&) = default; - Asset& operator=(Asset &&) = default; - - // Legacy AAS Part 1 - V2 - const util::optional & getAssetKind() { - return assetKind; - }; - void setAssetKind(AssetKind kind) { this->assetKind = kind; }; - - util::optional & getBillOfMaterialModelRef() { - return billOfMaterialModelRef; - } - void setBillOfMaterialModelRef(Reference bomModelRef) { - billOfMaterialModelRef = bomModelRef; - } - - const util::optional & getAssetIDentificationModelRef() { - return assetIdentificationModelRef; - } - const void setAssetIdentificationModelRef(Reference assetIdentModelRef) { - assetIdentificationModelRef = assetIdentModelRef; - } - - // Identifiable - special purpose - void setIdentification(Token t, Identifier identifier) { - this->Identifiable::setIdentification(identifier); - } -}; - -}; diff --git a/src/libaas/basyx/environment.h b/src/libaas/basyx/environment.h index 323f21b..812cf00 100644 --- a/src/libaas/basyx/environment.h +++ b/src/libaas/basyx/environment.h @@ -4,7 +4,6 @@ #include #include #include -#include namespace basyx { @@ -17,7 +16,6 @@ class Environment { private: ElementContainer aass; - ElementVector assets; public: Environment() = default; public: @@ -30,10 +28,6 @@ class Environment const ElementContainer & getAssetAdministrationShells() const { return this->aass; }; ElementContainer & getAssetAdministrationShells() { return this->aass; }; void setAssetAdministrationShells(ElementContainer aass) { this->aass = aass; }; - - const ElementVector & getAssets() const { return this->assets; }; - ElementVector & getAssets() { return this->assets; }; - void setAssets(ElementVector assets) { this->assets = std::move(assets); }; }; }; diff --git a/src/libaas/basyx/serialization/json/serializer.cpp b/src/libaas/basyx/serialization/json/serializer.cpp index bafc459..e45c9c3 100644 --- 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(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 index 2588f01..f0e1b42 100644 --- 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 @@ -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 index 1a20ad7..bf21f6b 100644 --- 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 assets; if (asset_container_node.root()) { assets = deSerializeAssets(asset_container_node); env.setAssets(assets); } + */ xml_node submodel_container_node = findChildByName(node, XML_submodels); ElementVector 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 XMLDeSerializer::convertAssetToAssetInformation( ElementVector assets) { @@ -133,6 +138,7 @@ ElementVector XMLDeSerializer::convertAssetToAssetInformation( } */ +/* ElementVector 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 index 7c14138..036200a 100644 --- 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 deSerializeAssets( pugi::xml_node node); + ElementVector convertAssetToAssetInformation( ElementVector assets); Asset deSerializeAssetMetamodel_V2(pugi::xml_node node); + */ + AssetKind deSerializeAssetKind(pugi::xml_node node); ElementContainer deSerializeAASs( diff --git a/src/libaas/sources.cmake b/src/libaas/sources.cmake index b239e3c..65e3093 100644 --- 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 index 56452f6..96abc4d 100644 --- a/tests/tests_libaas/test_basyx.cpp +++ b/tests/tests_libaas/test_basyx.cpp @@ -5,7 +5,6 @@ #include #include #include -#include #include #include @@ -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 index 03dde68..b717bd3 100644 --- a/tests/tests_libaas/test_copyable.cpp +++ b/tests/tests_libaas/test_copyable.cpp @@ -5,7 +5,6 @@ #include #include #include -#include #include #include diff --git a/tests/tests_libaas/test_property.cpp b/tests/tests_libaas/test_property.cpp index 5ab5244..5a444a1 100644 --- a/tests/tests_libaas/test_property.cpp +++ b/tests/tests_libaas/test_property.cpp @@ -5,7 +5,6 @@ #include #include #include -#include #include #include diff --git a/tests/tests_libaas/test_qualifier.cpp b/tests/tests_libaas/test_qualifier.cpp index 88d2d94..2326771 100644 --- a/tests/tests_libaas/test_qualifier.cpp +++ b/tests/tests_libaas/test_qualifier.cpp @@ -5,7 +5,6 @@ #include #include #include -#include #include #include