You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2022/02/26 11:39:24 UTC
[olingo-odata4] branch master updated: [OLINGO-1560] Updated micro version of dependencies
This is an automated email from the ASF dual-hosted git repository.
mibo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/olingo-odata4.git
The following commit(s) were added to refs/heads/master by this push:
new 2fbd91d [OLINGO-1560] Updated micro version of dependencies
2fbd91d is described below
commit 2fbd91d8457b92a8b69f7e7a1bde406973a2eaad
Author: mibo <mi...@apache.org>
AuthorDate: Sat Feb 26 12:39:18 2022 +0100
[OLINGO-1560] Updated micro version of dependencies
---
.../AcceptHeaderAcceptCharsetHeaderITCase.java | 82 ++++++++++++----------
.../fit/tecsvc/http/BasicBoundActionsITCase.java | 5 +-
.../olingo/fit/tecsvc/http/BasicHttpITCase.java | 23 +++---
.../olingo/fit/tecsvc/http/BasicStreamITCase.java | 25 +++----
.../tecsvc/http/DerivedAndMixedTypeTestITCase.java | 23 +++---
.../fit/tecsvc/http/EntityReferenceITCase.java | 5 +-
.../olingo/fit/tecsvc/http/InOperatorITCase.java | 7 +-
.../tecsvc/http/ODataVersionConformanceITCase.java | 17 ++---
.../http/PreferHeaderForGetAndDeleteITCase.java | 33 ++++-----
.../http/SelectOnComplexPropertiesITCase.java | 11 +--
.../response/batch/ODataBatchResponseManager.java | 22 +++---
pom.xml | 19 ++---
12 files changed, 142 insertions(+), 130 deletions(-)
diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/AcceptHeaderAcceptCharsetHeaderITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/AcceptHeaderAcceptCharsetHeaderITCase.java
index e7b971e..8ada63c 100644
--- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/AcceptHeaderAcceptCharsetHeaderITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/AcceptHeaderAcceptCharsetHeaderITCase.java
@@ -18,13 +18,6 @@
*/
package org.apache.olingo.fit.tecsvc.http;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.net.HttpURLConnection;
-import java.net.URL;
-
import org.apache.commons.io.IOUtils;
import org.apache.olingo.client.api.ODataClient;
import org.apache.olingo.commons.api.format.ContentType;
@@ -33,8 +26,18 @@ import org.apache.olingo.commons.api.http.HttpMethod;
import org.apache.olingo.commons.api.http.HttpStatusCode;
import org.apache.olingo.fit.AbstractBaseTestITCase;
import org.apache.olingo.fit.tecsvc.TecSvcConst;
+import org.junit.Assert;
import org.junit.Test;
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.nio.charset.Charset;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
public class AcceptHeaderAcceptCharsetHeaderITCase extends AbstractBaseTestITCase {
private static final String SERVICE_URI = TecSvcConst.BASE_URI + "/";
@@ -50,7 +53,7 @@ public class AcceptHeaderAcceptCharsetHeaderITCase extends AbstractBaseTestITCas
assertEquals(HttpStatusCode.OK.getStatusCode(), connection.getResponseCode());
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
assertNotNull(content);
}
@@ -65,7 +68,7 @@ public class AcceptHeaderAcceptCharsetHeaderITCase extends AbstractBaseTestITCas
assertEquals(HttpStatusCode.BAD_REQUEST.getStatusCode(), connection.getResponseCode());
- final String content = IOUtils.toString(connection.getErrorStream());
+ final String content = IOUtils.toString(connection.getErrorStream(), Charset.defaultCharset());
assertTrue(content.contains("The content-type range ' abc' is not supported as "
+ "value of the Accept header."));
}
@@ -81,7 +84,7 @@ public class AcceptHeaderAcceptCharsetHeaderITCase extends AbstractBaseTestITCas
assertEquals(HttpStatusCode.NOT_ACCEPTABLE.getStatusCode(), connection.getResponseCode());
- final String content = IOUtils.toString(connection.getErrorStream());
+ final String content = IOUtils.toString(connection.getErrorStream(), Charset.defaultCharset());
assertTrue(content.contains("The content-type range 'application/xyz' is "
+ "not supported as value of the Accept header."));
}
@@ -106,7 +109,7 @@ public class AcceptHeaderAcceptCharsetHeaderITCase extends AbstractBaseTestITCas
assertEquals("minimal", contentType.getParameter("odata.metadata"));
assertEquals("utf-8", contentType.getParameter("charset"));
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
assertNotNull(content);
}
@@ -121,7 +124,7 @@ public class AcceptHeaderAcceptCharsetHeaderITCase extends AbstractBaseTestITCas
assertEquals(HttpStatusCode.NOT_ACCEPTABLE.getStatusCode(), connection.getResponseCode());
- final String content = IOUtils.toString(connection.getErrorStream());
+ final String content = IOUtils.toString(connection.getErrorStream(), Charset.defaultCharset());
assertTrue(content.contains("The charset specified in Accept charset header "
+ "'US-ASCII' is not supported."));
}
@@ -137,7 +140,7 @@ public class AcceptHeaderAcceptCharsetHeaderITCase extends AbstractBaseTestITCas
assertEquals(HttpStatusCode.NOT_ACCEPTABLE.getStatusCode(), connection.getResponseCode());
- final String content = IOUtils.toString(connection.getErrorStream());
+ final String content = IOUtils.toString(connection.getErrorStream(), Charset.defaultCharset());
assertTrue(content.contains("The charset specified in Accept charset header 'abc' is not supported."));
}
@@ -161,7 +164,7 @@ public class AcceptHeaderAcceptCharsetHeaderITCase extends AbstractBaseTestITCas
assertEquals("minimal", contentType.getParameter("odata.metadata"));
assertEquals("utf8", contentType.getParameter("charset"));
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
assertNotNull(content);
}
@@ -177,7 +180,7 @@ public class AcceptHeaderAcceptCharsetHeaderITCase extends AbstractBaseTestITCas
assertEquals(HttpStatusCode.NOT_ACCEPTABLE.getStatusCode(), connection.getResponseCode());
- final String content = IOUtils.toString(connection.getErrorStream());
+ final String content = IOUtils.toString(connection.getErrorStream(), Charset.defaultCharset());
assertTrue(content.contains("The charset specified in Accept charset header "
+ "'iso-8859-1' is not supported."));
}
@@ -201,7 +204,7 @@ public class AcceptHeaderAcceptCharsetHeaderITCase extends AbstractBaseTestITCas
assertEquals("minimal", contentType.getParameter("odata.metadata"));
assertEquals("utf-8", contentType.getParameter("charset"));
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
assertNotNull(content);
}
@@ -216,7 +219,7 @@ public class AcceptHeaderAcceptCharsetHeaderITCase extends AbstractBaseTestITCas
assertEquals(HttpStatusCode.NOT_ACCEPTABLE.getStatusCode(), connection.getResponseCode());
- final String content = IOUtils.toString(connection.getErrorStream());
+ final String content = IOUtils.toString(connection.getErrorStream(), Charset.defaultCharset());
assertTrue(content.contains("The charset specified in Accept charset header "
+ "'iso-8859-1' is not supported."));
}
@@ -232,7 +235,7 @@ public class AcceptHeaderAcceptCharsetHeaderITCase extends AbstractBaseTestITCas
assertEquals(HttpStatusCode.NOT_ACCEPTABLE.getStatusCode(), connection.getResponseCode());
- final String content = IOUtils.toString(connection.getErrorStream());
+ final String content = IOUtils.toString(connection.getErrorStream(), Charset.defaultCharset());
assertTrue(content.contains("The charset specified in Accept charset "
+ "header 'abc' is not supported."));
}
@@ -257,7 +260,7 @@ public class AcceptHeaderAcceptCharsetHeaderITCase extends AbstractBaseTestITCas
assertEquals("utf-8", contentType.getParameter("charset"));
assertEquals("0.1", contentType.getParameter("q"));
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
assertNotNull(content);
}
@@ -280,7 +283,7 @@ public class AcceptHeaderAcceptCharsetHeaderITCase extends AbstractBaseTestITCas
assertEquals("utf8", contentType.getParameter("charset"));
assertEquals("minimal", contentType.getParameter("odata.metadata"));
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
assertNotNull(content);
}
@@ -302,7 +305,7 @@ public class AcceptHeaderAcceptCharsetHeaderITCase extends AbstractBaseTestITCas
assertEquals(1, contentType.getParameters().size());
assertEquals("minimal", contentType.getParameter("odata.metadata"));
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
assertNotNull(content);
}
@@ -318,7 +321,7 @@ public class AcceptHeaderAcceptCharsetHeaderITCase extends AbstractBaseTestITCas
assertEquals(HttpStatusCode.BAD_REQUEST.getStatusCode(), connection.getResponseCode());
- final String content = IOUtils.toString(connection.getErrorStream());
+ final String content = IOUtils.toString(connection.getErrorStream(), Charset.defaultCharset());
assertTrue(content.contains("The content-type range ' abc' is not supported as value of the Accept header."));
}
@@ -334,7 +337,7 @@ public class AcceptHeaderAcceptCharsetHeaderITCase extends AbstractBaseTestITCas
assertEquals(HttpStatusCode.BAD_REQUEST.getStatusCode(), connection.getResponseCode());
- final String content = IOUtils.toString(connection.getErrorStream());
+ final String content = IOUtils.toString(connection.getErrorStream(), Charset.defaultCharset());
assertTrue(content.contains("The content-type range 'application/json;q=<1' is not "
+ "supported as value of the Accept header."));
}
@@ -351,7 +354,7 @@ public class AcceptHeaderAcceptCharsetHeaderITCase extends AbstractBaseTestITCas
assertEquals(HttpStatusCode.BAD_REQUEST.getStatusCode(), connection.getResponseCode());
- final String content = IOUtils.toString(connection.getErrorStream());
+ final String content = IOUtils.toString(connection.getErrorStream(), Charset.defaultCharset());
assertTrue(content.contains("The charset specified in Accept header "
+ "'application/json;charset=utf<8' is not supported."));
}
@@ -367,7 +370,7 @@ public class AcceptHeaderAcceptCharsetHeaderITCase extends AbstractBaseTestITCas
assertEquals(HttpStatusCode.NOT_ACCEPTABLE.getStatusCode(), connection.getResponseCode());
- final String content = IOUtils.toString(connection.getErrorStream());
+ final String content = IOUtils.toString(connection.getErrorStream(), Charset.defaultCharset());
assertTrue(content.contains("The content-type range 'application/json;abc=xyz' is not "
+ "supported as value of the Accept header."));
}
@@ -382,7 +385,7 @@ public class AcceptHeaderAcceptCharsetHeaderITCase extends AbstractBaseTestITCas
assertEquals(HttpStatusCode.NOT_ACCEPTABLE.getStatusCode(), connection.getResponseCode());
- final String content = IOUtils.toString(connection.getErrorStream());
+ final String content = IOUtils.toString(connection.getErrorStream(), Charset.defaultCharset());
assertTrue(content.contains("The $format option 'application/json;charset=abc' is not supported."));
}
@@ -396,7 +399,7 @@ public class AcceptHeaderAcceptCharsetHeaderITCase extends AbstractBaseTestITCas
assertEquals(HttpStatusCode.NOT_ACCEPTABLE.getStatusCode(), connection.getResponseCode());
- final String content = IOUtils.toString(connection.getErrorStream());
+ final String content = IOUtils.toString(connection.getErrorStream(), Charset.defaultCharset());
assertTrue(content.contains("The $format option 'application/json;abc=xyz' is not supported."));
}
@@ -411,7 +414,7 @@ public class AcceptHeaderAcceptCharsetHeaderITCase extends AbstractBaseTestITCas
assertEquals(HttpStatusCode.BAD_REQUEST.getStatusCode(), connection.getResponseCode());
- final String content = IOUtils.toString(connection.getErrorStream());
+ final String content = IOUtils.toString(connection.getErrorStream(), Charset.defaultCharset());
assertTrue(content.contains("The Accept charset header 'utf-8;abc=xyz' is not supported."));
}
@@ -426,7 +429,7 @@ public class AcceptHeaderAcceptCharsetHeaderITCase extends AbstractBaseTestITCas
assertEquals(HttpStatusCode.BAD_REQUEST.getStatusCode(), connection.getResponseCode());
- final String content = IOUtils.toString(connection.getErrorStream());
+ final String content = IOUtils.toString(connection.getErrorStream(), Charset.defaultCharset());
assertTrue(content.contains("The Accept charset header 'utf<8' is not supported."));
}
@@ -441,7 +444,7 @@ public class AcceptHeaderAcceptCharsetHeaderITCase extends AbstractBaseTestITCas
assertEquals(HttpStatusCode.BAD_REQUEST.getStatusCode(), connection.getResponseCode());
- final String content = IOUtils.toString(connection.getErrorStream());
+ final String content = IOUtils.toString(connection.getErrorStream(), Charset.defaultCharset());
assertTrue(content.contains("The Accept charset header 'utf<8' is not supported."));
}
@@ -456,7 +459,7 @@ public class AcceptHeaderAcceptCharsetHeaderITCase extends AbstractBaseTestITCas
assertEquals(HttpStatusCode.BAD_REQUEST.getStatusCode(), connection.getResponseCode());
- final String content = IOUtils.toString(connection.getErrorStream());
+ final String content = IOUtils.toString(connection.getErrorStream(), Charset.defaultCharset());
assertTrue(content.contains("The Accept charset header 'utf-8;q=<' is not supported."));
}
@@ -471,7 +474,7 @@ public class AcceptHeaderAcceptCharsetHeaderITCase extends AbstractBaseTestITCas
assertEquals(HttpStatusCode.BAD_REQUEST.getStatusCode(), connection.getResponseCode());
- final String content = IOUtils.toString(connection.getErrorStream());
+ final String content = IOUtils.toString(connection.getErrorStream(), Charset.defaultCharset());
assertTrue(content.contains("The Accept charset header 'utf-8;q=<' is not supported."));
}
@@ -486,7 +489,7 @@ public class AcceptHeaderAcceptCharsetHeaderITCase extends AbstractBaseTestITCas
assertEquals(HttpStatusCode.BAD_REQUEST.getStatusCode(), connection.getResponseCode());
- final String content = IOUtils.toString(connection.getErrorStream());
+ final String content = IOUtils.toString(connection.getErrorStream(), Charset.defaultCharset());
assertTrue(content.contains("The Accept charset header 'utf-8;abc=xyz' is not supported."));
}
@@ -499,10 +502,13 @@ public class AcceptHeaderAcceptCharsetHeaderITCase extends AbstractBaseTestITCas
connection.setRequestProperty(HttpHeader.ACCEPT, "application/json;charset=utf-8");
connection.connect();
- assertEquals(HttpStatusCode.BAD_REQUEST.getStatusCode(), connection.getResponseCode());
-
- final String content = IOUtils.toString(connection.getErrorStream());
- assertTrue(content.contains("The $format option 'application/json;charset=utf<8' is not supported."));
+ try {
+ assertEquals(HttpStatusCode.BAD_REQUEST.getStatusCode(), connection.getResponseCode());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
+ Assert.fail("Expect IOException.");
+ } catch (IOException e) {
+ assertTrue(e.getMessage().contains("application/json;charset=utf<8"));
+ }
}
@Test
@@ -524,7 +530,7 @@ public class AcceptHeaderAcceptCharsetHeaderITCase extends AbstractBaseTestITCas
assertEquals("minimal", contentType.getParameter("odata.metadata"));
assertEquals("utf-8", contentType.getParameter("charset"));
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
assertNotNull(content);
}
diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/BasicBoundActionsITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/BasicBoundActionsITCase.java
index d12a4cb..c59070e 100644
--- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/BasicBoundActionsITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/BasicBoundActionsITCase.java
@@ -25,6 +25,7 @@ import static org.junit.Assert.assertTrue;
import java.io.OutputStreamWriter;
import java.net.HttpURLConnection;
import java.net.URL;
+import java.nio.charset.Charset;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
@@ -65,7 +66,7 @@ public class BasicBoundActionsITCase {
assertEquals(HttpStatusCode.CREATED.getStatusCode(), connection.getResponseCode());
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
final String expected = "\"PropertyInt16\":1,\"PropertyString\":\"1\","
+ "\"PropertyComp\":{\"PropertyInt16\":11,"
+ "\"PropertyComp\":{\"PropertyString\":\"StringValue\","
@@ -110,7 +111,7 @@ public class BasicBoundActionsITCase {
assertEquals(HttpStatusCode.OK.getStatusCode(), connection.getResponseCode());
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
final String expected = "\"PropertyInt16\":1,\"PropertyString\":\"1\","
+ "\"PropertyComp\":{\"PropertyInt16\":30,\"PropertyComp\":"
+ "{\"PropertyString\":\"StringValue\",\"PropertyBinary\":\"ASNFZ4mrze8=\","
diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/BasicHttpITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/BasicHttpITCase.java
index 24f3e28..dcd56f0 100644
--- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/BasicHttpITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/BasicHttpITCase.java
@@ -25,6 +25,7 @@ import static org.junit.Assert.assertTrue;
import java.net.HttpURLConnection;
import java.net.URL;
+import java.nio.charset.Charset;
import org.apache.commons.io.IOUtils;
import org.apache.olingo.client.api.ODataClient;
@@ -155,7 +156,7 @@ public class BasicHttpITCase extends AbstractBaseTestITCase {
assertEquals(HttpStatusCode.OK.getStatusCode(), connection.getResponseCode());
assertEquals(ContentType.create(ContentType.JSON, ContentType.PARAMETER_IEEE754_COMPATIBLE, "true"),
ContentType.create(connection.getContentType()));
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
assertTrue(content.contains("\"PropertyDecimal\":\"34\""));
assertTrue(content.contains("\"PropertyInt64\":\"9223372036854775807\""));
@@ -172,7 +173,7 @@ public class BasicHttpITCase extends AbstractBaseTestITCase {
assertEquals(HttpStatusCode.OK.getStatusCode(), connection.getResponseCode());
assertEquals(ContentType.create(ContentType.JSON, ContentType.PARAMETER_IEEE754_COMPATIBLE, "true"),
ContentType.create(connection.getContentType()));
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
assertTrue(content.contains("\"PropertyDecimal\":\"34\""));
assertTrue(content.contains("\"PropertyInt64\":\"9223372036854775807\""));
@@ -218,7 +219,7 @@ public class BasicHttpITCase extends AbstractBaseTestITCase {
connection.connect();
assertEquals(HttpStatusCode.OK.getStatusCode(), connection.getResponseCode());
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
assertTrue(content.contains("\"PropertyInt16\":111"));
assertTrue(content.contains("\"PropertyString\":\"TEST A\""));
@@ -236,7 +237,7 @@ public class BasicHttpITCase extends AbstractBaseTestITCase {
connection.connect();
assertEquals(HttpStatusCode.OK.getStatusCode(), connection.getResponseCode());
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
assertTrue(content.contains("\"TEST A 0815\""));
}
@@ -250,7 +251,7 @@ public class BasicHttpITCase extends AbstractBaseTestITCase {
connection.connect();
assertEquals(HttpStatusCode.OK.getStatusCode(), connection.getResponseCode());
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
assertTrue(content.contains("\"PropertyInt16\":32766"));
assertTrue(content.contains("\"PropertyString\":\"Test String1\""));
@@ -267,7 +268,7 @@ public class BasicHttpITCase extends AbstractBaseTestITCase {
connection.connect();
assertEquals(HttpStatusCode.BAD_REQUEST.getStatusCode(), connection.getResponseCode());
- final String content = IOUtils.toString(connection.getErrorStream());
+ final String content = IOUtils.toString(connection.getErrorStream(), Charset.defaultCharset());
assertTrue(content.contains("The type filter 'olingo.odata.test1.ETTwoPrim' is incompatible."));
}
@@ -282,7 +283,7 @@ public class BasicHttpITCase extends AbstractBaseTestITCase {
connection.connect();
assertEquals(HttpStatusCode.OK.getStatusCode(), connection.getResponseCode());
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
assertTrue(content.contains("\"PropertyInt16\":111"));
assertTrue(content.contains("\"PropertyString\":\"TEST A\""));
@@ -301,7 +302,7 @@ public class BasicHttpITCase extends AbstractBaseTestITCase {
connection.connect();
assertEquals(HttpStatusCode.OK.getStatusCode(), connection.getResponseCode());
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
assertNotNull(content);
}
@@ -317,7 +318,7 @@ public class BasicHttpITCase extends AbstractBaseTestITCase {
connection.connect();
assertEquals(HttpStatusCode.OK.getStatusCode(), connection.getResponseCode());
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
assertNotNull(content);
}
@@ -333,7 +334,7 @@ public class BasicHttpITCase extends AbstractBaseTestITCase {
connection.connect();
assertEquals(HttpStatusCode.OK.getStatusCode(), connection.getResponseCode());
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
assertNotNull(content);
}
@@ -349,7 +350,7 @@ public class BasicHttpITCase extends AbstractBaseTestITCase {
connection.connect();
assertEquals(HttpStatusCode.OK.getStatusCode(), connection.getResponseCode());
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
assertNotNull(content);
}
diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/BasicStreamITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/BasicStreamITCase.java
index dd1819a..48c10f4 100644
--- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/BasicStreamITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/BasicStreamITCase.java
@@ -28,6 +28,7 @@ import java.io.InputStream;
import java.net.HttpURLConnection;
import java.net.URL;
+import java.nio.charset.Charset;
import org.apache.commons.io.IOUtils;
import org.apache.olingo.client.api.ODataClient;
@@ -54,7 +55,7 @@ public class BasicStreamITCase extends AbstractBaseTestITCase {
assertEquals(HttpStatusCode.OK.getStatusCode(), connection.getResponseCode());
assertEquals(ContentType.JSON, ContentType.create(connection.getHeaderField(HttpHeader.CONTENT_TYPE)));
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
assertTrue(content.contains("Streamed-Employee1@company.example\"," +
"\"Streamed-Employee2@company.example\"," +
@@ -86,7 +87,7 @@ public class BasicStreamITCase extends AbstractBaseTestITCase {
assertEquals(HttpStatusCode.OK.getStatusCode(), connection.getResponseCode());
assertEquals(ContentType.APPLICATION_XML, ContentType.create(connection.getHeaderField(HttpHeader.CONTENT_TYPE)));
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
assertTrue(content.contains("<m:element>Streamed-Employee1@company.example</m:element>" +
"<m:element>Streamed-Employee2@company.example</m:element>" +
"<m:element>Streamed-Employee3@company.example</m:element>"));
@@ -105,7 +106,7 @@ public class BasicStreamITCase extends AbstractBaseTestITCase {
assertEquals(HttpStatusCode.OK.getStatusCode(), connection.getResponseCode());
assertEquals(ContentType.APPLICATION_XML, ContentType.create(connection.getHeaderField(HttpHeader.CONTENT_TYPE)));
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
assertTrue(content.contains("<a:link rel=\"next\" href="));
assertTrue(content.contains("ESStreamServerSidePaging?$format=xml&%24skiptoken=1%2A10\"/>"));
assertTrue(content.contains("<a:id>ESStreamServerSidePaging(1)</a:id>"));
@@ -124,7 +125,7 @@ public class BasicStreamITCase extends AbstractBaseTestITCase {
assertEquals(HttpStatusCode.OK.getStatusCode(), connection.getResponseCode());
assertEquals(ContentType.APPLICATION_XML, ContentType.create(connection.getHeaderField(HttpHeader.CONTENT_TYPE)));
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
assertTrue(content.contains("<a:link rel=\"next\" href="));
assertTrue(content.contains("ESStreamServerSidePaging?$format=xml&%24skiptoken=2%2A10\"/>"));
assertTrue(content.contains("<a:id>ESStreamServerSidePaging(11)</a:id>"));
@@ -143,7 +144,7 @@ public class BasicStreamITCase extends AbstractBaseTestITCase {
assertEquals(HttpStatusCode.OK.getStatusCode(), connection.getResponseCode());
assertEquals(ContentType.JSON, ContentType.create(connection.getHeaderField(HttpHeader.CONTENT_TYPE)));
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
assertTrue(content.contains("{\"PropertyInt16\":2,"+
"\"PropertyStream@odata.mediaEtag\":\"eTag\",\"PropertyStream@odata.mediaContentType\":\"image/jpeg\"}"));
@@ -163,7 +164,7 @@ public class BasicStreamITCase extends AbstractBaseTestITCase {
assertEquals(HttpStatusCode.OK.getStatusCode(), connection.getResponseCode());
assertEquals(ContentType.JSON, ContentType.create(connection.getHeaderField(HttpHeader.CONTENT_TYPE)));
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
assertTrue(content.contains("{\"PropertyInt16\":12,"+
"\"PropertyStream@odata.mediaEtag\":\"eTag\",\"PropertyStream@odata.mediaContentType\":\"image/jpeg\"}"));
@@ -183,7 +184,7 @@ public class BasicStreamITCase extends AbstractBaseTestITCase {
assertEquals(HttpStatusCode.OK.getStatusCode(), connection.getResponseCode());
assertEquals(ContentType.APPLICATION_XML, ContentType.create(connection.getHeaderField(HttpHeader.CONTENT_TYPE)));
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
assertTrue(content.contains("<a:link rel=\"next\" href="));
assertTrue(content.contains("ESStreamServerSidePaging?$count=true&$format=xml&%24skiptoken=1%2A10\"/>"));
assertTrue(content.contains("<a:id>ESStreamServerSidePaging(1)</a:id>"));
@@ -204,7 +205,7 @@ public class BasicStreamITCase extends AbstractBaseTestITCase {
assertEquals(HttpStatusCode.OK.getStatusCode(), connection.getResponseCode());
assertEquals(ContentType.JSON, ContentType.create(connection.getHeaderField(HttpHeader.CONTENT_TYPE)));
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
assertTrue(content.contains("{\"PropertyInt16\":2,"+
"\"PropertyStream@odata.mediaEtag\":\"eTag\",\"PropertyStream@odata.mediaContentType\":\"image/jpeg\"}"));
@@ -224,7 +225,7 @@ public class BasicStreamITCase extends AbstractBaseTestITCase {
assertEquals(HttpStatusCode.OK.getStatusCode(), connection.getResponseCode());
assertEquals(ContentType.APPLICATION_XML, ContentType.create(connection.getHeaderField(HttpHeader.CONTENT_TYPE)));
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
assertTrue(content.contains("<a:link rel=\"next\" href="));
assertTrue(content.contains("ESStreamServerSidePaging?$count=false&$format=xml&%24skiptoken=1%2A10\"/>"));
assertTrue(content.contains("<a:id>ESStreamServerSidePaging(1)</a:id>"));
@@ -245,7 +246,7 @@ public class BasicStreamITCase extends AbstractBaseTestITCase {
assertEquals(HttpStatusCode.OK.getStatusCode(), connection.getResponseCode());
assertEquals(ContentType.JSON, ContentType.create(connection.getHeaderField(HttpHeader.CONTENT_TYPE)));
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
assertTrue(content.contains("{\"PropertyInt16\":2,"+
"\"PropertyStream@odata.mediaEtag\":\"eTag\",\"PropertyStream@odata.mediaContentType\":\"image/jpeg\"}"));
@@ -268,7 +269,7 @@ public class BasicStreamITCase extends AbstractBaseTestITCase {
assertEquals(HttpStatusCode.OK.getStatusCode(), connection.getResponseCode());
assertEquals(ContentType.JSON, ContentType.create(connection.getHeaderField(HttpHeader.CONTENT_TYPE)));
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
assertTrue(content.contains("\"NavPropertyETStreamOnComplexPropOne\":{"
+ "\"PropertyInt16\":7,"
@@ -301,7 +302,7 @@ public class BasicStreamITCase extends AbstractBaseTestITCase {
assertEquals(HttpStatusCode.OK.getStatusCode(), connection.getResponseCode());
assertEquals(ContentType.JSON, ContentType.create(connection.getHeaderField(HttpHeader.CONTENT_TYPE)));
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
assertTrue(content.contains("\"PropertyInt16\":7,"
+ "\"PropertyInt32\":10,\"PropertyEntityStream@mediaEtag\":\"eTag\","
diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/DerivedAndMixedTypeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/DerivedAndMixedTypeTestITCase.java
index ce41951..38dfed7 100644
--- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/DerivedAndMixedTypeTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/DerivedAndMixedTypeTestITCase.java
@@ -23,6 +23,7 @@ import static org.junit.Assert.assertTrue;
import java.net.HttpURLConnection;
import java.net.URL;
+import java.nio.charset.Charset;
import org.apache.commons.io.IOUtils;
import org.apache.olingo.client.api.ODataClient;
@@ -49,7 +50,7 @@ public class DerivedAndMixedTypeTestITCase extends AbstractBaseTestITCase {
assertEquals(HttpStatusCode.OK.getStatusCode(), connection.getResponseCode());
assertEquals(ContentType.JSON, ContentType.create(connection.getHeaderField(HttpHeader.CONTENT_TYPE)));
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
assertTrue(content.contains(
"[{\"PropertyInt16\":32767,\"PropertyCompAno\":null,\"CollPropertyCompAno\":[{\"PropertyString\":" +
@@ -71,7 +72,7 @@ public class DerivedAndMixedTypeTestITCase extends AbstractBaseTestITCase {
assertEquals(HttpStatusCode.OK.getStatusCode(), connection.getResponseCode());
assertEquals(ContentType.APPLICATION_XML, ContentType.create(connection.getHeaderField(HttpHeader.CONTENT_TYPE)));
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
assertTrue(content.contains("<d:PropertyCompAno m:type=\"#olingo.odata.test1.CTBaseAno\">" +
"<d:PropertyString>Num111</d:PropertyString>" +
"<d:AdditionalPropString>Test123</d:AdditionalPropString>" +
@@ -92,7 +93,7 @@ public class DerivedAndMixedTypeTestITCase extends AbstractBaseTestITCase {
assertEquals(HttpStatusCode.OK.getStatusCode(), connection.getResponseCode());
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
assertTrue(content.contains("\"@odata.type\":\"#olingo.odata.test1.ETBase\"," +
"\"PropertyInt16\":32766," +
"\"PropertyString\":\"Test String1\"," +
@@ -109,7 +110,7 @@ public class DerivedAndMixedTypeTestITCase extends AbstractBaseTestITCase {
assertEquals(HttpStatusCode.OK.getStatusCode(), connection.getResponseCode());
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
assertTrue(content.contains("term=\"#olingo.odata.test1.ETBase\"/>"));
assertTrue(content.contains(
"<d:PropertyInt16 m:type=\"Int16\">32766</d:PropertyInt16>" +
@@ -129,7 +130,7 @@ public class DerivedAndMixedTypeTestITCase extends AbstractBaseTestITCase {
assertEquals(HttpStatusCode.OK.getStatusCode(), connection.getResponseCode());
assertEquals(ContentType.JSON_NO_METADATA, ContentType.create(connection.getHeaderField(HttpHeader.CONTENT_TYPE)));
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
assertTrue(content.contains(
"[{\"PropertyInt16\":32767,\"PropertyCompAno\":null,\"CollPropertyCompAno\":[{\"PropertyString\":" +
@@ -152,7 +153,7 @@ public class DerivedAndMixedTypeTestITCase extends AbstractBaseTestITCase {
assertEquals(ContentType.JSON_FULL_METADATA,
ContentType.create(connection.getHeaderField(HttpHeader.CONTENT_TYPE)));
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
assertTrue(content.contains("\"PropertyInt16\":32767,\"PropertyCompAno\":null," +
"\"CollPropertyCompAno@odata.type\":\"#Collection(olingo.odata.test1.CTTwoPrimAno)\"," +
@@ -187,7 +188,7 @@ public class DerivedAndMixedTypeTestITCase extends AbstractBaseTestITCase {
assertEquals(ContentType.JSON_FULL_METADATA,
ContentType.create(connection.getHeaderField(HttpHeader.CONTENT_TYPE)));
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
final String actualContent = "\"value\":[{\"@odata.type\":\"#olingo.odata.test1.ETMixPrimCollComp\","
+ "\"@odata.id\":\"ESMixPrimCollComp(32767)\","
+ "\"PropertyInt16@odata.type\":\"#Int16\",\"PropertyInt16\":32767,"
@@ -267,7 +268,7 @@ public class DerivedAndMixedTypeTestITCase extends AbstractBaseTestITCase {
assertEquals(ContentType.JSON,
ContentType.create(connection.getHeaderField(HttpHeader.CONTENT_TYPE)));
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
assertTrue(content.contains("\"value\":[{\"PropertyInt16\":32767,"
+ "\"CollPropertyString\":[\"Employee1@company.example\","
+ "\"Employee2@company.example\","
@@ -315,7 +316,7 @@ public class DerivedAndMixedTypeTestITCase extends AbstractBaseTestITCase {
assertEquals(ContentType.JSON_FULL_METADATA,
ContentType.create(connection.getHeaderField(HttpHeader.CONTENT_TYPE)));
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
assertTrue(content.contains("\"@odata.type\":\"#olingo.odata.test1.ETBase\","
+ "\"@odata.id\":\"ESBase(111)\","
+ "\"PropertyInt16@odata.type\":\"#Int16\","
@@ -338,7 +339,7 @@ public class DerivedAndMixedTypeTestITCase extends AbstractBaseTestITCase {
assertEquals(ContentType.JSON_FULL_METADATA,
ContentType.create(connection.getHeaderField(HttpHeader.CONTENT_TYPE)));
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
assertTrue(content.contains("\"value\":[{\"@odata.type\":\"#olingo.odata.test1.ETBase\","
+ "\"@odata.id\":\"ESBase(111)\","
+ "\"PropertyInt16@odata.type\":\"#Int16\","
@@ -363,7 +364,7 @@ public class DerivedAndMixedTypeTestITCase extends AbstractBaseTestITCase {
assertEquals(ContentType.JSON,
ContentType.create(connection.getHeaderField(HttpHeader.CONTENT_TYPE)));
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
assertTrue(content.contains("\"PropertyInt16\":0,"
+ "\"PropertyString\":\"\","
+ "\"PropertyBoolean\":false,"
diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/EntityReferenceITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/EntityReferenceITCase.java
index 6d63638..63a3671 100644
--- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/EntityReferenceITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/EntityReferenceITCase.java
@@ -23,6 +23,7 @@ import static org.junit.Assert.assertTrue;
import java.net.HttpURLConnection;
import java.net.URL;
+import java.nio.charset.Charset;
import org.apache.commons.io.IOUtils;
import org.apache.olingo.client.api.ODataClient;
@@ -51,7 +52,7 @@ public class EntityReferenceITCase extends AbstractBaseTestITCase {
assertEquals(HttpStatusCode.OK.getStatusCode(), connection.getResponseCode());
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
assertTrue(content.contains(CONTEXT_ENTITY_REFERENCE));
}
@@ -66,7 +67,7 @@ public class EntityReferenceITCase extends AbstractBaseTestITCase {
assertEquals(HttpStatusCode.OK.getStatusCode(), connection.getResponseCode());
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
assertTrue(content.contains(CONTEXT_COLLECTION_REFERENCE));
}
diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/InOperatorITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/InOperatorITCase.java
index f95b3fe..91320c5 100644
--- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/InOperatorITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/InOperatorITCase.java
@@ -23,6 +23,7 @@ import static org.junit.Assert.assertTrue;
import java.net.HttpURLConnection;
import java.net.URL;
+import java.nio.charset.Charset;
import org.apache.commons.io.IOUtils;
import org.apache.olingo.client.api.ODataClient;
@@ -55,7 +56,7 @@ public class InOperatorITCase extends AbstractBaseTestITCase {
assertEquals(HttpStatusCode.OK.getStatusCode(), connection.getResponseCode());
assertEquals(ContentType.JSON, ContentType.create(connection.getHeaderField(HttpHeader.CONTENT_TYPE)));
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
assertTrue(content.contains("\"value\":[{\"PropertyInt16\":-32768,"
+ "\"PropertyString\":\"Second Resource - negative values\","
+ "\"PropertyBoolean\":false,\"PropertyByte\":0,\"PropertySByte\":-128,"
@@ -78,7 +79,7 @@ public class InOperatorITCase extends AbstractBaseTestITCase {
assertEquals(HttpStatusCode.OK.getStatusCode(), connection.getResponseCode());
assertEquals(ContentType.JSON, ContentType.create(connection.getHeaderField(HttpHeader.CONTENT_TYPE)));
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
assertTrue(content.contains("\"value\":[{\"PropertyInt16\":10,"
+ "\"PropertyString\":\"Employee1@company.example\","
+ "\"PropertyBoolean\":false,\"PropertyByte\":0,\"PropertySByte\":0,"
@@ -103,7 +104,7 @@ public class InOperatorITCase extends AbstractBaseTestITCase {
assertEquals(HttpStatusCode.OK.getStatusCode(), connection.getResponseCode());
assertEquals(ContentType.JSON, ContentType.create(connection.getHeaderField(HttpHeader.CONTENT_TYPE)));
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
assertTrue(content.contains("\"value\":[]"));
}
}
diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/ODataVersionConformanceITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/ODataVersionConformanceITCase.java
index a8c8912..3a57e6a 100644
--- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/ODataVersionConformanceITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/ODataVersionConformanceITCase.java
@@ -24,6 +24,7 @@ import static org.junit.Assert.assertTrue;
import java.net.HttpURLConnection;
import java.net.URL;
+import java.nio.charset.Charset;
import org.apache.commons.io.IOUtils;
import org.apache.olingo.client.api.ODataClient;
@@ -50,7 +51,7 @@ public class ODataVersionConformanceITCase extends AbstractBaseTestITCase {
assertEquals(HttpStatusCode.BAD_REQUEST.getStatusCode(), connection.getResponseCode());
assertEquals("4.0", connection.getHeaderField(HttpHeader.ODATA_VERSION));
- final String content = IOUtils.toString(connection.getErrorStream());
+ final String content = IOUtils.toString(connection.getErrorStream(), Charset.defaultCharset());
assertTrue(content.contains("OData version '3.0' is not supported."));
}
@@ -66,7 +67,7 @@ public class ODataVersionConformanceITCase extends AbstractBaseTestITCase {
assertEquals(HttpStatusCode.BAD_REQUEST.getStatusCode(), connection.getResponseCode());
assertEquals("4.0", connection.getHeaderField(HttpHeader.ODATA_VERSION));
- final String content = IOUtils.toString(connection.getErrorStream());
+ final String content = IOUtils.toString(connection.getErrorStream(), Charset.defaultCharset());
assertTrue(content.contains("OData version '5.0' is not supported."));
}
@@ -82,7 +83,7 @@ public class ODataVersionConformanceITCase extends AbstractBaseTestITCase {
assertEquals(HttpStatusCode.BAD_REQUEST.getStatusCode(), connection.getResponseCode());
assertEquals("4.0", connection.getHeaderField(HttpHeader.ODATA_VERSION));
- final String content = IOUtils.toString(connection.getErrorStream());
+ final String content = IOUtils.toString(connection.getErrorStream(), Charset.defaultCharset());
assertTrue(content.contains("OData version '3.0' is not supported."));
}
@@ -97,7 +98,7 @@ public class ODataVersionConformanceITCase extends AbstractBaseTestITCase {
assertEquals("4.0", connection.getHeaderField(HttpHeader.ODATA_VERSION));
- final String content = IOUtils.toString(connection.getErrorStream());
+ final String content = IOUtils.toString(connection.getErrorStream(), Charset.defaultCharset());
assertNotNull(content);
}
@@ -113,7 +114,7 @@ public class ODataVersionConformanceITCase extends AbstractBaseTestITCase {
assertEquals("4.0", connection.getHeaderField(HttpHeader.ODATA_VERSION));
- final String content = IOUtils.toString(connection.getErrorStream());
+ final String content = IOUtils.toString(connection.getErrorStream(), Charset.defaultCharset());
assertNotNull(content);;
}
@@ -132,7 +133,7 @@ public class ODataVersionConformanceITCase extends AbstractBaseTestITCase {
assertEquals("application/json; odata.metadata=minimal",
connection.getHeaderField(HttpHeader.CONTENT_TYPE));
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
assertNotNull(content);
}
@@ -151,7 +152,7 @@ public class ODataVersionConformanceITCase extends AbstractBaseTestITCase {
assertEquals("application/json; odata.metadata=minimal",
connection.getHeaderField(HttpHeader.CONTENT_TYPE));
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
assertNotNull(content);
}
@@ -168,7 +169,7 @@ public class ODataVersionConformanceITCase extends AbstractBaseTestITCase {
assertEquals(HttpStatusCode.BAD_REQUEST.getStatusCode(), connection.getResponseCode());
assertEquals("4.0", connection.getHeaderField(HttpHeader.ODATA_VERSION));
- final String content = IOUtils.toString(connection.getErrorStream());
+ final String content = IOUtils.toString(connection.getErrorStream(), Charset.defaultCharset());
assertTrue(content.contains("OData version '5.0' is not supported."));
}
diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/PreferHeaderForGetAndDeleteITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/PreferHeaderForGetAndDeleteITCase.java
index 180c957..12c39d8 100644
--- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/PreferHeaderForGetAndDeleteITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/PreferHeaderForGetAndDeleteITCase.java
@@ -25,6 +25,7 @@ import java.io.InputStream;
import java.io.OutputStreamWriter;
import java.net.HttpURLConnection;
import java.net.URL;
+import java.nio.charset.Charset;
import java.util.HashMap;
import java.util.Map;
@@ -54,7 +55,7 @@ public class PreferHeaderForGetAndDeleteITCase extends AbstractBaseTestITCase {
connection.connect();
assertEquals(HttpStatusCode.BAD_REQUEST.getStatusCode(), connection.getResponseCode());
- final String content = IOUtils.toString(connection.getErrorStream());
+ final String content = IOUtils.toString(connection.getErrorStream(), Charset.defaultCharset());
assertTrue(content.contains("The Prefer header 'return=minimal' is not supported for this HTTP Method."));
}
@@ -69,7 +70,7 @@ public class PreferHeaderForGetAndDeleteITCase extends AbstractBaseTestITCase {
connection.connect();
assertEquals(HttpStatusCode.BAD_REQUEST.getStatusCode(), connection.getResponseCode());
- final String content = IOUtils.toString(connection.getErrorStream());
+ final String content = IOUtils.toString(connection.getErrorStream(), Charset.defaultCharset());
assertTrue(content.contains("The Prefer header 'return=representation' is not supported for this HTTP Method."));
}
@@ -84,7 +85,7 @@ public class PreferHeaderForGetAndDeleteITCase extends AbstractBaseTestITCase {
connection.connect();
assertEquals(HttpStatusCode.BAD_REQUEST.getStatusCode(), connection.getResponseCode());
- final String content = IOUtils.toString(connection.getErrorStream());
+ final String content = IOUtils.toString(connection.getErrorStream(), Charset.defaultCharset());
assertTrue(content.contains("The Prefer header 'return=minimal' is not supported for this HTTP Method."));
}
@@ -99,7 +100,7 @@ public class PreferHeaderForGetAndDeleteITCase extends AbstractBaseTestITCase {
connection.connect();
assertEquals(HttpStatusCode.BAD_REQUEST.getStatusCode(), connection.getResponseCode());
- final String content = IOUtils.toString(connection.getErrorStream());
+ final String content = IOUtils.toString(connection.getErrorStream(), Charset.defaultCharset());
assertTrue(content.contains("The Prefer header 'return=representation' is not supported for this HTTP Method."));
}
@@ -114,7 +115,7 @@ public class PreferHeaderForGetAndDeleteITCase extends AbstractBaseTestITCase {
connection.connect();
assertEquals(HttpStatusCode.BAD_REQUEST.getStatusCode(), connection.getResponseCode());
- final String content = IOUtils.toString(connection.getErrorStream());
+ final String content = IOUtils.toString(connection.getErrorStream(), Charset.defaultCharset());
assertTrue(content.contains("The Prefer header 'return=representation' is not supported for this HTTP Method."));
}
@@ -129,7 +130,7 @@ public class PreferHeaderForGetAndDeleteITCase extends AbstractBaseTestITCase {
connection.connect();
assertEquals(HttpStatusCode.BAD_REQUEST.getStatusCode(), connection.getResponseCode());
- final String content = IOUtils.toString(connection.getErrorStream());
+ final String content = IOUtils.toString(connection.getErrorStream(), Charset.defaultCharset());
assertTrue(content.contains("The Prefer header 'return=minimal' is not supported for this HTTP Method."));
}
@@ -144,7 +145,7 @@ public class PreferHeaderForGetAndDeleteITCase extends AbstractBaseTestITCase {
connection.connect();
assertEquals(HttpStatusCode.BAD_REQUEST.getStatusCode(), connection.getResponseCode());
- final String content = IOUtils.toString(connection.getErrorStream());
+ final String content = IOUtils.toString(connection.getErrorStream(), Charset.defaultCharset());
assertTrue(content.contains("The Prefer header 'return=representation' is not supported for this HTTP Method."));
}
@@ -159,7 +160,7 @@ public class PreferHeaderForGetAndDeleteITCase extends AbstractBaseTestITCase {
connection.connect();
assertEquals(HttpStatusCode.BAD_REQUEST.getStatusCode(), connection.getResponseCode());
- final String content = IOUtils.toString(connection.getErrorStream());
+ final String content = IOUtils.toString(connection.getErrorStream(), Charset.defaultCharset());
assertTrue(content.contains("The Prefer header 'return=minimal' is not supported for this HTTP Method."));
}
@@ -174,7 +175,7 @@ public class PreferHeaderForGetAndDeleteITCase extends AbstractBaseTestITCase {
connection.connect();
assertEquals(HttpStatusCode.BAD_REQUEST.getStatusCode(), connection.getResponseCode());
- final String content = IOUtils.toString(connection.getErrorStream());
+ final String content = IOUtils.toString(connection.getErrorStream(), Charset.defaultCharset());
assertTrue(content.contains("The Prefer header 'return=minimal' is not supported for this HTTP Method."));
}
@@ -189,7 +190,7 @@ public class PreferHeaderForGetAndDeleteITCase extends AbstractBaseTestITCase {
connection.connect();
assertEquals(HttpStatusCode.BAD_REQUEST.getStatusCode(), connection.getResponseCode());
- final String content = IOUtils.toString(connection.getErrorStream());
+ final String content = IOUtils.toString(connection.getErrorStream(), Charset.defaultCharset());
assertTrue(content.contains("The Prefer header 'return=representation' is not supported for this HTTP Method."));
}
@@ -204,7 +205,7 @@ public class PreferHeaderForGetAndDeleteITCase extends AbstractBaseTestITCase {
connection.connect();
assertEquals(HttpStatusCode.BAD_REQUEST.getStatusCode(), connection.getResponseCode());
- final String content = IOUtils.toString(connection.getErrorStream());
+ final String content = IOUtils.toString(connection.getErrorStream(), Charset.defaultCharset());
assertTrue(content.contains("The Prefer header 'return=representation' is not supported for this HTTP Method."));
}
@@ -219,7 +220,7 @@ public class PreferHeaderForGetAndDeleteITCase extends AbstractBaseTestITCase {
connection.connect();
assertEquals(HttpStatusCode.BAD_REQUEST.getStatusCode(), connection.getResponseCode());
- final String content = IOUtils.toString(connection.getErrorStream());
+ final String content = IOUtils.toString(connection.getErrorStream(), Charset.defaultCharset());
assertTrue(content.contains("The Prefer header 'return=minimal' is not supported for this HTTP Method."));
}
@@ -236,7 +237,7 @@ public class PreferHeaderForGetAndDeleteITCase extends AbstractBaseTestITCase {
connection.connect();
assertEquals(HttpStatusCode.BAD_REQUEST.getStatusCode(), connection.getResponseCode());
- final String content = IOUtils.toString(connection.getErrorStream());
+ final String content = IOUtils.toString(connection.getErrorStream(), Charset.defaultCharset());
assertTrue(content.contains("The Prefer header 'return=minimal' is not supported for this HTTP Method."));
}
@@ -251,7 +252,7 @@ public class PreferHeaderForGetAndDeleteITCase extends AbstractBaseTestITCase {
connection.connect();
assertEquals(HttpStatusCode.BAD_REQUEST.getStatusCode(), connection.getResponseCode());
- final String content = IOUtils.toString(connection.getErrorStream());
+ final String content = IOUtils.toString(connection.getErrorStream(), Charset.defaultCharset());
assertTrue(content.contains("The Prefer header 'return=representation' is not supported for this HTTP Method."));
}
@@ -266,7 +267,7 @@ public class PreferHeaderForGetAndDeleteITCase extends AbstractBaseTestITCase {
connection.connect();
assertEquals(HttpStatusCode.BAD_REQUEST.getStatusCode(), connection.getResponseCode());
- final String content = IOUtils.toString(connection.getErrorStream());
+ final String content = IOUtils.toString(connection.getErrorStream(), Charset.defaultCharset());
assertTrue(content.contains("The Prefer header 'return=representation' is not supported for this HTTP Method."));
}
@@ -281,7 +282,7 @@ public class PreferHeaderForGetAndDeleteITCase extends AbstractBaseTestITCase {
connection.connect();
assertEquals(HttpStatusCode.BAD_REQUEST.getStatusCode(), connection.getResponseCode());
- final String content = IOUtils.toString(connection.getErrorStream());
+ final String content = IOUtils.toString(connection.getErrorStream(), Charset.defaultCharset());
assertTrue(content.contains("The Prefer header 'return=minimal' is not supported for this HTTP Method."));
}
diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/SelectOnComplexPropertiesITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/SelectOnComplexPropertiesITCase.java
index 207acf6..8b06ea9 100644
--- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/SelectOnComplexPropertiesITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/SelectOnComplexPropertiesITCase.java
@@ -23,6 +23,7 @@ import static org.junit.Assert.assertTrue;
import java.net.HttpURLConnection;
import java.net.URL;
+import java.nio.charset.Charset;
import org.apache.commons.io.IOUtils;
import org.apache.olingo.client.api.ODataClient;
@@ -50,7 +51,7 @@ public class SelectOnComplexPropertiesITCase extends AbstractBaseTestITCase {
assertEquals(HttpStatusCode.OK.getStatusCode(), connection.getResponseCode());
assertEquals(ContentType.JSON, ContentType.create(connection.getHeaderField(HttpHeader.CONTENT_TYPE)));
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
assertTrue(content.contains("\"value\":[{\"PropertyComp\":"
+ "{\"PropertyString\":\"First Resource - positive values\"}},"
+ "{\"PropertyComp\":{\"PropertyString\":\"First Resource - positive values\"}},"
@@ -69,7 +70,7 @@ public class SelectOnComplexPropertiesITCase extends AbstractBaseTestITCase {
assertEquals(HttpStatusCode.OK.getStatusCode(), connection.getResponseCode());
assertEquals(ContentType.JSON, ContentType.create(connection.getHeaderField(HttpHeader.CONTENT_TYPE)));
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
assertTrue(content.contains("\"value\":[{\"PropertyInt16\":1},{\"PropertyInt16\":2},{\"PropertyInt16\":3}]"));
}
@@ -85,7 +86,7 @@ public class SelectOnComplexPropertiesITCase extends AbstractBaseTestITCase {
assertEquals(HttpStatusCode.OK.getStatusCode(), connection.getResponseCode());
assertEquals(ContentType.JSON, ContentType.create(connection.getHeaderField(HttpHeader.CONTENT_TYPE)));
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
System.out.println("Content is::"+ content);
assertTrue(content.contains("\"value\":[{\"PropertyComp\":{"
+ "\"PropertyString\":\"First Resource - positive values\","
@@ -132,7 +133,7 @@ public class SelectOnComplexPropertiesITCase extends AbstractBaseTestITCase {
assertEquals(HttpStatusCode.OK.getStatusCode(), connection.getResponseCode());
assertEquals(ContentType.JSON, ContentType.create(connection.getHeaderField(HttpHeader.CONTENT_TYPE)));
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
assertTrue(content.contains("\"PropertyCompNav\":{\"PropertyInt16\":1}"));
connection.disconnect();
}
@@ -150,7 +151,7 @@ public class SelectOnComplexPropertiesITCase extends AbstractBaseTestITCase {
assertEquals(ContentType.JSON_FULL_METADATA, ContentType.create(
connection.getHeaderField(HttpHeader.CONTENT_TYPE)));
- final String content = IOUtils.toString(connection.getInputStream());
+ final String content = IOUtils.toString(connection.getInputStream(), Charset.defaultCharset());
assertTrue(content.contains("\"@odata.type\":\"#Collection(olingo.odata.test1.CTTwoPrimAno)\","
+ "\"value\":[{\"@odata.type\":\"#olingo.odata.test1.CTBaseAno\","
+ "\"PropertyString\":\"TEST12345\"},{\"@odata.type\":"
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/response/batch/ODataBatchResponseManager.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/response/batch/ODataBatchResponseManager.java
index 8404076..2dec90a 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/response/batch/ODataBatchResponseManager.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/response/batch/ODataBatchResponseManager.java
@@ -88,20 +88,14 @@ public class ODataBatchResponseManager implements Iterator<ODataBatchResponseIte
final boolean continueOnError) {
this.continueOnError = continueOnError;
-
- try {
- this.expectedItemsIterator = expectedItems.iterator();
- this.batchLineIterator = new ODataBatchLineIteratorImpl(
- IOUtils.lineIterator(res.getRawResponse(), Constants.UTF8));
-
- // search for boundary
- batchBoundary = ODataBatchUtilities.getBoundaryFromHeader(
- res.getHeader(HttpHeader.CONTENT_TYPE));
- LOG.debug("Retrieved batch response bondary '{}'", batchBoundary);
- } catch (IOException e) {
- LOG.error("Error parsing batch response", e);
- throw new IllegalStateException(e);
- }
+ this.expectedItemsIterator = expectedItems.iterator();
+ this.batchLineIterator = new ODataBatchLineIteratorImpl(
+ IOUtils.lineIterator(res.getRawResponse(), Constants.UTF8));
+
+ // search for boundary
+ batchBoundary = ODataBatchUtilities.getBoundaryFromHeader(
+ res.getHeader(HttpHeader.CONTENT_TYPE));
+ LOG.debug("Retrieved batch response bondary '{}'", batchBoundary);
}
@Override
diff --git a/pom.xml b/pom.xml
index 21268a2..30271ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,7 +73,7 @@
<properties>
<commons.codec.version>1.15</commons.codec.version>
- <commons.io.version>2.10.0</commons.io.version>
+ <commons.io.version>2.11.0</commons.io.version>
<commons.lang3.version>3.12.0</commons.lang3.version>
<commons.logging.version>1.2</commons.logging.version>
@@ -82,7 +82,7 @@
<servlet.version>3.1.0</servlet.version>
<cxf.version>3.0.16</cxf.version>
<spring.version>4.0.9.RELEASE</spring.version>
- <netty.version>4.1.72.Final</netty.version>
+ <netty.version>4.1.74.Final</netty.version>
<velocity.version>1.7</velocity.version>
<maven.plugin.api.version>3.6.1</maven.plugin.api.version>
@@ -92,15 +92,18 @@
<hc.core.version>4.4.11</hc.core.version>
<jackson.version>2.13.1</jackson.version>
<jackson-databind.version>2.13.1</jackson-databind.version>
- <aalto-xml.version>1.3.0</aalto-xml.version>
+ <aalto-xml.version>1.3.1</aalto-xml.version>
+ <xmlunit.version>1.6</xmlunit.version>
+ <mockito-all.version>1.9.5</mockito-all.version>
+ <junit.version>4.13.2</junit.version>
<android.platform.version>4.1.1.4</android.platform.version>
<stax.api.version>1.0-2</stax.api.version>
- <sl4j.version>1.7.32</sl4j.version>
+ <sl4j.version>1.7.36</sl4j.version>
<tomcat.servlet.port>9080</tomcat.servlet.port>
- <tomcat.version>7.0.55</tomcat.version>
+ <tomcat.version>7.0.109</tomcat.version>
<!-- for osgi integration testing -->
<osgi.version>4.2.0</osgi.version>
@@ -284,19 +287,19 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.13.2</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
- <version>1.9.5</version>
+ <version>${mockito-all.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
- <version>1.5</version>
+ <version>${xmlunit.version}</version>
<scope>test</scope>
</dependency>
<dependency>