Skip to content

Commit 7383e64

Browse files
committed
- removes access to deprecated API
1 parent a84ffed commit 7383e64

File tree

5 files changed

+4
-41
lines changed

5 files changed

+4
-41
lines changed

src/test/java/com/microsoft/graph/functional/CustomRequestTests.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ public void testCustomGet() {
5252
*/
5353
@Test
5454
public void testCustomPut() {
55-
JsonParser parser = new JsonParser();
5655
DefaultSerializer serializer = new DefaultSerializer(new DefaultLogger());
5756
String str = "{ \"appActivityId\": \"/article?12345\", \"activitySourceHost\": \"https://www.contoso.com\", \"userTimezone\": \"Africa/Casablanca\","
5857
+ " \"appDisplayName\": \"Contoso, Ltd.\", \"activationUrl\": \"https://www.contoso.com/article?id=12345\", \"contentUrl\": \"https://www.contoso.com/article?id=12345\", "
@@ -65,7 +64,7 @@ public void testCustomPut() {
6564
JsonObject response = testBase.graphClient.
6665
customRequest("/me/activities/%2Farticle%3F12346").
6766
buildRequest().
68-
put(parser.parse(str).getAsJsonObject());
67+
put(JsonParser.parseString(str).getAsJsonObject());
6968

7069
UserActivity userActivity = serializer.deserializeObject(str, UserActivity.class);
7170
UserActivity responseWithClass = testBase.graphClient.

src/test/java/com/microsoft/graph/http/BaseCollectionRequestTests.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ public void testFunctionParameters() {
8181
final Option f1 = new FunctionOption("1", "one");
8282
final Option f2 = new FunctionOption("2", null);
8383
final BaseCollectionRequest<String,String> request = new BaseCollectionRequest<String,String>("https://a.b.c", null, Arrays.asList(f1, f2), null,null){};
84-
String urlTest = request.getRequestUrl().toString();
8584
assertEquals("https://a.b.c(1='one',2=null)", request.getRequestUrl().toString());
8685
request.addFunctionOption(new FunctionOption("3","two"));;
8786
assertEquals("https://a.b.c(1='one',2=null,3='two')", request.getRequestUrl().toString());

src/test/java/com/microsoft/graph/http/CoreHttpProviderTests.java

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -40,23 +40,6 @@ public void testErrorResponse() throws Exception {
4040
toSerialize.error.innererror = null;
4141

4242
setDefaultHttpProvider(toSerialize);
43-
final ITestConnectionData data = new ITestConnectionData() {
44-
@Override
45-
public int getRequestCode() {
46-
return 415;
47-
}
48-
49-
@Override
50-
public String getJsonResponse() {
51-
return "{}";
52-
}
53-
54-
@Override
55-
public Map<String, String> getHeaders() {
56-
return new HashMap<>();
57-
}
58-
};
59-
6043
try {
6144
mProvider.send(new MockHttpRequest(), DriveItem.class, null);
6245
fail("Expected exception in previous statement");
@@ -87,23 +70,6 @@ public void testVerboseErrorResponse() throws Exception {
8770
new MockExecutors(),
8871
logger);
8972

90-
final ITestConnectionData data = new ITestConnectionData() {
91-
@Override
92-
public int getRequestCode() {
93-
return 415;
94-
}
95-
96-
@Override
97-
public String getJsonResponse() {
98-
return "{}";
99-
}
100-
101-
@Override
102-
public Map<String, String> getHeaders() {
103-
return new HashMap<>();
104-
}
105-
};
106-
10773
try {
10874
mProvider.send(new MockHttpRequest(), DriveItem.class, null);
10975
fail("Expected exception in previous statement");

src/test/java/com/microsoft/graph/http/MockHttpProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public <Result, BodyType> void send(IHttpRequest request,
6565
if(connection.getResponseCode() == 200) {
6666
if(connection.getHeaders().containsKey("Content-Type")) {
6767
if (connection.getHeaders().get("Content-Type").equals("application/json")){
68-
JsonObject jsonObject = new JsonParser().parse(connection.getResponseMessage()).getAsJsonObject();
68+
JsonObject jsonObject = JsonParser.parseString(connection.getResponseMessage()).getAsJsonObject();
6969
result = (Result) jsonObject;
7070
}else if (connection.getHeaders().get("Content-Type").equals("application/octet-stream")) {
7171
result = (Result) new BufferedInputStream(connection.getInputStream());
@@ -89,7 +89,7 @@ public <Result, BodyType> Result send(IHttpRequest request,
8989
if(connection.getResponseCode() == 200) {
9090
if(connection.getHeaders().containsKey("Content-Type")) {
9191
if (connection.getHeaders().get("Content-Type").equals("application/json")){
92-
JsonObject jsonObject = new JsonParser().parse(connection.getResponseMessage()).getAsJsonObject();
92+
JsonObject jsonObject = JsonParser.parseString(connection.getResponseMessage()).getAsJsonObject();
9393
return (Result) jsonObject;
9494
}else if (connection.getHeaders().get("Content-Type").equals("application/octet-stream")) {
9595
return (Result) new BufferedInputStream(connection.getInputStream());

src/test/java/com/microsoft/graph/serializer/AdditionalDataTests.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,7 @@ public void testHashMapChildAdditionalData() {
9393

9494
String serialized = serializer.serializeObject(deserializedObject);
9595

96-
JsonParser parser = new JsonParser();
97-
JsonObject jsonObject = parser.parse(serialized).getAsJsonObject();
96+
JsonObject jsonObject = JsonParser.parseString(serialized).getAsJsonObject();
9897
assertNotNull(jsonObject.get("checklist").getAsJsonObject().get("1234"));
9998
assertNull(jsonObject.get("checklist").getAsJsonObject().get("1234").getAsJsonObject().get("1234"));
10099
assertNull(jsonObject.get("checklist").getAsJsonObject().get("1234").getAsJsonObject().get("66442"));

0 commit comments

Comments
 (0)