Skip to content

Filter-out duplicating method-properties #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NikolaiShipilov merged 2 commits into from
Jun 11, 2026
Merged

Filter-out duplicating method-properties #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f97a002
Filter-out duplicating method-properties
NikolaiShipilov Jun 10, 2026
41c46d7
Update changelog and bump version to 4.0.1
NikolaiShipilov Jun 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

## Bug fixes

- [#32](https://github.com/openDAQ/OpcUaModules/pull/32) Filter-out duplicating method-properties.
- [#9](https://github.com/openDAQ/OpcUaModules/pull/9) Fix appending dependent boost components.

## Documenation
Expand Down
2 changes: 1 addition & 1 deletion module_version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.0.0
4.0.1
3 changes: 3 additions & 0 deletions ...pcuatms/opcuatms_client/include/opcuatms_client/objects/tms_client_property_object_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ class TmsClientPropertyObjectBaseImpl : public TmsClientObjectImpl, public Impl
: TmsClientObjectImpl(ctx, clientContext, nodeId)
, Impl(ctx, parent, localId)
, propBrowseName(propBrowseName)
, defaultMethodsNames({"Connect", "Disconnect"})
{
init();
}
Expand Down Expand Up @@ -126,6 +127,7 @@ class TmsClientPropertyObjectBaseImpl : public TmsClientObjectImpl, public Impl
: TmsClientObjectImpl(ctx, clientContext, nodeId)
, Impl(localId, nullptr, parentDevice, ctx, parent)
, propBrowseName(propBrowseName)
, defaultMethodsNames({"EnableDiscovery", "DisableDiscovery"})
{
init();
}
Expand Down Expand Up @@ -160,6 +162,7 @@ class TmsClientPropertyObjectBaseImpl : public TmsClientObjectImpl, public Impl
std::map<std::string, std::string> propBrowseName;
opcua::OpcUaNodeId methodParentNodeId;
LoggerComponentPtr loggerComponent;
const std::unordered_set<std::string> defaultMethodsNames{};

ErrCode setOPCUAPropertyValueInternal(IString* propertyName, IBaseObject* value, bool protectedWrite);
void addProperties(const OpcUaNodeId& parentId,
Expand Down
4 changes: 3 additions & 1 deletion shared/libraries/opcuatms/opcuatms_client/src/objects/tms_client_property_object_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -642,6 +642,8 @@ void TmsClientPropertyObjectBaseImpl<Impl>::browseRawProperties()
auto ec = Impl::addProperty(prop);
if (ec != OPENDAQ_ERR_ALREADYEXISTS)
return ec;
else
daqClearErrorInfo();
LOG_W("OPC UA exposes two properties with the same name \"{}\". The duplicate property will be ignored.", prop.getName())
return OPENDAQ_SUCCESS;
};
Expand Down Expand Up @@ -674,7 +676,7 @@ void TmsClientPropertyObjectBaseImpl<Impl>::setLocksForAttributes()
template <class Impl>
bool TmsClientPropertyObjectBaseImpl<Impl>::isIgnoredMethodProperty(const std::string& browseName)
{
return browseName == "BeginUpdate" || browseName == "EndUpdate" || browseName == "GetErrorInformation";
return browseName == "BeginUpdate" || browseName == "EndUpdate" || browseName == "GetErrorInformation" || defaultMethodsNames.count(browseName) != 0;
}

template <class Impl>
Expand Down
Loading