Skip to content

Commit 99ca9e6

Browse files
committed
- lints serializer package
1 parent da944a5 commit 99ca9e6

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public <T> T deserializeObject(@Nonnull final String inputString, @Nonnull final
8282
@Nullable
8383
public <T> T deserializeObject(@Nonnull final InputStream inputStream, @Nonnull final Class<T> clazz, @Nonnull final Map<String, List<String>> responseHeaders) {
8484
T result = null;
85-
try (final InputStreamReader streamReader = new InputStreamReader(inputStream)) {
85+
try (final InputStreamReader streamReader = new InputStreamReader(inputStream, "UTF-8")) {
8686
final JsonElement rawElement = gson.fromJson(streamReader, JsonElement.class);
8787
result = deserializeObject(rawElement, clazz, responseHeaders);
8888
} catch (IOException ex) {
@@ -276,7 +276,7 @@ private void getChildAdditionalData(final IJsonBackedObject serializableObject,
276276
try {
277277
final Object fieldObject = field.get(serializableObject);
278278
final JsonElement fieldJsonElement = outJson.get(field.getName());
279-
if(fieldObject == null || field == null || fieldJsonElement == null)
279+
if(fieldObject == null || fieldJsonElement == null)
280280
continue;
281281

282282
// If the object is a HashMap, iterate through its children

src/main/java/com/microsoft/graph/serializer/GsonFactory.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import java.lang.reflect.Type;
4141
import java.text.ParseException;
4242
import java.time.OffsetDateTime;
43+
import java.util.Arrays;
4344
import java.util.EnumSet;
4445
import java.util.GregorianCalendar;
4546

@@ -112,7 +113,7 @@ public JsonElement serialize(final byte[] src,
112113
try {
113114
return new JsonPrimitive(ByteArraySerializer.serialize(src));
114115
} catch (final Exception e) {
115-
logger.logError(PARSING_MESSAGE + src, e);
116+
logger.logError(PARSING_MESSAGE + Arrays.toString(src), e);
116117
return null;
117118
}
118119
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ default <T> T deserializeObject(@Nonnull final String inputString, @Nonnull fina
5959
* @return the deserialized item from the input string
6060
*/
6161
@Nullable
62-
<T> T deserializeObject(@Nonnull final String inputString, @Nonnull final Class<T> clazz, @Nonnull final Map<String, List<String>> responseHeaders);
62+
<T> T deserializeObject(@Nonnull final String inputString, @Nonnull final Class<T> clazz, @Nullable final Map<String, List<String>> responseHeaders);
6363

6464
/**
6565
* Deserialize an object from the input stream
@@ -84,7 +84,7 @@ default <T> T deserializeObject(@Nonnull final InputStream inputStream, @Nonnull
8484
* @return the deserialized item from the input string
8585
*/
8686
@Nullable
87-
<T> T deserializeObject(@Nonnull final InputStream inputStream, @Nonnull final Class<T> clazz, @Nonnull final Map<String, List<String>> responseHeaders);
87+
<T> T deserializeObject(@Nonnull final InputStream inputStream, @Nonnull final Class<T> clazz, @Nullable final Map<String, List<String>> responseHeaders);
8888

8989
/**
9090
* Deserialize an object from the input JsonElement
@@ -95,7 +95,7 @@ default <T> T deserializeObject(@Nonnull final InputStream inputStream, @Nonnull
9595
* @return the deserialized item from the input string
9696
*/
9797
@Nullable
98-
default <T> T deserializeObject(@Nonnull JsonElement jsonElement, @Nonnull Class<T> clazz) {
98+
default <T> T deserializeObject(@Nonnull final JsonElement jsonElement, @Nonnull final Class<T> clazz) {
9999
return deserializeObject(jsonElement, clazz, null);
100100
}
101101

@@ -109,7 +109,7 @@ default <T> T deserializeObject(@Nonnull JsonElement jsonElement, @Nonnull Class
109109
* @return the deserialized item from the input string
110110
*/
111111
@Nullable
112-
<T> T deserializeObject(@Nonnull JsonElement jsonElement, @Nonnull Class<T> clazz, @Nonnull Map<String, List<String>> responseHeaders);
112+
<T> T deserializeObject(@Nonnull final JsonElement jsonElement, @Nonnull final Class<T> clazz, @Nullable final Map<String, List<String>> responseHeaders);
113113

114114
/**
115115
* Serializes an object into a string

0 commit comments

Comments
 (0)