port to QtJsonSerializer 4.0.0

Skycoder42 · Skycoder42 · commit a75f6c5fa892 · 2019-11-13T11:59:05.000+01:00
diff --git a/src/datasync/conflictresolver.h b/src/datasync/conflictresolver.h
@@ -4,7 +4,7 @@
 #include <QtCore/qobject.h>
 #include <QtCore/qscopedpointer.h>
 
-#include <QtJsonSerializer/qjsonserializer.h>
+#include <QtJsonSerializer/jsonserializer.h>
 
 #include "QtDataSync/qtdatasync_global.h"
 #include "QtDataSync/defaults.h"
@@ -60,10 +60,10 @@ class GenericConflictResolver : public GenericConflictResolver<Args...>
 		if(typeId == qMetaTypeId<T1>()) {
 			try {
 				QObject scope;
-				const QJsonSerializer *ser = this->defaults().serializer();
-				auto d1 = ser->deserialize<T1>(data1, &scope);
-				auto d2 = ser->deserialize<T1>(data2, &scope);
-				return ser->serialize<T1>(resolveConflict(d1, d2, &scope));
+				const auto ser = this->defaults().serializer();
+				auto d1 = ser->template deserialize<T1>(data1, &scope);
+				auto d2 = ser->template deserialize<T1>(data2, &scope);
+				return ser->template serialize<T1>(resolveConflict(d1, d2, &scope));
 			} catch(NoConflictResultException&) {
 				return QJsonObject();
 			}
@@ -117,10 +117,10 @@ class GenericConflictResolver<T1> : public ConflictResolver
 		if(typeId == qMetaTypeId<T1>()) {
 			try {
 				QObject scope;
-				const QJsonSerializer *ser = this->defaults().serializer();
-				auto d1 = ser->deserialize<T1>(data1, &scope);
-				auto d2 = ser->deserialize<T1>(data2, &scope);
-				return ser->serialize<T1>(resolveConflict(d1, d2, &scope));
+				const auto ser = this->defaults().serializer();
+				auto d1 = ser->template deserialize<T1>(data1, &scope);
+				auto d2 = ser->template deserialize<T1>(data2, &scope);
+				return ser->template serialize<T1>(resolveConflict(d1, d2, &scope));
 			} catch(NoConflictResultException&) {
 				return QJsonObject();
 			}
diff --git a/src/datasync/datastore.cpp b/src/datasync/datastore.cpp
@@ -2,11 +2,12 @@
 #include "datastore_p.h"
 #include "defaults_p.h"
 
-#include <QtJsonSerializer/QJsonSerializer>
+#include <QtJsonSerializer/JsonSerializer>
 
 #include "signal_private_connect_p.h"
 
 using namespace QtDataSync;
+using namespace QtJsonSerializer;
 using std::function;
 
 #define QTDATASYNC_LOG d->logger
diff --git a/src/datasync/datastore_p.h b/src/datasync/datastore_p.h
@@ -21,7 +21,7 @@ class DataStorePrivate
 
 	Defaults defaults;
 	Logger *logger;
-	QPointer<const QJsonSerializer> serializer;
+	QPointer<const QtJsonSerializer::JsonSerializer> serializer;
 
 	LocalStore *store;
 };
diff --git a/src/datasync/defaults.cpp b/src/datasync/defaults.cpp
@@ -19,6 +19,7 @@
 #include "rep_changeemitter_p_replica.h"
 
 using namespace QtDataSync;
+using namespace QtJsonSerializer;
 
 #define QTDATASYNC_LOG d->logger
 
@@ -82,7 +83,7 @@ QSettings *Defaults::createSettings(QObject *parent, const QString &group) const
 	return settings;
 }
 
-const QJsonSerializer *Defaults::serializer() const
+const JsonSerializer *Defaults::serializer() const
 {
 	return d->serializer;
 }
@@ -210,7 +211,7 @@ QMutex DefaultsPrivate::setupDefaultsMutex;
 QHash<QString, QSharedPointer<DefaultsPrivate>> DefaultsPrivate::setupDefaults;
 QThreadStorage<DefaultsPrivate::DatabaseHolder> DefaultsPrivate::dbRefHash;
 
