TEIID-5444: Upgrading the OData Olingo library to 4.5.0

teiid · Oct 1, 2018 · ad7d3a9 · ad7d3a9
1 parent 5549c0b
commit ad7d3a9
Show file tree

Hide file tree

Showing 5 changed files with 79 additions and 72 deletions.
diff --git a/build/kits/jboss-as7/overlay/docs/teiid/teiid-releasenotes.html b/build/kits/jboss-as7/overlay/docs/teiid/teiid-releasenotes.html
@@ -242,6 +242,9 @@ <h4 class="western">from ${project.version}</h4>
 <li/>
 	<p style="margin-bottom: 0in">
 <a href='https://issues.jboss.org/browse/TEIID-5443'>TEIID-5443</a> - Using RAND() function in a column mask errors on temp table creation (fix for creating an improper view when adding masking)
+<li/>
+	<p style="margin-bottom: 0in">
+<a href='https://issues.jboss.org/browse/TEIID-5444'>TEIID-5444</a> - Upgrade to Olingo-4.5 (Upgrading the OData Olingo library to 4.5.0)
 <li/>
 	<p style="margin-bottom: 0in">
 <a href='https://issues.jboss.org/browse/TEIID-5477'>TEIID-5477</a> - Incorrect results with lead/lag over windows with duplicates (correcting lead/lag over duplicate values)

diff --git a/connectors/translator-odata4/src/main/java/org/teiid/translator/odata4/ODataUpdateQuery.java b/connectors/translator-odata4/src/main/java/org/teiid/translator/odata4/ODataUpdateQuery.java
@@ -95,7 +95,7 @@ public String getInsertMethod() {
 
 
     public String getPayload(Entity parentEntity) throws TranslatorException {
-        JsonSerializer serializer = new JsonSerializer(false, ContentType.APPLICATION_JSON);
+        JsonSerializer serializer = new JsonSerializer(false, ContentType.JSON_FULL_METADATA);
         StringWriter writer = new StringWriter();
 
         try {

diff --git a/olingo/src/main/java/org/teiid/olingo/TeiidODataJsonSerializer.java b/olingo/src/main/java/org/teiid/olingo/TeiidODataJsonSerializer.java
@@ -25,6 +25,7 @@
 import java.net.URI;
 import java.util.List;
 
+import org.apache.commons.codec.DecoderException;
 import org.apache.olingo.commons.api.Constants;
 import org.apache.olingo.commons.api.data.ContextURL;
 import org.apache.olingo.commons.api.format.ContentType;
@@ -80,6 +81,8 @@ public SerializerResult complexCollection(final ServiceMetadata metadata,
             json.close();
         } catch (final IOException e) {
             throw new SerializerException("An I/O exception occurred.", e, SerializerException.MessageKeys.IO_EXCEPTION);
+        } catch (final DecoderException e) {
+        	throw new SerializerException("An I/O exception occurred.", e, SerializerException.MessageKeys.IO_EXCEPTION);
         }
         return SerializerResultImpl.with().content(buffer.getInputStream()).build();
     }