Skip to content

Commit 59a3098

Browse files
committed
Fixes "Access to private field logger of class FallbackTypeAdapterFactory requires synthetic accessor".
1 parent 7ecec8e commit 59a3098

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,14 @@ public void write(JsonWriter out, Void value) throws IOException {
7070
}
7171

7272
@Override
73-
public Void read(JsonReader in) throws IOException {
73+
public Void read(JsonReader in) {
7474
return null;
7575
}
7676

7777
};
7878

7979
/**
80-
* Instanciates a new type adapter factory
80+
* Instantiates a new type adapter factory
8181
*
8282
* @param logger logger to use for the factory
8383
*/
@@ -94,7 +94,7 @@ public <T> TypeAdapter<T> create(@Nonnull final Gson gson, @Nonnull final TypeTo
9494
final Class<T> rawType = (Class<T>) type.getRawType();
9595

9696
if (rawType.isEnum()) {
97-
return new EnumTypeAdapter<T>(rawType, logger);
97+
return new EnumTypeAdapter<>(rawType, logger);
9898
} else if (rawType == Void.class) {
9999
return (TypeAdapter<T>) voidAdapter;
100100
} else if (IJsonBackedObject.class.isAssignableFrom(type.getRawType())) {
@@ -104,8 +104,8 @@ public <T> TypeAdapter<T> create(@Nonnull final Gson gson, @Nonnull final TypeTo
104104
return null;
105105
}
106106

107-
final TypeAdapter<?> delegatedAdapter = gson.getDelegateAdapter(this, type);
108-
return (TypeAdapter<T>) new ODataTypeParametrizedIJsonBackedObjectAdapter(gson, delegatedAdapter, type);
107+
final TypeAdapter<IJsonBackedObject> delegatedAdapter = (TypeAdapter<IJsonBackedObject>) gson.getDelegateAdapter(this, type);
108+
return (TypeAdapter<T>) new ODataTypeParametrizedIJsonBackedObjectAdapter(gson, delegatedAdapter, (TypeToken<IJsonBackedObject>) type, logger);
109109
}
110110
else {
111111
return null;
@@ -121,13 +121,13 @@ public <T> TypeAdapter<T> create(@Nonnull final Gson gson, @Nonnull final TypeTo
121121
private class ODataTypeParametrizedIJsonBackedObjectAdapter extends TypeAdapter<IJsonBackedObject> {
122122

123123
private final Gson gson;
124-
private final TypeAdapter<?> delegatedAdapter;
125-
private final TypeToken<?> type;
124+
private final TypeAdapter<IJsonBackedObject> delegatedAdapter;
125+
private final TypeToken<IJsonBackedObject> type;
126126
private final DerivedClassIdentifier derivedClassIdentifier;
127127

128-
public ODataTypeParametrizedIJsonBackedObjectAdapter(@Nonnull Gson gson, @Nonnull TypeAdapter<?> delegatedAdapter, @Nonnull final TypeToken<?> type) {
128+
public ODataTypeParametrizedIJsonBackedObjectAdapter(@Nonnull Gson gson, @Nonnull TypeAdapter<IJsonBackedObject> delegatedAdapter, @Nonnull final TypeToken<IJsonBackedObject> type, @Nonnull final ILogger logger) {
129129
super();
130-
this.gson = Objects.requireNonNull(gson, "parameter gson cannot be null");;
130+
this.gson = Objects.requireNonNull(gson, "parameter gson cannot be null");
131131
this.delegatedAdapter = Objects.requireNonNull(delegatedAdapter, "object delegated adapted cannot be null");
132132
this.type = Objects.requireNonNull(type, "object type cannot be null");
133133
this.derivedClassIdentifier = new DerivedClassIdentifier(logger);
@@ -137,7 +137,7 @@ public ODataTypeParametrizedIJsonBackedObjectAdapter(@Nonnull Gson gson, @Nonnul
137137
public void write(JsonWriter out, IJsonBackedObject value)
138138
throws IOException
139139
{
140-
((TypeAdapter<IJsonBackedObject>)this.delegatedAdapter).write(out, value);
140+
this.delegatedAdapter.write(out, value);
141141
}
142142

143143
@Override
@@ -153,7 +153,7 @@ public IJsonBackedObject read(JsonReader in) {
153153
}
154154
}
155155

156-
return (IJsonBackedObject) delegatedAdapter.fromJsonTree(jsonElement);
156+
return delegatedAdapter.fromJsonTree(jsonElement);
157157
}
158158
}
159159

0 commit comments

Comments
 (0)