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/08/04 12:01:19 UTC
svn commit: r960742 - in /websites/staging/olingo/trunk/content: ./
doc/odata4/tutorials/read/tutorial_read.html
Author: buildbot
Date: Tue Aug 4 10:01:19 2015
New Revision: 960742
Log:
Staging update by buildbot for olingo
Modified:
websites/staging/olingo/trunk/content/ (props changed)
websites/staging/olingo/trunk/content/doc/odata4/tutorials/read/tutorial_read.html
Propchange: websites/staging/olingo/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Aug 4 10:01:19 2015
@@ -1 +1 @@
-1693026
+1694019
Modified: websites/staging/olingo/trunk/content/doc/odata4/tutorials/read/tutorial_read.html
==============================================================================
--- websites/staging/olingo/trunk/content/doc/odata4/tutorials/read/tutorial_read.html (original)
+++ websites/staging/olingo/trunk/content/doc/odata4/tutorials/read/tutorial_read.html Tue Aug 4 10:01:19 2015
@@ -111,7 +111,7 @@ For example, only READ scenario is cover
This data model will be enhanced in the subsequent tutorials in order to display Categories and to support navigation from a product to its Category.</p>
<p><strong>Goal</strong></p>
<p>We will be dealing with 3 java classes and the web.xml descriptor file.
-Furthermore, for building with maven, we will edit the <code>pom.xml</code> file.</p>
+Furthermore, for building with Maven, we will edit the <code>pom.xml</code> file.</p>
<p>This is how our working directory in Eclipse will look:</p>
<p><img alt="projectLayout" src="EclipseProjectTree.png" title="The project layout" /></p>
<p>At the end of this tutorial, you will have written an OData service and you will be able to invoke the following URL in a browser:</p>
@@ -450,15 +450,14 @@ In our example, we set our previously cr
<p><strong><em>getEntityContainer()</em></strong></p>
<p>In order to provide data, our OData service needs an <em>EntityContainer</em> that carries the <em>EntitySets</em>.
In our example, we have only one <em>EntitySet</em>, so we create one <em>EntityContainer</em> and set our <em>EntitySet</em>.</p>
-<div class="codehilite"><pre><span class="nd">@Override</span>
-<span class="kd">public</span> <span class="n">EntityContainer</span> <span class="nf">getEntityContainer</span><span class="o">()</span> <span class="kd">throws</span> <span class="n">ODataException</span> <span class="o">{</span>
+<div class="codehilite"><pre><span class="kd">public</span> <span class="n">CsdlEntityContainer</span> <span class="nf">getEntityContainer</span><span class="o">()</span> <span class="kd">throws</span> <span class="n">ODataException</span> <span class="o">{</span>
<span class="c1">// create EntitySets</span>
- <span class="n">List</span><span class="o"><</span><span class="n">EntitySet</span><span class="o">></span> <span class="n">entitySets</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ArrayList</span><span class="o"><</span><span class="n">EntitySet</span><span class="o">>();</span>
+ <span class="n">List</span><span class="o"><</span><span class="n">CsdlEntitySet</span><span class="o">></span> <span class="n">entitySets</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ArrayList</span><span class="o"><</span><span class="n">CsdlEntitySet</span><span class="o">>();</span>
<span class="n">entitySets</span><span class="o">.</span><span class="na">add</span><span class="o">(</span><span class="n">getEntitySet</span><span class="o">(</span><span class="n">CONTAINER</span><span class="o">,</span> <span class="n">ES_PRODUCTS_NAME</span><span class="o">));</span>
<span class="c1">// create EntityContainer</span>
- <span class="n">EntityContainer</span> <span class="n">entityContainer</span> <span class="o">=</span> <span class="k">new</span> <span class="n">EntityContainer</span><span class="o">();</span>
+ <span class="n">CsdlEntityContainer</span> <span class="n">entityContainer</span> <span class="o">=</span> <span class="k">new</span> <span class="n">CsdlEntityContainer</span><span class="o">();</span>
<span class="n">entityContainer</span><span class="o">.</span><span class="na">setName</span><span class="o">(</span><span class="n">CONTAINER_NAME</span><span class="o">);</span>
<span class="n">entityContainer</span><span class="o">.</span><span class="na">setEntitySets</span><span class="o">(</span><span class="n">entitySets</span><span class="o">);</span>
@@ -761,7 +760,6 @@ Furthermore, the <code>ODataHttpHandler<
<span class="kd">private</span> <span class="kd">static</span> <span class="kd">final</span> <span class="kt">long</span> <span class="n">serialVersionUID</span> <span class="o">=</span> <span class="mi">1L</span><span class="o">;</span>
<span class="kd">private</span> <span class="kd">static</span> <span class="kd">final</span> <span class="n">Logger</span> <span class="n">LOG</span> <span class="o">=</span> <span class="n">LoggerFactory</span><span class="o">.</span><span class="na">getLogger</span><span class="o">(</span><span class="n">DemoServlet</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
- <span class="nd">@Override</span>
<span class="kd">protected</span> <span class="kt">void</span> <span class="nf">service</span><span class="o">(</span><span class="kd">final</span> <span class="n">HttpServletRequest</span> <span class="n">req</span><span class="o">,</span> <span class="kd">final</span> <span class="n">HttpServletResponse</span> <span class="n">resp</span><span class="o">)</span> <span class="kd">throws</span> <span class="n">ServletException</span><span class="o">,</span> <span class="n">IOException</span> <span class="o">{</span>
<span class="k">try</span> <span class="o">{</span>
<span class="c1">// create odata handler and configure it with CsdlEdmProvider and Processor</span>