You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by bu...@apache.org on 2015/09/17 14:00:24 UTC

svn commit: r965760 - in /websites/staging/olingo/trunk/content: ./ doc/odata4/tutorials/sqo_es/tutorial_sqo_es.html

Author: buildbot
Date: Thu Sep 17 12:00:21 2015
New Revision: 965760

Log:
Staging update by buildbot for olingo

Modified:
    websites/staging/olingo/trunk/content/   (props changed)
    websites/staging/olingo/trunk/content/doc/odata4/tutorials/sqo_es/tutorial_sqo_es.html

Propchange: websites/staging/olingo/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu Sep 17 12:00:21 2015
@@ -1 +1 @@
-1703569
+1703583

Modified: websites/staging/olingo/trunk/content/doc/odata4/tutorials/sqo_es/tutorial_sqo_es.html
==============================================================================
--- websites/staging/olingo/trunk/content/doc/odata4/tutorials/sqo_es/tutorial_sqo_es.html (original)
+++ websites/staging/olingo/trunk/content/doc/odata4/tutorials/sqo_es/tutorial_sqo_es.html Thu Sep 17 12:00:21 2015
@@ -414,10 +414,12 @@ Also, the <code>expandOption</code> has
 
 <span class="c1">// make sure that `$expand` and $select are considered by the serializer</span>
 <span class="c1">// adding the selectOption to the serializerOpts will actually tell the lib to do the job</span>
+<span class="kd">final</span> <span class="n">String</span> <span class="n">id</span> <span class="o">=</span> <span class="n">request</span><span class="o">.</span><span class="na">getRawBaseUri</span><span class="o">()</span> <span class="o">+</span> <span class="s">&quot;/&quot;</span> <span class="o">+</span> <span class="n">edmEntitySet</span><span class="o">.</span><span class="na">getName</span><span class="o">();</span>
 <span class="n">EntitySerializerOptions</span> <span class="n">opts</span> <span class="o">=</span> <span class="n">EntitySerializerOptions</span><span class="o">.</span><span class="na">with</span><span class="o">()</span>
                                                       <span class="o">.</span><span class="na">contextURL</span><span class="o">(</span><span class="n">contextUrl</span><span class="o">)</span>
                                                       <span class="o">.</span><span class="na">select</span><span class="o">(</span><span class="n">selectOption</span><span class="o">)</span>
                                                       <span class="o">.</span><span class="na">expand</span><span class="o">(</span><span class="n">expandOption</span><span class="o">)</span>
+                                                      <span class="o">.</span><span class="na">id</span><span class="o">(</span><span class="n">id</span><span class="o">)</span> 
                                                       <span class="o">.</span><span class="na">build</span><span class="o">();</span>
 </pre></div>
 
@@ -613,17 +615,20 @@ The same system query option expressions
       <span class="n">Link</span> <span class="n">link</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Link</span><span class="o">();</span>
       <span class="n">link</span><span class="o">.</span><span class="na">setTitle</span><span class="o">(</span><span class="n">navPropName</span><span class="o">);</span>
       <span class="n">link</span><span class="o">.</span><span class="na">setType</span><span class="o">(</span><span class="n">Constants</span><span class="o">.</span><span class="na">ENTITY_NAVIGATION_LINK_TYPE</span><span class="o">);</span>
+      <span class="n">link</span><span class="o">.</span><span class="na">setRel</span><span class="o">(</span><span class="n">Constants</span><span class="o">.</span><span class="na">NS_ASSOCIATION_LINK_REL</span> <span class="o">+</span> <span class="n">navPropName</span><span class="o">);</span>
 
       <span class="k">if</span><span class="o">(</span><span class="n">edmNavigationProperty</span><span class="o">.</span><span class="na">isCollection</span><span class="o">()){</span> <span class="c1">// in case of Categories(1)/$expand=Products</span>
         <span class="c1">// fetch the data for the $expand (to-many navigation) from backend</span>
         <span class="c1">// here we get the data for the expand</span>
         <span class="n">EntityCollection</span> <span class="n">expandEntityCollection</span> <span class="o">=</span> <span class="n">storage</span><span class="o">.</span><span class="na">getRelatedEntityCollection</span><span class="o">(</span><span class="n">entity</span><span class="o">,</span> <span class="n">expandEdmEntityType</span><span class="o">);</span>
         <span class="n">link</span><span class="o">.</span><span class="na">setInlineEntitySet</span><span class="o">(</span><span class="n">expandEntityCollection</span><span class="o">);</span>
+        <span class="n">link</span><span class="o">.</span><span class="na">setHref</span><span class="o">(</span><span class="n">expandEntityCollection</span><span class="o">.</span><span class="na">getId</span><span class="o">().</span><span class="na">toASCIIString</span><span class="o">());</span>
       <span class="o">}</span> <span class="k">else</span> <span class="o">{</span>  <span class="c1">// in case of Products(1)?$expand=Category</span>
         <span class="c1">// fetch the data for the $expand (to-one navigation) from backend</span>
         <span class="c1">// here we get the data for the expand</span>
         <span class="n">Entity</span> <span class="n">expandEntity</span> <span class="o">=</span> <span class="n">storage</span><span class="o">.</span><span class="na">getRelatedEntity</span><span class="o">(</span><span class="n">entity</span><span class="o">,</span> <span class="n">expandEdmEntityType</span><span class="o">);</span>
         <span class="n">link</span><span class="o">.</span><span class="na">setInlineEntity</span><span class="o">(</span><span class="n">expandEntity</span><span class="o">);</span>
+        <span class="n">link</span><span class="o">.</span><span class="na">setHref</span><span class="o">(</span><span class="n">expandEntity</span><span class="o">.</span><span class="na">getId</span><span class="o">().</span><span class="na">toASCIIString</span><span class="o">());</span>
       <span class="o">}</span>
 
       <span class="c1">// set the link - containing the expanded data - to the current entity</span>