Skip to content

Commit e2df811

Browse files
author
Caitlin Bales (MSFT)
committed
Parameterize enumset with wildcard
1 parent 99cf619 commit e2df811

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ private EnumSetSerializer() {
4848
* @param jsonStrToDeserialize The string to deserialize
4949
* @return EnumSet of values
5050
*/
51-
public static EnumSet deserialize(Type type, String jsonStrToDeserialize) {
51+
public static EnumSet<?> deserialize(Type type, String jsonStrToDeserialize) {
5252
Gson gson = new Gson();
5353
String arrayString = "[" + jsonStrToDeserialize + "]";
54-
return jsonStrToDeserialize == null ? null : (EnumSet) gson.fromJson(arrayString, type);
54+
return jsonStrToDeserialize == null ? null : (EnumSet<?>) gson.fromJson(arrayString, type);
5555
}
5656

5757
/**

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,9 +162,9 @@ public DateOnly deserialize(final JsonElement json,
162162
}
163163
};
164164

165-
final JsonSerializer<EnumSet> enumSetJsonSerializer = new JsonSerializer<EnumSet>() {
165+
final JsonSerializer<EnumSet<?>> enumSetJsonSerializer = new JsonSerializer<EnumSet<?>>() {
166166
@Override
167-
public JsonElement serialize(final EnumSet src,
167+
public JsonElement serialize(final EnumSet<?> src,
168168
final Type typeOfSrc,
169169
final JsonSerializationContext context) {
170170
if (src == null || src.isEmpty()) {
@@ -175,9 +175,9 @@ public JsonElement serialize(final EnumSet src,
175175
}
176176
};
177177

178-
final JsonDeserializer<EnumSet> enumSetJsonDeserializer = new JsonDeserializer<EnumSet>() {
178+
final JsonDeserializer<EnumSet<?>> enumSetJsonDeserializer = new JsonDeserializer<EnumSet<?>>() {
179179
@Override
180-
public EnumSet deserialize(final JsonElement json,
180+
public EnumSet<?> deserialize(final JsonElement json,
181181
final Type typeOfT,
182182
final JsonDeserializationContext context) throws JsonParseException {
183183
if (json == null) {

0 commit comments

Comments
 (0)