-void DefaultsPrivate::createDefaults(const QString &setupName, bool isPassive, const QDir &storageDir, const QUrl &roAddress, const QHash<Defaults::PropertyKey, QVariant> &properties, QJsonSerializer *serializer, ConflictResolver *resolver)
+void DefaultsPrivate::createDefaults(const QString &setupName, bool isPassive, const QDir &storageDir, const QUrl &roAddress, const QHash<Defaults::PropertyKey, QVariant> &properties, JsonSerializer *serializer, ConflictResolver *resolver)
 {
 	//create the defaults and do additional setup
 	auto d = QSharedPointer<DefaultsPrivate>::create(setupName, storageDir, roAddress, properties, serializer, resolver);
@@ -260,7 +261,7 @@ QSharedPointer<DefaultsPrivate> DefaultsPrivate::obtainDefaults(const QString &s
 		throw SetupDoesNotExistException(setupName);
 }
 
-DefaultsPrivate::DefaultsPrivate(QString setupName, QDir storageDir, QUrl roAddress, QHash<Defaults::PropertyKey, QVariant> properties, QJsonSerializer *serializer, ConflictResolver *resolver) :
+DefaultsPrivate::DefaultsPrivate(QString setupName, QDir storageDir, QUrl roAddress, QHash<Defaults::PropertyKey, QVariant> properties, JsonSerializer *serializer, ConflictResolver *resolver) :
 	setupName{std::move(setupName)},
 	storageDir{std::move(storageDir)},
 	logger{new Logger("defaults", this->setupName, this)},
diff --git a/src/datasync/defaults.h b/src/datasync/defaults.h
@@ -15,7 +15,9 @@
 #include "QtDataSync/setup.h"
 
 class QSqlDatabase;
-class QJsonSerializer;
+namespace QtJsonSerializer {
+class JsonSerializer;
+}
 
 namespace QtDataSync {
 
@@ -115,7 +117,7 @@ class Q_DATASYNC_EXPORT Defaults
 	//! Returns a new instance of QSettings for this setup
 	QSettings *createSettings(QObject *parent = nullptr, const QString &group = {}) const;
 	//! Returns the serializer of the current setup
-	const QJsonSerializer *serializer() const;
+	const QtJsonSerializer::JsonSerializer *serializer() const;
 	//! Returns the conflict resolver of the current setup
 	const ConflictResolver *conflictResolver() const;
 	//! Returns the extra property defined by the given key
diff --git a/src/datasync/defaults_p.h b/src/datasync/defaults_p.h
@@ -6,7 +6,7 @@
 
 #include <QtSql/QSqlDatabase>
 
-#include <QtJsonSerializer/QJsonSerializer>
+#include <QtJsonSerializer/JsonSerializer>
 
 #include "qtdatasync_global.h"
 #include "objectkey.h"
@@ -51,7 +51,7 @@ class Q_DATASYNC_EXPORT DefaultsPrivate : public QObject
 							   const QDir &storageDir,
 							   const QUrl &roAddress,
 							   const QHash<Defaults::PropertyKey, QVariant> &properties,
-							   QJsonSerializer *serializer,
+							   QtJsonSerializer::JsonSerializer *serializer,
 							   ConflictResolver *resolver);
 	static void removeDefaults(const QString &setupName);
 	static QSharedPointer<DefaultsPrivate> obtainDefaults(const QString &setupName);
@@ -60,7 +60,7 @@ class Q_DATASYNC_EXPORT DefaultsPrivate : public QObject
 					QDir storageDir,
 					QUrl roAddress,
 					QHash<Defaults::PropertyKey, QVariant> properties,
-					QJsonSerializer *serializer,
+					QtJsonSerializer::JsonSerializer *serializer,
 					ConflictResolver *resolver);
 	~DefaultsPrivate() override;
 
@@ -95,7 +95,7 @@ private Q_SLOTS:
 	QDir storageDir;
 	Logger *logger;
 	QUrl roAddress;
