4 files changed, 3 insertions, 7 deletions

diff --git a/common/domain/applicationdomaintype.h b/common/domain/applicationdomaintype.h
index d36bffc..c822895 100644
--- a/common/domain/applicationdomaintype.h
+++ b/common/domain/applicationdomaintype.h
@@ -370,7 +370,6 @@ struct SINK_EXPORT Mail : public Entity {
     };
 
     SINK_ENTITY(Mail);
-    SINK_PROPERTY(QString, Uid, uid);
     SINK_EXTRACTED_PROPERTY(Contact, Sender, sender);
     SINK_EXTRACTED_PROPERTY(QList<Contact>, To, to);
     SINK_EXTRACTED_PROPERTY(QList<Contact>, Cc, cc);
diff --git a/common/domain/mail.cpp b/common/domain/mail.cpp
index 9f120cc..8cbe61b 100644
--- a/common/domain/mail.cpp
+++ b/common/domain/mail.cpp
@@ -36,7 +36,6 @@ using namespace Sink::ApplicationDomain;
 
 void TypeImplementation<Mail>::configure(TypeIndex &index)
 {
-    index.addProperty<Mail::Uid>();
     // index.addProperty<Mail::Sender>();
     /* index.addProperty<QByteArray>(Mail::SenderName::name); */
     /* index->addProperty<QString>(Mail::Subject::name); */
@@ -66,7 +65,6 @@ void TypeImplementation<Mail>::configure(IndexPropertyMapper &indexPropertyMappe
 
 void TypeImplementation<Mail>::configure(ReadPropertyMapper<Buffer> &propertyMapper)
 {
-    propertyMapper.addMapping<Mail::Uid, Buffer>(&Buffer::uid);
     propertyMapper.addMapping<Mail::Sender, Buffer>(&Buffer::sender);
     propertyMapper.addMapping<Mail::To, Buffer>(&Buffer::to);
     propertyMapper.addMapping<Mail::Cc, Buffer>(&Buffer::cc);
@@ -87,7 +85,6 @@ void TypeImplementation<Mail>::configure(ReadPropertyMapper<Buffer> &propertyMap
 
 void TypeImplementation<Mail>::configure(WritePropertyMapper<BufferBuilder> &propertyMapper)
 {
-    propertyMapper.addMapping<Mail::Uid>(&BufferBuilder::add_uid);
     propertyMapper.addMapping<Mail::Sender>(&BufferBuilder::add_sender);
     propertyMapper.addMapping<Mail::To>(&BufferBuilder::add_to);
     propertyMapper.addMapping<Mail::Cc>(&BufferBuilder::add_cc);
diff --git a/tests/mailquerybenchmark.cpp b/tests/mailquerybenchmark.cpp
index 080d30e..d68151a 100644
--- a/tests/mailquerybenchmark.cpp
+++ b/tests/mailquerybenchmark.cpp
@@ -69,7 +69,7 @@ class MailQueryBenchmark : public QObject
         const auto date = QDateTime::currentDateTimeUtc();
         for (int i = 0; i < count; i++) {
             auto domainObject = Mail::Ptr::create();
-            domainObject->setUid("uid");
+            domainObject->setExtractedMessageId("uid");
             domainObject->setExtractedSubject(QString("subject%1").arg(i));
             domainObject->setExtractedDate(date.addSecs(count));
             domainObject->setFolder("folder1");
@@ -151,7 +151,7 @@ private slots:
     void test50k()
     {
         Sink::Query query;
-        query.request<Mail::Uid>()
+        query.request<Mail::MessageId>()
              .request<Mail::Subject>()
              .request<Mail::Date>();
         query.sort<Mail::Date>();
diff --git a/tests/pipelinebenchmark.cpp b/tests/pipelinebenchmark.cpp
index 7052c4c..126e344 100644
--- a/tests/pipelinebenchmark.cpp
+++ b/tests/pipelinebenchmark.cpp
@@ -73,7 +73,7 @@ class PipelineBenchmark : public QObject
         const auto date = QDateTime::currentDateTimeUtc();
         for (int i = 0; i < count; i++) {
             auto domainObject = Sink::ApplicationDomain::Mail::Ptr::create();
-            domainObject->setUid("uid");
+            domainObject->setExtractedMessageId("uid");
             domainObject->setExtractedSubject(QString("subject%1").arg(i));
             domainObject->setExtractedDate(date.addSecs(count));
             domainObject->setFolder("folder1");