<table><tr><td style="">dvratil requested changes to this revision.<br />dvratil added a comment.<br />This revision now requires changes to proceed.
</td><a style="text-decoration: none; padding: 4px 8px; margin: 0 8px 8px; float: right; color: #464C5C; font-weight: bold; border-radius: 3px; background-color: #F7F7F9; background-image: linear-gradient(to bottom,#fff,#f1f0f1); display: inline-block; border: 1px solid rgba(71,87,120,.2);" href="https://phabricator.kde.org/D28560">View Revision</a></tr></table><br /><div><div><p>Great job!</p>
<p>I haven't checked the detailed implementation of each handler, since I assume it's mostly just copy-pasted code from the old resources, so I looked more at the new code and the overall architecture.</p>
<p>Regarding the Handlers being friends of the Resource: I would propose here to use a design similar to the one in the IMAP resource: create an abstract layer with Resource-like API, call it e.g. <tt style="background: #ebebeb; font-size: 13px;">ResourceStateInterface</tt>. Then create an implementation of that interface, called <tt style="background: #ebebeb; font-size: 13px;">ResourceState</tt>, which is a friend of <tt style="background: #ebebeb; font-size: 13px;">GoogleResource</tt> and forwards all method calls to the real resource. In constructor of each handler, you pass them this <tt style="background: #ebebeb; font-size: 13px;">ResourceState</tt>, instead of the <tt style="background: #ebebeb; font-size: 13px;">GoogleResource</tt> itself. Thanks to this the Handlers will not have to have access to <tt style="background: #ebebeb; font-size: 13px;">GoogleResource</tt>'s private stuff and it will be possible to create a <tt style="background: #ebebeb; font-size: 13px;">MockResourceState</tt> for testing purposes and write proper uinit-tests for each handler.</p></div></div><br /><div><strong>INLINE COMMENTS</strong><div><div style="margin: 6px 0 12px 0;"><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D28560#inline-163473">View Inline</a><span style="color: #4b4d51; font-weight: bold;">googleresource.cpp:327</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">m_jobs</span> <span style="color: #aa2211">=</span> <span class="n">m_handlers</span><span class="p">.</span><span class="n">count</span><span class="p">();</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #aa4000">for</span> <span class="p">(</span><span style="color: #aa4000">auto</span> <span style="color: #aa2211">&</span><span style="color: #a0a000">handler</span> <span class="p">:</span> <span class="n">m_handlers</span><span class="p">)</span> <span class="p">{</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">This is making me feel uneasy - we keep some global state here for a local task, but I do not have a better solution at the moment.</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D28560#inline-163472">View Inline</a><span style="color: #4b4d51; font-weight: bold;">googleresource.cpp:329</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #aa4000">for</span> <span class="p">(</span><span style="color: #aa4000">auto</span> <span style="color: #aa2211">&</span><span style="color: #a0a000">handler</span> <span class="p">:</span> <span class="n">m_handlers</span><span class="p">)</span> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">handler</span><span style="color: #aa2211">-></span><span class="n">retrieveCollections</span><span class="p">();</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="p">}</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">I would propose passing the <tt style="background: #ebebeb; font-size: 13px;">m_rootCollection</tt> into the <tt style="background: #ebebeb; font-size: 13px;">GenericHandler::retrieveCollections()</tt> as an argument rather than allowing the Handlers to touch the Resource's private <tt style="background: #ebebeb; font-size: 13px;">m_rootCollection</tt>.</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D28560#inline-163474">View Inline</a><span style="color: #4b4d51; font-weight: bold;">googleresource.cpp:351-354</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #aa4000">auto</span> <span class="n">it</span> <span style="color: #aa2211">=</span> <span class="n">std</span><span style="color: #aa2211">::</span><span class="n">find_if</span><span class="p">(</span><span class="n">m_handlers</span><span class="p">.</span><span class="n">begin</span><span class="p">(),</span> <span class="n">m_handlers</span><span class="p">.</span><span class="n">end</span><span class="p">(),</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="p">[</span><span style="color: #aa2211">&</span><span class="n">collection</span><span class="p">](</span><span style="color: #aa4000">const</span> <span class="n">GenericHandler</span><span style="color: #aa2211">::</span><span class="n">Ptr</span> <span style="color: #aa2211">&</span><span class="n">handler</span><span class="p">){</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #aa4000">return</span> <span class="n">collection</span><span class="p">.</span><span class="n">contentMimeTypes</span><span class="p">().</span><span class="n">contains</span><span class="p">(</span><span class="n">handler</span><span style="color: #aa2211">-></span><span class="n">mimetype</span><span class="p">());</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="p">});</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">This variant of code keeps repeating - I propose a method for this, e.g. <tt style="background: #ebebeb; font-size: 13px;">GenericHandler *GoogleResource::handlerForCollectionTask(const QString &mimeType)</tt></p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D28560#inline-163475">View Inline</a><span style="color: #4b4d51; font-weight: bold;">googleresource.cpp:389-392</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #aa4000">auto</span> <span class="n">it</span> <span style="color: #aa2211">=</span> <span class="n">std</span><span style="color: #aa2211">::</span><span class="n">find_if</span><span class="p">(</span><span class="n">m_handlers</span><span class="p">.</span><span class="n">begin</span><span class="p">(),</span> <span class="n">m_handlers</span><span class="p">.</span><span class="n">end</span><span class="p">(),</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="p">[</span><span style="color: #aa2211">&</span><span class="n">item</span><span class="p">](</span><span style="color: #aa4000">const</span> <span class="n">GenericHandler</span><span style="color: #aa2211">::</span><span class="n">Ptr</span> <span style="color: #aa2211">&</span><span class="n">handler</span><span class="p">){</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #aa4000">return</span> <span class="n">handler</span><span style="color: #aa2211">-></span><span class="n">canPerformTask</span><span class="p">(</span><span class="n">item</span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="p">});</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Same thing with the handler here and in all the other tasks - should be a method of its own</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D28560#inline-163476">View Inline</a><span style="color: #4b4d51; font-weight: bold;">googleresource.cpp:406-411</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #74777d">// TODO: what if items have different mimetypes?</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #aa4000">const</span> <span class="n">QString</span> <span class="n">mimeType</span> <span style="color: #aa2211">=</span> <span class="n">items</span><span class="p">.</span><span class="n">first</span><span class="p">().</span><span class="n">mimeType</span><span class="p">();</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #aa4000">auto</span> <span class="n">it</span> <span style="color: #aa2211">=</span> <span class="n">std</span><span style="color: #aa2211">::</span><span class="n">find_if</span><span class="p">(</span><span class="n">m_handlers</span><span class="p">.</span><span class="n">begin</span><span class="p">(),</span> <span class="n">m_handlers</span><span class="p">.</span><span class="n">end</span><span class="p">(),</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="p">[</span><span style="color: #aa2211">&</span><span class="n">mimeType</span><span class="p">](</span><span style="color: #aa4000">const</span> <span class="n">GenericHandler</span><span style="color: #aa2211">::</span><span class="n">Ptr</span> <span style="color: #aa2211">&</span><span class="n">handler</span><span class="p">){</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #aa4000">return</span> <span class="n">handler</span><span style="color: #aa2211">-></span><span class="n">mimetype</span><span class="p">()</span> <span style="color: #aa2211">==</span> <span class="n">mimeType</span><span class="p">;</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="p">});</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Akonadi guarantees that all <tt style="background: #ebebeb; font-size: 13px;">items</tt> here belong to the same Collection, thus they are all managed by the same <tt style="background: #ebebeb; font-size: 13px;">Handler</tt>.</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D28560#inline-163470">View Inline</a><span style="color: #4b4d51; font-weight: bold;">googleresource.h:117</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">QList</span><span style="color: #aa2211"><</span><span class="n">GenericHandler</span><span style="color: #aa2211">::</span><span class="n">Ptr</span><span style="color: #aa2211">></span> <span class="n">m_handlers</span><span class="p">;</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">CalendarHandler</span><span style="color: #aa2211">::</span><span class="n">Ptr</span> <span class="n">m_freeBusyHandler</span><span class="p">;</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">IMO this should be a <tt style="background: #ebebeb; font-size: 13px;">std::vector<std::unique_ptr<GenericHandler>></tt> - in other words, it should be an "owning" list. When the list is destroyed, all handlers are destroyed.</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D28560#inline-163471">View Inline</a><span style="color: #4b4d51; font-weight: bold;">googleresource.h:118</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">QList</span><span style="color: #aa2211"><</span><span class="n">GenericHandler</span><span style="color: #aa2211">::</span><span class="n">Ptr</span><span style="color: #aa2211">></span> <span class="n">m_handlers</span><span class="p">;</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">CalendarHandler</span><span style="color: #aa2211">::</span><span class="n">Ptr</span> <span class="n">m_freeBusyHandler</span><span class="p">;</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #aa4000">int</span> <span class="n">m_jobs</span><span class="p">;</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">I'd propose to make a dedicated <tt style="background: #ebebeb; font-size: 13px;">FreeBusyHandler</tt> that is /not/ subclasses from <tt style="background: #ebebeb; font-size: 13px;">GenericHandler</tt> and implement the corresponding functionality there., rather than having two <tt style="background: #ebebeb; font-size: 13px;">CalendarHandler</tt>s. Or just drop the <tt style="background: #ebebeb; font-size: 13px;">m_freeBusyHandler</tt> completely and use the <tt style="background: #ebebeb; font-size: 13px;">CalendarHandler</tt> from <tt style="background: #ebebeb; font-size: 13px;">m_handlers</tt> directly (look it up by the mimetype).</p></div></div></div></div></div><br /><div><strong>REPOSITORY</strong><div><div>R44 KDE PIM Runtime</div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D28560">https://phabricator.kde.org/D28560</a></div></div><br /><div><strong>To: </strong>poboiko, dvratil, mlaurent<br /><strong>Cc: </strong>mlaurent, kde-pim, fbampaloukas, dcaliste, dvasin, rodsevich, winterz, vkrause, knauss, dvratil<br /></div>