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/08 13:11:14 UTC

svn commit: r964736 - in /websites/staging/olingo/trunk/content: ./ doc/odata4/tutorials/navigation/tutorial_navigation.html

Author: buildbot
Date: Tue Sep  8 11:11:14 2015
New Revision: 964736

Log:
Staging update by buildbot for olingo

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

Propchange: websites/staging/olingo/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Sep  8 11:11:14 2015
@@ -1 +1 @@
-1701415
+1701773

Modified: websites/staging/olingo/trunk/content/doc/odata4/tutorials/navigation/tutorial_navigation.html
==============================================================================
--- websites/staging/olingo/trunk/content/doc/odata4/tutorials/navigation/tutorial_navigation.html (original)
+++ websites/staging/olingo/trunk/content/doc/odata4/tutorials/navigation/tutorial_navigation.html Tue Sep  8 11:11:14 2015
@@ -473,7 +473,7 @@ The target entity set is defined in the
   2. we need the navigation property that corresponds to the second segment of the URI
     in our example: Products</p>
 <p>As shown below, from the source <code>EdmEntitySet</code> we get the binding target, based on the navigation property.</p>
-<div class="codehilite"><pre><span class="n">EdmBindingTarget</span> <span class="n">edmBindingTarget</span> <span class="o">=</span> <span class="n">startEntitySet</span><span class="o">.</span><span class="na">getRelatedBindingTarget</span><span class="o">(</span><span class="n">navPropName</span><span class="o">);</span>
+<div class="codehilite"><pre><span class="n">EdmBindingTarget</span> <span class="n">edmBindingTarget</span> <span class="o">=</span> <span class="n">startEdmEntitySet</span><span class="o">.</span><span class="na">getRelatedBindingTarget</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">edmBindingTarget</span> <span class="k">instanceof</span> <span class="n">EdmEntitySet</span><span class="o">){</span>
     <span class="n">navigationTargetEntitySet</span> <span class="o">=</span> <span class="o">(</span><span class="n">EdmEntitySet</span><span class="o">)</span><span class="n">edmBindingTarget</span><span class="o">;</span>
 </pre></div>
@@ -538,7 +538,7 @@ Furthermore, configure the response obje
 <span class="n">EntityCollectionSerializerOptions</span> <span class="n">opts</span> <span class="o">=</span> <span class="n">EntityCollectionSerializerOptions</span><span class="o">.</span><span class="na">with</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="na">build</span><span class="o">();</span>
 <span class="n">EdmEntityType</span> <span class="n">edmEntityType</span> <span class="o">=</span> <span class="n">responseEdmEntitySet</span><span class="o">.</span><span class="na">getEntityType</span><span class="o">();</span>
 
-<span class="n">ODataSerializer</span> <span class="n">serializer</span> <span class="o">=</span> <span class="n">odata</span><span class="o">.</span><span class="na">createSerializer</span><span class="o">(</span><span class="n">ODataFormat</span><span class="o">.</span><span class="na">fromContentType</span><span class="o">(</span><span class="n">responseFormat</span><span class="o">));</span>
+<span class="n">ODataSerializer</span> <span class="n">serializer</span> <span class="o">=</span> <span class="n">odata</span><span class="o">.</span><span class="na">createSerializer</span><span class="o">(</span><span class="n">responseFormat</span><span class="o">);</span>
 <span class="n">SerializerResult</span> <span class="n">serializerResult</span> <span class="o">=</span> <span class="n">serializer</span><span class="o">.</span><span class="na">entityCollection</span><span class="o">(</span><span class="k">this</span><span class="o">.</span><span class="na">srvMetadata</span><span class="o">,</span> <span class="n">edmEntityType</span><span class="o">,</span> <span class="n">responseEntityCollection</span><span class="o">,</span> <span class="n">opts</span><span class="o">);</span>
 
 <span class="c1">// 4th: configure the response object: set the body, headers and status code</span>
@@ -754,8 +754,7 @@ We don’t need to do an additional e
     <span class="n">ContextURL</span> <span class="n">contextUrl</span> <span class="o">=</span> <span class="n">ContextURL</span><span class="o">.</span><span class="na">with</span><span class="o">().</span><span class="na">entitySet</span><span class="o">(</span><span class="n">responseEdmEntitySet</span><span class="o">).</span><span class="na">suffix</span><span class="o">(</span><span class="n">Suffix</span><span class="o">.</span><span class="na">ENTITY</span><span class="o">).</span><span class="na">build</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="na">contextURL</span><span class="o">(</span><span class="n">contextUrl</span><span class="o">).</span><span class="na">build</span><span class="o">();</span>
 
-    <span class="n">ODataFormat</span> <span class="n">oDataFormat</span> <span class="o">=</span> <span class="n">ODataFormat</span><span class="o">.</span><span class="na">fromContentType</span><span class="o">(</span><span class="n">responseFormat</span><span class="o">);</span>
-    <span class="n">ODataSerializer</span> <span class="n">serializer</span> <span class="o">=</span> <span class="k">this</span><span class="o">.</span><span class="na">odata</span><span class="o">.</span><span class="na">createSerializer</span><span class="o">(</span><span class="n">oDataFormat</span><span class="o">);</span>
+    <span class="n">ODataSerializer</span> <span class="n">serializer</span> <span class="o">=</span> <span class="k">this</span><span class="o">.</span><span class="na">odata</span><span class="o">.</span><span class="na">createSerializer</span><span class="o">(</span><span class="n">responseFormat</span><span class="o">);</span>
     <span class="n">SerializerResult</span> <span class="n">serializerResult</span> <span class="o">=</span> <span class="n">serializer</span><span class="o">.</span><span class="na">entity</span><span class="o">(</span><span class="k">this</span><span class="o">.</span><span class="na">srvMetadata</span><span class="o">,</span> <span class="n">responseEdmEntityType</span><span class="o">,</span> <span class="n">responseEntity</span><span class="o">,</span> <span class="n">opts</span><span class="o">);</span>
 
     <span class="c1">//4. configure the response object</span>