Adapted aas submodelelement interfaces to Java sdk
Change-Id: I14e8300b18afa6c7c6a1c8ef8b8e6a5cb671390e
Signed-off-by: Johannes Wendel <johannes.wendel@iese.fraunhofer.de>
diff --git a/sdks/c++/basys.sdk.cc/src/aas/aas/backend/connected/submodelelement/ConnectedDataElement.cpp b/sdks/c++/basys.sdk.cc/src/aas/aas/backend/connected/submodelelement/ConnectedDataElement.cpp
index cf4ba2d..f514c8a 100644
--- a/sdks/c++/basys.sdk.cc/src/aas/aas/backend/connected/submodelelement/ConnectedDataElement.cpp
+++ b/sdks/c++/basys.sdk.cc/src/aas/aas/backend/connected/submodelelement/ConnectedDataElement.cpp
@@ -23,50 +23,50 @@
return this->getProxyCollection(reference::paths::DATASPECIFICATIONS);
}
-void ConnectedDataElement::setDataSpecificationReferences(const basyx::objectCollection_t & data_specification_references)
-{
- this->setProxyValue(reference::paths::DATASPECIFICATIONS, data_specification_references);
-}
+//void ConnectedDataElement::setDataSpecificationReferences(const basyx::objectCollection_t & data_specification_references)
+//{
+// this->setProxyValue(reference::paths::DATASPECIFICATIONS, data_specification_references);
+//}
std::string ConnectedDataElement::getIdShort() const
{
return this->getProxyValue(qualifier::ReferablePaths::IDSHORT);
}
-void ConnectedDataElement::setIdShort(const std::string & idShort)
-{
- this->setProxyValue(qualifier::ReferablePaths::IDSHORT, idShort);
-}
+//void ConnectedDataElement::setIdShort(const std::string & idShort)
+//{
+// this->setProxyValue(qualifier::ReferablePaths::IDSHORT, idShort);
+//}
std::string ConnectedDataElement::getCategory() const
{
return this->getProxyValue(qualifier::ReferablePaths::CATEGORY);
}
-void ConnectedDataElement::setCategory(const std::string & category)
-{
- this->setProxyValue(qualifier::ReferablePaths::CATEGORY, category);
-}
+//void ConnectedDataElement::setCategory(const std::string & category)
+//{
+// this->setProxyValue(qualifier::ReferablePaths::CATEGORY, category);
+//}
std::string ConnectedDataElement::getDescription() const
{
return this->getProxyValue(qualifier::ReferablePaths::DESCRIPTION);
}
-void ConnectedDataElement::setDescription(const std::string & description)
-{
- this->setProxyValue(qualifier::ReferablePaths::DESCRIPTION, description);
-}
+//void ConnectedDataElement::setDescription(const std::string & description)
+//{
+// this->setProxyValue(qualifier::ReferablePaths::DESCRIPTION, description);
+//}
basyx::any ConnectedDataElement::getParent() const
{
return this->getProxyCollection(reference::paths::PARENTS);
}
-void ConnectedDataElement::setParent(const basyx::any & parent_reference)
-{
- this->setProxyValue(reference::paths::PARENTS, parent_reference);
-}
+//void ConnectedDataElement::setParent(const basyx::any & parent_reference)
+//{
+// this->setProxyValue(reference::paths::PARENTS, parent_reference);
+//}
std::string ConnectedDataElement::getId() const
{
@@ -83,10 +83,10 @@
return this->getProxyCollection(reference::paths::QUALIFIERS);
}
-void ConnectedDataElement::setQualifier(const basyx::objectCollection_t & qualifiers)
-{
- this->setProxyValue(reference::paths::QUALIFIERS, qualifiers);
-}
+//void ConnectedDataElement::setQualifier(const basyx::objectCollection_t & qualifiers)
+//{
+// this->setProxyValue(reference::paths::QUALIFIERS, qualifiers);
+//}
basyx::any ConnectedDataElement::getSemanticId() const
{
@@ -103,10 +103,10 @@
return this->getProxyValue(qualifier::haskind::Paths::KIND);
}
-void ConnectedDataElement::setHasKindReference(const std::string & kind)
-{
- this->setProxyValue(qualifier::haskind::Paths::KIND, kind);
-}
+//void ConnectedDataElement::setHasKindReference(const std::string & kind)
+//{
+// this->setProxyValue(qualifier::haskind::Paths::KIND, kind);
+//}
basyx::objectCollection_t ConnectedDataElement::getProxyCollection(const std::string & path) const
{
diff --git a/sdks/c++/basys.sdk.cc/src/aas/aas/backend/connected/submodelelement/ConnectedDataElement.h b/sdks/c++/basys.sdk.cc/src/aas/aas/backend/connected/submodelelement/ConnectedDataElement.h
index af69625..183c4b5 100644
--- a/sdks/c++/basys.sdk.cc/src/aas/aas/backend/connected/submodelelement/ConnectedDataElement.h
+++ b/sdks/c++/basys.sdk.cc/src/aas/aas/backend/connected/submodelelement/ConnectedDataElement.h
@@ -24,31 +24,31 @@
~ConnectedDataElement() = default;
basyx::objectCollection_t getDataSpecificationReferences() const override;
- void setDataSpecificationReferences(const basyx::objectCollection_t & data_specification_references) override;
+ //void setDataSpecificationReferences(const basyx::objectCollection_t & data_specification_references) override;
std::string getIdShort() const override;
- void setIdShort(const std::string & idShort) override;
+ //void setIdShort(const std::string & idShort) override;
std::string getCategory() const override;
- void setCategory(const std::string & category) override;
+ //void setCategory(const std::string & category) override;
std::string getDescription() const override;
- void setDescription(const std::string & description) override;
+ //void setDescription(const std::string & description) override;
basyx::any getParent() const override;
- void setParent(const basyx::any & parent) override;
+ //void setParent(const basyx::any & parent) override;
std::string getId() const override;
void setId(const std::string & id) override;
basyx::objectCollection_t getQualifier() const override;
- void setQualifier(const basyx::objectCollection_t & qualifiers) override;
+ //void setQualifier(const basyx::objectCollection_t & qualifiers) override;
basyx::any getSemanticId() const override;
void setSemanticID(const basyx::any & semanticId) override;
std::string getHasKindReference() const override;
- void setHasKindReference(const std::string & kind) override;
+ //void setHasKindReference(const std::string & kind) override;
private:
basyx::objectCollection_t getProxyCollection(const std::string & path) const;
diff --git a/sdks/c++/basys.sdk.cc/src/aas/aas/backend/connected/submodelelement/ConnectedSubmodelElement.cpp b/sdks/c++/basys.sdk.cc/src/aas/aas/backend/connected/submodelelement/ConnectedSubmodelElement.cpp
index dff7f57..be747f3 100644
--- a/sdks/c++/basys.sdk.cc/src/aas/aas/backend/connected/submodelelement/ConnectedSubmodelElement.cpp
+++ b/sdks/c++/basys.sdk.cc/src/aas/aas/backend/connected/submodelelement/ConnectedSubmodelElement.cpp
@@ -30,45 +30,33 @@
return collection.Get<basyx::objectCollection_t>();
}
-void ConnectedSubmodelElement::setDataSpecificationReferences(const basyx::objectCollection_t & references)
-{
- //Check if all subclasses do the same
-}
+//void ConnectedSubmodelElement::setDataSpecificationReferences(const basyx::objectCollection_t & references)
+//{
+// //Check if all subclasses do the same
+//}
std::string ConnectedSubmodelElement::getIdShort() const
{
return std::string();
}
-void ConnectedSubmodelElement::setIdShort(const std::string & idShort)
-{}
-
std::string ConnectedSubmodelElement::getCategory() const
{
return std::string();
}
-void ConnectedSubmodelElement::setCategory(const std::string & category)
-{}
-
std::string ConnectedSubmodelElement::getDescription() const
{
return std::string();
}
-void ConnectedSubmodelElement::setDescription(const std::string & description)
-{}
-
basyx::any ConnectedSubmodelElement::getParent() const
{
return basyx::any();
}
-void ConnectedSubmodelElement::setParent(const basyx::any & parent)
-{}
-
-void ConnectedSubmodelElement::setQualifier(const basyx::objectCollection_t & qualifiers)
-{}
+//void ConnectedSubmodelElement::setQualifier(const basyx::objectCollection_t & qualifiers)
+//{}
basyx::objectCollection_t ConnectedSubmodelElement::getQualifier() const
{
@@ -88,8 +76,8 @@
return std::string();
}
-void ConnectedSubmodelElement::setHasKindReference(const std::string & kind)
-{}
+//void ConnectedSubmodelElement::setHasKindReference(const std::string & kind)
+//{}
}
}
diff --git a/sdks/c++/basys.sdk.cc/src/aas/aas/backend/connected/submodelelement/ConnectedSubmodelElement.h b/sdks/c++/basys.sdk.cc/src/aas/aas/backend/connected/submodelelement/ConnectedSubmodelElement.h
index f2760cb..b8306dd 100644
--- a/sdks/c++/basys.sdk.cc/src/aas/aas/backend/connected/submodelelement/ConnectedSubmodelElement.h
+++ b/sdks/c++/basys.sdk.cc/src/aas/aas/backend/connected/submodelelement/ConnectedSubmodelElement.h
@@ -24,21 +24,14 @@
// Inherited via ISubmodelElement
virtual basyx::objectCollection_t getDataSpecificationReferences() const override;
- virtual void setDataSpecificationReferences(const basyx::objectCollection_t & references) override;
virtual std::string getIdShort() const override;
- virtual void setIdShort(const std::string & idShort) override;
virtual std::string getCategory() const override;
- virtual void setCategory(const std::string & category) override;
virtual std::string getDescription() const override;
- virtual void setDescription(const std::string & description) override;
virtual basyx::any getParent() const override;
- virtual void setParent(const basyx::any & parent) override;
- virtual void setQualifier(const basyx::objectCollection_t & qualifiers) override;
virtual basyx::objectCollection_t getQualifier() const override;
virtual basyx::any getSemanticId() const override;
virtual void setSemanticID(const basyx::any & semantic_identifier) override;
virtual std::string getHasKindReference() const override;
- virtual void setHasKindReference(const std::string & kind) override;
};
}
diff --git a/sdks/c++/basys.sdk.cc/src/aas/aas/qualifier/IHasDataSpecification.h b/sdks/c++/basys.sdk.cc/src/aas/aas/qualifier/IHasDataSpecification.h
index ef50003..8095a8d 100644
--- a/sdks/c++/basys.sdk.cc/src/aas/aas/qualifier/IHasDataSpecification.h
+++ b/sdks/c++/basys.sdk.cc/src/aas/aas/qualifier/IHasDataSpecification.h
@@ -28,7 +28,7 @@
virtual ~IHasDataSpecification() = default;
virtual basyx::objectCollection_t getDataSpecificationReferences() const = 0;
- virtual void setDataSpecificationReferences(const basyx::objectCollection_t & references) = 0;
+ //virtual void setDataSpecificationReferences(const basyx::objectCollection_t & references) = 0;
};
}
diff --git a/sdks/c++/basys.sdk.cc/src/aas/aas/qualifier/IReferable.h b/sdks/c++/basys.sdk.cc/src/aas/aas/qualifier/IReferable.h
index 6dbdff1..57e7e31 100644
--- a/sdks/c++/basys.sdk.cc/src/aas/aas/qualifier/IReferable.h
+++ b/sdks/c++/basys.sdk.cc/src/aas/aas/qualifier/IReferable.h
@@ -29,16 +29,16 @@
virtual ~IReferable() = default;
virtual std::string getIdShort() const = 0;
- virtual void setIdShort(const std::string & idShort) = 0;
+ //virtual void setIdShort(const std::string & idShort) = 0;
virtual std::string getCategory() const = 0;
- virtual void setCategory(const std::string & category) = 0;
+ //virtual void setCategory(const std::string & category) = 0;
virtual std::string getDescription() const = 0;
- virtual void setDescription(const std::string & description) = 0;
+ //virtual void setDescription(const std::string & description) = 0;
virtual basyx::any getParent() const = 0;
- virtual void setParent(const basyx::any & parent) = 0;
+ //virtual void setParent(const basyx::any & parent) = 0;
};
}
diff --git a/sdks/c++/basys.sdk.cc/src/aas/aas/qualifier/haskind/IHasKind.h b/sdks/c++/basys.sdk.cc/src/aas/aas/qualifier/haskind/IHasKind.h
index 2884fc8..348a87b 100644
--- a/sdks/c++/basys.sdk.cc/src/aas/aas/qualifier/haskind/IHasKind.h
+++ b/sdks/c++/basys.sdk.cc/src/aas/aas/qualifier/haskind/IHasKind.h
@@ -25,7 +25,7 @@
virtual ~IHasKind() = default;
virtual std::string getHasKindReference() const = 0;
- virtual void setHasKindReference(const std::string & kind) = 0;
+ //virtual void setHasKindReference(const std::string & kind) = 0;
};
diff --git a/sdks/c++/basys.sdk.cc/src/aas/aas/qualifier/qualifiable/IQualifiable.h b/sdks/c++/basys.sdk.cc/src/aas/aas/qualifier/qualifiable/IQualifiable.h
index c775087..caab63d 100644
--- a/sdks/c++/basys.sdk.cc/src/aas/aas/qualifier/qualifiable/IQualifiable.h
+++ b/sdks/c++/basys.sdk.cc/src/aas/aas/qualifier/qualifiable/IQualifiable.h
@@ -19,7 +19,7 @@
public:
virtual ~IQualifiable() = default;
- virtual void setQualifier(const basyx::objectCollection_t & qualifiers) = 0;
+ //virtual void setQualifier(const basyx::objectCollection_t & qualifiers) = 0;
virtual basyx::objectCollection_t getQualifier() const = 0;
};
diff --git a/sdks/c++/basys.sdk.cc/tests/regression/aas/backend/connected/test_ConnectedDataElement.cpp b/sdks/c++/basys.sdk.cc/tests/regression/aas/backend/connected/test_ConnectedDataElement.cpp
index 433e28d..756d562 100644
--- a/sdks/c++/basys.sdk.cc/tests/regression/aas/backend/connected/test_ConnectedDataElement.cpp
+++ b/sdks/c++/basys.sdk.cc/tests/regression/aas/backend/connected/test_ConnectedDataElement.cpp
@@ -38,16 +38,16 @@
ASSERT_EQ(1, mock->overallMockCalls());
}
-TEST_F(ConnectedDataElementTest, TestSetIdShort)
-{
- auto data_element = ConnectedDataElement(proxy);
-
- data_element.setIdShort("new id");
-
- ASSERT_EQ(std::string(ReferablePaths::IDSHORT), mock->updateElementCallValues.at(0).first);
- ASSERT_EQ("new id", mock->updateElementCallValues.at(0).second.Get<std::string>());
- ASSERT_EQ(1, mock->overallMockCalls());
-}
+//TEST_F(ConnectedDataElementTest, TestSetIdShort)
+//{
+// auto data_element = ConnectedDataElement(proxy);
+//
+// data_element.setIdShort("new id");
+//
+// ASSERT_EQ(std::string(ReferablePaths::IDSHORT), mock->updateElementCallValues.at(0).first);
+// ASSERT_EQ("new id", mock->updateElementCallValues.at(0).second.Get<std::string>());
+// ASSERT_EQ(1, mock->overallMockCalls());
+//}
TEST_F(ConnectedDataElementTest, TestGetCategory)
{
@@ -59,16 +59,16 @@
ASSERT_EQ(1, mock->overallMockCalls());
}
-TEST_F(ConnectedDataElementTest, TestSetCategory)
-{
- auto data_element = ConnectedDataElement(proxy);
-
- data_element.setCategory("new category");
-
- ASSERT_EQ(std::string(ReferablePaths::CATEGORY), mock->updateElementCallValues.at(0).first);
- ASSERT_EQ("new category", mock->updateElementCallValues.at(0).second.Get<std::string>());
- ASSERT_EQ(1, mock->overallMockCalls());
-}
+//TEST_F(ConnectedDataElementTest, TestSetCategory)
+//{
+// auto data_element = ConnectedDataElement(proxy);
+//
+// data_element.setCategory("new category");
+//
+// ASSERT_EQ(std::string(ReferablePaths::CATEGORY), mock->updateElementCallValues.at(0).first);
+// ASSERT_EQ("new category", mock->updateElementCallValues.at(0).second.Get<std::string>());
+// ASSERT_EQ(1, mock->overallMockCalls());
+//}
TEST_F(ConnectedDataElementTest, TestGetDescription)
{
@@ -80,16 +80,16 @@
ASSERT_EQ(1, mock->overallMockCalls());
}
-TEST_F(ConnectedDataElementTest, TestSetDescription)
-{
- auto data_element = ConnectedDataElement(proxy);
-
- data_element.setDescription("new description");
-
- ASSERT_EQ(std::string(ReferablePaths::DESCRIPTION), mock->updateElementCallValues.at(0).first);
- ASSERT_EQ("new description", mock->updateElementCallValues.at(0).second.Get<std::string>());
- ASSERT_EQ(1, mock->overallMockCalls());
-}
+//TEST_F(ConnectedDataElementTest, TestSetDescription)
+//{
+// auto data_element = ConnectedDataElement(proxy);
+//
+// data_element.setDescription("new description");
+//
+// ASSERT_EQ(std::string(ReferablePaths::DESCRIPTION), mock->updateElementCallValues.at(0).first);
+// ASSERT_EQ("new description", mock->updateElementCallValues.at(0).second.Get<std::string>());
+// ASSERT_EQ(1, mock->overallMockCalls());
+//}
TEST_F(ConnectedDataElementTest, TestGetIdNotLocal)
{
@@ -146,15 +146,15 @@
ASSERT_EQ(1, mock->overallMockCalls());
}
-TEST_F(ConnectedDataElementTest, TestSetHasKindreference)
-{
- auto data_element = ConnectedDataElement(proxy);
-
- data_element.setHasKindReference("new kind");
-
- ASSERT_EQ(std::string(haskind::Paths::KIND), mock->updateElementCallValues.at(0).first);
- ASSERT_EQ("new kind", mock->updateElementCallValues.at(0).second.Get<std::string>());
- ASSERT_EQ(1, mock->overallMockCalls());
-}
+//TEST_F(ConnectedDataElementTest, TestSetHasKindreference)
+//{
+// auto data_element = ConnectedDataElement(proxy);
+//
+// data_element.setHasKindReference("new kind");
+//
+// ASSERT_EQ(std::string(haskind::Paths::KIND), mock->updateElementCallValues.at(0).first);
+// ASSERT_EQ("new kind", mock->updateElementCallValues.at(0).second.Get<std::string>());
+// ASSERT_EQ(1, mock->overallMockCalls());
+//}