Skip to content

Commit 49bdbb5

Browse files
Add ISerializer.deserializeObject(jsonElement). Add Util.closeQuietly
1 parent 9346585 commit 49bdbb5

6 files changed

Lines changed: 109 additions & 55 deletions

File tree

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package com.microsoft.graph;
2+
3+
import java.io.Closeable;
4+
import java.io.IOException;
5+
6+
public final class Util {
7+
private Util() {}
8+
9+
public static void closeQuietly(Closeable closeable) {
10+
if (closeable == null) {
11+
return;
12+
}
13+
try {
14+
closeable.close();
15+
} catch (Exception e) {
16+
// we don't care much
17+
}
18+
}
19+
}

‎src/main/java/com/microsoft/graph/http/CoreHttpProvider.java‎

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,17 @@
2222

2323
package com.microsoft.graph.http;
2424

25+
import com.google.common.annotations.VisibleForTesting;
26+
27+
import com.microsoft.graph.core.ClientException;
28+
import com.microsoft.graph.core.Constants;
29+
import com.microsoft.graph.httpcore.middlewareoption.RedirectOptions;
30+
import com.microsoft.graph.httpcore.middlewareoption.RetryOptions;
31+
import com.microsoft.graph.logger.ILogger;
32+
import com.microsoft.graph.logger.LoggerLevel;
33+
import com.microsoft.graph.options.HeaderOption;
34+
import com.microsoft.graph.serializer.ISerializer;
35+
2536
import java.io.BufferedInputStream;
2637
import java.io.BufferedOutputStream;
2738
import java.io.ByteArrayInputStream;
@@ -30,42 +41,22 @@
3041
import java.io.OutputStream;
3142
import java.io.UnsupportedEncodingException;
3243
import java.net.URL;
33-
import java.util.ArrayList;
34-
import java.util.Arrays;
35-
import java.util.HashMap;
3644
import java.util.List;
3745
import java.util.Locale;
3846
import java.util.Map;
3947
import java.util.Scanner;
40-
import java.util.concurrent.ExecutionException;
41-
import java.util.concurrent.ExecutorService;
42-
import java.util.concurrent.Executors;
43-
import java.util.concurrent.TimeUnit;
4448

45-
import javax.annotation.Nullable;
4649
import javax.annotation.Nonnull;
50+
import javax.annotation.Nullable;
4751

48-
import com.google.common.annotations.VisibleForTesting;
49-
import com.microsoft.graph.core.ClientException;
50-
import com.microsoft.graph.core.Constants;
51-
import com.microsoft.graph.httpcore.HttpClients;
52-
import com.microsoft.graph.httpcore.middlewareoption.RedirectOptions;
53-
import com.microsoft.graph.httpcore.middlewareoption.RetryOptions;
54-
import com.microsoft.graph.logger.ILogger;
55-
import com.microsoft.graph.logger.LoggerLevel;
56-
import com.microsoft.graph.options.HeaderOption;
57-
import com.microsoft.graph.serializer.ISerializer;
58-
59-
import okhttp3.Headers;
6052
import okhttp3.MediaType;
6153
import okhttp3.OkHttpClient;
6254
import okhttp3.Request;
6355
import okhttp3.RequestBody;
6456
import okhttp3.Response;
65-
import okhttp3.internal.Util;
6657
import okio.BufferedSink;
6758

68-
import static okhttp3.internal.Util.closeQuietly;
59+
import static com.microsoft.graph.Util.closeQuietly;
6960