-	QJsonSerializer *serializer;
+	QtJsonSerializer::JsonSerializer *serializer;
 	ConflictResolver *resolver;
 	QHash<Defaults::PropertyKey, QVariant> properties;
 
diff --git a/src/datasync/setup.cpp b/src/datasync/setup.cpp
@@ -18,6 +18,7 @@
 Q_LOGGING_CATEGORY(qdssetup, "qtdatasync.setup", QtInfoMsg)
 
 using namespace QtDataSync;
+using namespace QtJsonSerializer;
 
 bool Setup::exists(const QString &name)
 {
@@ -130,7 +131,7 @@ QUrl Setup::remoteObjectHost() const
 	return d->roAddress;
 }
 
-QJsonSerializer *Setup::serializer() const
+JsonSerializer *Setup::serializer() const
 {
 	return d->serializer.data();
 }
@@ -222,7 +223,7 @@ Setup &Setup::setRemoteObjectHost(QUrl remoteObjectHost)
 	return *this;
 }
 
-Setup &Setup::setSerializer(QJsonSerializer *serializer)
+Setup &Setup::setSerializer(JsonSerializer *serializer)
 {
 	Q_ASSERT_X(serializer, Q_FUNC_INFO, "Serializer must not be null");
 	d->serializer.reset(serializer);
@@ -333,7 +334,7 @@ Setup &Setup::resetRemoteObjectHost()
 
 Setup &Setup::resetSerializer()
 {
-	return setSerializer(new QJsonSerializer());
+	return setSerializer(new JsonSerializer());
 }
 
 Setup &Setup::resetConflictResolver()
@@ -628,7 +629,7 @@ QJsonObject SetupPrivate::parseObj(const QByteArray &data)
 
 SetupPrivate::SetupPrivate() :
 	localDir{DefaultLocalDir},
-	serializer{new QJsonSerializer()},
+	serializer{new JsonSerializer()},
 	properties{
 		{Defaults::CacheSize, MB(100)},
 		{Defaults::PersistDeleted, false},
diff --git a/src/datasync/setup.h b/src/datasync/setup.h
@@ -15,7 +15,9 @@ class QLockFile;
 #include "QtDataSync/exception.h"
 #include "QtDataSync/remoteconfig.h"
 
-class QJsonSerializer;
+namespace QtJsonSerializer {
+class JsonSerializer;
+}
 
 namespace QtDataSync {
 
@@ -66,7 +68,7 @@ class Q_DATASYNC_EXPORT Setup
 	//! The url to be used to host the remote object sources, and to connect to to acquire the replicas
 	Q_PROPERTY(QUrl remoteObjectHost READ remoteObjectHost WRITE setRemoteObjectHost RESET resetRemoteObjectHost)
 	//! The serializer to be used to serialize and deserialize data to and from the store
-	Q_PROPERTY(QJsonSerializer* serializer READ serializer WRITE setSerializer RESET resetSerializer)
+	Q_PROPERTY(QtJsonSerializer::JsonSerializer* serializer READ serializer WRITE setSerializer RESET resetSerializer)
 	//! An optional conflict resolver to handle merge conflicts
 	Q_PROPERTY(QtDataSync::ConflictResolver* conflictResolver READ conflictResolver WRITE setConflictResolver RESET resetConflictResolver)
 	//! An alternative handler for fatal errors
@@ -206,7 +208,7 @@ class Q_DATASYNC_EXPORT Setup
 	//! @readAcFn{Setup::remoteObjectHost}
 	QUrl remoteObjectHost() const;
 	//! @readAcFn{Setup::serializer}
-	QJsonSerializer *serializer() const;
+	QtJsonSerializer::JsonSerializer *serializer() const;
 	//! @readAcFn{Setup::conflictResolver}
 	ConflictResolver* conflictResolver() const;
 	//! @readAcFn{Setup::fatalErrorHandler}
@@ -243,7 +245,7 @@ class Q_DATASYNC_EXPORT Setup
 	//! @writeAcFn{Setup::remoteObjectHost}
 	Setup &setRemoteObjectHost(QUrl remoteObjectHost);
 	//! @writeAcFn{Setup::serializer}
-	Setup &setSerializer(QJsonSerializer *serializer);
+	Setup &setSerializer(QtJsonSerializer::JsonSerializer *serializer);
 	//! @writeAcFn{Setup::conflictResolver}
 	Setup &setConflictResolver(ConflictResolver* conflictResolver);
 	//! @writeAcFn{Setup::fatalErrorHandler}
diff --git a/src/datasync/setup_p.h b/src/datasync/setup_p.h
@@ -5,7 +5,7 @@
 #include <QtCore/QThread>
 #include <QtCore/QSharedPointer>
 
-#include <QtJsonSerializer/QJsonSerializer>
+#include <QtJsonSerializer/JsonSerializer>
 
 #include "qtdatasync_global.h"
 #include "setup.h"
@@ -41,7 +41,7 @@ class Q_DATASYNC_EXPORT SetupPrivate
 
 	QString localDir;
 	QUrl roAddress;
-	QScopedPointer<QJsonSerializer> serializer;
+	QScopedPointer<QtJsonSerializer::JsonSerializer> serializer;
 	QScopedPointer<ConflictResolver> resolver;
 	QHash<Defaults::PropertyKey, QVariant> properties;
 	Setup::FatalErrorHandler fatalErrorHandler;
diff --git a/tests/auto/datasync/TestLib/testlib.cpp b/tests/auto/datasync/TestLib/testlib.cpp
@@ -1,5 +1,6 @@
 #include "testlib.h"
 using namespace QtDataSync;
+using namespace QtJsonSerializer;
 
 const QByteArray TestLib::TypeName("TestData");
 QTemporaryDir TestLib::tDir;
@@ -8,7 +9,7 @@ void TestLib::init(const QByteArray &keystorePath)
 {
 	qputenv("PLUGIN_KEYSTORES_PATH", keystorePath);
 	qRegisterMetaType<TestData>();
-	QJsonSerializer::registerListConverters<TestData>();
+	JsonSerializer::registerListConverters<TestData>();
 	Setup::setCleanupTimeout(10000);
 #ifdef VERBOSE_TESTS
 	QLoggingCategory::setFilterRules(QStringLiteral("qtdatasync.*.debug=true"));
diff --git a/tests/auto/datasync/TestSetup/tst_setup.cpp b/tests/auto/datasync/TestSetup/tst_setup.cpp
@@ -91,7 +91,7 @@ void TestSetup::testProperties()
 		//test generic property assignments
 		const auto sName = QStringLiteral("testProperties_setup");
 		Setup setup;
-		auto ser = new QJsonSerializer{this};
+		auto ser = new QtJsonSerializer::JsonSerializer{this};
 		auto res = new TestResolver{};
 		auto ssl = QSslConfiguration::defaultConfiguration();
 		ssl.setPeerVerifyMode(QSslSocket::VerifyPeer);

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`#include "rep_changeemitter_p_replica.h"`
`20`	`20`
`21`	`21`	`using namespace QtDataSync;`
	`22`	`+using namespace QtJsonSerializer;`
`22`	`23`
`23`	`24`	`#define QTDATASYNC_LOG d->logger`
`24`	`25`
`@@ -82,7 +83,7 @@ QSettings Defaults::createSettings(QObject parent, const QString &group) const`
`82`	`83`	`return settings;`
`83`	`84`	`}`
`84`	`85`
`85`		`-const QJsonSerializer *Defaults::serializer() const`
	`86`	`+const JsonSerializer *Defaults::serializer() const`
`86`	`87`	`{`
`87`	`88`	`return d->serializer;`
`88`	`89`	`}`
`@@ -210,7 +211,7 @@ QMutex DefaultsPrivate::setupDefaultsMutex;`
`210`	`211`	`QHash<QString, QSharedPointer<DefaultsPrivate>> DefaultsPrivate::setupDefaults;`
`211`	`212`	`QThreadStorage<DefaultsPrivate::DatabaseHolder> DefaultsPrivate::dbRefHash;`
`212`	`213`
`213`		`-void DefaultsPrivate::createDefaults(const QString &setupName, bool isPassive, const QDir &storageDir, const QUrl &roAddress, const QHash<Defaults::PropertyKey, QVariant> &properties, QJsonSerializer serializer, ConflictResolver resolver)`
	`214`	`+void DefaultsPrivate::createDefaults(const QString &setupName, bool isPassive, const QDir &storageDir, const QUrl &roAddress, const QHash<Defaults::PropertyKey, QVariant> &properties, JsonSerializer serializer, ConflictResolver resolver)`
`214`	`215`	`{`
`215`	`216`	`//create the defaults and do additional setup`
`216`	`217`	`auto d = QSharedPointer<DefaultsPrivate>::create(setupName, storageDir, roAddress, properties, serializer, resolver);`
`@@ -260,7 +261,7 @@ QSharedPointer<DefaultsPrivate> DefaultsPrivate::obtainDefaults(const QString &s`
`260`	`261`	`throw SetupDoesNotExistException(setupName);`
`261`	`262`	`}`
`262`	`263`
`263`		`-DefaultsPrivate::DefaultsPrivate(QString setupName, QDir storageDir, QUrl roAddress, QHash<Defaults::PropertyKey, QVariant> properties, QJsonSerializer serializer, ConflictResolver resolver) :`
	`264`	`+DefaultsPrivate::DefaultsPrivate(QString setupName, QDir storageDir, QUrl roAddress, QHash<Defaults::PropertyKey, QVariant> properties, JsonSerializer serializer, ConflictResolver resolver) :`
`264`	`265`	`setupName{std::move(setupName)},`
`265`	`266`	`storageDir{std::move(storageDir)},`
`266`	`267`	`logger{new Logger("defaults", this->setupName, this)},`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`Q_LOGGING_CATEGORY(qdssetup, "qtdatasync.setup", QtInfoMsg)`
`19`	`19`
`20`	`20`	`using namespace QtDataSync;`
	`21`	`+using namespace QtJsonSerializer;`
`21`	`22`
`22`	`23`	`bool Setup::exists(const QString &name)`
`23`	`24`	`{`
`@@ -130,7 +131,7 @@ QUrl Setup::remoteObjectHost() const`
`130`	`131`	`return d->roAddress;`
`131`	`132`	`}`
`132`	`133`
`133`		`-QJsonSerializer *Setup::serializer() const`
	`134`	`+JsonSerializer *Setup::serializer() const`
`134`	`135`	`{`
`135`	`136`	`return d->serializer.data();`
`136`	`137`	`}`
`@@ -222,7 +223,7 @@ Setup &Setup::setRemoteObjectHost(QUrl remoteObjectHost)`
`222`	`223`	`return *this;`
`223`	`224`	`}`
`224`	`225`
`225`		`-Setup &Setup::setSerializer(QJsonSerializer *serializer)`
	`226`	`+Setup &Setup::setSerializer(JsonSerializer *serializer)`
`226`	`227`	`{`
`227`	`228`	`Q_ASSERT_X(serializer, Q_FUNC_INFO, "Serializer must not be null");`
`228`	`229`	`d->serializer.reset(serializer);`
`@@ -333,7 +334,7 @@ Setup &Setup::resetRemoteObjectHost()`
`333`	`334`
`334`	`335`	`Setup &Setup::resetSerializer()`
`335`	`336`	`{`
`336`		`- return setSerializer(new QJsonSerializer());`
	`337`	`+ return setSerializer(new JsonSerializer());`
`337`	`338`	`}`
`338`	`339`
`339`	`340`	`Setup &Setup::resetConflictResolver()`
`@@ -628,7 +629,7 @@ QJsonObject SetupPrivate::parseObj(const QByteArray &data)`
`628`	`629`
`629`	`630`	`SetupPrivate::SetupPrivate() :`
`630`	`631`	`localDir{DefaultLocalDir},`
`631`		`- serializer{new QJsonSerializer()},`
	`632`	`+ serializer{new JsonSerializer()},`
`632`	`633`	`properties{`
`633`	`634`	`{Defaults::CacheSize, MB(100)},`
`634`	`635`	`{Defaults::PersistDeleted, false},`