Skip to content

bugfix/default content type and boolean deserialization #693

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
baywet merged 5 commits into from
Mar 9, 2021
Merged

bugfix/default content type and boolean deserialization #693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f3ca542
- adds a serializer to handle actions & functions with primitive retu…
baywet Mar 9, 2021
b9c9126
- fixes a bug where null content on post request would have a wrong a…
baywet Mar 9, 2021
1d37003
- updates types summary
Mar 9, 2021
1c35771
- minor defensive programming improvement
baywet Mar 9, 2021
38b99aa
Merge branch 'bugfix/default-content-type-and-boolean-deserialization…
baywet Mar 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions src/main/java/com/microsoft/graph/http/CoreHttpProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ public <Result, Body> Request getHttpRequest(final IHttpRequest request,
if(this.connectionConfig == null) {
this.connectionConfig = new DefaultConnectionConfig();
}

// Request level middleware options
RedirectOptions redirectOptions = new RedirectOptions(request.getMaxRedirects() > 0? request.getMaxRedirects() : this.connectionConfig.getMaxRedirects(),
request.getShouldRedirect() != null? request.getShouldRedirect() : this.connectionConfig.getShouldRedirect());
Expand All @@ -256,7 +256,7 @@ public <Result, Body> Request getHttpRequest(final IHttpRequest request,
.newBuilder()
.tag(RedirectOptions.class, redirectOptions)
.tag(RetryOptions.class, retryOptions);

String contenttype = null;

logger.logDebug("Request Method " + request.getHttpMethod().toString());
Expand All @@ -276,11 +276,7 @@ public <Result, Body> Request getHttpRequest(final IHttpRequest request,
// This ensures that the Content-Length header is properly set
if (request.getHttpMethod() == HttpMethod.POST) {
bytesToWrite = new byte[0];
if(contenttype == null) {
contenttype = Constants.BINARY_CONTENT_TYPE;
}
}
else {
} else {
bytesToWrite = null;
}
} else if (serializable instanceof byte[]) {
Expand Down Expand Up @@ -341,7 +337,11 @@ public void writeTo(BufferedSink sink) throws IOException {

@Override
public MediaType contentType() {
return MediaType.parse(mediaContentType);
if(mediaContentType == null || mediaContentType.isEmpty()) {
return null;
} else {
return MediaType.parse(mediaContentType);
}
}
};
}
Expand Down Expand Up @@ -401,7 +401,7 @@ public Request authenticateRequest(Request request) {
try {

// Call being executed


if (handler != null) {
handler.configConnection(response);
Expand All @@ -425,7 +425,7 @@ public Request authenticateRequest(Request request) {

if (response.code() == HttpResponseCode.HTTP_NOBODY
|| response.code() == HttpResponseCode.HTTP_NOT_MODIFIED) {
logger.logDebug("Handling response with no body");
logger.logDebug("Handling response with no body");
return handleEmptyResponse(responseHeadersHelper.getResponseHeadersAsMapOfStringList(response), resultClass);
}

Expand All @@ -442,7 +442,7 @@ public Request authenticateRequest(Request request) {
return (Result) null;

final String contentType = headers.get(Constants.CONTENT_TYPE_HEADER_NAME);
if (contentType != null && resultClass != InputStream.class &&
if (contentType != null && resultClass != InputStream.class &&
contentType.contains(Constants.JSON_CONTENT_TYPE)) {
logger.logDebug("Response json");
return handleJsonResponse(in, responseHeadersHelper.getResponseHeadersAsMapOfStringList(response), resultClass);
Expand Down Expand Up @@ -534,12 +534,12 @@ private <Result> Result handleJsonResponse(final InputStream in, Map<String, Lis

/**
* Handles the case where the response body is empty
*
*
* @param responseHeaders the response headers
* @param clazz the type of the response object
* @return the JSON object
*/
private <Result> Result handleEmptyResponse(Map<String, List<String>> responseHeaders, final Class<Result> clazz)
private <Result> Result handleEmptyResponse(Map<String, List<String>> responseHeaders, final Class<Result> clazz)
throws UnsupportedEncodingException{
//Create an empty object to attach the response headers to
InputStream in = new ByteArrayInputStream("{}".getBytes(Constants.JSON_ENCODING));
Expand Down
47 changes: 47 additions & 0 deletions src/main/java/com/microsoft/graph/serializer/EdmNativeTypeSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
package com.microsoft.graph.serializer;

import java.lang.reflect.Type;
import java.math.BigDecimal;
import java.util.UUID;

import com.google.gson.JsonElement;
import com.google.gson.JsonParseException;
import com.microsoft.graph.logger.ILogger;

public class EdmNativeTypeSerializer {
public static <T> T deserialize(final JsonElement json, final Class<T> type, final ILogger logger) throws JsonParseException {
if (json == null || type == null) {
return null;
} else if(json.isJsonPrimitive()) {
return getPrimitiveValue(json, type);
} else if(json.isJsonObject()) {
final JsonElement element = json.getAsJsonObject().get("@odata.null");
if(element != null && element.isJsonPrimitive()) {
return getPrimitiveValue(element, type);
} else {
Copy link
Contributor

@zengin zengin Mar 9, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: else block can be removed

return null;
}
}
return null;
}
@SuppressWarnings("unchecked")
private static <T> T getPrimitiveValue(final JsonElement json, final Class<T> type) {
if(type == Boolean.class) {
return (T) Boolean.valueOf(json.getAsBoolean());
} else if(type == String.class) {
return (T)json.getAsString();
} else if(type == Integer.class) {
return (T) Integer.valueOf(json.getAsInt());
} else if(type == UUID.class) {
return (T) UUID.fromString(json.getAsString());
} else if(type == Long.class) {
return (T) Long.valueOf(json.getAsLong());
} else if (type == Float.class) {
return (T) Float.valueOf(json.getAsFloat());
} else if (type == BigDecimal.class) {
return (T) json.getAsBigDecimal();
} else {
return null;
}
}
}
72 changes: 72 additions & 0 deletions src/main/java/com/microsoft/graph/serializer/GsonFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,12 @@

import com.microsoft.graph.models.extensions.TimeOfDay;
import java.lang.reflect.Type;
import java.math.BigDecimal;
import java.text.ParseException;
import java.util.Calendar;
import java.util.EnumSet;
import java.util.GregorianCalendar;
import java.util.UUID;

import javax.xml.datatype.DatatypeFactory;
import javax.xml.datatype.Duration;
Expand Down Expand Up @@ -244,8 +246,78 @@ public TimeOfDay deserialize(final JsonElement json,
}
};

final JsonDeserializer<Boolean> booleanJsonDeserializer = new JsonDeserializer<Boolean>() {
@Override
public Boolean deserialize(final JsonElement json,
final Type typeOfT,
final JsonDeserializationContext context) throws JsonParseException {
return EdmNativeTypeSerializer.deserialize(json, Boolean.class, logger);
}
};

final JsonDeserializer<String> stringJsonDeserializer = new JsonDeserializer<String>() {
@Override
public String deserialize(final JsonElement json,
final Type typeOfT,
final JsonDeserializationContext context) throws JsonParseException {
return EdmNativeTypeSerializer.deserialize(json, String.class, logger);
}
};

final JsonDeserializer<BigDecimal> bigDecimalJsonDeserializer = new JsonDeserializer<BigDecimal>() {
@Override
public BigDecimal deserialize(final JsonElement json,
final Type typeOfT,
final JsonDeserializationContext context) throws JsonParseException {
return EdmNativeTypeSerializer.deserialize(json, BigDecimal.class, logger);
}
};

final JsonDeserializer<Integer> integerJsonDeserializer = new JsonDeserializer<Integer>() {
@Override
public Integer deserialize(final JsonElement json,
final Type typeOfT,
final JsonDeserializationContext context) throws JsonParseException {
return EdmNativeTypeSerializer.deserialize(json, Integer.class, logger);
}
};

final JsonDeserializer<Long> longJsonDeserializer = new JsonDeserializer<Long>() {
@Override
public Long deserialize(final JsonElement json,
final Type typeOfT,
final JsonDeserializationContext context) throws JsonParseException {
return EdmNativeTypeSerializer.deserialize(json, Long.class, logger);
}
};

final JsonDeserializer<UUID> uuidJsonDeserializer = new JsonDeserializer<UUID>() {
@Override
public UUID deserialize(final JsonElement json,
final Type typeOfT,
final JsonDeserializationContext context) throws JsonParseException {
return EdmNativeTypeSerializer.deserialize(json, UUID.class, logger);
}
};

final JsonDeserializer<Float> floatJsonDeserializer = new JsonDeserializer<Float>() {
@Override
public Float deserialize(final JsonElement json,
final Type typeOfT,
final JsonDeserializationContext context) throws JsonParseException {
return EdmNativeTypeSerializer.deserialize(json, Float.class, logger);
}
};

return new GsonBuilder()
.excludeFieldsWithoutExposeAnnotation()
.registerTypeAdapter(Boolean.class, booleanJsonDeserializer)
.registerTypeAdapter(String.class, stringJsonDeserializer)
.registerTypeAdapter(Float.class, floatJsonDeserializer)
.registerTypeAdapter(Integer.class, integerJsonDeserializer)
.registerTypeAdapter(BigDecimal.class, bigDecimalJsonDeserializer)
.registerTypeAdapter(UUID.class, uuidJsonDeserializer)
.registerTypeAdapter(Long.class, longJsonDeserializer)
.registerTypeAdapter(Calendar.class, calendarJsonSerializer)
.registerTypeAdapter(Calendar.class, calendarJsonDeserializer)
.registerTypeAdapter(GregorianCalendar.class, calendarJsonSerializer)
Expand Down
18 changes: 14 additions & 4 deletions src/test/java/com/microsoft/graph/functional/UserTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;

import java.io.File;
import java.io.FileInputStream;
Expand Down Expand Up @@ -160,7 +161,7 @@ public void meInsightsUsed() {
IUsedInsightCollectionPage usedInsightCollectionPage = graphServiceClient.me().insights().used().buildRequest().get();
assertNotNull(usedInsightCollectionPage);
}

@Test
public void mailFoldertest() {
//GET me/mailFolders
Expand All @@ -172,7 +173,7 @@ public void mailFoldertest() {
assertNotNull(messageCollectionPage);
}
}

@Test
public void meMemberof() {
IDirectoryObjectCollectionWithReferencesPage page = graphServiceClient.me().memberOf().buildRequest().get();
Expand Down Expand Up @@ -201,7 +202,7 @@ public void run() {
}

@Test
public void emptyPostContentType() {
public void emptyPostContentTypeIsNotReset() {
final String contentTypeValue = "application/json";
final HeaderOption ctype = new HeaderOption("Content-Type", contentTypeValue);
final ArrayList<Option> options = new ArrayList<>();
Expand All @@ -211,7 +212,16 @@ public void emptyPostContentType() {
.buildRequest(options)
.withHttpMethod(HttpMethod.POST)
.getHttpRequest();
assertEquals(contentTypeValue, request.body().contentType().toString());
assertEquals(contentTypeValue, request.body().contentType().toString());
}
@Test
public void emptyPostContentTypeIsNotSet() {
final Request request = graphServiceClient.me()
.revokeSignInSessions()
.buildRequest()
.withHttpMethod(HttpMethod.POST)
.getHttpRequest();
assertNull(request.body().contentType());
}
@Test
public void castTest() {
Expand Down
76 changes: 76 additions & 0 deletions src/test/java/com/microsoft/graph/serializer/EdmNativeTypeSerializerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
package com.microsoft.graph.serializer;

import static org.junit.Assert.assertEquals;

import java.math.BigDecimal;
import java.util.UUID;

import com.microsoft.graph.logger.DefaultLogger;

import org.junit.Test;

public class EdmNativeTypeSerializerTests {
@Test
public void testBoolean() throws Exception {
final DefaultSerializer serializer = new DefaultSerializer(new DefaultLogger());

final String source = "{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#Edm.Null\",\"@odata.null\":true}";
final Boolean result = serializer.deserializeObject(source, Boolean.class);

assertEquals(Boolean.valueOf(true), result);
}
@Test
public void testInteger() throws Exception {
final DefaultSerializer serializer = new DefaultSerializer(new DefaultLogger());

final String source = "{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#Edm.Null\",\"@odata.null\":12}";
final Integer result = serializer.deserializeObject(source, Integer.class);

assertEquals(Integer.valueOf(12), result);
}
@Test
public void testString() throws Exception {
final DefaultSerializer serializer = new DefaultSerializer(new DefaultLogger());

final String source = "{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#Edm.Null\",\"@odata.null\":\"toto\"}";
final String result = serializer.deserializeObject(source, String.class);

assertEquals("toto", result);
}
@Test
public void testFloat() throws Exception {
final DefaultSerializer serializer = new DefaultSerializer(new DefaultLogger());

final String source = "{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#Edm.Null\",\"@odata.null\":12.5}";
final Float result = serializer.deserializeObject(source, Float.class);

assertEquals(Float.valueOf("12.5"), result);
}
@Test
public void testLong() throws Exception {
final DefaultSerializer serializer = new DefaultSerializer(new DefaultLogger());

final String source = "{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#Edm.Null\",\"@odata.null\":12}";
final Long result = serializer.deserializeObject(source, Long.class);

assertEquals(Long.valueOf(12), result);
}
@Test
public void testBigDecimal() throws Exception {
final DefaultSerializer serializer = new DefaultSerializer(new DefaultLogger());

final String source = "{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#Edm.Null\",\"@odata.null\":12}";
final BigDecimal result = serializer.deserializeObject(source, BigDecimal.class);

assertEquals(BigDecimal.valueOf(12), result);
}
@Test
public void testUUID() throws Exception {
final DefaultSerializer serializer = new DefaultSerializer(new DefaultLogger());

final String source = "{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#Edm.Null\",\"@odata.null\":\"0E6558C3-9640-4385-860A-2A894AC5C246\"}";
final UUID result = serializer.deserializeObject(source, UUID.class);

assertEquals(UUID.fromString("0E6558C3-9640-4385-860A-2A894AC5C246"), result);
}
}
6 changes: 6 additions & 0 deletions typeSummary.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226307,6 +226307,12 @@
method serializeObject
return type java.lang.String
param serializableObject : java.lang.Object
class com.microsoft.graph.serializer.EdmNativeTypeSerializer
method deserialize
return type java.lang.Object
param json : com.google.gson.JsonElement
param type : java.lang.Class
param logger : com.microsoft.graph.logger.ILogger
class com.microsoft.graph.serializer.EnumSetSerializer
method deserialize
return type java.util.EnumSet
Expand Down