7061
/**
7162
* HTTP provider based off of OkHttp and msgraph-sdk-java-core library

‎src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java‎

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,14 @@
4444
import javax.annotation.Nonnull;
4545
import javax.annotation.Nullable;
4646

47+
import static com.microsoft.graph.Util.closeQuietly;
48+
import static java.util.Collections.emptyMap;
49+
4750
/**
4851
* The default serializer implementation for the SDK
4952
*/
5053
public class DefaultSerializer implements ISerializer {
54+
private static final String graphResponseHeadersKey = "graphResponseHeaders";
5155

5256
/**
5357
* The instance of the internal serializer
@@ -80,18 +84,33 @@ public DefaultSerializer(@Nonnull final ILogger logger) {
8084
@Override
8185
@Nullable
8286
public <T> T deserializeObject(@Nonnull final InputStream inputStream, @Nonnull final Class<T> clazz) {
83-
return deserializeObject(inputStream, clazz, null);
87+
return deserializeObject(inputStream, clazz, emptyMap());
8488
}
85-
private static final String graphResponseHeadersKey = "graphResponseHeaders";
89+
90+
@SuppressWarnings("unchecked")
91+
@Override
92+
@Nullable
93+
public <T> T deserializeObject(@Nonnull final String inputString, @Nonnull final Class<T> clazz) {
94+
final JsonElement rawElement = gson.fromJson(inputString, JsonElement.class);
95+
return deserializeObject(rawElement, clazz, emptyMap());
96+
}
97+
8698
@SuppressWarnings("unchecked")
8799
@Override
88100
@Nullable
89101
public <T> T deserializeObject(@Nonnull final InputStream inputStream, @Nonnull final Class<T> clazz, @Nonnull final Map<String, List<String>> responseHeaders) {
90-
final JsonElement rawElement = gson.fromJson(new InputStreamReader(inputStream), JsonElement.class);
91-
return deserializeObject(rawElement, clazz, responseHeaders);
102+
InputStreamReader streamReader = null;
103+
try {
104+
streamReader = new InputStreamReader(inputStream);
105+
final JsonElement rawElement = gson.fromJson(streamReader, JsonElement.class);
106+
return deserializeObject(rawElement, clazz, responseHeaders);
107+
} finally {
108+
closeQuietly(streamReader);
109+
}
92110
}
93111

94112
@SuppressWarnings("unchecked")
113+
@Override
95114
@Nullable
96115
public <T> T deserializeObject(@Nonnull final JsonElement rawElement, @Nonnull final Class<T> clazz, @Nonnull final Map<String, List<String>> responseHeaders) {
97116
final T jsonObject = gson.fromJson(rawElement, clazz);

‎src/main/java/com/microsoft/graph/serializer/ISerializer.java‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222

2323
package com.microsoft.graph.serializer;
2424

25+
import com.google.gson.JsonElement;
26+
2527
import java.io.InputStream;
2628
import java.util.List;
2729
import java.util.Map;
@@ -59,15 +61,28 @@ public interface ISerializer {
5961
/**
6062
* Deserialize an object from the input string
6163
*
62-
* @param inputStream the string that stores the representation of the item
63-
* @param clazz the .class of the item to be deserialized
64+
* @param inputStream the stream that stores the representation of the item
65+
* @param clazz the {@code Class} of the item to be deserialized
6466
* @param responseHeaders the HTTP response headers
6567
* @param <T> the type of the item to be deserialized
6668
* @return the deserialized item from the input string
6769
*/
6870
@Nullable
6971
<T> T deserializeObject(@Nonnull final InputStream inputStream, @Nonnull final Class<T> clazz, @Nonnull final Map<String, List<String>> responseHeaders);
7072

73+
/**
74+
* Deserialize an object from the input string
75+
*
76+
* @param jsonElement the {@code JsonElement} that stores the representation of the item
77+
* @param clazz the {@code Class} of the item to be deserialized
78+
* @param responseHeaders the HTTP response headers
79+
* @param <T> the type of the item to be deserialized
80+
* @return the deserialized item from the input string
81+
*/
82+
@SuppressWarnings("unchecked")
83+
@Nullable
84+
<T> T deserializeObject(@Nonnull JsonElement jsonElement, @Nonnull Class<T> clazz, @Nonnull Map<String, List<String>> responseHeaders);
85+
7186
/**
7287
* Serializes an object into a string
7388
*

‎src/test/java/com/microsoft/graph/core/GraphServiceClientTest.java‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.microsoft.graph.core;
22

3+
import com.google.gson.JsonElement;
4+
35
import static org.junit.Assert.assertEquals;
46
import static org.junit.Assert.assertNotNull;
57
import static org.mockito.Mockito.mock;
@@ -8,6 +10,8 @@
810
import java.util.List;
911
import java.util.Map;
1012

13+
import org.jetbrains.annotations.NotNull;
14+
import org.jetbrains.annotations.Nullable;
1115
import org.junit.Test;
1216

1317
import okhttp3.Request;
@@ -79,6 +83,18 @@ public <T> T deserializeObject(InputStream inputStream, Class<T> clazz,
7983
return null;
8084
}
8185

86+
@Nullable
87+
@Override
88+
public <T> T deserializeObject(@NotNull JsonElement jsonElement, @NotNull Class<T> clazz, @NotNull Map<String, List<String>> responseHeaders) {
89+
return null;
90+
}
91+
92+
@Nullable
93+
@Override
94+
public <T> T deserializeObject(@NotNull String inputString, @NotNull Class<T> clazz) {
95+
return null;
96+
}
97+
8298
@Override
8399
public <T> T deserializeObject(InputStream inputString, Class<T> clazz) {
84100
return null;

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

Lines changed: 21 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,35 @@
11
package com.microsoft.graph.http;
22

3-
import static org.junit.Assert.assertEquals;
4-
import static org.junit.Assert.assertNotNull;
5-
import static org.junit.Assert.assertNull;
6-
import static org.mockito.Mockito.doAnswer;
7-
import static org.mockito.Mockito.doNothing;
8-
import static org.mockito.Mockito.mock;
9-
import static org.mockito.Mockito.when;
10-
import static org.mockito.Mockito.anyObject;
11-
12-
import java.util.ArrayList;
13-
import java.util.Arrays;
14-
import java.util.HashMap;
15-
import java.util.Map;
3+
import com.google.gson.JsonObject;
4+
import com.google.gson.JsonPrimitive;
165

17-
import javax.annotation.meta.When;
6+
import com.microsoft.graph.core.IBaseClient;
7+
import com.microsoft.graph.logger.ILogger;
8+
import com.microsoft.graph.options.FunctionOption;
9+
import com.microsoft.graph.options.Option;
10+
import com.microsoft.graph.options.QueryOption;
11+
import com.microsoft.graph.serializer.ISerializer;
1812

1913
import org.junit.Before;
2014
import org.junit.Test;
21-
import org.mockito.Mockito;
2215

23-
import okhttp3.Call;
16+
import java.util.ArrayList;
17+
import java.util.Arrays;
18+
2419
import okhttp3.MediaType;
2520
import okhttp3.OkHttpClient;
2621
import okhttp3.Protocol;
2722
import okhttp3.Request;
2823
import okhttp3.Response;
2924
import okhttp3.ResponseBody;
3025

31-
import com.google.gson.JsonObject;
32-
import com.google.gson.JsonPrimitive;
33-
import com.microsoft.graph.core.IBaseClient;
34-
import com.microsoft.graph.logger.ILogger;
35-
import com.microsoft.graph.options.FunctionOption;
36-
import com.microsoft.graph.options.Option;
37-
import com.microsoft.graph.options.QueryOption;
38-
import com.microsoft.graph.serializer.ISerializer;
26+
import static org.junit.Assert.assertEquals;
27+
import static org.junit.Assert.assertNotNull;
28+
import static org.junit.Assert.assertNull;
29+
import static org.mockito.ArgumentMatchers.any;
30+
import static org.mockito.ArgumentMatchers.anyString;
31+
import static org.mockito.Mockito.mock;
32+
import static org.mockito.Mockito.when;
3933

4034
/**
4135
* Test cases for {@see BaseCollectionRequest}
@@ -79,10 +73,10 @@ public void setUp() throws Exception {
7973
resultobj.add("id", new JsonPrimitive("zzz"));
8074
@SuppressWarnings("unchecked")
8175
final ICollectionResponse<JsonObject> result = mock(ICollectionResponse.class);
82-
when(result.values()).thenReturn(new ArrayList<JsonObject>(Arrays.asList(resultobj)));
76+
when(result.values()).thenReturn(new ArrayList<>(Arrays.asList(resultobj)));
8377
final ISerializer mSerializer = mock(ISerializer.class);
84-
when(mSerializer.deserializeObject(anyObject(), anyObject(), anyObject())).thenReturn(result);
85-
when(mSerializer.serializeObject(anyObject())).thenReturn("[{ \"id\": \"zzz\" }]");
78+
when(mSerializer.deserializeObject(anyString(), any())).thenReturn(result);
79+
when(mSerializer.serializeObject(any())).thenReturn("[{ \"id\": \"zzz\" }]");
8680
CoreHttpProvider mProvider = new CoreHttpProvider(mSerializer,
8781
mock(ILogger.class),
8882
mockClient);

0 commit comments

Comments
 (0)