Fix API inconsistency

'securityPolicies' is without URI but 'securityPolicyUri' contains it.

Change-Id: I4309c519682de4dd8acad154721b07c67337ff62
Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>

12 files changed, 38 insertions, 38 deletions

diff --git a/examples/opcua/opcuaviewer/mainwindow.cpp b/examples/opcua/opcuaviewer/mainwindow.cpp
index e97b448..23e41f0 100644
--- a/examples/opcua/opcuaviewer/mainwindow.cpp
+++ b/examples/opcua/opcuaviewer/mainwindow.cpp
@@ -300,7 +300,7 @@ void MainWindow::getEndpointsComplete(const QVector<QOpcUaEndpointDescription> &
             }
 
             const QString EndpointName = QString("%1 (%2)")
-                    .arg(endpoint.securityPolicyUri())
+                    .arg(endpoint.securityPolicy())
                     .arg(modes[endpoint.securityMode()]);
             mEndpoints->addItem(EndpointName, index++);
         }
diff --git a/src/imports/doc/snippets/basic/basic.qml b/src/imports/doc/snippets/basic/basic.qml
index 0f588ec..da3c59c 100644
--- a/src/imports/doc/snippets/basic/basic.qml
+++ b/src/imports/doc/snippets/basic/basic.qml
@@ -87,7 +87,7 @@ Item {
                     return; // wait until finished
                 if (count > 0) {
                     // choose right endpoint
-                    console.log("Using endpoint", at(0).endpointUrl, at(0).securityPolicyUri);
+                    console.log("Using endpoint", at(0).endpointUrl, at(0).securityPolicy);
                     connection.connectToEndpoint(at(0));
                 } else {
                     // no endpoints retrieved
diff --git a/src/opcua/client/qopcuabackend.cpp b/src/opcua/client/qopcuabackend.cpp
index beb97e7..aedfb55 100644
--- a/src/opcua/client/qopcuabackend.cpp
+++ b/src/opcua/client/qopcuabackend.cpp
@@ -96,7 +96,7 @@ double QOpcUaBackend::revisePublishingInterval(double requestedValue, double min
  */
 bool QOpcUaBackend::verifyEndpointDescription(const QOpcUaEndpointDescription &endpoint, QString *message)
 {
-    if (endpoint.endpointUrl().isEmpty() || endpoint.securityPolicyUri().isEmpty()) {
+    if (endpoint.endpointUrl().isEmpty() || endpoint.securityPolicy().isEmpty()) {
         if (message)
             *message = QLatin1String("Endpoint description is invalid because endpoint URL or security policy URL is empty");
         return false;
diff --git a/src/opcua/client/qopcuaendpointdescription.cpp b/src/opcua/client/qopcuaendpointdescription.cpp
index 28dfb09..7ddc540 100644
--- a/src/opcua/client/qopcuaendpointdescription.cpp
+++ b/src/opcua/client/qopcuaendpointdescription.cpp
@@ -62,7 +62,7 @@ public:
     QOpcUaApplicationDescription server;
     QByteArray serverCertificate;
     QOpcUaEndpointDescription::MessageSecurityMode securityMode{QOpcUaEndpointDescription::MessageSecurityMode::None};
-    QString securityPolicyUri;
+    QString securityPolicy;
     QVector<QOpcUaUserTokenPolicy> userIdentityTokens;
     QString transportProfileUri;
     quint8 securityLevel{0};
@@ -100,7 +100,7 @@ bool QOpcUaEndpointDescription::operator==(const QOpcUaEndpointDescription &rhs)
             rhs.endpointUrl() == endpointUrl() &&
             rhs.securityMode() == securityMode() &&
             rhs.securityLevel() == securityLevel() &&
-            rhs.securityPolicyUri() == securityPolicyUri() &&
+            rhs.securityPolicy() == securityPolicy() &&
             rhs.serverCertificate() == serverCertificate() &&
             rhs.userIdentityTokens() == userIdentityTokens() &&
             rhs.transportProfileUri() == transportProfileUri();
@@ -176,17 +176,17 @@ void QOpcUaEndpointDescription::setUserIdentityTokens(const QVector<QOpcUaUserTo
 /*!
     Returns the URI of the security policy.
 */
-QString QOpcUaEndpointDescription::securityPolicyUri() const
+QString QOpcUaEndpointDescription::securityPolicy() const
 {
-    return data->securityPolicyUri;
+    return data->securityPolicy;
 }
 
 /*!
-    Sets the URI of the security policy to \a securityPolicyUri.
+    Sets the URI of the security policy to \a securityPolicy.
 */
-void QOpcUaEndpointDescription::setSecurityPolicyUri(const QString &securityPolicyUri)
+void QOpcUaEndpointDescription::setSecurityPolicy(const QString &securityPolicy)
 {
-    data->securityPolicyUri = securityPolicyUri;
+    data->securityPolicy = securityPolicy;
 }
 
 /*!
diff --git a/src/opcua/client/qopcuaendpointdescription.h b/src/opcua/client/qopcuaendpointdescription.h
index 5cc63af..478b5ba 100644
--- a/src/opcua/client/qopcuaendpointdescription.h
+++ b/src/opcua/client/qopcuaendpointdescription.h
@@ -52,7 +52,7 @@ class Q_OPCUA_EXPORT QOpcUaEndpointDescription
     Q_PROPERTY(QString endpointUrl READ endpointUrl)
     Q_PROPERTY(QOpcUaApplicationDescription server READ server)
     Q_PROPERTY(QOpcUaEndpointDescription::MessageSecurityMode securityMode READ securityMode)
-    Q_PROPERTY(QString securityPolicyUri READ securityPolicyUri)
+    Q_PROPERTY(QString securityPolicy READ securityPolicy)
     Q_PROPERTY(QVector<QOpcUaUserTokenPolicy> userIdentityTokens READ userIdentityTokens)
 
 public:
@@ -83,8 +83,8 @@ public:
     QOpcUaEndpointDescription::MessageSecurityMode securityMode() const;
     void setSecurityMode(QOpcUaEndpointDescription::MessageSecurityMode securityMode);
 
-    QString securityPolicyUri() const;
-    void setSecurityPolicyUri(const QString &securityPolicyUri);
+    QString securityPolicy() const;
+    void setSecurityPolicy(const QString &securityPolicy);
 
     QVector<QOpcUaUserTokenPolicy> userIdentityTokens() const;
     QVector<QOpcUaUserTokenPolicy> &userIdentityTokensRef();
diff --git a/src/opcua/client/qopcuausertokenpolicy.cpp b/src/opcua/client/qopcuausertokenpolicy.cpp
index c5f0357..df51756 100644
--- a/src/opcua/client/qopcuausertokenpolicy.cpp
+++ b/src/opcua/client/qopcuausertokenpolicy.cpp
@@ -62,7 +62,7 @@ public:
     QOpcUaUserTokenPolicy::TokenType tokenType{QOpcUaUserTokenPolicy::TokenType::Anonymous};
     QString issuedTokenType;
     QString issuerEndpointUrl;
-    QString securityPolicyUri;
+    QString securityPolicy;
 };
 
 QOpcUaUserTokenPolicy::QOpcUaUserTokenPolicy()
@@ -97,7 +97,7 @@ bool QOpcUaUserTokenPolicy::operator==(const QOpcUaUserTokenPolicy &rhs) const
             rhs.tokenType() == tokenType() &&
             rhs.issuedTokenType() == issuedTokenType() &&
             rhs.issuerEndpointUrl() == issuerEndpointUrl() &&
-            rhs.securityPolicyUri() == securityPolicyUri();
+            rhs.securityPolicy() == securityPolicy();
 }
 
 QOpcUaUserTokenPolicy::~QOpcUaUserTokenPolicy()
@@ -107,17 +107,17 @@ QOpcUaUserTokenPolicy::~QOpcUaUserTokenPolicy()
 /*!
     Returns the URI of the security policy required when encrypting or signing the token for ActivateSession.
 */
-QString QOpcUaUserTokenPolicy::securityPolicyUri() const
+QString QOpcUaUserTokenPolicy::securityPolicy() const
 {
-    return data->securityPolicyUri;
+    return data->securityPolicy;
 }
 
 /*!
-    Sets the URI of the security policy to \a securityPolicyUri.
+    Sets the URI of the security policy to \a securityPolicy.
 */
-void QOpcUaUserTokenPolicy::setSecurityPolicyUri(const QString &securityPolicyUri)
+void QOpcUaUserTokenPolicy::setSecurityPolicy(const QString &securityPolicy)
 {
-    data->securityPolicyUri = securityPolicyUri;
+    data->securityPolicy = securityPolicy;
 }
 
 /*!
diff --git a/src/opcua/client/qopcuausertokenpolicy.h b/src/opcua/client/qopcuausertokenpolicy.h
index 332b64f..f48c629 100644
--- a/src/opcua/client/qopcuausertokenpolicy.h
+++ b/src/opcua/client/qopcuausertokenpolicy.h
@@ -75,8 +75,8 @@ public:
     QString issuerEndpointUrl() const;
     void setIssuerEndpointUrl(const QString &issuerEndpointUrl);
 
-    QString securityPolicyUri() const;
-    void setSecurityPolicyUri(const QString &securityPolicyUri);
+    QString securityPolicy() const;
+    void setSecurityPolicy(const QString &securityPolicy);
 
 private:
     QSharedDataPointer<QOpcUaUserTokenPolicyData> data;
diff --git a/src/plugins/opcua/open62541/qopen62541backend.cpp b/src/plugins/opcua/open62541/qopen62541backend.cpp
index c03f444..7ea258e 100644
--- a/src/plugins/opcua/open62541/qopen62541backend.cpp
+++ b/src/plugins/opcua/open62541/qopen62541backend.cpp
@@ -781,7 +781,7 @@ void Open62541AsyncBackend::connectToEndpoint(const QOpcUaEndpointDescription &e
 
     const QString nonePolicyUri = QLatin1String("http://opcfoundation.org/UA/SecurityPolicy#None");
 
-    if (endpoint.securityPolicyUri() != nonePolicyUri) {
+    if (endpoint.securityPolicy() != nonePolicyUri) {
         qCWarning(QT_OPCUA_PLUGINS_OPEN62541) << "open62541 does not yet support secure connections";
         emit stateAndOrErrorChanged(QOpcUaClient::Disconnected, QOpcUaClient::ClientError::NoError);
         return;
@@ -804,7 +804,7 @@ void Open62541AsyncBackend::connectToEndpoint(const QOpcUaEndpointDescription &e
 
         bool suitableTokenFound = false;
         for (const auto token : endpoint.userIdentityTokens()) {
-            if (token.tokenType() == QOpcUaUserTokenPolicy::Username && token.securityPolicyUri() == nonePolicyUri) {
+            if (token.tokenType() == QOpcUaUserTokenPolicy::Username && token.securityPolicy() == nonePolicyUri) {
                 suitableTokenFound = true;
                 break;
             }
@@ -898,7 +898,7 @@ void Open62541AsyncBackend::requestEndpoints(const QUrl &url)
             epd.setEndpointUrl(vc::scalarToQt<QString, UA_String>(&endpoints[i].endpointUrl));
             epd.setServerCertificate(vc::scalarToQt<QByteArray, UA_ByteString>(&endpoints[i].serverCertificate));
             epd.setSecurityMode(static_cast<QOpcUaEndpointDescription::MessageSecurityMode>(endpoints[i].securityMode));
-            epd.setSecurityPolicyUri(vc::scalarToQt<QString, UA_String>(&endpoints[i].securityPolicyUri));
+            epd.setSecurityPolicy(vc::scalarToQt<QString, UA_String>(&endpoints[i].securityPolicyUri));
             for (size_t j = 0; j < endpoints[i].userIdentityTokensSize; ++j) {
                 QOpcUaUserTokenPolicy policy;
                 UA_UserTokenPolicy *policySrc = &endpoints[i].userIdentityTokens[j];
@@ -906,7 +906,7 @@ void Open62541AsyncBackend::requestEndpoints(const QUrl &url)
                 policy.setTokenType(static_cast<QOpcUaUserTokenPolicy::TokenType>(endpoints[i].userIdentityTokens[j].tokenType));
                 policy.setIssuedTokenType(vc::scalarToQt<QString, UA_String>(&endpoints[i].userIdentityTokens[j].issuedTokenType));
                 policy.setIssuerEndpointUrl(vc::scalarToQt<QString, UA_String>(&endpoints[i].userIdentityTokens[j].issuerEndpointUrl));
-                policy.setSecurityPolicyUri(vc::scalarToQt<QString, UA_String>(&endpoints[i].userIdentityTokens[j].securityPolicyUri));
+                policy.setSecurityPolicy(vc::scalarToQt<QString, UA_String>(&endpoints[i].userIdentityTokens[j].securityPolicyUri));
                 epd.userIdentityTokensRef().append(policy);
             }
 
diff --git a/src/plugins/opcua/uacpp/quacppbackend.cpp b/src/plugins/opcua/uacpp/quacppbackend.cpp
index 13985b2..57d5c27 100644
--- a/src/plugins/opcua/uacpp/quacppbackend.cpp
+++ b/src/plugins/opcua/uacpp/quacppbackend.cpp
@@ -255,8 +255,8 @@ void UACppAsyncBackend::connectToEndpoint(const QOpcUaEndpointDescription &endpo
 
         // set server certificate from endpoint
         sessionSecurityInfo.serverCertificate = UaByteString(endpoint.serverCertificate().length(), (OpcUa_Byte*)(endpoint.serverCertificate().constData()));
-        // set SecurityPolicyUri
-        sessionSecurityInfo.sSecurityPolicy = endpoint.securityPolicyUri().toUtf8().constData();
+        // set SecurityPolicy
+        sessionSecurityInfo.sSecurityPolicy = endpoint.securityPolicy().toUtf8().constData();
         // set MessageSecurityMode
         sessionSecurityInfo.messageSecurityMode = static_cast<OpcUa_MessageSecurityMode>(endpoint.securityMode());
     }
@@ -383,14 +383,14 @@ void UACppAsyncBackend::requestEndpoints(const QUrl &url)
             }
             temp.setServerCertificate(QByteArray(reinterpret_cast<char *>(endpoints[i].ServerCertificate.Data), endpoints[i].ServerCertificate.Length));
             temp.setSecurityMode(static_cast<QOpcUaEndpointDescription::MessageSecurityMode>(endpoints[i].SecurityMode));
-            temp.setSecurityPolicyUri(QString::fromUtf8(UaString(endpoints[i].SecurityPolicyUri).toUtf8()));
+            temp.setSecurityPolicy(QString::fromUtf8(UaString(endpoints[i].SecurityPolicyUri).toUtf8()));
             for (int j = 0; j < endpoints[i].NoOfUserIdentityTokens; ++j) {
                 QOpcUaUserTokenPolicy policy;
                 policy.setPolicyId(QString::fromUtf8(UaString(endpoints[i].UserIdentityTokens[j].PolicyId).toUtf8()));
                 policy.setTokenType(static_cast<QOpcUaUserTokenPolicy::TokenType>(endpoints[i].UserIdentityTokens[j].TokenType));
                 policy.setIssuedTokenType(QString::fromUtf8(UaString(endpoints[i].UserIdentityTokens[j].IssuedTokenType).toUtf8()));
                 policy.setIssuerEndpointUrl(QString::fromUtf8(UaString(endpoints[i].UserIdentityTokens[j].IssuerEndpointUrl).toUtf8()));
-                policy.setSecurityPolicyUri(QString::fromUtf8(UaString(endpoints[i].UserIdentityTokens[j].SecurityPolicyUri).toUtf8()));
+                policy.setSecurityPolicy(QString::fromUtf8(UaString(endpoints[i].UserIdentityTokens[j].SecurityPolicyUri).toUtf8()));
                 temp.userIdentityTokensRef().append(policy);
             }
             temp.setTransportProfileUri(QString::fromUtf8(UaString(endpoints[i].TransportProfileUri).toUtf8()));
diff --git a/tests/auto/declarative/DiscoveryTest.qml b/tests/auto/declarative/DiscoveryTest.qml
index 9c04f07..ba1def3 100644
--- a/tests/auto/declarative/DiscoveryTest.qml
+++ b/tests/auto/declarative/DiscoveryTest.qml
@@ -159,7 +159,7 @@ Item {
             else
                 compare(myEndpoints1.count, 1);
             verify(myEndpoints1.at(0).endpointUrl.startsWith("opc.tcp://"));
-            compare(myEndpoints1.at(0).securityPolicyUri, "http://opcfoundation.org/UA/SecurityPolicy#None");
+            compare(myEndpoints1.at(0).securityPolicy, "http://opcfoundation.org/UA/SecurityPolicy#None");
 
             connection1.connectToEndpoint(myEndpoints1.at(0));
 
@@ -266,7 +266,7 @@ Item {
             else
                 compare(myEndpoints2.count, 1);
             verify(myEndpoints2.at(0).endpointUrl.startsWith("opc.tcp://"));
-            compare(myEndpoints2.at(0).securityPolicyUri, "http://opcfoundation.org/UA/SecurityPolicy#None");
+            compare(myEndpoints2.at(0).securityPolicy, "http://opcfoundation.org/UA/SecurityPolicy#None");
 
             connection2.connectToEndpoint(myEndpoints2.at(0));
 
diff --git a/tests/auto/qopcuaclient/tst_client.cpp b/tests/auto/qopcuaclient/tst_client.cpp
index 48922b5..a320dba 100644
--- a/tests/auto/qopcuaclient/tst_client.cpp
+++ b/tests/auto/qopcuaclient/tst_client.cpp
@@ -730,7 +730,7 @@ void Tst_QOpcUaClient::requestEndpoints()
     QVERIFY(desc.size() > 0);
 
     QCOMPARE(QUrl(desc[0].endpointUrl()).port(), 43344);
-    QCOMPARE(desc[0].securityPolicyUri(), QStringLiteral("http://opcfoundation.org/UA/SecurityPolicy#None"));
+    QCOMPARE(desc[0].securityPolicy(), QStringLiteral("http://opcfoundation.org/UA/SecurityPolicy#None"));
     QCOMPARE(desc[0].transportProfileUri(), QStringLiteral("http://opcfoundation.org/UA-Profile/Transport/uatcp-uasc-uabinary"));
     QCOMPARE(desc[0].securityLevel(), 0);
     QCOMPARE(desc[0].securityMode(), QOpcUaEndpointDescription::MessageSecurityMode::None);
diff --git a/tests/auto/security/tst_security.cpp b/tests/auto/security/tst_security.cpp
index cd0e31e..e9ae69b 100644
--- a/tests/auto/security/tst_security.cpp
+++ b/tests/auto/security/tst_security.cpp
@@ -127,7 +127,7 @@ static QString messageSecurityModeToString(QOpcUaEndpointDescription::MessageSec
     QTest::addColumn<QOpcUaEndpointDescription>("endpoint");\
     for (auto backend : m_backends)\
         for (auto endpoint : m_endpoints) { \
-            const QString rowName = QString("%1 using %2 %3").arg(backend).arg(endpoint.securityPolicyUri()).arg(messageSecurityModeToString(endpoint.securityMode())); \
+            const QString rowName = QString("%1 using %2 %3").arg(backend).arg(endpoint.securityPolicy()).arg(messageSecurityModeToString(endpoint.securityMode())); \
             QTest::newRow(rowName.toLatin1().constData()) << backend << endpoint; \
         } \
 }
@@ -242,9 +242,9 @@ void Tst_QOpcUaSecurity::initTestCase()
 
         // Select first non-None security policy
         for (const auto &endpoint : qAsConst(desc)) {
-            if (!endpoint.securityPolicyUri().endsWith("#None")) {
+            if (!endpoint.securityPolicy().endsWith("#None")) {
                 m_endpoints.append(endpoint);
-                qDebug() << endpoint.securityPolicyUri();
+                qDebug() << endpoint.securityPolicy();
             }
         }
 
@@ -280,7 +280,7 @@ void Tst_QOpcUaSecurity::connectAndDisconnectUsingCertificate()
     client->setApplicationIdentity(identity);
     client->setPkiConfiguration(pkiConfig);
 
-    qDebug() << "Testing security policy" << endpoint.securityPolicyUri();
+    qDebug() << "Testing security policy" << endpoint.securityPolicy();
     QSignalSpy connectSpy(client.data(), &QOpcUaClient::stateChanged);
     int passwordRequestSpy = 0;
     connect(client.data(), &QOpcUaClient::passwordForPrivateKeyRequired, [&passwordRequestSpy](const QString &privateKeyFilePath, QString *password, bool previousTryFailed) {
@@ -342,7 +342,7 @@ void Tst_QOpcUaSecurity::connectAndDisconnectUsingEncryptedPassword()
     client->setApplicationIdentity(identity);
     client->setPkiConfiguration(pkiConfig);
 
-    qDebug() << "Testing security policy" << endpoint.securityPolicyUri();
+    qDebug() << "Testing security policy" << endpoint.securityPolicy();
     QSignalSpy connectSpy(client.data(), &QOpcUaClient::stateChanged);
     int passwordRequestSpy = 0;
     connect(client.data(), &QOpcUaClient::passwordForPrivateKeyRequired, [&passwordRequestSpy, &pkiConfig](const QString &privateKeyFilePath, QString *password, bool previousTryFailed) {