Ws usernametoken

doc/CHANGES_1_8.txt

@@ -1,6 +1,7 @@
 General:
 ========
 * Fix internally-created faults lacking an XML element name (so e.g. toXml() would abort)
+* KDSoapMessage::messageAddressingProperties() is now correctly filled in when receiving a message with WS-Addressing in the header
 
 Client-side:
 ============
@@ -12,6 +13,8 @@ Client-side:
 * Fix error code when authentication failed
 * Autodeletion of jobs is now configurable (github pull #125)
 * Add error details in faultAsString() - and the generated lastError() - coming from the SOAP 1.2 detail element.
+* Fix memory leak in KDSoapClientInterface::callNoReply
+* Add support for WS-UsernameToken, see KDSoapAuthentication
 
 Server-side:
 ============

kdwsdl2cpp/libkode/style.cpp

@@ -83,6 +83,8 @@ QString Style::lowerFirst( const QString &str )
 
 QString Style::makeIdentifier( const QString &str )
 {
+  Q_ASSERT(!str.isEmpty());
+
   QString identifier = str;
   identifier.replace( "-", "_" );
   identifier.replace( ".", "_" );

kdwsdl2cpp/schema/parser.cpp

@@ -487,7 +487,7 @@ Element Parser::parseElement(ParserContext *context,
     newElement.setNillable(stringToBoolean(element.attribute(QLatin1String("nillable"))));
 
     if (element.hasAttribute(QLatin1String("type"))) {
-        QName typeName(element.attribute(QLatin1String("type")));
+        QName typeName(element.attribute(QLatin1String("type")).trimmed());
         typeName.setNameSpace(context->namespaceManager()->uri(typeName.prefix()));
         if (debugParsing()) {
             qDebug() << "typeName=" << typeName.qname() << "namespace=" << context->namespaceManager()->uri(typeName.prefix());

kdwsdl2cpp/src/compiler.cpp

@@ -103,7 +103,6 @@ void Compiler::parse(const QDomElement &element)
 
         definitions.fixUpDefinitions(/*&context, element*/);
 
-        KODE::Code::setDefaultIndentation(4);
 
         WSDL wsdl;
         wsdl.setDefinitions(definitions);
@@ -116,7 +115,19 @@ void Compiler::parse(const QDomElement &element)
             QCoreApplication::exit(4);
         } else {
             KWSDL::Creator creator;
-            creator.create(converter.classes());
+            creator.setOutputDirectory(Settings::self()->outputDirectory());
+            creator.setSourceFile(Settings::self()->wsdlFileName());
+            creator.setHeaderFileName(Settings::self()->headerFileName());
+            creator.setImplementationFileName(Settings::self()->implementationFileName());
+
+            creator.setClasses(converter.classes());
+            if (Settings::self()->generateHeader()) {
+                creator.createHeader();
+            }
+            if (Settings::self()->generateImplementation()) {
+                creator.createImplementation();
+            }
+
             QCoreApplication::exit(0);
         }
     } else {

kdwsdl2cpp/src/converter_clientstub.cpp

@@ -164,6 +164,16 @@ bool Converter::convertClientService()
                 setEndPoint.setDocs(QLatin1String("Overwrite the end point defined in the .wsdl file, with another http/https URL."));
                 newClass.addFunction(setEndPoint);
             }
+            // endPoint() accessor
+            {
+                KODE::Function getEndPoint(QLatin1String("endPoint"), QLatin1String("QString"));
+                getEndPoint.setConst(true);
+                KODE::Code code;
+                code += "return d_ptr->m_endPoint;";
+                getEndPoint.setBody(code);
+                getEndPoint.setDocs(QLatin1String("Return the end point that will be used."));
+                newClass.addFunction(getEndPoint);
+            }
             //setSoapVersion() method
             {
                 KODE::Function setSoapVersion(QLatin1String("setSoapVersion"), QLatin1String("void"));
@@ -175,6 +185,16 @@ bool Converter::convertClientService()
                                                      "version can be KDSoapClientInterface::SOAP1_1 or KDSoapClientInterface::SOAP1_2"));
                 newClass.addFunction(setSoapVersion);
             }
+            //soapVersion() method
+            {
+                KODE::Function getSoapVersion(QLatin1String("soapVersion"), QLatin1String("KDSoapClientInterface::SoapVersion"));
+                getSoapVersion.setConst(true);
+                KODE::Code code;
+                code += "return clientInterface()->soapVersion();";
+                getSoapVersion.setBody(code);
+                getSoapVersion.setDocs(QLatin1String("Return the soap version used.n"));
+                newClass.addFunction(getSoapVersion);
+            }
             // lastErrorCode() method
             {
                 KODE::Function lastError(QLatin1String("lastErrorCode"), QLatin1String("int"));
@@ -385,6 +405,7 @@ bool Converter::convertClientService()
                 if (hasAction) {
                     callLine += QLatin1String(", action");
                 }
+                callLine += QLatin1String(", requestHeaders()");
                 callLine += QLatin1String(");");
                 doStartCode += callLine;
 

kdwsdl2cpp/src/converter_complextype.cpp

@@ -192,7 +192,8 @@ void Converter::convertComplexType(const XSD::ComplexType *type)
 
         typeName = mTypeMap.localType(attribute.type());
         if (typeName.isEmpty()) {
-            qDebug() << "ERROR: attribute with unknown type:" << attribute.name() << attribute.type() << "in" << typeName;
+            qWarning() << "ERROR: attribute with unknown type:" << attribute.name() << attribute.type() << "in" << typeName;
+            continue;
         }
         inputTypeName = mTypeMap.localInputType(attribute.type(), QName());
         //qDebug() << "Attribute" << attribute.name();
@@ -643,6 +644,9 @@ void Converter::createComplexTypeSerializer(KODE::Class &newClass, const XSD::Co
         bool first = true;
         Q_FOREACH (const XSD::Attribute &attribute, attributes) {
             const QString attrName = attribute.name();
+            if (attrName.isEmpty()) {
+                continue;
+            }
             const QString variableName = QLatin1String("d_ptr->") + KODE::MemberVariable::memberVariableName(attrName);
 
             demarshalCode.addBlock(demarshalNameTest(attribute.type(), attrName, &first));

kdwsdl2cpp/src/creator.cpp

@@ -31,43 +31,53 @@ using namespace KWSDL;
 
 Creator::Creator()
 {
-}
-
-void Creator::create(const KODE::Class::List &classes)
-{
-    KODE::Printer printer;
-    printer.setOutputDirectory(Settings::self()->outputDirectory());
+    KODE::Code::setDefaultIndentation(4);
 
     // Set generated header details.
-    printer.setCreationWarning(true);
-    printer.setGenerator(QLatin1String("KDAB's kdwsdl2cpp"));
-    printer.setSourceFile(Settings::self()->wsdlFileName());
+    _printer.setCreationWarning(true);
+    _printer.setGenerator(QLatin1String("KDAB's kdwsdl2cpp"));
 
     // Qt-like coding style
-    printer.setLabelsDefineIndent(false);
-    printer.setIndentLabels(false);
+    _printer.setLabelsDefineIndent(false);
+    _printer.setIndentLabels(false);
 
-    //qDebug() << "Create server=" << Settings::self()->generateServerCode() << "impl=" << Settings::self()->generateImplementation();
+    _file.setLicense(KODE::License::GeneratedNoRestriction);
+}
 
-    KODE::File file;
+void Creator::setOutputDirectory(const QString &outputDirectory)
+{
+    _printer.setOutputDirectory(outputDirectory);
+}
 
-    if (Settings::self()->generateImplementation()) {
-        file.setImplementationFilename(Settings::self()->outputFileName());
-        file.setHeaderFilename(Settings::self()->headerFile());
-    } else {
-        file.setHeaderFilename(Settings::self()->outputFileName());
-    }
+void Creator::setSourceFile(const QString &sourceFile)
+{
+    _printer.setSourceFile(sourceFile);
+}
 
-    file.setLicense(KODE::License::GeneratedNoRestriction);
+void Creator::setHeaderFileName(const QString &headerFileName)
+{
+    _file.setHeaderFilename(headerFileName);
+}
 
+void Creator::setImplementationFileName(const QString &implementationFileName)
+{
+    _file.setImplementationFilename(implementationFileName);
+}
+
+void Creator::setClasses(const KODE::Class::List &list)
+{
     KODE::Class::List::ConstIterator it;
-    for (it = classes.constBegin(); it != classes.constEnd(); ++it) {
-        file.insertClass(*it);
+    for (it = list.constBegin(); it != list.constEnd(); ++it) {
+        _file.insertClass(*it);
     }
+}
 
-    if (Settings::self()->generateImplementation()) {
-        printer.printImplementation(file);
-    } else {
-        printer.printHeader(file);
-    }
+void Creator::createHeader()
+{
+    _printer.printHeader(_file);
+}
+
+void Creator::createImplementation()
+{
+    _printer.printImplementation(_file);
 }

kdwsdl2cpp/src/creator.h

@@ -21,6 +21,9 @@
 #define KWSDL_CREATOR_H
 
 #include <libkode/class.h>
+#include <libkode/file.h>
+#include <libkode/license.h>
+#include <libkode/printer.h>
 
 namespace KWSDL
 {
@@ -30,7 +33,19 @@ class Creator
 public:
     Creator();
 
-    void create(const KODE::Class::List &list);
+    void setOutputDirectory(const QString &outputDirectory);
+    void setSourceFile(const QString &sourceFile);
+
+    void setHeaderFileName(const QString &headerFileName);
+    void setImplementationFileName(const QString &implementationFileName);
+    void setClasses(const KODE::Class::List &list);
+
+    void createHeader();
+    void createImplementation();
+
+private:
+    KODE::File _file;
+    KODE::Printer _printer;
 };
 
 }