Author: buildbot
Date: Wed Jun 17 19:09:36 2015
New Revision: 955165
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 Wed Jun 17 19:09:36 2015
@@ -1 +1 @@
-1682704
+1686094
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
Wed Jun 17 19:09:36 2015
@@ -320,12 +320,12 @@ Here, the user can see which Entity Coll
<p>The information that is given by these 2 URIs, has to be implemented in the
service code.
-Olingo provides API for it and we will use it in the implementation of our
<em>EdmProvider.</em></p>
+Olingo provides API for it and we will use it in the implementation of our
<em>CsdlEdmProvider</em>.</p>
<h3 id="412-create-class">4.1.2. Create class</h3>
<p>Create package <em>myservice.mynamespace.service</em><br />
-Create class <em>DemoEdmProvider</em> and specify the superclass
<em>org.apache.olingo.server.api.edm.provider.EdmProvider</em></p>
+Create class <em>DemoEdmProvider</em> and specify the superclass
<em>org.apache.olingo.commons.api.edm.provider.CsdlAbstractEdmProvider</em></p>
<p>Note: <strong>edm</strong> is the abbreviation for <strong>Entity Data
Model</strong>.<br />
-Accordingly, we understand that the <em>EdmProvider</em> is supposed to
provide static descriptive information.</p>
+Accordingly, we understand that the <em>CsdlEdmProvider</em> is supposed to
provide static descriptive information.</p>
<p>The Entity Model of the service can be defined in the EDM Provider. The EDM
model basically defines the available EntityTypes and the relation between the
entities. An EntityType consists of primitive, complex or navigation
properties. The model can be invoked with the metadata document request.</p>
<p>As we can see, the Olingo server API provides one package that contains
interfaces for the description of the metadata:</p>
<p><img alt="edmPackage" src="edmPackage.png" title="The edm package" /></p>
@@ -333,7 +333,7 @@ Accordingly, we understand that the <em>
Note:
You can find the Javadoc here: <a
href="http://olingo.apache.org/javadoc/odata4/index.html";>http://olingo.apache.org/javadoc/odata4/index.html</a></p>
<h3 id="413-implement-the-required-methods">4.1.3. Implement the required
methods</h3>
-<p>The base class <em>EdmProvider</em> provides methods for declaring the
metadata of all OData elements.</p>
+<p>The base class <em>AbstractCsdlEdmProvider</em> provides methods for
declaring the metadata of all OData elements.</p>
<p>For example:
<em> The entries that are displayed in the service document are provided by
the method
</em>getEntityContainerInfo()<em>
@@ -743,7 +743,7 @@ Create Java class with name <code>DemoSe
Basically, what we are doing here is to create an
<code>ODataHttpHandler</code>, which is a class that is provided by
<em>Olingo</em>.
It receives the user request and if the URL conforms to the OData
specification, the request is delegated to the processor implementation of the
OData service.
This means that the handler has to be configured with all processor
implementations that have been created along with the OData service (in our
example, only one processor).
-Furthermore, the <code>ODataHttpHandler</code> needs to carry the knowledge
about the <code>EdmProvider</code>.</p>
+Furthermore, the <code>ODataHttpHandler</code> needs to carry the knowledge
about the <code>CsdlEdmProvider</code>.</p>
<p>This is where our two implemented classes come together, the metadata
declaration and the data provisioning.</p>
<div class="codehilite"><pre><span class="kd">public</span> <span
class="kd">class</span> <span class="nc">DemoServlet</span> <span
class="kd">extends</span> <span class="n">HttpServlet</span> <span
class="o">{</span>
@@ -752,23 +752,54 @@ Furthermore, the <code>ODataHttpHandler<
<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>
+</pre></div>
- <span class="k">try</span> <span class="o">{</span>
- <span class="c1">// create odata handler and configure it with
EdmProvider and Processor</span>
- <span class="n">OData</span> <span class="n">odata</span> <span
class="o">=</span> <span class="n">OData</span><span class="o">.</span><span
class="na">newInstance</span><span class="o">();</span>
- <span class="n">ServiceMetadata</span> <span class="n">edm</span> <span
class="o">=</span> <span class="n">odata</span><span class="o">.</span><span
class="na">createServiceMetadata</span><span class="o">(</span><span
class="k">new</span> <span class="n">DemoEdmProvider</span><span
class="o">(),</span> <span class="k">new</span> <span
class="n">ArrayList</span><span class="o"><</span><span
class="n">EdmxReference</span><span class="o">>());</span>
- <span class="n">ODataHttpHandler</span> <span class="n">handler</span>
<span class="o">=</span> <span class="n">odata</span><span
class="o">.</span><span class="na">createHandler</span><span
class="o">(</span><span class="n">edm</span><span class="o">);</span>
- <span class="n">handler</span><span class="o">.</span><span
class="na">register</span><span class="o">(</span><span class="k">new</span>
<span class="n">DemoEntityCollectionProcessor</span><span class="o">());</span>
-
- <span class="c1">// let the handler do the work</span>
- <span class="n">handler</span><span class="o">.</span><span
class="na">process</span><span class="o">(</span><span
class="n">req</span><span class="o">,</span> <span class="n">resp</span><span
class="o">);</span>
-
- <span class="o">}</span> <span class="k">catch</span> <span
class="o">(</span><span class="n">RuntimeException</span> <span
class="n">e</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">LOG</span><span class="o">.</span><span
class="na">error</span><span class="o">(</span><span class="s">"Server
Error occurred in ExampleServlet"</span><span class="o">,</span> <span
class="n">e</span><span class="o">);</span>
- <span class="k">throw</span> <span class="k">new</span> <span
class="nf">ServletException</span><span class="o">(</span><span
class="n">e</span><span class="o">);</span>
- <span class="o">}</span>
- <span class="o">}</span>
-<span class="o">}</span>
+
+<p><<<<<<< .mine
+ try {
+ // create odata handler and configure it with CsdlEdmProvider
and Processor
+ OData odata = OData.newInstance();
+ ServiceMetadata edm = odata.createServiceMetadata(new
ExampleEdmProvider(), new ArrayList<EdmxReference>());
+ ODataHttpHandler handler = odata.createHandler(edm);
+ handler.register(new DemoEntityCollectionProcessor());
+||||||| .r1680189
+ try {
+ // create odata handler and configure it with EdmProvider and
Processor
+ OData odata = OData.newInstance();
+ ServiceMetadata edm = odata.createServiceMetadata(new
ExampleEdmProvider(), new ArrayList<EdmxReference>());
+ ODataHttpHandler handler = odata.createHandler(edm);
+ handler.register(new DemoEntityCollectionProcessor());
+=======
+ try {
+ // create odata handler and configure it with EdmProvider and
Processor
+ OData odata = OData.newInstance();
+ ServiceMetadata edm = odata.createServiceMetadata(new
DemoEdmProvider(), new ArrayList<EdmxReference>());
+ ODataHttpHandler handler = odata.createHandler(edm);
+ handler.register(new DemoEntityCollectionProcessor());</p>
+<blockquote>
+<blockquote>
+<blockquote>
+<blockquote>
+<blockquote>
+<blockquote>
+<blockquote>
+<p>.r1686092</p>
+</blockquote>
+</blockquote>
+</blockquote>
+</blockquote>
+</blockquote>
+</blockquote>
+</blockquote>
+<div class="codehilite"><pre> <span class="o">//</span> <span
class="n">let</span> <span class="n">the</span> <span class="n">handler</span>
<span class="n">do</span> <span class="n">the</span> <span class="n">work</span>
+ <span class="n">handler</span><span class="p">.</span><span
class="n">process</span><span class="p">(</span><span class="n">req</span><span
class="p">,</span> <span class="n">resp</span><span class="p">);</span>
+
+ <span class="p">}</span> <span class="k">catch</span> <span
class="p">(</span><span class="n">RuntimeException</span> <span
class="n">e</span><span class="p">)</span> <span class="p">{</span>
+ <span class="n">LOG</span><span class="p">.</span><span
class="n">error</span><span class="p">(</span>"<span
class="n">Server</span> <span class="n">Error</span> <span
class="n">occurred</span> <span class="n">in</span> <span
class="n">ExampleServlet</span>"<span class="p">,</span> <span
class="n">e</span><span class="p">);</span>
+ <span class="n">throw</span> <span class="n">new</span> <span
class="n">ServletException</span><span class="p">(</span><span
class="n">e</span><span class="p">);</span>
+ <span class="p">}</span>
+ <span class="p">}</span>
+<span class="p">}</span>
</pre></div>
@@ -907,7 +938,26 @@ Our first OData service is very simple;
</ul>
<p><strong>Further reading</strong></p>
<p>OData specification: <a href="http://odata.org/";>http://odata.org/</a><br />
-Olingo Javadoc: <a
href="/javadoc/odata4/index.html">http://olingo.apache.org/javadoc/odata4/index.html</a></p><div
align="center">
+<<<<<<< .mine
+Olingo Javadoc: <a
href="http://olingo.apache.org/javadoc/odata4/index.html";>http://olingo.apache.org/javadoc/odata4/index.html</a>|||||||
.r1680189
+Olingo Javadoc: <a
href="http://olingo.apache.org/javadoc/odata4/index.html";>http://olingo.apache.org/javadoc/odata4/index.html</a>
+=======
+Olingo Javadoc: <a
href="/javadoc/odata4/index.html">http://olingo.apache.org/javadoc/odata4/index.html</a></p>
+<blockquote>
+<blockquote>
+<blockquote>
+<blockquote>
+<blockquote>
+<blockquote>
+<blockquote>
+<p>.r1686092</p>
+</blockquote>
+</blockquote>
+</blockquote>
+</blockquote>
+</blockquote>
+</blockquote>
+</blockquote><div align="center">
<p>Copyright © 2013-2015, The Apache Software Foundation<br>
Apache Olingo, Olingo, Apache,
the Apache feather, and
the Apache Olingo project logo are trademarks
of the Apache Software
